Эх сурвалжийг харах

refactor(dev,test): 调整测试和开发的访问环境

yuj 7 жил өмнө
parent
commit
336cf58f26

+ 13 - 13
src/main/resources/dev/account.properties

@@ -1,7 +1,7 @@
 ### account center config, 
-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
+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
 ### \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD:
 ### sso config
 sso.app=mall
@@ -9,17 +9,17 @@ sso.app=mall
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-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
+sso.login.url=https://test-sso.uuzcc.cn
+sso.logout.url=https://test-sso.uuzcc.cn/logquit
+sso.register.url=https://test-sso.uuzcc.cn/register/enterpriseRegistration
+sso.updatePassword.url=https://test-sso.uuzcc.cn/reset/forgetPasswordValidationAccount
+sso.updateMobile.url=https://test-sso.uuzcc.cn/validation/phoneValidation
+sso.updateEmail.url=https://test-sso.uuzcc.cn/validation/emailValidation
+sso.updateQuestion.url=https://test-sso.uuzcc.cn/encrypted-setting/EncryptedSetting
+sso.realNameAuth.url=https://test-sso.uuzcc.cn/certification/realNameCertification
 #cross domain
-sso.ask.url=http://188.131.128.107:3000/sso/login/ask
-sso.askout.url=http://188.131.128.107:3000/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.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=

+ 2 - 0
src/main/resources/dev/jdbc.properties

@@ -1,5 +1,7 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=7e5ef205e2ff4ca465e5938df11039fbd8c6b199dd4a7aaa96b15509a0293d175a9b5ec4e7cf3d474c104dd96d988f4ed5a1cb49da75d3385b3cdc8b75cee4aca0ed7be1dd4e24bc2b3a56fb58a6a0a6517e82a62c82b595c72b7aa67cc6e28ee2ab68b82263a7c5134dc9a322e75b67505db36980c1e0ae93c76e21c8bd92ec4e71b284c2ff419fbb79b93497692557ce0cd4911da3766366420c7f66ff8cc0
+
+7e5ef205e2ff4ca4ac98c9f833880ec6d6085f468fc17f40a4dfc9bf67cf337d8161ba85a3d70d1b4fe75d882e787d153aeb790a4137ba411d4ad617c2597c9adfdc60459f9d4f713399948d5dcd615f7bad79d50f49ce8c27b3246574344a5056a61f3aab10970034a23bf895ace2b12bd4ed6cbf0b5e664f9bca3c439b87a493bf837581ab6eede1d5a08b3c10e7a55fc9806d53ec1d453f3b0132088da1d8
 jdbc.username=73f3cd5578b9e08b
 jdbc.password=48981af937f010627b96e886a0d38aad
 jdbc.initialSize=1

+ 1 - 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://188.131.128.107:24001
+messagePublicServiceDevUrl=https://test-message.uuzcc.cn
 inviteVendorMailTemplateId=9028790a-9fc0-4759-a2df-8c26a7f3aa9a

+ 7 - 7
src/main/resources/dev/sys.properties

@@ -20,10 +20,10 @@ lastCheckUserUU=1000017605
 
 # YesPay config
 yes_gateway=https://mertest.ysepay.com/openapi_gateway/gateway.do
-notifyURL=http://tb2c.usoftchina.com/platform-b2c/api/payment/ysepayNotify
+notifyURL=http://test-mall.uuzcc.cn/platform-b2c/api/payment/ysepayNotify
 returnUrl=/api/yesreturn
 paymentPrice=test
-orderProxyUrl=http://tb2c.usoftchina.com/order/proxy
+orderProxyUrl=http://test-mall.uuzcc.cn/order/proxy
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C
@@ -43,20 +43,20 @@ searchUrl = http://188.131.128.107:24006
 # message ip
 messageServiceIp=http://message.ubtob.com/
 # product public ip
-productServiceIp=http://188.131.128.107:24002
+productServiceIp=https://test-product.uuzcc.cn
 
 # Kafka
 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://188.131.128.107:24000
-inquiryServiceInnerUrl=http://188.131.128.107:24000
+inquiryServiceUrl=https://test-inquiry.uuzcc.cn
+inquiryServiceInnerUrl=https://test-inquiry.uuzcc.cn
 
 #public message  service url
-messageServiceUrl=http://188.131.128.107:24001/
+messageServiceUrl=https://test-message.uuzcc.cn/
 
 #b2b
-b2b=http://test-b2b.uuzcc.cn
+b2b=https://test-b2b.uuzcc.cn
 b2bDomain=test-b2b.uuzcc.cn/b2b-test
 
 #lottery

+ 1 - 1
src/main/resources/ptest/account.properties

@@ -1,5 +1,5 @@
 ### account center config, 
-account.us.save.url=https://test-sso.uuzcc.cn/api/userspace
+account.us.save.url=http://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
 ### sso config

+ 1 - 1
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=https://test-message.uuzcc.cn
+messagePublicServiceDevUrl=http://192.168.100.2:8080

+ 4 - 4
src/main/resources/ptest/sys.properties

@@ -41,22 +41,22 @@ recommendPort=80
 # upload file
 uploadFileUrl=http://dfs-api.ubtob.com
 # search file
-searchUrl=http://188.131.128.107:24006
+searchUrl=http://192.168.100.12:8080
 
 # message ip
 messageServiceIp=http://message.ubtob.com/
 # product public ip
-productServiceIp=http://188.131.128.107:24002
+productServiceIp=http://192.168.100.11:8080
 
 # Kafka
 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=https://test-inquiry.uuzcc.cn
