Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/ptest/account.properties

@@ -1,25 +1,25 @@
 ### account center config, 
-account.us.save.url=https://tsso.usoftchina.com/api/userspace
-account.user.save.url=https://tsso.usoftchina.com/api/user
-account.user.getPartners.url=https://tsso.usoftchina.com/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
 ### sso config
 sso.app=mall
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
 sso.cookie.browser=false
-sso.cookie.domain=usoftchina.com
-sso.login.url=https://tsso.usoftchina.com
-sso.logout.url=https://tsso.usoftchina.com/logquit
-sso.register.url=https://tsso.usoftchina.com/register/enterpriseRegistration
-sso.updatePassword.url=https://tsso.usoftchina.com/reset/forgetPasswordValidationAccount
-sso.updateMobile.url=https://tsso.usoftchina.com/validation/phoneValidation
-sso.updateEmail.url=https://tsso.usoftchina.com/validation/emailValidation
-sso.updateQuestion.url=https://tsso.usoftchina.com/encrypted-setting/EncryptedSetting
-sso.realNameAuth.url=https://tsso.usoftchina.com/certification/realNameCertification
+sso.cookie.domain=uuzcc.cn
+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=https://tsso.usoftchina.com/sso/login/ask
-sso.askout.url=https://tsso.usoftchina.com/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=

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://tmessage-api.usoftchina.com/
+messagePublicServiceDevUrl=https://test-message.uuzcc.cn

src/main/resources/ptest/minio.properties

@@ -1,6 +1,6 @@
 # minio upload file
-url=https://tminio.usoftchina.com
+url=https://minio.usoftchina.com
 accessKey=UW67ELM93TD7Q4I82MJZ
 secretKey=D2lOfo2Oh_2dzu4Cnzt56wjNtes7qVQxmBfyjd80
-staticUrl=https://tstatic.usoftchina.com/
+staticUrl=https://static.usoftchina.com/
 buketName=appb2c

src/main/resources/ptest/sys.properties

@@ -6,7 +6,7 @@ listenOnIndexChange=false
 imageUri=http://113.105.74.140/images/
 manageInner=http://192.168.100.5:8080
 im=http://113.105.74.131:8092
-b2c=https://tb2c.usoftchina.com
+b2c=https://test-b2c.uuzcc.cn
 #file path
 outputFile=${catalina.home}/logs/b2c_sys_out.log
 #enUU and adminUU for the System Mall
@@ -21,13 +21,13 @@ lastCheckUserUU=1000017605
 
 # YesPay config
 yes_gateway=https://openapi.ysepay.com/gateway.do
-notifyURL=https://tmall.usoftchina.com/api/payment/ysepayNotify
-returnUrl=https://tmall.usoftchina.com/api/yesreturn
+notifyURL=https://test-mall.uuzcc.cn/api/payment/ysepayNotify
+returnUrl=https://test-mall.uuzcc.cn/api/yesreturn
 paymentPrice=ptest
-orderProxyUrl=https://tmall.usoftchina.com/order/proxy
+orderProxyUrl=https://test-mall.uuzcc.cn/order/proxy
 #report url
-reportPrintUrl=https://tprint.usoftchina.com/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
-reportUploadUrl=https://tprint.usoftchina.com/report/fileUpload?userName=B2C
+reportPrintUrl=https://test-print.uuzcc.cn/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
+reportUploadUrl=https://test-print.uuzcc.cn/report/fileUpload?userName=B2C
 # micro service IP(Swarm Manager IP)
 microServiceIp=news.usoftchina.com
 newsMicroServiceIp=news.usoftchina.com
@@ -52,15 +52,15 @@ productServiceIp=http://188.131.128.107:24002
 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://tinquiry-api.usoftchina.com
-inquiryServiceInnerUrl=http://10.1.51.92:24000
+inquiryServiceUrl=https://test-inquiry.uuzcc.cn
+inquiryServiceInnerUrl=http://188.131.128.107:24000
 
 #public message  service url
