更新

src/main/java/com/template/common/result/ResponseStatusEnum.java

@@ -36,7 +36,7 @@ public enum ResponseStatusEnum implements Code{
     SYSTEM_PHONE_ERROR(556,false,"手机号格式错误"),
     SYSTEM_SEND_PHONE_ERROR(557,false,"发送验证码失败"),
     SYSTEM_TOKEN_ERROR(558,false,"token为空"),
-    SYSTEM_LOGIN_ERROR(559,false,"无效token"),
+    SYSTEM_LOGIN_ERROR(559,false,"无效token,请重新登入"),
     PARAM_ERROR(560, false, "参数不能为空！"),
     THIRD_PARTY_SERVICE_CALL_FAILED(561,false,"第三方服务调用失败"),
     EXISTS(999,false,"已存在");

src/main/java/com/template/common/utils/MessageDecryptUtil.java

@@ -35,7 +35,7 @@ public class MessageDecryptUtil {
         String sign = MD5.getMD5(message_buffer.toString());
 
         if(sign.equals(pushMessage.getSign())){
-            log.info("校验签名成功");
+//            log.info("校验签名成功");
 
             String messageDate_str = AesUtils.decrypt(pushMessage.getData(),appId);
 //            log.info("messageDate_str : {}" , messageDate_str);

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.HouseNumberStateAPI;
 import com.template.common.utils.DateUtil;
+import com.template.common.utils.MyGlobalThreadPool;
 import com.template.common.utils.OrderNumber;
 import com.template.component.WeiXiaoComponent;
 import com.template.config.DoorLockConfig;
@@ -1919,13 +1920,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         String msg = "";
 
-//        多线程关电
+////        多线程关电
 //        MyGlobalThreadPool.execute(()->{
-//        try(
-        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//        )catch (Exception e) {
-//                    log.error("置净失败，失败原因：{}", e);
-//                }
+//        try {
+            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//        }catch (Exception e) {
+//            log.error("置净失败，失败原因：{}", e);
+//        }
 //        });
 
         if (!aBoolean) {

src/main/java/com/template/controller/HouseOrderController.java

@@ -1951,7 +1951,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //                    订单详情
                     List<HouseOrderWaterAndElectricVo> houseOrderWaters=houseOrderService.getWaterAndElectric(vo.getHouseOrderSource());
                     String details="";
-                    for (int i2 = 0; i2 < houseOrderWaters.size(); i++) {
+                    for (int i2 = 0; i2 < houseOrderWaters.size(); i2++) {
                         HouseOrderWaterAndElectricVo we = houseOrderWaters.get(i2);
                         we.setFreeWater(water);
                         we.setWaterPrice(waterPrice);

src/main/java/com/template/core/JwtAuthenticationInterceptor.java

@@ -44,37 +44,53 @@ public class JwtAuthenticationInterceptor implements HandlerInterceptor {
         //endregion
 
         //除了登录和注册接口不需要user_head和token请求头外其他时候基本都要请求头
-        if(request.getHeader("user_head") == null){
-            //region 自定义返回响应的json格式
-            //加上这个可以让浏览器那里得到浏览器的401：response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//        if(request.getHeader("user_head") == null){
+//            //region 自定义返回响应的json格式
+//            //加上这个可以让浏览器那里得到浏览器的401：response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//            response.setCharacterEncoding("UTF-8");
+//            response.setContentType("application/json; charset=utf-8");
+//            JSONObject res = new JSONObject();
+//            res.put("code", ResponseStatusEnum.MISSING_REQUEST_HEADER.getStatus());
+//            res.put("message",  ResponseStatusEnum.MISSING_REQUEST_HEADER.getMsg());
+//            res.put("success", false);
+//            PrintWriter out = null;
+//            out = response.getWriter();
+//            out.write(res.toString());
+//            out.flush();
+//            out.close();
+//            //endregion
+//            return false;
+//        }
+
+        //region 获取url传递的参数 Query string传递的参数
+        //获取url参数 getParameter方法里的参数名和定义的参数名一致
+        String token = request.getHeader("token");
+        // 验证userToken
+        if (!StringUtils.hasText(token)) {
+            throw new MyCustomException(ResponseStatusEnum.SYSTEM_TOKEN_ERROR);
+        }
+
+        // 解析token
+        try {
+            Map<String, Claim> stringClaimMap = JWTUtil.verifyToken(token);
+            if (ObjectUtils.isNotEmpty(stringClaimMap)) { // 登录
+                return true;
+            }
+        }catch (Exception e){
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=utf-8");
             JSONObject res = new JSONObject();
-            res.put("code", ResponseStatusEnum.MISSING_REQUEST_HEADER.getStatus());
-            res.put("message",  ResponseStatusEnum.MISSING_REQUEST_HEADER.getMsg());
+            res.put("code", ResponseStatusEnum.SYSTEM_LOGIN_ERROR.getStatus());
+            res.put("message", ResponseStatusEnum.SYSTEM_LOGIN_ERROR.getMsg());
             res.put("success", false);
             PrintWriter out = null;
             out = response.getWriter();
             out.write(res.toString());
             out.flush();
             out.close();
-            //endregion
             return false;
         }
 
-        //region 获取url传递的参数 Query string传递的参数
-        //获取url参数 getParameter方法里的参数名和定义的参数名一致
-        String token = request.getHeader("token");
-        // 验证userToken
-        if (!StringUtils.hasText(token)) {
-            throw new MyCustomException(ResponseStatusEnum.SYSTEM_TOKEN_ERROR);
-        }
-
-        // 解析token
-        Map<String, Claim> stringClaimMap = JWTUtil.verifyToken(token);
-        if (ObjectUtils.isNotEmpty(stringClaimMap)) { // 登录
-            return true;
-        }
         //endregion
 
         //region 自定义返回响应的json格式

src/main/java/com/template/core/JwtlnterceptorConfig.java

@@ -14,7 +14,7 @@ public class JwtlnterceptorConfig implements WebMvcConfigurer {
         //目前测试下来 使用 /**所有的话，response.sendError浏览器获取不到响应的信息
         //默认拦截所有路径
         registry.addInterceptor(authenticationInterceptor())
-                .addPathPatterns("/auto0/**");
+                .addPathPatterns("/auto/**");
         //endregion
     }
 

src/main/resources/mapper/template/HouseOrderMapper.xml

@@ -423,7 +423,7 @@
             `house_order` ho
                 LEFT JOIN house_number hn on ho.house_number_id=hn.id
         WHERE
-            deleted=0
+            ho.deleted=0
           AND FIND_IN_SET(ho.id,#{houseOrderSource})
     </select>
     <select id="dateBillType" resultType="java.lang.String">