Authored by chunhua.zhang

commit autoconfig.

@@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
  5 +crf.service.url = https://osprec-ci.crfchina.com
  6 +
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 8
7 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
@@ -14,6 +16,8 @@ register.new.user.page.probability = 9 @@ -14,6 +16,8 @@ register.new.user.page.probability = 9
14 16
15 uic.service.url = http://uic.yohoops.org:8096/uic 17 uic.service.url = http://uic.yohoops.org:8096/uic
16 18
  19 +union.domain.url = http://webunion_tl.yohobuy.com/union
  20 +
17 user.session.expire = 10080 21 user.session.expire = 10080
18 22
19 users.base.isUic = false 23 users.base.isUic = false
@@ -29,8 +33,6 @@ users.yohocoin.dilute = true @@ -29,8 +33,6 @@ users.yohocoin.dilute = true
29 33
30 verify_student_flag = false 34 verify_student_flag = false
31 35
32 -crf.service.url=https://osprec-ci.crfchina.com  
33 -  
34 yoho.users.env.namespace = users 36 yoho.users.env.namespace = users
35 yoho.users.env.serverport = 1 37 yoho.users.env.serverport = 1
36 yoho.users.env.webapphome = /home/test/yoho-users/deploy 38 yoho.users.env.webapphome = /home/test/yoho-users/deploy
@@ -40,6 +42,3 @@ zmxy_contract_flag = si201604080002520001 @@ -40,6 +42,3 @@ zmxy_contract_flag = si201604080002520001
40 zmxy_rsa_mySK = MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIjfNWUXqCNtlaBFpv4KrBTVQb4btX9Gi+UPuz7AMvwbSXmtIxV2awkz4Rg0Q3PtTkuAUpuW958u3uNxypcsCJD3o4qphgqSMVpe33bJ1bZaeL/h8WT9KNBiIxGsYQco44JbJkjrHTAI3Wt+RNhHyn+nKI9wCaeYPCY7ZipVpmL3AgMBAAECgYBn/BxWx1hIQjMQ5pnuGzGNSk9+HRMQtQoHZqI9FEwn2JtDw9QJtEOxZCa4+svcQQfguIcKCfHqj/NqHMNrglqmmJhKrut+ilUt8rqJCmvRSh8AdG7ZnqzxQYdTrrEEKgO932WqPOI98X2H+2cPzLfIOgxN7FhCDg+lVi4CBdfJ8QJBANosNf2b4f50AgAkstAKX1Hqqsb+k5L5reoF9e6eQufPXIpSrbME3cETyRMMLKX+YfhHpv66fpfg0X4JiHZIpdsCQQCgmmPNWs2nbvHY3Eo3xuYs/KJRIltgYaAd9+CCjpCTbU21afqyGkK7zibHfLADh+m5GOkOZ5IFn5Alhg1NQNgVAkBTX/PeEDVEPWcKUPv4nw4gSvKqi10wHLSGq3J5lwdweQEfZ0s0D5cDEyGTYuKpKNadwBwkWnbIacUFSnVY5phjAkAt4Ix73+F5X77kROFKl52u4if350mU+a5EgUd35AO2qXWWSgTcFZZUkaoQODULfSqtvkjs3Xcf9hm2LlnkZI6VAkEAl8+0+a6Rjz119mxJXy9JWKTbWirhja+ijyndLVEAmxTYjWTuNKbRdTYe59ekRYhmMWkiKzggP+PKjXHCHV6eRQ== 42 zmxy_rsa_mySK = MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIjfNWUXqCNtlaBFpv4KrBTVQb4btX9Gi+UPuz7AMvwbSXmtIxV2awkz4Rg0Q3PtTkuAUpuW958u3uNxypcsCJD3o4qphgqSMVpe33bJ1bZaeL/h8WT9KNBiIxGsYQco44JbJkjrHTAI3Wt+RNhHyn+nKI9wCaeYPCY7ZipVpmL3AgMBAAECgYBn/BxWx1hIQjMQ5pnuGzGNSk9+HRMQtQoHZqI9FEwn2JtDw9QJtEOxZCa4+svcQQfguIcKCfHqj/NqHMNrglqmmJhKrut+ilUt8rqJCmvRSh8AdG7ZnqzxQYdTrrEEKgO932WqPOI98X2H+2cPzLfIOgxN7FhCDg+lVi4CBdfJ8QJBANosNf2b4f50AgAkstAKX1Hqqsb+k5L5reoF9e6eQufPXIpSrbME3cETyRMMLKX+YfhHpv66fpfg0X4JiHZIpdsCQQCgmmPNWs2nbvHY3Eo3xuYs/KJRIltgYaAd9+CCjpCTbU21afqyGkK7zibHfLADh+m5GOkOZ5IFn5Alhg1NQNgVAkBTX/PeEDVEPWcKUPv4nw4gSvKqi10wHLSGq3J5lwdweQEfZ0s0D5cDEyGTYuKpKNadwBwkWnbIacUFSnVY5phjAkAt4Ix73+F5X77kROFKl52u4if350mU+a5EgUd35AO2qXWWSgTcFZZUkaoQODULfSqtvkjs3Xcf9hm2LlnkZI6VAkEAl8+0+a6Rjz119mxJXy9JWKTbWirhja+ijyndLVEAmxTYjWTuNKbRdTYe59ekRYhmMWkiKzggP+PKjXHCHV6eRQ==
41 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB 43 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
42 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do 44 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
43 -  
44 -crf.service.url=https://osprec-ci.crfchina.com  
45 -