Merge branch 'develop' of D:\globalpay\9009_manage_develop\royalpay.manage with conflicts.

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -3812,7 +3812,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
 
         AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayRetailMerchant();
-        Element resultElement = alipayClient.registerGmsPortal(mch.getPid(), client);
+        //Element resultElement = alipayClient.registerGmsPortal(mch.getPid(), client);
+        Element resultElement = null;
         if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
             throw new BadRequestException(resultElement.elementText("error"));
         }
@@ -4026,7 +4027,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         yeepayConfig.put("industry",merchantInfo.getString("industry"));
         yeepayConfig.put("business_content",merchantInfo.getString("business_content"));
         yeepayConfig.put("business_licence",merchantInfo.getString("business_licence"));
-        yeePayClientConfigMapper.update(yeepayConfig);
+        //yeePayClientConfigMapper.update(yeepayConfig);
         yeepayConfig.put("company_website",merchantInfo.getString("company_website"));
         yeepayConfig.put("abn",merchantInfo.getString("abn"));
         yeepayConfig.put("company_name",merchantInfo.getString("company_name"));

src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.schema-name=royalpay_production
-spring.datasource.host=192.168.0.111:3306
+spring.datasource.host=192.168.0.18:3306
 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root

src/main/resources/application-local.properties

@@ -1,6 +1,6 @@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.schema-name=royalpay_production
-spring.datasource.host=192.168.0.49:3306
+spring.datasource.host=127.0.0.1:3306
 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=5000
 
-spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay,lakala
+spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay
 
 env.company=RoyalPay
 
@@ -22,11 +22,11 @@ spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.database=1
 
-spring.data.mongodb.host=10.30.0.8
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=admin
-spring.data.mongodb.username=mongouser
-spring.data.mongodb.password=Royalpay123
+#spring.data.mongodb.host=192.168.0.111
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=admin
+#spring.data.mongodb.username=mongouser
+#spring.data.mongodb.password=Royalpay123
 
 mybatis.autosql.default-dialect=mysql
 
@@ -57,17 +57,23 @@ app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499
 #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf
 app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf
 
-app.host.main=http://192.168.0.9:9003/
-app.host.regions.cn=https://mpay-cn.royalpay.com.au/
-app.host.regions.au=https://mpay-au.royalpay.com.au/
+#app.host.main=https://mpay.royalpay.com.au/
+#app.host.regions.cn=https://mpay-cn.royalpay.com.au/
+#app.host.regions.au=https://mpay-au.royalpay.com.au/
+app.host.main=http://192.168.0.8:9009/
+app.host.regions.cn=http://192.168.0.8:9009/
+app.host.regions.au=http://192.168.0.8:9009/
 app.debug=true
 
 app.name=RoyalPay
 
-app.cms.host=https://www.royalpay.com.au/
+#app.cms.host=https://www.royalpay.com.au/
+
+app.cms.host=http://127.0.0.1:9533
 
 app.server.ip=127.0.0.1
 
+
 app.redpack_auth.enable=false
 hf.rsa-file=/opt/2000604000101.pfx
 ##积分商城
@@ -88,8 +94,9 @@ app.mail.appid=1
 app.mail.host=https://mailsupport.royalpay.com.au
 mail.send.credentialCode=Fd1aRfdjc9
 
-apple.message.apns.password=F1b5*ChJPp73
-apple.message.apns.file=/opt/adn
+app.sandbox=true
+apple.message.apns.password=BSNMNkxPq0AT
+apple.message.apns.file=D:\\globalpay\\9009_manage_develop\\royalpay.manage\\src\\main\\resources\\apple_message_cert_product.p12
 android.message.secret=2b96d9bc6169c9554218aab1
 android.message.appkey=3f33a10d0a7d4ac94d8f2431
 
@@ -141,4 +148,4 @@ app.hanyin-secure.pid=ROYALPAY
 app.hanyin-secure.sftp-host=180.168.61.86
 app.hanyin-secure.sftp-port=28480
 app.hanyin-secure.sftp-username=royalpay
-app.hanyin-secure.sftp-pwd=royalpay
+app.hanyin-secure.sftp-pwd=royalpay