小柒2012 6 年之前
父节点
当前提交
4d5e69fdd2

+ 1 - 1
src/main/java/com/itstyle/common/config/InitPay.java

@@ -1,4 +1,4 @@
-package com.itstyle.common.config;
+package com.itstyle.common.cinfig;
 
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;

+ 1 - 1
src/main/java/com/itstyle/common/config/Swagger2.java

@@ -1,4 +1,4 @@
-package com.itstyle.common.config;
+package com.itstyle.common.cinfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;

+ 1 - 1
src/main/resources/templates/error/404.html

@@ -7,7 +7,7 @@
 </head>
 <body>
 <div style="text-align:center">
-	页面不见了(功能自行完善,对于开发者来说 so easy)
+	页面不见了
 </div>
 </body>
 </html>

+ 25 - 24
src/main/resources/zfbinfo.properties

@@ -1,24 +1,25 @@
-# \u652f\u4ed8\u5b9d\u7f51\u5173\u540d\u3001partnerId\u548cappId
-open_api_domain = https://openapi.alipay.com/gateway.do
-mcloud_api_domain = http://mcloudmonitor.com/gateway.do
-#\u6b64\u5904\u8bf7\u586b\u5199\u4f60\u7684PID
-pid =XXXXXXXXXXXXXX
-#\u6b64\u5904\u8bf7\u586b\u5199\u4f60\u5f53\u9762\u4ed8\u7684APPID 
-appid =XXXXXXXXXXXXXX
-
-# RSA\u79c1\u94a5\u3001\u516c\u94a5\u548c\u652f\u4ed8\u5b9d\u516c\u94a5
-private_key = XXXXXXXXXXXXXX
-public_key = XXXXXXXXXXXXXX
-alipay_public_key = XXXXXXXXXXXXXX
-
-# \u5f53\u9762\u4ed8\u6700\u5927\u67e5\u8be2\u6b21\u6570\u548c\u67e5\u8be2\u95f4\u9694\uff08\u6beb\u79d2\uff09
-max_query_retry = 5
-query_duration = 5000
-
-# \u5f53\u9762\u4ed8\u6700\u5927\u64a4\u9500\u6b21\u6570\u548c\u64a4\u9500\u95f4\u9694\uff08\u6beb\u79d2\uff09
-max_cancel_retry = 3
-cancel_duration = 2000
-
-# \u4ea4\u6613\u4fdd\u969c\u7ebf\u7a0b\u7b2c\u4e00\u6b21\u8c03\u5ea6\u5ef6\u8fdf\u548c\u8c03\u5ea6\u95f4\u9694\uff08\u79d2\uff09
-heartbeat_delay = 5
-heartbeat_duration = 900
+# \u652f\u4ed8\u5b9d\u7f51\u5173\u540d\u3001partnerId\u548cappId \u6b22\u8fce\u5173\u6ce8https://blog.52itstyle.com/
+open_api_domain = https://openapi.alipay.com/gateway.do
+mcloud_api_domain = http://mcloudmonitor.com/gateway.do
+#\u6b64\u5904\u8bf7\u586b\u5199\u4f60\u7684PID
+pid =XXXXXXXXXXXXXXXX
+#\u6b64\u5904\u8bf7\u586b\u5199\u4f60\u5f53\u9762\u4ed8\u7684APPID 
+appid =XXXXXXXXXXXXXXXX
+
+# RSA\u79c1\u94a5\u3001\u516c\u94a5\u548c\u652f\u4ed8\u5b9d\u516c\u94a5
+private_key = XXXXXXXXXXXXXXXX
+public_key = XXXXXXXXXXXXXXXX
+alipay_public_key = XXXXXXXXXXXXXXXX
+
+# \u5f53\u9762\u4ed8\u6700\u5927\u67e5\u8be2\u6b21\u6570\u548c\u67e5\u8be2\u95f4\u9694\uff08\u6beb\u79d2\uff09
+max_query_retry = 5
+query_duration = 5000
+
+# \u5f53\u9762\u4ed8\u6700\u5927\u64a4\u9500\u6b21\u6570\u548c\u64a4\u9500\u95f4\u9694\uff08\u6beb\u79d2\uff09
+max_cancel_retry = 3
+cancel_duration = 2000
+
+# \u4ea4\u6613\u4fdd\u969c\u7ebf\u7a0b\u7b2c\u4e00\u6b21\u8c03\u5ea6\u5ef6\u8fdf\u548c\u8c03\u5ea6\u95f4\u9694\uff08\u79d2\uff09
+heartbeat_delay = 5
+heartbeat_duration = 900
+>>>>>>> parent of d10079e... \u5305\u540d