Merge branch 'hotfix-yuj-1219'

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -249,8 +249,8 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 				throw new IllegalOperatorException("表格模板不正确！请重新下载最新模板");
 		}
 		int rowNum = SheetUtil.getSheetLastNum(sheet, isPcb ? UploadConstant.MAX_TOTAL_COLUMN_PCB : UploadConstant.MAX_TOTAL_COLUMN);
-		if (rowNum > 2002) {
-			throw new IllegalOperatorException("您上传的信息超过2000条，请拆分成2000以下再上传");
+		if (rowNum > 10002) {
+			throw new IllegalOperatorException("您上传的信息超过10002条，请拆分成10002以下再上传");
 		}
 		if (rowNum < 2) {
 			throw new IllegalOperatorException("请填写上传信息");

src/main/resources/pre/account.properties

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

@@ -40,7 +40,7 @@ recommendPort=20100
 # upload file
 uploadFileUrl=http://dfs-api.ubtob.com
 # search file
-searchUrl=http://192.168.78.12:8081
+searchUrl=http://192.168.78.12:8080
 
 # message ip
 messageServiceIp=http://message.ubtob.com/