小程序注册链接加入白名单；党员导出调整；添加token无效时的异常抛出

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java

@@ -157,20 +157,15 @@ public class AuthServiceImpl implements AuthService {
             throw new RenException(ErrorCode.UNAUTHORIZED);
         }
         //获取用户ID
-        String userId;
+        String userId = claims.getSubject();
-        try {
-            userId = claims.getSubject();
-        } catch (Exception e) {
-            throw new RenException(ErrorCode.PARSING_ERROR, Constant.TOKEN_HEADER);
-        }
         //查询Redis，如果没数据，则保持用户信息到Redis
         TokenDto cpUserDetail = cpUserDetailRedis.get(userId);
-        if (cpUserDetail != null) {
+        if (null == cpUserDetail) {
-            //过期时间
+            throw new RenException(ErrorCode.INVALID_ERROR, Constant.TOKEN_HEADER);
-            long expire = (claims.getExpiration().getTime() - System.currentTimeMillis()) / 1000;
-            cpUserDetailRedis.set(cpUserDetail, expire);
-            return cpUserDetail;
         }
-        return null;
+        //过期时间
+        long expire = (claims.getExpiration().getTime() - System.currentTimeMillis()) / 1000;
+        cpUserDetailRedis.set(cpUserDetail, expire);
+        return cpUserDetail;
     }
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/exception/ErrorCode.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -39,5 +39,5 @@ public interface ErrorCode {
     int DEPT_USER_DELETE_ERROR = 10015;
     int JSON_FORMAT_ERROR = 10016;
     int PARSING_ERROR = 10017;
-
+    int INVALID_ERROR = 10018;
 }

esua-epdc/epdc-commons/epdc-commons-tools/src/main/resources/i18n/messages_common.properties

@@ -18,3 +18,5 @@
 10014=\u8BF7\u5148\u5220\u9664\u4E0B\u7EA7\u90E8\u95E8
 10015=\u8BF7\u5148\u5220\u9664\u90E8\u95E8\u4E0B\u7684\u7528\u6237
 10016=\u53C2\u6570\u683C\u5F0F\u4E0D\u6B63\u786E\uFF0C\u8BF7\u4F7F\u7528JSON\u683C\u5F0F
+10017=\u89E3\u6790{0}\u51FA\u932F
+10018=\u65E0\u6548\u7684{0}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/resources/i18n/messages_common_en_US.properties

@@ -19,3 +19,4 @@
 10015=Please delete the user under the department first
 10016=The parameter format is incorrect. Please use JSON format.
 10017=Parsing {0} error
+10018=Invalid {0}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_CN.properties

@@ -19,3 +19,4 @@
 10015=\u8BF7\u5148\u5220\u9664\u90E8\u95E8\u4E0B\u7684\u7528\u6237
 10016=\u53C2\u6570\u683C\u5F0F\u4E0D\u6B63\u786E\uFF0C\u8BF7\u4F7F\u7528JSON\u683C\u5F0F
 10017=\u89E3\u6790{0}\u51FA\u9519
+10018=\u65E0\u6548\u7684{0}

esua-epdc/epdc-commons/epdc-commons-tools/src/main/resources/i18n/messages_common_zh_TW.properties

@@ -19,3 +19,4 @@
 10015=\u8ACB\u5148\u522A\u9664\u90E8\u9580\u4E0B\u7684\u7528\u6236
 10016=\u53C3\u6578\u683C\u5F0F\u4E0D\u6B63\u78BA\uFF0C\u8ACB\u4F7F\u7528JSON\u683C\u5F0F
 10017=\u89E3\u6790{0}\u51FA\u932F
+10018=\u7121\u6548\u7684{0}

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -195,3 +195,5 @@ epdc:
     - /api/admin/dept/completeName # 获取完整部门名称
     - /api/message/sms/sendCode # 发送短信验证码
     - /api/events/issue/upload # 上传图片
+    - /api/app-user/user/mp/regist # 公众号用户注册
+    - /api/app-user/user/ma/regist # 小程序用户注册

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -25,7 +25,7 @@ public class AdminServiceImpl implements AdminService {
 
         CompleteDeptDTO completeDept = adminResult.getData();
         if (!adminResult.success() || null == completeDept || null == completeDept.getGridId()) {
-            return new Result().error(adminResult.getMsg());
+            return new Result().error("查询部门信息失败");
         }
         String deptName = completeDept.getDistrict().concat("/")
                 .concat(completeDept.getStreet()).concat("/")

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java

@@ -30,24 +30,34 @@ import java.util.Date;
  */
 @Data
 public class PartyMembersExcel {
+
     @Excel(name = "姓名")
     private String realName;
+
     @Excel(name = "手机号")
     private String mobile;
+
     @Excel(name = "身份证号")
     private String identityNo;
+
     @Excel(name = "职务")
     private String post;
+
     @Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"})
     private String cadreFlag;
-    @Excel(name = "注册状态", replace = {"是_1", "否_0"})
+
+    @Excel(name = "是否注册", replace = {"是_1", "否_0"})
     private String registFlag;
-    @Excel(name = "注册时间")
+
+    @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date registTime;
-    @Excel(name = "街道名称")
+
+    @Excel(name = "街道")
     private String streetName;
-    @Excel(name = "社区名称")
+
+    @Excel(name = "社区")
     private String communityName;
-    @Excel(name = "网格名称")
+
+    @Excel(name = "网格")
     private String gridName;
 }