Merge remote-tracking branch 'origin/feature-201843-wangcz' into feature-201843-wangcz

src/main/resources/dev/account.properties

@@ -1,7 +1,7 @@
 ### account center config, 
-account.us.save.url=http://188.131.128.107:24004/api/userspace
-account.user.save.url=http://188.131.128.107:24004/api/user
-account.user.getPartners.url=http://188.131.128.107:24004/api/partners
+account.us.save.url=http://188.131.128.107:3000/api/userspace
+account.user.save.url=http://188.131.128.107:3000/api/user
+account.user.getPartners.url=http://188.131.128.107:3000/api/partners
 ### \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD:
 ### sso config
 sso.app=mall
@@ -9,16 +9,16 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.login.url=http://188.131.128.107:24004
-sso.logout.url=http://188.131.128.107:24004/logquit
-sso.register.url=http://188.131.128.107:24004/register/enterpriseRegistration
-sso.updatePassword.url=http://188.131.128.107:24004/reset/forgetPasswordValidationAccount
-sso.updateMobile.url=http://188.131.128.107:24004/validation/phoneValidation
-sso.updateEmail.url=http://188.131.128.107:24004/validation/emailValidation
-sso.updateQuestion.url=http://188.131.128.107:24004/encrypted-setting/EncryptedSetting
-sso.realNameAuth.url=http://188.131.128.107:24004/certification/realNameCertification
+sso.login.url=http://188.131.128.107:3000
+sso.logout.url=http://188.131.128.107:3000/logquit
+sso.register.url=http://188.131.128.107:3000/register/enterpriseRegistration
+sso.updatePassword.url=http://188.131.128.107:3000/reset/forgetPasswordValidationAccount
+sso.updateMobile.url=http://188.131.128.107:3000/validation/phoneValidation
+sso.updateEmail.url=http://188.131.128.107:3000/validation/emailValidation
+sso.updateQuestion.url=http://188.131.128.107:3000/encrypted-setting/EncryptedSetting
+sso.realNameAuth.url=http://188.131.128.107:3000/certification/realNameCertification
 #cross domain
-sso.ask.url=http://188.131.128.107:24004/sso/login/ask
+sso.ask.url=http://188.131.128.107:3000/sso/login/ask
 sso.askout.url=http://188.131.128.107:24004/sso/logout/ask
 
 sso.authcookie.secretkey=Z318866alN6gA0piuO

src/main/resources/dev/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=7e5ef205e2ff4ca4ac98c9f833880ec6e2fe1a4579ebe694cfadee207b20b5e2117a91db885bc50d2e397066c57e9fc432b41fef4178ab4e8a646fd89b9851a0f7432a8bd9956b2418e78dee1c5e5d82567f1298126b0dca5e3fdf150d16d06c2f31b54827ae14e87ca646b5a71154c6a4c09b934eeadccaa91ce8de7659392f9da7fc12426aa4539e840f5fe9330ae0aa41f8a2acc3771cabe6d12a3e97a9d4
+jdbc.url=7e5ef205e2ff4ca465e5938df11039fbd8c6b199dd4a7aaa96b15509a0293d175a9b5ec4e7cf3d474c104dd96d988f4ed5a1cb49da75d3385b3cdc8b75cee4aca0ed7be1dd4e24bc2b3a56fb58a6a0a6517e82a62c82b595c72b7aa67cc6e28ee2ab68b82263a7c5134dc9a322e75b67505db36980c1e0ae93c76e21c8bd92ec4e71b284c2ff419fbb79b93497692557ce0cd4911da3766366420c7f66ff8cc0
 jdbc.username=474e1aeadeeecac5
 jdbc.password=48981af937f010627b96e886a0d38aad
 jdbc.initialSize=1

src/main/resources/dev/message.properties

@@ -7,5 +7,5 @@ plaformB2cComponentApprovedTemplateId=36812a85-d0f9-4d2a-a7aa-62319f092b6f
 plaformB2cComponentUnproveTemplateId=6228240a-93ba-405f-851c-f874a6c99864
 plaformB2cSupplyChainTemplateId=b28337ba-f115-4f11-b457-15d558443160
 
-messagePublicServiceDevUrl=http://218.17.158.219:24000/message
+messagePublicServiceDevUrl=http://188.131.128.107:24001/message
 inviteVendorMailTemplateId=9028790a-9fc0-4759-a2df-8c26a7f3aa9a

src/main/resources/dev/redis.properties

@@ -1,2 +1,2 @@
-redis.host=192.168.253.6
+redis.host=188.131.128.107
 redis.port=6379

src/main/resources/dev/redisson.yaml

@@ -13,7 +13,7 @@ singleServerConfig:
   password: null
   subscriptionsPerConnection: 5
   clientName: null
-  address: ["redis://192.168.253.6:6379"]
+  address: ["redis://188.131.128.107:6379"]
   subscriptionConnectionMinimumIdleSize: 1
   subscriptionConnectionPoolSize: 25
   connectionMinimumIdleSize: 5

src/main/resources/dev/sys.properties

@@ -5,7 +5,7 @@ listenOnIndexChange=false
 imageUri=http://218.17.158.219:8020/images/
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
-b2c=http://218.17.158.219:9090/platform-b2c
+b2c=http://tb2c.usoftchina.com
 #file path
 outputFile=
 #enUU for the System Mall

src/main/resources/ptest/message.properties

@@ -8,4 +8,4 @@ plaformB2cSupplyChainTemplateId=b28337ba-f115-4f11-b457-15d558443160
 inviteVendorMailTemplateId=9028790a-9fc0-4759-a2df-8c26a7f3aa9a
 tplAfterBeAddedtoB2C=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
 
-messagePublicServiceDevUrl=http://192.168.100.2:8080/
+messagePublicServiceDevUrl=https://tmessage-api.usoftchina.com/

src/main/resources/ptest/sys.properties

@@ -10,14 +10,14 @@ b2c=https://tb2c.usoftchina.com
 #file path
 outputFile=${catalina.home}/logs/b2c_sys_out.log
 #enUU and adminUU for the System Mall
-enUU=10042875
-adminUU=1000002821
+enUU=10030994
+adminUU=1000001962
 adminName=\u5218\u840C\u51B0
+enName=\u4F18\u8F6F\u6D4B\u8BD5\u4E8C
 storeid = 33069557578d44e69bd91ad12d28a8d4
-enName=\u6DF1\u5733\u4F18\u8F6F\u5546\u57CE\u79D1\u6280\u6709\u9650\u516C\u53F8
 
 # Store check
-lastCheckUserUU=1000002242
+lastCheckUserUU=1000017605
 
 # YesPay config
 yes_gateway=https://openapi.ysepay.com/gateway.do
@@ -52,11 +52,11 @@ productServiceIp=http://192.168.100.11:8080
 kafka-bootstrap-servers=10.10.100.11:9292,10.10.100.12:9292,10.10.100.13:9292,10.10.100.14:9292,10.10.100.15:9292,10.10.100.16:9292
 
 #inquiry service url
-inquiryServiceUrl=http://192.168.100.9:8080
+inquiryServiceUrl=https://tinquiry-api.usoftchina.com
 inquiryServiceInnerUrl=http://192.168.100.9:8080
 
 #public message  service url
-messageServiceUrl=http://192.168.100.2:8080
+messageServiceUrl=https://tmessage-api.usoftchina.com
 
 #b2b
 b2b=http://tb2b.usoftchina.com

src/main/resources/test/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=7e5ef205e2ff4ca4ac98c9f833880ec6e2fe1a4579ebe694cfadee207b20b5e2117a91db885bc50d2e397066c57e9fc432b41fef4178ab4e8a646fd89b9851a0f7432a8bd9956b2418e78dee1c5e5d82567f1298126b0dca5e3fdf150d16d06c2f31b54827ae14e87ca646b5a71154c6a4c09b934eeadccaa91ce8de7659392f9da7fc12426aa4539e840f5fe9330ae0aa41f8a2acc3771cabe6d12a3e97a9d4
+jdbc.url=7e5ef205e2ff4ca465e5938df11039fbd8c6b199dd4a7aaa96b15509a0293d175a9b5ec4e7cf3d474c104dd96d988f4ed5a1cb49da75d3385b3cdc8b75cee4aca0ed7be1dd4e24bc2b3a56fb58a6a0a6517e82a62c82b595c72b7aa67cc6e28ee2ab68b82263a7c5134dc9a322e75b67505db36980c1e0ae93c76e21c8bd92ec4e71b284c2ff419fbb79b93497692557ce0cd4911da3766366420c7f66ff8cc0
 jdbc.username=474e1aeadeeecac5
 jdbc.password=48981af937f010627b96e886a0d38aad
 jdbc.initialSize=1

src/main/resources/test/redis.properties

@@ -1,3 +1,3 @@
-redis.host=192.168.253.6
+redis.host=188.131.128.107
 #redis.host=10.10.100.200
 redis.port=6379

src/main/resources/test/redisson.yaml

@@ -13,7 +13,7 @@ singleServerConfig:
   password: null
   subscriptionsPerConnection: 5
   clientName: null
-  address: ["redis://192.168.253.6:6379"]
+  address: ["redis://188.131.128.107:6379"]
   subscriptionConnectionMinimumIdleSize: 1
   subscriptionConnectionPoolSize: 25
   connectionMinimumIdleSize: 5

src/test/java/com/uas/platform/b2c/DesTest.java

@@ -14,7 +14,7 @@ public class DesTest {
     public void test(){
         // 测试
         System.out.println("text & dev: ");
-        prindHexString("jdbc:mysql://192.168.253.6:3306/mall_test_dev?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&useUnicode=true");
+        prindHexString("jdbc:mysql://188.131.128.107:3306/mall_test_dev?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&useUnicode=true");
         prindHexString("root");
         prindHexString("select111***");