From eb0ffe677d167f243f5714aaaaf8b878a9d5c807 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 5 Jan 2021 14:27:58 +0800 Subject: [PATCH] =?UTF-8?q?20200105=E4=BF=AE=E6=94=B9mustLogin,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloudutil/aspect/MustLoginAspect.java | 4 ++ .../com/ccsens/form/api/FormController.java | 5 +++ .../com/ccsens/form/api/ModuleController.java | 37 +++++++++++++++++++ .../ccsens/form/api/StatisticsController.java | 4 ++ .../com/ccsens/form/api/WriteController.java | 4 ++ .../com/ccsens/form/bean/dto/ModuleDto.java | 7 ++++ .../com/ccsens/form/bean/vo/ModuleVo.java | 4 ++ .../java/com/ccsens/tall/bean/vo/UserVo.java | 4 ++ .../com/ccsens/tall/web/UserController.java | 12 +++--- .../com/ccsens/util/bean/dto/QueryDto.java | 4 ++ 10 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 form/src/main/java/com/ccsens/form/api/FormController.java create mode 100644 form/src/main/java/com/ccsens/form/api/ModuleController.java create mode 100644 form/src/main/java/com/ccsens/form/api/StatisticsController.java create mode 100644 form/src/main/java/com/ccsens/form/api/WriteController.java create mode 100644 form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java create mode 100644 form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java index 71b9119f..1a611514 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java @@ -71,8 +71,12 @@ public class MustLoginAspect { if (response != null && response.getCode().intValue() == CodeEnum.SUCCESS.getCode().intValue() && response.getData() != null) { JSONObject json = JSONObject.parseObject(JSON.toJSONString(response.getData())); Long userId = json.getLong("id"); + String userName = json.getString("userName"); + String avatarUrl = json.getString("avatarUrl"); if (dto != null) { dto.setUserId(userId); + dto.setUserName(userName); + dto.setAvatarUrl(avatarUrl); } } Object result = pjp.proceed(); diff --git a/form/src/main/java/com/ccsens/form/api/FormController.java b/form/src/main/java/com/ccsens/form/api/FormController.java new file mode 100644 index 00000000..0a8eff9f --- /dev/null +++ b/form/src/main/java/com/ccsens/form/api/FormController.java @@ -0,0 +1,5 @@ +package com.ccsens.form.api; + + +public class FormController { +} diff --git a/form/src/main/java/com/ccsens/form/api/ModuleController.java b/form/src/main/java/com/ccsens/form/api/ModuleController.java new file mode 100644 index 00000000..6d11f1cc --- /dev/null +++ b/form/src/main/java/com/ccsens/form/api/ModuleController.java @@ -0,0 +1,37 @@ +package com.ccsens.form.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.form.bean.dto.ModuleDto; +import com.ccsens.form.bean.vo.ModuleVo; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author 逗 + */ +@Slf4j +@Api(tags = "组件相关api" , description = "") +@RestController +@RequestMapping("/module") +public class ModuleController { + + @MustLogin + @ApiOperation(value = "查找所有组件模板", notes = "") + @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selResult(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看测评结果：{}",params); + + log.info("查看测评结果"); + return JsonResponse.newInstance().ok(); + } + +} diff --git a/form/src/main/java/com/ccsens/form/api/StatisticsController.java b/form/src/main/java/com/ccsens/form/api/StatisticsController.java new file mode 100644 index 00000000..d3343719 --- /dev/null +++ b/form/src/main/java/com/ccsens/form/api/StatisticsController.java @@ -0,0 +1,4 @@ +package com.ccsens.form.api; + +public class StatisticsController { +} diff --git a/form/src/main/java/com/ccsens/form/api/WriteController.java b/form/src/main/java/com/ccsens/form/api/WriteController.java new file mode 100644 index 00000000..f3b9c702 --- /dev/null +++ b/form/src/main/java/com/ccsens/form/api/WriteController.java @@ -0,0 +1,4 @@ +package com.ccsens.form.api; + +public class WriteController { +} diff --git a/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java b/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java new file mode 100644 index 00000000..aaba39ca --- /dev/null +++ b/form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java @@ -0,0 +1,7 @@ +package com.ccsens.form.bean.dto; + +/** + * @author 逗 + */ +public class ModuleDto { +} diff --git a/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java b/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java new file mode 100644 index 00000000..0850fe0a --- /dev/null +++ b/form/src/main/java/com/ccsens/form/bean/vo/ModuleVo.java @@ -0,0 +1,4 @@ +package com.ccsens.form.bean.vo; + +public class ModuleVo { +} diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java index d0d18891..d2ed5e45 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java @@ -66,6 +66,10 @@ public class UserVo { public static class TokenToUserId{ @ApiModelProperty("用户id") private Long id; + @ApiModelProperty("用户名") + private String userName; + @ApiModelProperty("头像") + private String avatarUrl; } @Data diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java index e5f91ce5..978741ec 100644 --- a/tall/src/main/java/com/ccsens/tall/web/UserController.java +++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.dto.UserDto; +import com.ccsens.tall.bean.po.SysUser; import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.UserVo; import com.ccsens.tall.exception.UserLoginException; @@ -413,15 +414,16 @@ public class UserController { if(userService.tokenNotExistInCache(Long.valueOf(claims.getSubject()))){ return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN); } -// //验证用户是否禁用 -// SysUser user = userService.getUserById(Long.valueOf(claims.getSubject())); -// if(user.getRecStatus() == WebConstant.REC_STATUS.Disabled.value){ -// return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN); -// } tokenToUserId.setId(Long.valueOf(claims.getSubject())); long end = System.currentTimeMillis(); log.info("根据token查找userId用时：{}",end - start); + SysUser sysUser = userService.getUserById(Long.valueOf(claims.getSubject())); + if(ObjectUtil.isNotNull(sysUser)){ + tokenToUserId.setAvatarUrl(sysUser.getAvatarUrl()); + } + tokenToUserId.setUserName(userService.getUserNameByUserId(Long.valueOf(claims.getSubject()))); + return JsonResponse.newInstance().ok(tokenToUserId); } diff --git a/util/src/main/java/com/ccsens/util/bean/dto/QueryDto.java b/util/src/main/java/com/ccsens/util/bean/dto/QueryDto.java index f5d7d93e..c8f3577a 100644 --- a/util/src/main/java/com/ccsens/util/bean/dto/QueryDto.java +++ b/util/src/main/java/com/ccsens/util/bean/dto/QueryDto.java @@ -20,4 +20,8 @@ public class QueryDto { private T param; @ApiModelProperty("登录用户ID 前端不为userId赋值") private Long userId; + @ApiModelProperty("用户名") + private String userName; + @ApiModelProperty("头像") + private String avatarUrl; }