Merge branch 'dev' of maopiao/mp-server into mp-server-test

mp-admin/src/main/resources/application-test.yml

@@ -1,9 +1,9 @@
 mp:
   profile: /home/mangpiao/mp-server
 pay:
-  callbackUrl: https://test-api.kaimanghe.net/service/notify/payCallback
+  callbackUrl: https://test-mp-adm.kaimanghe.net/service/notify/payCallback
 alipay:
-  callbackUrl: https://test-api.kaimanghe.net/service/notify/alipayCallback
+  callbackUrl: https://test-mp-adm.kaimanghe.net/service/notify/alipayCallback
 
 # 日志配置
 logging:
@@ -152,11 +152,11 @@ ys-pay:
   private-key-path: /home/mangpiao/mp-server/data/ysPayPre.pfx
   public-key-path: /home/mangpiao/mp-server/data/businessgate.cer
   # 支付完后跳转
-  return-url: https://test-api.kaimanghe.net
+  return-url: https://test-mp-adm.kaimanghe.net
   # 回调地址
-  pay-notify-url: https://test-api.kaimanghe.net/service/notify/ysCallback
+  pay-notify-url: https://test-mp-adm.kaimanghe.net/service/notify/ysCallback
   # 分账回调地址
-  div-notify-url: https://test-api.kaimanghe.net/service/notify/ysDivCallback
+  div-notify-url: https://test-mp-adm.kaimanghe.net/service/notify/ysDivCallback
   # 提现回调地址
-  withdraw-notify-url: https://test-api.kaimanghe.net/service/notify/ysWithdrawCallback
+  withdraw-notify-url: https://test-mp-adm.kaimanghe.net/service/notify/ysWithdrawCallback
 

mp-admin/src/main/resources/logback-8091.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/mangpiao/mp-server"/>
+	<property name="log.path" value="/home/quanshu/mp-server"/>
     <!-- 日志输出格式 -->
     <!-- You can override this to have a custom pattern -->
 	<property name="CONSOLE_LOG_PATTERN" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />