用户相关修改；短信相关修改

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

@@ -10,6 +10,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.log.SysLogLogin;
@@ -155,10 +156,13 @@ public class AuthServiceImpl implements AuthService {
         if (claims == null || jwtUtils.isTokenExpired(claims.getExpiration())) {
             throw new RenException(ErrorCode.UNAUTHORIZED);
         }
-
         //获取用户ID
-        String userId = claims.getSubject();
+        String userId;
-
+        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) {

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

@@ -38,5 +38,6 @@ public interface ErrorCode {
     int DEPT_SUB_DELETE_ERROR = 10014;
     int DEPT_USER_DELETE_ERROR = 10015;
     int JSON_FORMAT_ERROR = 10016;
+    int PARSING_ERROR = 10017;
 
 }

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

@@ -17,4 +17,5 @@
 10013=Data permission interface, which can only be a Map type parameter
 10014=Please delete the subordinate department first
 10015=Please delete the user under the department first
-10016=The parameter format is incorrect. Please use JSON format.
+10016=The parameter format is incorrect. Please use JSON format.
+10017=Parsing {0} error

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

@@ -17,4 +17,5 @@
 10013=\u6570\u636E\u6743\u9650\u63A5\u53E3\uFF0C\u53EA\u80FD\u662FMap\u7C7B\u578B\u53C2\u6570
 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
+10016=\u53C2\u6570\u683C\u5F0F\u4E0D\u6B63\u786E\uFF0C\u8BF7\u4F7F\u7528JSON\u683C\u5F0F
+10017=\u89E3\u6790{0}\u51FA\u9519

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

@@ -17,4 +17,5 @@
 10013=\u6578\u64DA\u6B0A\u9650\u63A5\u53E3\uFF0C\u53EA\u80FD\u662FMap\u985E\u578B\u53C3\u6578
 10014=\u8ACB\u5148\u522A\u9664\u4E0B\u7D1A\u90E8\u9580
 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
+10016=\u53C3\u6578\u683C\u5F0F\u4E0D\u6B63\u78BA\uFF0C\u8ACB\u4F7F\u7528JSON\u683C\u5F0F
+10017=\u89E3\u6790{0}\u51FA\u932F

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiMessageController.java

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/11 20:56
+ */
+@RestController
+@RequestMapping("message")
+public class ApiMessageController {
+
+    @Autowired
+    private MessageService messageService;
+
+    /**
+     * 发送短信验证码
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/11 21:03
+     */
+    @GetMapping("sms/sendCode")
+    public Result sendSmsCode(String mobile) {
+        return messageService.sendSmsCode(mobile);
+    }
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/MessageFeignClient.java

@@ -0,0 +1,28 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.fallback.MessageFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 文件对象模块
+ *
+ * @Author LC
+ * @Date 2019/9/8 18:24
+ */
+@FeignClient(name = ServiceConstant.EPDC_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class, url = "http://127.0.0.1:9062")
+public interface MessageFeignClient {
+
+    /**
+     * 发送短信验证码
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/11 20:59
+     */
+    @GetMapping(value = "message/sms/sendCode")
+    Result sendCode(String mobile);
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/MessageFeignClientFallback.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.MessageFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 文件对象模块
+ *
+ * @Author LC
+ * @Date 2019/9/8 18:25
+ */
+@Component
+public class MessageFeignClientFallback implements MessageFeignClient {
+
+    @Override
+    public Result sendCode(String mobile) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_MESSAGE_SERVER, "sendCode", mobile);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/11 21:01
+ */
+public interface MessageService {
+    /**
+     * 发送短信验证码
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/11 21:04
+     */
+    Result sendSmsCode(String mobile);
+}

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

@@ -262,9 +262,7 @@ public class AppUserServiceImpl implements AppUserService {
 
         String address = formDto.getRoad()
                 .concat(StringUtils.isNotBlank(formDto.getVillageName()) ? formDto.getVillageName() : "")
-                .concat(StringUtils.isNotBlank(formDto.getBuildingCode()) ? formDto.getBuildingCode().concat("号楼") : "")
+                .concat(StringUtils.isNotBlank(formDto.getDwellingPlace()) ? formDto.getDwellingPlace() : "");
-                .concat(StringUtils.isNotBlank(formDto.getUnitCode()) ? formDto.getUnitCode().concat("单元") : "")
-                .concat(StringUtils.isNotBlank(formDto.getHouseCode()) ? formDto.getHouseCode() : "");
         user.setAddress(address);
 
         Date now = new Date();

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

@@ -78,6 +78,7 @@ public class IssueServiceImpl implements IssueService {
         return issueFeignClient.statement(formDto);
     }
 
+    @Override
     public Result<IssueDetailResultDTO> getIssueDetail(TokenDto userDetail, String issueId) {
         IssueDetailFormDTO formDto = new IssueDetailFormDTO();
         formDto.setUserId(userDetail.getUserId());

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

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.MessageFeignClient;
+import com.elink.esua.epdc.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/11 21:03
+ */
+@Service
+public class MessageServiceImpl implements MessageService {
+
+    @Autowired
+    private MessageFeignClient messageFeignClient;
+
+    /**
+     * 发送六位短信验证码
+     *
+     * @param mobile
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author yujintao
+     * @date 2019/9/12 09:21
+     */
+    @Override
+    public Result sendSmsCode(String mobile) {
+        return messageFeignClient.sendCode(mobile);
+    }
+}

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/controller/SmsController.java

@@ -116,7 +116,7 @@ public class SmsController {
      * @date 2019/9/6 16:50
      */
     @GetMapping("sendCode")
-    public Result sendCode(String mobile) {
+    public Result sendCode(@RequestBody String mobile) {
         if (StringUtils.isBlank(mobile)) {
             return new Result().error();
         }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -151,19 +151,9 @@ public class UserDTO implements Serializable {
     private String villageName;
 
     /**
-     * 所在楼栋号
+     * 住处（楼栋-单元-房间）
      */
-    private String buildingCode;
+    private String dwellingPlace;
-
-    /**
-     * 所在门牌号
-     */
-    private String houseCode;
-
-    /**
-     * 所在单元号
-     */
-    private String unitCode;
 
     /**
      * 居民住址

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java

@@ -55,17 +55,9 @@ public class EpdcUserRegistFormDTO implements Serializable {
      */
     private String villageName;
     /**
-     * 楼栋号
+     * 住处（楼栋-单元-房间）
      */
-    private String buildingCode;
+    private String dwellingPlace;
-    /**
-     * 单元号
-     */
-    private String unitCode;
-    /**
-     * 门牌号
-     */
-    private String houseCode;
     /**
      * 微信code
      */

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java

@@ -6,22 +6,8 @@ import java.io.Serializable;
 
 @Data
 public class EpdcUserInfoResultDTO implements Serializable {
-    private static final long serialVersionUID = -6180752191444428845L;
-
 
-    /**
+    private static final long serialVersionUID = -6180752191444428845L;
-     * id : 76285
-     * nickname : O6NgD993cl
-     * mobile : hXK5rtfPpz
-     * identityNo : OxwNGTzPQb
-     * deptName : S28bmHve2o
-     * realName : kGO1tskRFD
-     * road : bp1wmRHqbu
-     * villageName : ddev0Yeu9V
-     * buildingCode : eREM7kdwep
-     * unitCode : n36b2wWNzN
-     * headImg : l4pXJYvRwG
-     */
 
     private String id;
     private String nickname;
@@ -31,8 +17,7 @@ public class EpdcUserInfoResultDTO implements Serializable {
     private String realName;
     private String road;
     private String villageName;
-    private String buildingCode;
+    private String dwellingPlace;
-    private String unitCode;
     private String faceImg;
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java

@@ -149,19 +149,9 @@ public class UserEntity extends BaseEpdcEntity {
     private String villageName;
 
     /**
-     * 所在楼栋号
+     * 住处（楼栋-单元-房间）
      */
-    private String buildingCode;
+    private String dwellingPlace;
-
-    /**
-     * 所在单元号
-     */
-    private String unitCode;
-
-    /**
-     * 所在门牌号
-     */
-    private String houseCode;
 
     /**
      * 居民住址

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -18,8 +18,7 @@
             eu.REAL_NAME AS realName,
             eu.ROAD AS road,
             eu.VILLAGE_NAME AS villageName,
-            eu.BUILDING_CODE AS buildingCode,
+            eu.DWELLING_PLACE AS dwellingPlace
-            eu.UNIT_CODE AS unitCode
         FROM
             epdc_user eu
         WHERE