fix： 调整B2B环境配置：dev环境接口访问地址等采用外网；ptest环境网页访问地址采用外网，客户端访问地址采用内网

pom.xml

@@ -12,7 +12,10 @@
     </parent>
     <profiles>
         <profile>
-
+            <!-- 默认 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <!-- 开发环境 -->
             <id>dev</id>
             <properties>
@@ -21,16 +24,6 @@
                 <static-path>static</static-path>
             </properties>
         </profile>
-        <profile>
-            <!-- 测试环境 -->
-            <id>test</id>
-            <properties>
-                <profile>test</profile>
-                <!-- static plugin -->
-                <static-path>static</static-path>
-            </properties>
-
-        </profile>
         <profile>
             <!-- 生产环境 -->
             <id>ptest</id>
@@ -50,10 +43,6 @@
             </properties>
         </profile>
         <profile>
-            <!-- 默认 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <!-- 预部署环境 -->
             <id>pre</id>
             <properties>

src/main/resources/dev/account.properties

@@ -1,7 +1,7 @@
-account.us.save.url=http://192.168.253.6:32323/api/userspace
-account.user.save.url=http://192.168.253.6:32323/api/user
-account.user.getPartners.url = http://192.168.253.6:32323/api/partners
-account.user.getContactPage.url=http://192.168.253.6:32323/business/groups
+account.us.save.url=https://test-sso.uuzcc.cn/api/userspace
+account.user.save.url=https://test-sso.uuzcc.cn/api/user
+account.user.getPartners.url = https://test-sso.uuzcc.cn/api/partners
+account.user.getContactPage.url=https://test-sso.uuzcc.cn/business/groups
 
 ### sso config
 sso.app=b2b
@@ -9,12 +9,12 @@ sso.app=b2b
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.login.url=http://192.168.253.6:32323/
-sso.logout.url=http://192.168.253.6:32323/logquit
+sso.login.url=https://test-sso.uuzcc.cn/
+sso.logout.url=https://test-sso.uuzcc.cn/logquit
 
 #cross domain
-sso.ask.url=http://192.168.253.6:32323/sso/login/ask
-sso.askout.url=http://192.168.253.6:32323/sso/logout/ask
+sso.ask.url=https://test-sso.uuzcc.cn/sso/login/ask
+sso.askout.url=https://test-sso.uuzcc.cn/sso/logout/ask
 sso.proxy.uri=login/proxy
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/dev/jdbc.properties

@@ -1,6 +1,6 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.253.6:3306/b2b_mysql_test?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
-jdbc.username=root
+jdbc.url=jdbc:mysql://188.131.128.107:3306/b2b_mysql_test?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
+jdbc.username=sa
 jdbc.password=select111***
 jdbc.initialSize=5
 jdbc.maxActive=100

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/sys.properties

@@ -1,26 +1,26 @@
 #path
-b2b=https://tb2b.usoftchina.com
+b2b=https://test-b2b.uuzcc.cn
 manage=http://218.17.158.219:9090/platform-manage
 manageInner=http://192.168.253.60:9090/platform-manage
 im=http://113.105.74.131:8092
-b2c=https://tmall.usoftchina.com
-registerUrl=http://192.168.253.12:32323/register/enterpriseRegistration
+b2c=https://test-b2c.uuzcc.cn
+registerUrl=https://test-sso.uuzcc.cn/register/enterpriseRegistration
 
 #report url
 reportPrintUrl=http://192.168.253.121:8090/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://192.168.253.121:8090/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=http://10.1.51.92:24002
+productServiceUrl=https://test-product.uuzcc.cn
 
 #inquiry service url
-inquiryServiceUrl=http://10.1.51.92:24000
+inquiryServiceUrl=https://test-inquiry.uuzcc.cn
 
 #message service ip
 messageServiceIp=http://10.1.51.92:24001
 
 #search url
-searchUrl=http://10.1.51.92:24005
+searchUrl=http://188.131.128.107:24005
 
 #dfs file url
 dfsFileUrl=http://10.10.100.200:9999

src/main/resources/ptest/account.properties

@@ -1,14 +1,14 @@
 ### account center config, 
