diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 4db66137a..3030a1532 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -196,4 +196,4 @@ epdc: - /api/message/sms/registerResult # 发送用户注册审核结果 - /api/events/issue/upload # 上传图片 - /api/app-user/user/mp/regist # 公众号用户注册 - - /api/app-user/user/ma/regist # 小程序用户注册 + - /api/app-user/user/ma/** # 小程序用户相关操作，包括注册，登录，及迭代版本的注册，登录 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index c4a9beca2..8da7c266f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; -import com.elink.esua.epdc.common.token.util.TokenUtil; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; @@ -22,10 +21,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO; import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; -import com.elink.esua.epdc.enums.AppUserAuditStateEnum; -import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum; -import com.elink.esua.epdc.enums.AppUserRegisterWayEnum; -import com.elink.esua.epdc.enums.AppUserStateEnum; +import com.elink.esua.epdc.enums.*; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.UserFeignClient; import com.elink.esua.epdc.jwt.JwtTokenProperties; @@ -73,9 +69,6 @@ public class AppUserServiceImpl implements AppUserService { @Autowired private UserFeignClient userFeignClient; - @Autowired - private TokenUtil tokenUtil; - @Autowired private JwtTokenProperties jwtTokenProperties; @@ -181,7 +174,7 @@ public class AppUserServiceImpl implements AppUserService { else if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(state)) { TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class); tokenDto.setUserId(userDto.getId()); - authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid()); + authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), AppUserStateEnum.REGISTERED.value()); return new Result().ok(authorization); } else { @@ -244,7 +237,7 @@ public class AppUserServiceImpl implements AppUserService { TokenDto tokenDto = ConvertUtils.sourceToTarget(newAppUser, TokenDto.class); tokenDto.setUserId(newAppUser.getId()); - EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid()); + EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(tokenDto, newAppUser.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); return new Result().ok(authorization); } @@ -555,7 +548,7 @@ public class AppUserServiceImpl implements AppUserService { UserGridRelationDTO userGridRelation = appUserResult.getData(); userDetail.setGridId(Long.parseLong(gridId)); - EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(userDetail, userGridRelation.getGrid()); + EpdcAppAuthorizationDTO authorization = this.packageEpdcAppAuthorization(userDetail, userGridRelation.getGrid(), AppUserStatesEnum.STATE_REGISTERED.value()); return new Result().ok(authorization); } @@ -567,15 +560,16 @@ public class AppUserServiceImpl implements AppUserService { /** * 组装成功登录的数据 - * EpdcAppAuthorizationDTO的userState属性默认设置为AppUserStateEnum.REGISTERED + * EpdcAppAuthorizationDTO的userState属性默认设置为.REGISTERED * - * @param tokenDto 缓存的用户数据 - * @param grid 网格名称 + * @param tokenDto 缓存的用户数据 + * @param grid 网格名称 + * @param userState AppUserStatesEnum * @return com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO * @author work@yujt.net.cn * @date 2019/10/23 13:57 */ - private EpdcAppAuthorizationDTO packageEpdcAppAuthorization(TokenDto tokenDto, String grid) { + private EpdcAppAuthorizationDTO packageEpdcAppAuthorization(TokenDto tokenDto, String grid, String userState) { String userId = tokenDto.getUserId(); // 生成token String token = jwtTokenUtils.generateToken(userId); @@ -584,7 +578,7 @@ public class AppUserServiceImpl implements AppUserService { cpUserDetailRedis.set(tokenDto, expire); EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO(); - authorization.setUserState(AppUserStateEnum.REGISTERED.value()); + authorization.setUserState(userState); authorization.setToken(token); authorization.setUserId(userId); authorization.setExpire((long) expire); @@ -595,4 +589,5 @@ public class AppUserServiceImpl implements AppUserService { return authorization; } + } diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java index d8814a698..b0012a429 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java @@ -123,7 +123,7 @@ public class OssController { /** * 下载阿里云oss服务器上的文件 * - * @param url 完整的访问连击 + * @param url 完整的访问链接 * @param response 浏览器返回 * @return void * @author work@yujt.net.cn diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java index d1a2f04b4..ac2ae1e6c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserAuditStateEnum.java @@ -4,11 +4,13 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; /** * 用户审核状态枚举 + * 项目二期，所有的审核状态统一使用枚举类{@link AppUserStatesEnum}的枚举项 * * @author yujintao * @email yujintao@elink-cn.com * @date 2019/9/7 10:50 */ +@Deprecated public enum AppUserAuditStateEnum { /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStateEnum.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStateEnum.java index a5183173f..292033cec 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStateEnum.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/enums/AppUserStateEnum.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; /** * 用户状态枚举 + * 项目二期，所有的审核状态统一使用枚举类{@link AppUserStatesEnum}的枚举项 * * @author yujintao * @email yujintao@elink-cn.com