Merge remote-tracking branch 'origin/master'

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

@@ -73,6 +73,7 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
         // 没有登陆或没有设置“记住我”
         HttpServletRequest request1 = (HttpServletRequest) request;
         log.info("KickoutSessionControlFilter  isAuthenticated isRemembered {} {} {} {}.......",request1.getRequestURI(),subject.isAuthenticated(),subject.isRemembered(),!subject.isAuthenticated() && !subject.isRemembered());
+
         if (!subject.isAuthenticated() && !subject.isRemembered()) {
             log.info("KickoutSessionControlFilter isAuthenticated and isRemembered Please login first .......");
             // 没有登陆，抛出异常
@@ -136,12 +137,13 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
     public boolean isFilter(HttpServletRequest request) {
         String url =  request.getRequestURI();
         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 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;
         boolean result2=url.indexOf("/scheme/download")!=-1 || url.indexOf("/scheme/excel/template")!=-1;
         boolean result3=url.indexOf("/scheme/record/export")!=-1 || url.indexOf("/scheme/record/createExcel")!=-1;
+        boolean result4=url.indexOf("/pic/upload")!=-1;
         log.info("KickoutSessionControlFilter ifFilter url :{} , resultPay {}",url,resultPay);
-        return result || result1 || resultPay || result2 || result3;
+        return result || result1 || resultPay || result2 || result3 || result4;
 
     }