-account.us.save.url=https://test-sso.uuzcc.cn/api/userspace
-account.user.save.url=https://test-sso.uuzcc.cn/api/user
-account.user.getPartners.url = https://test-sso.uuzcc.cn/api/partners
-account.user.getContactPage.url=https://test-sso.uuzcc.cn/business/groups
+account.us.save.url=http://192.168.100.16:3000/api/userspace
+account.user.save.url=http://192.168.100.16:3000/api/user
+account.user.getPartners.url = http://192.168.100.16:3000/api/partners
+account.user.getContactPage.url=http://192.168.100.16:3000/business/groups
 
 ### sso config
 sso.app=b2b
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
-sso.cookie.domain=usoftchina.com
+sso.cookie.domain=uuzcc.cn
 sso.cookie.secure=false
 sso.cookie.browser=false
 sso.login.url=https://test-sso.uuzcc.cn
@@ -18,7 +18,7 @@ sso.ask.url=https://test-sso.uuzcc.cn/sso/login/ask
 sso.askout.url=https://test-sso.uuzcc.cn/sso/logout/ask
 sso.updatePassword.url=https://test-sso.uuzcc.cn/reset/forgetPasswordValidationAccount
 sso.cloudcenter.url=https://test-sso.uuzcc.cn/cloudcenter
-mall.login.url=https://tmall.usoftchina.com/newLogin/other
+mall.login.url=https://test-b2c.uuzcc.cn/newLogin/other
 sso.proxy.uri=login/proxy
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

src/main/resources/ptest/jdbc.properties

@@ -1,6 +1,6 @@
 #mysql info
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://188.131.128.107:3306/b2b_mysql_test?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
+jdbc.url=jdbc:mysql://192.168.100.3:3306:3306/b2b_mysql_test?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
 jdbc.username=sa
 jdbc.password=select111***
 jdbc.initialSize=5

src/main/resources/ptest/sys.properties

@@ -1,9 +1,9 @@
 #path
-b2b=http://test-b2b.uuzcc.cn
+b2b=http://192.168.100.13:8080
 manage=http://manage.ubtob.com
 manageInner=http://192.168.100.13:8080
 im=http://113.105.74.140:8092
-b2c=https://test-b2c.uuzcc.cn
+b2c=http://192.168.100.5:8080
 registerUrl=https://tsso.usoftchina.com/register/enterpriseRegistration
 
 #report url
@@ -20,7 +20,7 @@ inquiryServiceUrl=https://test-inquiry.uuzcc.cn
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://188.131.128.107:24005
+searchUrl=http://192.168.100.15:8080
 
 # dfs file url
 dfsFileUrl=http://dfs-api.ubtob.com

src/main/resources/test/account.properties

@@ -1,26 +0,0 @@
-### account center config, 
-account.us.save.url=http://218.17.158.219:32323/api/userspace
-account.user.save.url=http://218.17.158.219:32323/api/user
-account.user.getPartners.url = http://218.17.158.219:32323/api/partners
-account.user.getContactPage.url=http://218.17.158.219:32323/business/groups
-
-### sso config
-sso.app=b2b
-# token secretkey
-sso.secretkey=0taQcW073Z7G628g5H
-sso.cookie.secure=false
-sso.cookie.browser=false
-sso.login.url=http://218.17.158.219:32323/
-sso.logout.url=http://218.17.158.219:32323/logquit
-
-#cross domain
-sso.ask.url=http://218.17.158.219:32323/sso/login/ask
-sso.askout.url=http://218.17.158.219:32323/sso/logout/ask
-sso.updatePassword.url=http://218.17.158.219:32323/reset/forgetPasswordValidationAccount
-sso.cloudcenter.url=http://218.17.158.219:32323/cloudcenter
-mall.login.url=http://218.17.158.219:23400/newLogin/other
-sso.proxy.uri=login/proxy
-sso.authcookie.secretkey=Z318866alN6gA0piuO
-sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=
-sso.client.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKrkx/azsoEdYsjM1NQkkA1xvpSaTEIFpEVjMDt5c0vlCdxkatcscQ/JjxWQriLTEcT+DL7t578Q77CcfJX0V5ODBrMETiAT3HQQJ2rKYTe8EuZg7w3v1QSCr/n4OI+FRJ2pPVVAEIUtYA7afmZkKQnPf4M/L7nhdbniF7KQKFIQIDAQAB
-sso.center.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL2g7CEfuPZtEDy7Iz5AL6iwbHZewWGUBYUWxKnFAwAW4lY8mMavn5Ke5mB25eKj5bvUsB48r8gWTvJNsKRGEw8CAwEAAQ==

