修改头像 手机号

esua-epdc/epdc-gateway/pom.xml

@@ -94,9 +94,9 @@
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
                 <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
                 <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
-                </gateway.routes.epdc-activiti-server.uri>
+                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
+                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
                 <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -123,7 +123,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
 
                 <wx.mp.configs.appId>wx6ff4e50840cf7dfc</wx.mp.configs.appId>

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

@@ -5,6 +5,8 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@@ -53,10 +55,29 @@ public class ApiAppUserController {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.getToken(formDto);
     }
-
+    /***
+     * @Description  获取用户信息
+     * @Author  qushutong
+     * @Date   2019/9/9 17:33
+     * @Param  [userDetail]
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO>
+     * @Exception
+     *
+     */
     @GetMapping("user/getInfoById")
     public Result<EpdcUserInfoResultDTO> getInfoById(@LoginUser TokenDto userDetail){
-
         return appUserService.getInfoById(userDetail);
     }
+
+    @PostMapping("user/updateAvatar")
+    public Result updateAvatar(@LoginUser TokenDto userDetail, EpdcUserUpdateAvatarFromDTO fromDTO){
+        ValidatorUtils.validateEntity(fromDTO);
+        return appUserService.updateAvatar(userDetail,fromDTO);
+    }
+
+    @PostMapping("user/updateMobile")
+    public Result updateMobile(@LoginUser TokenDto userDetail, EpdcUserUpdateMobileFromDTO fromDTO){
+        ValidatorUtils.validateEntity(fromDTO);
+        return appUserService.updateMobile(userDetail,fromDTO);
+    }
 }

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

