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

@@ -53,8 +53,8 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
     StoredSellerCacheService storedSellerCacheService;
 
 
-    @Value("${zhimacert.switch:true}")
-    private boolean zhiMaCertSwitch;
+    //@Value("${zhimacert.switch:true}")
+    //private boolean zhiMaCertSwitch;
 
     @Autowired
     private SellerService sellerService;
@@ -124,6 +124,7 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
         logger.info("StoredSellerServiceImpl entryStatus uid is {} ",uid);
         Boolean isZhiMaCert=false;
         ZhiMaCert zhiMaCert = null;
+        /*
         if(zhiMaCertSwitch){
             zhiMaCert = getZhiMaCertInfo(uid);
             if(null != zhiMaCert){
@@ -132,6 +133,11 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
         }else{
             isZhiMaCert = true;
         }
+        */
+        zhiMaCert = getZhiMaCertInfo(uid);
+        if(null != zhiMaCert){
+            isZhiMaCert = true;
+        }
 
         Boolean isZhiMaCertWithPhoto = false ;
         if(zhiMaCert!=null&&1==zhiMaCert.getValidPhoto()){
@@ -246,10 +252,10 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
 
         int breakZhiMaCert=0;
         //芝麻认证没开启，并且没有认证
-        if(!zhiMaCertSwitch&&zhiMaCert==null){
+        /*if(!zhiMaCertSwitch&&zhiMaCert==null){
             zhiMaCert = new ZhiMaCert();
             breakZhiMaCert=1;
-        }
+        }*/
 
         if(null == zhiMaCert){
             logger.error("StoredSellerServiceImpl get  zhi ma cert info is null , uid is {} ",uid);

@@ -2,9 +2,6 @@
 deposit.prestore=999
 # 保证金充值列表
 deposit.recharge.list=1000,2000,5000,10000
-
-# 芝麻认证开始开关,如果为false，芝麻认知直接返回通过
-zhimacert.switch=true
 # ********************  service call timeout in mil-seconds  ********************
 service.call.connectReqTimeout=6000
 service.call.socketTimeout=6000

@@ -79,8 +79,8 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService {
     private String contextPath;
 
 
-    @Value("${zhimacert.switch:true}")
-    private boolean zhiMaCertSwitch;
+    //@Value("${zhimacert.switch:true}")
+    //private boolean zhiMaCertSwitch;
 
     @Autowired
     private ConfigReader configReader;
@@ -290,9 +290,9 @@ public class RealNameAuthorizeServiceImpl implements IRealNameAuthorizeService {
 
     public boolean isValidZhiMaCert(int uid){
         //如果芝麻认知没有开启,默认芝麻认证通过
-        if(!zhiMaCertSwitch){
+        /*if(!zhiMaCertSwitch){
             return true;
-        }
+        }*/
 
         //否则，从db查询认证信息
         if(null!=this.getValidZhiMaCert(uid)){

@@ -2,9 +2,6 @@
 deposit.prestore=999
 # 保证金充值列表
 deposit.recharge.list=1000,2000,5000,10000
-
-# 芝麻认证开始开关,如果为false，芝麻认知直接返回通过
-zhimacert.switch=true
 # ********************  service call timeout in mil-seconds  ********************
 service.call.connectReqTimeout=6000
 service.call.socketTimeout=6000

@@ -4,9 +4,6 @@ deposit.prestore=${depositPrestore}
 deposit.recharge.list=${depositRechargeList}
 deposit.earnest.money.limit=${depositEarnestMoneyLimit}
 
-# 芝麻认证开始开关,如果为false，芝麻认知直接返回通过
-zhimacert.switch=${zhiMaCertSwitch}
-
 # if true,   client_security check may be disabled.
 is_debug_enable=${is_debug_enable}
 # ********************  service call timeout in mil-seconds  ********************