src/main/resources/test/dubbo.properties

@@ -1,3 +0,0 @@
-zk.url=zookeeper://10.10.100.11:2181
-dubbo.owner=test
-dubbo.group=test

src/main/resources/test/email.properties

@@ -1,5 +0,0 @@
-email.host=smtp.mxhichina.com
-email.port=25
-email.username=admin@usoftchina.com
-email.password=Youruan888
-email.from=admin@usoftchina.com

src/main/resources/test/jdbc.properties

@@ -1,45 +0,0 @@
-#jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-#jdbc.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
-#jdbc.username=uuplatformdemo
-#jdbc.password=selectuuplatform
-#jdbc.initialSize=5
-#jdbc.maxActive=100
-#jdbc.minIdle=5
-#jdbc.suspectTimeout=60
-#jdbc.timeBetweenEvictionRunsMillis=30000
-#jdbc.minEvictableIdleTimeMillis=60000
-#jdbc.validationQuery=SELECT 1 FROM DUAL
-#jdbc.testWhileIdle=true
-#jdbc.testOnBorrow=true
-#jdbc.testOmReturn=false
-#jdbc.removeAbandoned=true
-#jdbc.removeAbandonedTimeout=1800
-#
-##manage.ubtob.com
-#manage.jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-#manage.jdbc.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
-#manage.jdbc.username=platformmanager$test
-#manage.jdbc.password=select!#%*(
-
-jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.253.6:3306/b2b_mysql_test?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true
-jdbc.username=root
-jdbc.password=select111***
-jdbc.initialSize=5
-jdbc.maxActive=100
-jdbc.minIdle=5
-jdbc.suspectTimeout=60
-jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
-jdbc.validationQuery=SELECT 1 FROM DUAL
-jdbc.testWhileIdle=true
-jdbc.testOnBorrow=true
-jdbc.testOmReturn=false
-jdbc.removeAbandoned=true
-jdbc.removeAbandonedTimeout=1800
-
-##manage.ubtob.com
-manage.jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
-manage.jdbc.url=jdbc:oracle:thin:@218.17.158.219:1521:orcl
-manage.jdbc.username=platformmanager$test
-manage.jdbc.password=select!#%*(

src/main/resources/test/message.properties

@@ -1,18 +0,0 @@
-tplInvitationForB2B=e565c0cf-87a2-4d18-8ce8-c5be757f5a3d
-msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
-tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
-msgTenderForB2B=f9e29b6f-4116-4d33-9bde-048aa037f8c6
-tplInvitationForERP=d8324da8-fa97-429c-8293-761698a94db8
-msgInvitationForERP=5081e29f-47af-4556-a560-9213af11753f
-
-## messageConfig
-tplInquiryForB2B=d94e931b-b699-46d7-8bb2-94604a3352c0
-tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
-msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
-msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
-messageUrl=http://message.ubtob.com/sms/send
-msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
-msgAddPartNoticeManager=4d55f1aa-be3e-4690-9b0d-9f31f75deecb
-msgAddPartNoticeContact=
-
-messagePublicServiceDevUrl=http://218.17.158.219:24000/message/

src/main/resources/test/redis.properties

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

src/main/resources/test/sys.properties

@@ -1,28 +0,0 @@
-#path
-b2b=http://218.17.158.219:9000/b2b-test
-manage=http://218.17.158.219:9090/platform-manage
-manageInner=http://10.1.51.24:8888
-im=http://113.105.74.131:8092
-b2c=http://192.168.253.12:23400
-registerUrl=http://192.168.253.12:32323/register/enterpriseRegistration
-
-#report url
-reportPrintUrl=http://192.168.253.121:8090/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
-reportUploadUrl=http://192.168.253.121:8090/report/fileUpload?userName=B2B%s
-
-#product service url
-## test http://218.17.158.219:24000
-productServiceUrl=http://218.17.158.219:24000
-#productServiceUrl=http://10.1.51.24:8080/
-#inquiry service url
-inquiryServiceUrl=http://218.17.158.219:24000
-#inquiryServiceUrl=http://10.1.51.83:8080/
-
-#message service ip
-messageServiceIp=http://message.ubtob.com/
-
-#search url
-searchUrl=http://192.168.253.6:8081
-
-#dfs file url
-dfsFileUrl=http://10.10.100.200:9999