ufo / yohoufo-fore · Commits

Go to a project

Authored by qinchao
Commit 9607f80d18d742927bb5e6bb42c534eaf9001c05 1 parent c6fde714

去掉- 芝麻认证开关 - 默认是开启的

Inline Side-by-side
Showing 5 changed files with 14 additions and 17 deletions
@@ -53,8 +53,8 @@ public class StoreSellerServiceImpl implements IStoredSellerService { @@ -53,8 +53,8 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
53 StoredSellerCacheService storedSellerCacheService; 53 StoredSellerCacheService storedSellerCacheService;
54 54
55 55
56 - @Value("${zhimacert.switch:true}")  
57 - private boolean zhiMaCertSwitch; 56 + //@Value("${zhimacert.switch:true}")
  57 + //private boolean zhiMaCertSwitch;
58 58
59 @Autowired 59 @Autowired
60 private SellerService sellerService; 60 private SellerService sellerService;
@@ -124,6 +124,7 @@ public class StoreSellerServiceImpl implements IStoredSellerService { @@ -124,6 +124,7 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
124 logger.info("StoredSellerServiceImpl entryStatus uid is {} ",uid); 124 logger.info("StoredSellerServiceImpl entryStatus uid is {} ",uid);
125 Boolean isZhiMaCert=false; 125 Boolean isZhiMaCert=false;
126 ZhiMaCert zhiMaCert = null; 126 ZhiMaCert zhiMaCert = null;
  127 + /*
127 if(zhiMaCertSwitch){ 128 if(zhiMaCertSwitch){
128 zhiMaCert = getZhiMaCertInfo(uid); 129 zhiMaCert = getZhiMaCertInfo(uid);
129 if(null != zhiMaCert){ 130 if(null != zhiMaCert){
@@ -132,6 +133,11 @@ public class StoreSellerServiceImpl implements IStoredSellerService { @@ -132,6 +133,11 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
132 }else{ 133 }else{
133 isZhiMaCert = true; 134 isZhiMaCert = true;
134 } 135 }
  136 + */
  137 + zhiMaCert = getZhiMaCertInfo(uid);
  138 + if(null != zhiMaCert){
  139 + isZhiMaCert = true;
  140 + }
135 141
136 Boolean isZhiMaCertWithPhoto = false ; 142 Boolean isZhiMaCertWithPhoto = false ;
137 if(zhiMaCert!=null&&1==zhiMaCert.getValidPhoto()){ 143 if(zhiMaCert!=null&&1==zhiMaCert.getValidPhoto()){
@@ -246,10 +252,10 @@ public class StoreSellerServiceImpl implements IStoredSellerService { @@ -246,10 +252,10 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
246 252
247 int breakZhiMaCert=0; 253 int breakZhiMaCert=0;
248 //芝麻认证没开启，并且没有认证 254 //芝麻认证没开启，并且没有认证
249 - if(!zhiMaCertSwitch&&zhiMaCert==null){ 255 + /*if(!zhiMaCertSwitch&&zhiMaCert==null){
250 zhiMaCert = new ZhiMaCert(); 256 zhiMaCert = new ZhiMaCert();
251 breakZhiMaCert=1; 257 breakZhiMaCert=1;
252 - } 258 + }*/
253 259
254 if(null == zhiMaCert){ 260 if(null == zhiMaCert){
255 logger.error("StoredSellerServiceImpl get zhi ma cert info is null , uid is {} ",uid); 261 logger.error("StoredSellerServiceImpl get zhi ma cert info is null , uid is {} ",uid);
@@ -2,9 +2,6 @@ @@ -2,9 +2,6 @@
2 deposit.prestore=999 2 deposit.prestore=999
3 # 保证金充值列表 3 # 保证金充值列表
4 deposit.recharge.list=1000,2000,5000,10000 4 deposit.recharge.list=1000,2000,5000,10000
5 -  
6 -# 芝麻认证开始开关,如果为false，芝麻认知直接返回通过  
7 -zhimacert.switch=true  
8 # ******************** service call timeout in mil-seconds ******************** 5 # ******************** service call timeout in mil-seconds ********************
9 service.call.connectReqTimeout=6000 6 service.call.connectReqTimeout=6000
10 service.call.socketTimeout=6000 7 service.call.socketTimeout=6000
@@ -79,8 +79,8 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService { @@ -79,8 +79,8 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService {
79 private String contextPath; 79 private String contextPath;
80 80
81 81
82 - @Value("${zhimacert.switch:true}")  
83 - private boolean zhiMaCertSwitch; 82 + //@Value("${zhimacert.switch:true}")
  83 + //private boolean zhiMaCertSwitch;
84 84
85 @Autowired 85 @Autowired
86 private ConfigReader configReader; 86 private ConfigReader configReader;
@@ -290,9 +290,9 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService { @@ -290,9 +290,9 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService {
290 290
291 public boolean isValidZhiMaCert(int uid){ 291 public boolean isValidZhiMaCert(int uid){
292 //如果芝麻认知没有开启,默认芝麻认证通过 292 //如果芝麻认知没有开启,默认芝麻认证通过
293 - if(!zhiMaCertSwitch){ 293 + /*if(!zhiMaCertSwitch){
294 return true; 294 return true;
295 - } 295 + }*/
296 296
297 //否则，从db查询认证信息 297 //否则，从db查询认证信息
298 if(null!=this.getValidZhiMaCert(uid)){ 298 if(null!=this.getValidZhiMaCert(uid)){
@@ -2,9 +2,6 @@ @@ -2,9 +2,6 @@
2 deposit.prestore=999 2 deposit.prestore=999
3 # 保证金充值列表 3 # 保证金充值列表
4 deposit.recharge.list=1000,2000,5000,10000 4 deposit.recharge.list=1000,2000,5000,10000
5 -  
6 -# 芝麻认证开始开关,如果为false，芝麻认知直接返回通过  
7 -zhimacert.switch=true  
8 # ******************** service call timeout in mil-seconds ******************** 5 # ******************** service call timeout in mil-seconds ********************
9 service.call.connectReqTimeout=6000 6 service.call.connectReqTimeout=6000
10 service.call.socketTimeout=6000 7 service.call.socketTimeout=6000
@@ -4,9 +4,6 @@ deposit.prestore=${depositPrestore} @@ -4,9 +4,6 @@ deposit.prestore=${depositPrestore}
4 deposit.recharge.list=${depositRechargeList} 4 deposit.recharge.list=${depositRechargeList}
5 deposit.earnest.money.limit=${depositEarnestMoneyLimit} 5 deposit.earnest.money.limit=${depositEarnestMoneyLimit}
6 6
7 -# 芝麻认证开始开关,如果为false，芝麻认知直接返回通过  
8 -zhimacert.switch=${zhiMaCertSwitch}  
9 -  
10 # if true, client_security check may be disabled. 7 # if true, client_security check may be disabled.
11 is_debug_enable=${is_debug_enable} 8 is_debug_enable=${is_debug_enable}
12 # ******************** service call timeout in mil-seconds ******************** 9 # ******************** service call timeout in mil-seconds ********************