-messageServiceUrl=https://tmessage-api.usoftchina.com
+messageServiceUrl=https://test-message.uuzcc.cn
 
 #b2b
-b2b=http://tb2b.usoftchina.com
-b2bDomain=tb2b.usoftchina.com
+b2b=http://test-b2b.uuzcc.cn
+b2bDomain=test-b2b.uuzcc.cn
 b2bInner=http://192.168.100.13:8080
 
 #lottery

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -192,9 +192,9 @@ define([ 'app/app' ], function(app) {
         var getAllData = function (addStartFormatDate, addEndFormatDate, startFormatDate, endFormatDate) {
             var defer = $q.defer();
             User.isDevOrProd(null, function (data) {
-                var ssoUrl = data.data == 'success' ? 'https://sso.ubtob.com' : 'http://188.131.128.107:24004',
+                var ssoUrl = data.data == 'success' ? 'https://sso.ubtob.com' : 'https://test-sso-server.uuzcc.cn',
                 // uasUrl = data.data == 'success' ? 'http://uas.ubtob.com' : 'http://192.168.253.12:9000/b2b-test',
-                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftchina.com' : 'https://tinquiry-api.usoftchina.com';
+                commonUrl = data.data == 'success' ? 'https://api-inquiry.usoftchina.com' : 'https://test-inquiry.uuzcc.cn';
                 defer.resolve([
                     getSeekInfo(commonUrl),
                     getAddEnUserCount(ssoUrl),

src/main/webapp/resources/js/common/services.js

@@ -151,12 +151,10 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 					// defer.promise.then(function (resolve) {
 					// 	$rootScope.b2bUrl = resolve.url;
 					// });
-					if (this.getRootPath().indexOf('tb2c.usoftchina.com') > -1 || this.getRootPath().indexOf('tmall.usoftchina.com') > -1) {
-                        $rootScope.b2bUrl = 'https://tb2b.usoftchina.com'
-					} else if (this.getRootPath().indexOf('rb2c.usoftchina.com') > -1 || this.getRootPath().indexOf('rmall.usoftchina.com') > -1) {
-                        $rootScope.b2bUrl = 'https://rb2b.usoftchina.com'
-					} else if (this.getRootPath().indexOf('pb2c.usoftchina.com') > -1 || this.getRootPath().indexOf('pmall.usoftchina.com') > -1) {
-                        $rootScope.b2bUrl = 'https://pb2b.usoftchina.com'
+					if (this.getRootPath().indexOf('test-b2c.uuzcc.cn') > -1 || this.getRootPath().indexOf('test-mall.uuzcc.cn') > -1) {
+                        $rootScope.b2bUrl = 'https://test-b2b.uuzcc.cn'
+					} else if (this.getRootPath().indexOf('rel-b2c.uuzcc.cn') > -1 || this.getRootPath().indexOf('rel-mall.uuzcc.cn') > -1) {
+                        $rootScope.b2bUrl = 'https://rel-b2b.uuzcc.cn'
                     } else if (this.getRootPath().indexOf('b2c.usoftchina.com') > -1 || this.getRootPath().indexOf('mall.usoftchina.com') > -1) {
                         $rootScope.b2bUrl = 'https://b2b.usoftchina.com'
 					} else {

src/main/webapp/resources/view/admin/stats_data.html

@@ -258,7 +258,7 @@
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品类目总数：</span>
-                        <span class="col-sm-6" ng-bind="start12 | number"></span>
+                        <span class="col-sm-6" ng-bind="(start32 + start33) | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品类目（标准）：</span>
@@ -270,7 +270,7 @@
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品品牌总数：</span>
-                        <span class="col-sm-6" ng-bind="start11 | number"></span>
+                        <span class="col-sm-6" ng-bind="(start34 + start35) | number"></span>
                     </div>
                     <div class="form-group row">
                         <span class="col-sm-6 text-right">在售商品品牌（标准）：</span>