@@ -56,5 +56,15 @@ public interface UserFeignClient {
      */
     @GetMapping(value = "app-user/epdc-app/user/getInfoById/{id}")
     Result<EpdcUserInfoResultDTO> getInfoById(@PathVariable("id") String id);
-
+    /***
+     * @Description 修改手机号 或者头像
+     * @Author  qushutong
+     * @Date   2019/9/9 18:26
+     * @Param  [userDTO]
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
+    @PostMapping(value = "app-user/epdc-app/user/updateMobileOrAvatar")
+    Result updateMobileOrAvatar(UserDTO userDTO);
 }

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

@@ -30,4 +30,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<EpdcUserInfoResultDTO> getInfoById(String id) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getInfoById", id);
     }
+
+    @Override
+    public Result updateMobileOrAvatar(UserDTO userDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateMobileOrAvatar", userDTO);
+    }
 }

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

@@ -3,6 +3,8 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@@ -45,4 +47,25 @@ public interface AppUserService {
      *
      */
     Result<EpdcUserInfoResultDTO> getInfoById(TokenDto userDetail);
+
+    /***
+     * @Description  修改头像
+     * @Author  qushutong
+     * @Date   2019/9/9 17:52
+     * @Param  [userDetail, fromDTO]
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
+    Result updateAvatar( TokenDto userDetail, EpdcUserUpdateAvatarFromDTO fromDTO);
+    /***
+     * @Description  修改手机号
+     * @Author  qushutong
+     * @Date   2019/9/9 17:52
+     * @Param  [userDetail, fromDTO]
+     * @Return      com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
+    Result updateMobile( TokenDto userDetail, EpdcUserUpdateMobileFromDTO fromDTO);
 }

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

@@ -10,6 +10,8 @@ import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@@ -136,6 +138,35 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.getInfoById(userDetail.getUserId());
     }
 
+    @Override
+    public Result updateAvatar(TokenDto userDetail, EpdcUserUpdateAvatarFromDTO fromDTO) {
+        UserDTO userDTO = new UserDTO();
+        userDTO.setId(fromDTO.getId());
+        userDTO.setFaceImg(fromDTO.getAvatar());
+        return userFeignClient.updateMobileOrAvatar(userDTO);
+    }
+
+    @Override
+    public Result updateMobile(TokenDto userDetail, EpdcUserUpdateMobileFromDTO fromDTO) {
+        // 校验手机验证码
+        String mobile = fromDTO.getMobile();
+        String smsCode = appUserRedis.getSmsCode(mobile);
+        if (StringUtils.isBlank(smsCode) || !smsCode.equals(fromDTO.getSmsCode())) {
+            return new Result().error("手机验证码错误");
+        }
+        UserDTO userDTO = new UserDTO();
+        userDTO.setId(userDetail.getUserId());
+        PhoneDto phoneDto = PhoneUtil.getPhoneDto(mobile);
+        if (phoneDto != null) {
+            userDTO.setMobile(mobile);
+            userDTO.setMobileCarrier(phoneDto.getCarrier());
+            userDTO.setMobileCity(phoneDto.getCityName());
+            userDTO.setMobileProvince(phoneDto.getProvinceName());
+        }
+        userFeignClient.updateMobileOrAvatar(userDTO);
+        return userFeignClient.updateMobileOrAvatar(userDTO);
+    }
+
     @Override
     public Result userRegist(EpdcUserRegistFormDTO formDto) {
 

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

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author: qushutong
+ * @Date: 2019/9/9 17:11
+ * @Description: 修改头像
+ */
+@Data
+public class EpdcUserUpdateAvatarFromDTO implements Serializable {
+    private static final long serialVersionUID = 1126153080068634180L;
+
+    /**
+     * avatar : 4dYNI3BKBf
+     */
+    @NotBlank(message = "上传头像不能为空")
+    private String avatar;
+
+    @NotBlank(message = "用户id不能为空")
+    private String id;
+
+}

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

@@ -0,0 +1,31 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2019/9/9 17:05
+ *  @Description: 换手机号
+ */
+@Data
+public class EpdcUserUpdateMobileFromDTO implements Serializable {
+    private static final long serialVersionUID = 6408236549416534900L;
+
+    /**
+     * mobile : rtJ5UDcx8f
+     * smsCode : obS6Tzpgmq
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+
+    @NotBlank(message = "验证码不能为空")
+    private String smsCode;
+
+    @NotBlank(message = "用户id不能为空")
+    private String id;
+
+
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -3,6 +3,8 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,9 +50,33 @@ public class EpdcAppUserController {
         return userService.userRegist(userDto);
     }
 
-
+    /***
+     * @Description 移动端获取用户信息
+     * @Author qushutong
+     * @Date 2019/9/9 17:00
+     * @Param [id]
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO>
+     * @Exception
+     *
+     */
     @GetMapping("getInfoById/{id}")
     public Result<EpdcUserInfoResultDTO> getInfoById(@PathVariable("id") String id) {
         return userService.getInfoById(id);
     }
+
+    /***
+     * @Description 修改手机号 或者手机号
+     * @Author qushutong
+     * @Date 2019/9/9 17:12
+     * @Param [formDto]
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
+    @PostMapping("updateMobileOrAvatar")
+    public Result updateMobileOrAvatar(@RequestBody UserDTO formDto) {
+        userService.updateMobileOrAvatar(formDto);
+        return new Result();
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -21,6 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 
@@ -79,4 +81,16 @@ public interface UserService extends BaseService<UserEntity> {
      *
      */
     Result<EpdcUserInfoResultDTO> getInfoById(String id);
+
+    /***
+     * @Description 修改手机号 或者头像
+     * @Author qushutong
+     * @Date 2019/9/9 17:14
+     * @Param [formDto]
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Exception
+     *
+     */
+    void updateMobileOrAvatar(UserDTO userDto);
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -28,6 +28,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.UserDao;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
@@ -58,6 +60,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private PartyMembersService partyMembersService;
 
+
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         IPage<UserEntity> page = baseDao.selectPage(
@@ -176,4 +179,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         return new Result<EpdcUserInfoResultDTO>().ok(baseDao.selectOneInfoById(id));
     }
+
+    @Override
+    public void updateMobileOrAvatar(UserDTO userDto) {
+        UserDTO olduUserDTO = get(userDto.getId());
+        if (StringUtils.isNotEmpty(userDto.getFaceImg())) {
+            olduUserDTO.setFaceImg(userDto.getFaceImg());
+        }
+        if (StringUtils.isNotEmpty(userDto.getMobile())) {
+            olduUserDTO.setFaceImg(userDto.getMobile());
+            olduUserDTO.setFaceImg(userDto.getMobileCarrier());
+            olduUserDTO.setFaceImg(userDto.getMobileCity());
+            olduUserDTO.setFaceImg(userDto.getMobileProvince());
+        }
+        UserEntity userEntity = ConvertUtils.sourceToTarget(olduUserDTO, UserEntity.class);
+        baseDao.updateById(userEntity);
+    }
+
 }