Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/shir/config/ShiroConfig.java

@@ -97,12 +97,12 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
         filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
         filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
+        filterChainDefinitionMap.put("/pay/**", "anno");
         filterChainDefinitionMap.put("/**", "authc");
         filterChainDefinitionMap.put("/account/**", "kickout");
         filterChainDefinitionMap.put("/banner/**", "kickout");
         filterChainDefinitionMap.put("/pic/**", "kickout");
         filterChainDefinitionMap.put("/school/**", "kickout");
-        filterChainDefinitionMap.put("/pay/**", "kickout");
         filterChainDefinitionMap.put("/price/**", "kickout");
         filterChainDefinitionMap.put("/profession/**", "kickout");
         filterChainDefinitionMap.put("/refillCard/**", "kickout");

wisenergy-service/src/main/java/cn/wisenergy/service/shir/filter/KickoutSessionControlFilter.java

@@ -138,8 +138,9 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
         boolean result = null != request.getHeader("identity") && request.getHeader("identity").equals("miniprogram");
         boolean result1 = url.indexOf("/login")!=-1 || url.indexOf("/user/valid")!=-1 || url.indexOf("/user/sendSms")!=-1;
         boolean resultPay=url.indexOf("pay/aliPayCallBack.do")!=-1 || url.indexOf("pay/wxPayCallBack.do")!=-1;
-        log.info("KickoutSessionControlFilter ifFilter url :{} , resultPay ",url,resultPay);
+        log.info("KickoutSessionControlFilter ifFilter url :{} , resultPay {}",url,resultPay);
         return result || result1 || resultPay;
+
     }
 
     public void changeSession(int type){