Authored by chunhua.zhang

commit autoconfig.

@@ -6,6 +6,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut @@ -6,6 +6,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut
6 6
7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
8 8
  9 +diff.base.flag = 1
  10 +
9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 11 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
10 12
11 jdbc.mysql.readonlyinslave = true 13 jdbc.mysql.readonlyinslave = true
@@ -16,7 +18,9 @@ register.new.user.page.probability = 5 @@ -16,7 +18,9 @@ register.new.user.page.probability = 5
16 18
17 uic.service.url = http://uic.yohoops.org:8096/uic 19 uic.service.url = http://uic.yohoops.org:8096/uic
18 20
19 -union.domain.url=http://webunion_tl.yohobuy.com/union 21 +union.domain.url = http://webunion_tl.yohobuy.com/union
  22 +
  23 +user.diff.place.login.message = 你的有货账号异地登录了,如果不是本人的操作,请立即修改密码,防止账号被盗?
20 24
21 user.session.expire = 10080 25 user.session.expire = 10080
22 26
@@ -44,5 +48,3 @@ zmxy_contract_flag = si201607290001591005 @@ -44,5 +48,3 @@ zmxy_contract_flag = si201607290001591005
44 zmxy_rsa_mySK = MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANXVSerwbHEI0GFyfjmXuT+u623YpaBDDfVg9y0hYKRnBzo7cBhJagPuDLX3/v4IcCPOM9mx/9VAX2EL10W7HCdmDD69KDo4JObQakjKkgtikgjgpmLtWjJkq3Wr+4JROOhCyd3QtS+tLYeT8waId+eD5gKyW/yw2/wMNs42LoS9AgMBAAECgYBuriG+i4d10nwZlGulX9UxE1ck2liQZWTaN8B5Cae+MN3a1F0nFQjc0+CcZ6sCzldNETRhX/Lt7I3x63EX1Muy3qr0u64NiJe5ReooCjr0BeVRa8OqDvY6SwwmQ+YYR95yuk9vuUGOtd3HJb0zMB9Vd66x3iUY89S3yCuUYH14wQJBAO7OUQCV3nb7vGKtlf25YcV6KWF+BMzuOKfw+tEezqgI04wr4zqzU5AkDGG5Zw1ze3ECurStF9syWJnm1mj6ecUCQQDlOqxJX2DxGmuilWU7ZfsJUXmMIT6yhjLPn0GqXTiejniJI6lJlFeNUEMJgBZYuJSnA4JV/Nfgn3vGNOLdzqaZAkB5G0CRH3AWv0umb4nlhqJC19UskBA3LYimAtvwOcNsDC3cpFU0a8UxEFcHKFNOywYLJesxvaafj0THp/2Md5pRAkAWTScF3GmqC0/9eVtn8/wAZBTXNUTMSZIX8P6KfJdNlb7UWMvXhL8f2HctLXD/ILYVqZm8k+TMzbdVCUApJDnBAkBxQ608TyPMgow+YriRpxH7O2tZ+S3pyM1SOJ9jzYpQ5idYpU7ZGv/CNMUSnxDweAOPIFahtDf2fsTSloqXd/Sg 48 zmxy_rsa_mySK = MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANXVSerwbHEI0GFyfjmXuT+u623YpaBDDfVg9y0hYKRnBzo7cBhJagPuDLX3/v4IcCPOM9mx/9VAX2EL10W7HCdmDD69KDo4JObQakjKkgtikgjgpmLtWjJkq3Wr+4JROOhCyd3QtS+tLYeT8waId+eD5gKyW/yw2/wMNs42LoS9AgMBAAECgYBuriG+i4d10nwZlGulX9UxE1ck2liQZWTaN8B5Cae+MN3a1F0nFQjc0+CcZ6sCzldNETRhX/Lt7I3x63EX1Muy3qr0u64NiJe5ReooCjr0BeVRa8OqDvY6SwwmQ+YYR95yuk9vuUGOtd3HJb0zMB9Vd66x3iUY89S3yCuUYH14wQJBAO7OUQCV3nb7vGKtlf25YcV6KWF+BMzuOKfw+tEezqgI04wr4zqzU5AkDGG5Zw1ze3ECurStF9syWJnm1mj6ecUCQQDlOqxJX2DxGmuilWU7ZfsJUXmMIT6yhjLPn0GqXTiejniJI6lJlFeNUEMJgBZYuJSnA4JV/Nfgn3vGNOLdzqaZAkB5G0CRH3AWv0umb4nlhqJC19UskBA3LYimAtvwOcNsDC3cpFU0a8UxEFcHKFNOywYLJesxvaafj0THp/2Md5pRAkAWTScF3GmqC0/9eVtn8/wAZBTXNUTMSZIX8P6KfJdNlb7UWMvXhL8f2HctLXD/ILYVqZm8k+TMzbdVCUApJDnBAkBxQ608TyPMgow+YriRpxH7O2tZ+S3pyM1SOJ9jzYpQ5idYpU7ZGv/CNMUSnxDweAOPIFahtDf2fsTSloqXd/Sg
45 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDn7lB5Pxis6rnI2JkC8Z/RQuF+/RInuZSD9IcK7bnovahZXN3yOEdc5YuWKB0FA9DWONBRkctEmabWbxCYdEbeHV+kh2Zd0DktzZZnDjp6vmRDtihkJ7IJtUKLPeksZCAbbnEq/HmonqNF4qU4qfYuyZGwmHaBVNrg4BxP9s0VTwIDAQAB 49 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDn7lB5Pxis6rnI2JkC8Z/RQuF+/RInuZSD9IcK7bnovahZXN3yOEdc5YuWKB0FA9DWONBRkctEmabWbxCYdEbeHV+kh2Zd0DktzZZnDjp6vmRDtihkJ7IJtUKLPeksZCAbbnEq/HmonqNF4qU4qfYuyZGwmHaBVNrg4BxP9s0VTwIDAQAB
46 zmxy_service_url = https://zmopenapi.zmxy.com.cn/openapi.do 50 zmxy_service_url = https://zmopenapi.zmxy.com.cn/openapi.do
47 -  
48 -user.diff.place.login.message=你的有货账号异地登录了,如果不是本人的操作,请立即修改密码,防止账号被盗!