-inquiryServiceInnerUrl=http://188.131.128.107:24000
+inquiryServiceInnerUrl=http://192.168.100.9:8080
 
 #public message  service url
-messageServiceUrl=https://test-message.uuzcc.cn
+messageServiceUrl=http://192.168.100.2:8080
 
 #b2b
 b2b=http://test-b2b.uuzcc.cn

+ 0 - 3
src/main/webapp/resources/js/sso/app.js

@@ -494,9 +494,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 		$scope.homeUrl = BaseService.getRootPath();
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
-            if (url == "http://188.131.128.107:24001/") {
-                url = 'http://188.131.128.107:24001/';
-            }
             var param = {
                 'receiverUu': data.userUU,
                 'receiverEnuu': data.enUU,

+ 1 - 1
src/main/webapp/resources/js/sso/controllers/forstore/ssoCenterCtrl.js

@@ -63,7 +63,7 @@ define(['app/app', 'calendar'], function(app) {
 
         if ($rootScope.isAdmin) {
             User.isDevOrProd(null, function (data) {
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'https://test-sso.uuzcc.cn';
                 $http({
                     method: 'get',
                     dataType: 'json',

+ 1 - 1
src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -26,7 +26,7 @@ define(['app/app'], function (app) {
         if ($scope.isAdmin) {
             User.isDevOrProd(null, function (data) {
                 // $scope.isProd = data.data;
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'https://test-sso.uuzcc.cn';
                 applyToEnterpriseTableParams();
             }, function (response) {
                 toaster.pop('error', '获取运行环境失败');

+ 0 - 3
src/main/webapp/resources/js/usercenter/app.js

@@ -963,9 +963,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 		$scope.homeUrl = BaseService.getRootPath();
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
-            if (url == "http://188.131.128.107:24001") {
-                url = 'http://188.131.128.107:24001';
-            }
             var param = {
                 'receiverUu': data.userUU,
                 'receiverEnuu': data.enUU,

+ 0 - 6
src/main/webapp/resources/js/usercenter/controllers/forstore/messagePersonalCtrl.js

@@ -322,9 +322,6 @@ define(['app/app'], function(app) {
         var getData = function () {
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
-                if (url == "http://188.131.128.107:24001/") {
-                    url = 'http://188.131.128.107:24001/';
-                }
                 var param = {
                     'receiverUu': data.userUU,
                     'receiverEnuu': data.enUU,
@@ -346,9 +343,6 @@ define(['app/app'], function(app) {
             InternalMessage.getUrl({}, function(info) {
                 if (info) {
                     var url = info.url;
-                    if (url == "http://188.131.128.107:24001/") {
-                        url = 'http://188.131.128.107:24001/';
-                    }
                     var param = {
                         'receiverUu': info.userUU,
                         'receiverEnuu': info.enUU,

+ 0 - 3
src/main/webapp/resources/js/vendor/app.js

@@ -1236,9 +1236,6 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
         /*console.info($rootScope.userInfo);*/
         InternalMessage.getUrl({}, function(data) {
             var url = data.url;
-            if (url == "http://188.131.128.107:24001/") {
-                url = 'http://188.131.128.107:24001/';
-            }
             var param = {
                 'receiverUu': data.userUU,
                 'receiverEnuu': data.enUU,

+ 0 - 6
src/main/webapp/resources/js/vendor/controllers/forstore/messagePersonalCtrl.js

@@ -287,9 +287,6 @@ define(['app/app'], function(app) {
             //获取所有消息数量
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
-                if (url == "http://188.131.128.107:24001/") {
-                    url = 'http://188.131.128.107:24001/';
-                }
                 var param = {
                     'receiverUu': data.userUU,
                     'receiverEnuu': data.enUU,
@@ -311,9 +308,6 @@ define(['app/app'], function(app) {
             InternalMessage.getUrl({}, function(info) {
                 if (info) {
                     var url = info.url;
-                    if (url == "http://188.131.128.107:24001/") {
-                        url = 'http://188.131.128.107:24001/';
-                    }
                     var param = {
                         'receiverUu': info.userUU,
                         'receiverEnuu': info.enUU,

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -81,7 +81,7 @@ define(['app/app'], function (app) {
         if ($scope.isAdmin) {
                 User.isDevOrProd(null, function (data) {
                     // $scope.isProd = data.data;
-                    $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
+                    $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'https://test-sso.uuzcc.cn';
                     applyToEnterpriseTableParams();
                 }, function (response) {
                     toaster.pop('error', '获取运行环境失败');

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -113,7 +113,7 @@ define(['app/app', 'calendar'], function(app) {
         if ($scope.isAdmin) {
             User.isDevOrProd(null, function (data) {
                 // $scope.isProd = data.data;
-                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004';
+                $scope.urlPrex = data.data == 'success' ? 'https://sso.ubtob.com' : 'https://test-sso.uuzcc.cn';
                 $http({
                     method: 'get',
                     dataType: 'json',

+ 1 - 1
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://188.131.128.107:3306/mall_test_dev?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&useUnicode=true");
+        prindHexString("jdbc:mysql://192.168.100.3:3306/mall_test_dev?characterEncoding=UTF-8&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&useUnicode=true");
         prindHexString("root");
         prindHexString("select111***");
 

+ 6 - 0
src/test/java/com/uas/platform/b2c/Test.java

@@ -67,5 +67,11 @@ public class Test {
             System.out.println(s);
         }
         System.out.println(st.toString());
+
+        StringBuffer buffer = new StringBuffer();
+        buffer.append("1,");
+        System.out.println(buffer.length());
+        CharSequence charSequence = buffer.subSequence(0, buffer.length() - 1);
+        System.out.println(charSequence.toString());
     }
 }