token添加用户的基本信息

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -5,6 +5,7 @@ import com.jzg.commons.constants.SystemConstants;
 import com.jzg.commons.entity.po.SysRoleDataScope;
 import com.jzg.commons.entity.po.SysRoleDataScopeLink;
 import com.jzg.commons.entity.vo.SysRoleDataScopeVo;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.entity.SysRolePerms;
 import com.jzg.entity.SysUser;
 import com.jzg.entity.vo.SysRoleDataPreVo;
@@ -24,6 +25,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class JzgAuthenticationProvider implements AuthenticationProvider {
@@ -84,6 +86,15 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
             }
         }
 
+        String name = "",workNumber = "",headSculpture = "";
+        if(!system.equals(SystemConstants.SYSTEM_PLATFORM.getCode())){
+            SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId());
+            name = jzgUserInfo.getName();
+            workNumber = jzgUserInfo.getWorkNumber();
+        }else{
+            name = byId.getUsername();
+        }
+
 
         //获取用户角色权限标识
         List<SysRolePerms> userPerms = sysUserRoleService.getUserPerms(byId.getId(), system);
@@ -96,8 +107,11 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
             throw new SystemException("没有权限访问系统");
         }
 
+        //获取用户头像
         SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId());
-
+        if(!Objects.isNull(jzgUserInfo.getHeadSculpture()) && !jzgUserInfo.getHeadSculpture().isEmpty()) {
+            jzgUserInfo.setHeadSculpture(MinioUtils.getPresignedObjectUrl("jzg", jzgUserInfo.getHeadSculpture()));
+        }
         //角色数据权限
         List<String> roleIds = userPerms.stream().map(x -> x.getRoleId()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
         List<SysRoleDataScope> sysRoleDataScopes = sysRoleDataScopeMapper.selectList(new LambdaQueryWrapper<SysRoleDataScope>()
@@ -127,6 +141,11 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
         detailMap.put("systemcode", system);
         detailMap.put("deptId",jzgUserInfo.getDeptId());
         detailMap.put("dataScope",sysRoleDataScopeVo);
+        detailMap.put("name",name);
+        detailMap.put("workNumber",workNumber);
+        detailMap.put("id",byId.getId());
+        detailMap.put("username",byId.getUsername());
+        detailMap.put("headSculpture",jzgUserInfo.getHeadSculpture());
         details = detailMap;
 
         Object finalDetails = details;

authentication/src/main/java/com/jzg/config/JzgTokenService.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 @Component
 public class JzgTokenService {
@@ -31,7 +32,7 @@ public class JzgTokenService {
         }
 
         RBucket<Object> bucket = redissonClient.getBucket(token);
-        bucket.set(authorization);
+        bucket.set(authorization, 2, TimeUnit.HOURS);
     }
 
     public String getToken(String token){

authentication/src/main/java/com/jzg/controller/AuthController.java

@@ -1,7 +1,10 @@
 package com.jzg.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.request.RequestSingleParam;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.PasswordUtils;
 import com.jzg.config.JzgTokenService;
 import com.jzg.config.JzgUserDetailsService;
@@ -9,11 +12,14 @@ import com.jzg.config.JzgUsernamePasswordAuthenticationToken;
 import com.jzg.commons.constants.RedisKeyConstants;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.entity.RedisToken;
+import com.jzg.entity.SysUploadFiles;
 import com.jzg.entity.SysUser;
 import com.jzg.entity.vo.LoginFormVo;
 import com.jzg.entity.vo.ModifyPassWordFormVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.handler.JzgAuthenticationSuccessHandler;
+import com.jzg.mapper.SysUploadFilesMapper;
 import com.jzg.service.SysUserService;
 import com.jzg.commons.util.ImageUtil;
 import com.wf.captcha.SpecCaptcha;
@@ -29,6 +35,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -52,6 +59,9 @@ import java.util.concurrent.TimeUnit;
 @RequestMapping("/auth")
 public class AuthController extends BaseController {
 
+    @Value("${minio.bucket-name}")
+    private String bucketName;
+
     @Autowired
     AuthenticationManager authenticationManager;
 
@@ -66,6 +76,10 @@ public class AuthController extends BaseController {
 
     @Autowired
     RedissonClient redissonClient;
+
+    @Autowired
+    SysUploadFilesMapper sysUploadFilesMapper;
+
     /**
      * 登录接口
      * @param loginFormVo
@@ -159,12 +173,14 @@ public class AuthController extends BaseController {
 
     @PostMapping("changeHeadSculpture")
     @Operation(summary = "修改头像")
-    public HttpResult changeHeadSculpture(@RequestBody String headSculpture){
+    public HttpResult changeHeadSculpture(@RequestSingleParam(value = "id") String id){
         String userName = getUserName();
         SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getUsername, userName));
-        sysUser.setHeadSculpture(headSculpture);
-        return sysUserService.updateById(sysUser)? HttpResult.ok("头像修改成功") : HttpResult.error("头像修改失败");
+                .eq(SysUser::getMobile, userName));
+        sysUser.setHeadSculpture(id);
+        SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(id);
+        String jzgTouXiang = MinioUtils.getPresignedObjectUrl(bucketName, sysUploadFiles.getFileName());
+        return sysUserService.updateById(sysUser)? HttpResult.ok(jzgTouXiang) : HttpResult.error("头像修改失败");
     }
 
     @PostMapping("getUsers")
@@ -182,4 +198,11 @@ public class AuthController extends BaseController {
         List<String> userPerms = getUserPerms();
         return HttpResult.ok(userPerms);
     }
+
+    @Operation(summary = "获取个人信息")
+    @GetMapping("/getUserInfo")
+    public HttpResult<RedisToken> getUserInfo(){
+        String userTokenString = getUserTokenString();
+        return HttpResult.ok(JSONObject.parseObject(userTokenString,RedisToken.class));
+    }
 }

authentication/src/main/java/com/jzg/entity/RedisToken.java

@@ -2,6 +2,7 @@ package com.jzg.entity;
 
 import com.jzg.commons.entity.vo.SysRoleDataScopeVo;
 import com.jzg.config.JzgGrantedAuthority;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
@@ -9,9 +10,31 @@ import java.util.List;
 
 @Data
 public class RedisToken {
+    @Schema(description = "用户名")
     private String username;
+
+    @Schema(description = "系统")
     private String system;
+
+    @Schema(description = "部门id")
     private String deptId;
+
+    @Schema(description = "数据权限")
     private SysRoleDataScopeVo dataScope;
+
+    @Schema(description = "权限")
     private List<JzgGrantedAuthority> auths;
+
+    @Schema(description = "头像")
+    private String headSculpture;
+
+    /**
+     * 晋掌柜数据
+     */
+
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "工号")
+    private String workNumber;
 }

authentication/src/main/java/com/jzg/entity/SysUploadFiles.java

@@ -0,0 +1,11 @@
+package com.jzg.entity;
+
+import lombok.Data;
+
+@Data
+public class SysUploadFiles {
+
+    private String id;
+
+    private String fileName;
+}

authentication/src/main/java/com/jzg/entity/vo/SysUserJzgVo.java

@@ -1,5 +1,6 @@
 package com.jzg.entity.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -8,12 +9,24 @@ import lombok.Data;
 @Data
 public class SysUserJzgVo {
 
+    @Schema(description = "id")
     private String id;
 
+    @Schema(description = "用户名")
     private String username;
 
+    @Schema(description = "手机号")
     private String mobile;
 
+    @Schema(description = "部门id")
     private String deptId;
 
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "工号")
+    private String workNumber;
+
+    @Schema(description = "头像")
+    private String headSculpture;
 }

authentication/src/main/java/com/jzg/filter/TokenAuthenticationFilter.java

@@ -70,7 +70,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
             response.getWriter().write(json.toJSONString());
 
             // 确保状态码为 401 OK，不进行重定向
-            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+            response.setStatus(HttpServletResponse.SC_OK);
         }
     }
 }

authentication/src/main/java/com/jzg/handler/JzgAuthenticationSuccessHandler.java

@@ -41,6 +41,10 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
         SysRoleDataScopeVo dataScopeVo = (SysRoleDataScopeVo) ((HashMap<?, ?>) authentication.getDetails()).get("dataScope");
         String system = ((HashMap<String, String>) authentication.getDetails()).get("systemcode");
         String deptId = ((HashMap<String, String>) authentication.getDetails()).get("deptId");
+        String id = ((HashMap<String, String>) authentication.getDetails()).get("id");
+        String workNumber = ((HashMap<String, String>) authentication.getDetails()).get("workNumber");
+        String name = ((HashMap<String, String>) authentication.getDetails()).get("name");
+        String headSculpture = ((HashMap<String, String>) authentication.getDetails()).get("headSculpture");
         RedisToken redisToken = new RedisToken();
         Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
         redisToken.setUsername(username);
@@ -50,10 +54,13 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
                 .collect(Collectors.toList());
 
         redisToken.setAuths(jzgGrantedAuthorities);
-
+        redisToken.setUsername(username);
+        redisToken.setWorkNumber(workNumber);
+        redisToken.setName(name);
         redisToken.setSystem(system);
         redisToken.setDeptId(deptId);
         redisToken.setDataScope(dataScopeVo);
+        redisToken.setHeadSculpture(headSculpture);
         String token = tokenService.generateToken(username);
         // 生成 JWT Token
         tokenService.saveToken(username,token,JSONObject.toJSONString(redisToken));

authentication/src/main/java/com/jzg/mapper/SysUploadFilesMapper.java

@@ -0,0 +1,13 @@
+package com.jzg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.entity.SysUploadFiles;
+import com.jzg.entity.SysUser;
+import com.jzg.entity.vo.SysUserJzgVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface SysUploadFilesMapper extends BaseMapper<SysUploadFiles> {
+
+}

authentication/src/main/resources/mapper/SysUserMapper.xml

@@ -5,11 +5,20 @@
 
     <select id="getJzgUserInfo" resultType="com.jzg.entity.vo.SysUserJzgVo">
         SELECT
-            su.*,
-            suji.dept_id
+            su.id,
+            su.username,
+            su.`password`,
+            su.salt,
+            su.mobile,
+            su.account_status,
+            suji.dept_id,
+            suji.NAME,
+            suji.work_number,
+            suf.file_name AS head_sculpture
         FROM
             sys_user su
                 LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id
+                LEFT JOIN sys_upload_files suf ON su.head_sculpture = suf.id
         WHERE
             su.id = #{userId}
     </select>

commons/pom.xml

@@ -16,6 +16,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>3.0.0</version>
         </dependency>
 
         <dependency>

commons/src/main/java/com/jzg/commons/config/MvcConfig.java

@@ -0,0 +1,22 @@
+package com.jzg.commons.config;
+
+import com.jzg.commons.request.RequestStringParamHandlerMethodArgumentResolver;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+public class MvcConfig implements WebMvcConfigurer {
+
+    /**
+     * 自定义参数解析器
+     * @param argumentResolvers initially an empty list
+     */
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(new RequestStringParamHandlerMethodArgumentResolver());
+        WebMvcConfigurer.super.addArgumentResolvers(argumentResolvers);
+    }
+}

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -22,6 +22,17 @@ public class BaseController {
     @Autowired
     RedissonClient redissonClient;
 
+    public String getUserTokenString(){
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        String authorizationHeader = request.getHeader("Authorization");
+        if(Objects.isNull(authorizationHeader) || Objects.isNull(redissonClient.getBucket(authorizationHeader).get())){
+            throw new TokenExpireException("用户登录信息过期");
+        }
+        String userJsonStr = redissonClient.getBucket(authorizationHeader).get().toString();
+        return userJsonStr;
+    }
+
     public String getUserName(){
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -192,6 +192,10 @@ public class SysUserJzgInfo extends BaseModel {
     @Schema(description = "性别")
     private String sex;
 
+    @TableField(value = "is_computer")
+    @Schema(description = "是否是计算机专业 1 是 0 否")
+    private String isComputer;
+
     @TableField(value = "speciality")
     @Schema(description = "专业")
     private String speciality;

commons/src/main/java/com/jzg/commons/request/RequestSingleParam.java

@@ -0,0 +1,19 @@
+package com.jzg.commons.request;
+
+import org.springframework.web.bind.annotation.ValueConstants;
+
+import java.lang.annotation.*;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RequestSingleParam {
+
+    String value();
+
+    boolean required() default true;
+
+    String defaultValue() default ValueConstants.DEFAULT_NONE;
+
+
+}

commons/src/main/java/com/jzg/commons/request/RequestStringParamHandlerMethodArgumentResolver.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.request;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.core.MethodParameter;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+import java.io.BufferedReader;
+
+public class RequestStringParamHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
+
+    @Override
+    public boolean supportsParameter(MethodParameter methodParameter) {
+        return methodParameter.hasParameterAnnotation(RequestSingleParam.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer modelAndViewContainer, NativeWebRequest nativeWebRequest, WebDataBinderFactory webDataBinderFactory) throws Exception {
+        RequestSingleParam requestSingleParam = methodParameter.getParameterAnnotation(RequestSingleParam.class);
+        HttpServletRequest request = nativeWebRequest.getNativeRequest(HttpServletRequest.class);
+        assert request != null;
+        BufferedReader reader = request.getReader();
+        StringBuilder sb = new StringBuilder();
+        char[] buf = new char[1024];
+        int rd;
+        while ((rd = reader.read(buf)) != -1) {
+            sb.append(buf, 0, rd);
+        }
+
+        String value = requestSingleParam.value();
+        JSONObject jsonObject = JSON.parseObject(sb.toString());
+        return jsonObject.get(value);
+    }
+
+}

platform/src/main/java/com/jzg/controller/FileUploadController.java

@@ -7,7 +7,7 @@ import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.util.FileUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.SysUploadFilesMapper;
-import com.jzg.util.MinioUtils;
+import com.jzg.commons.util.MinioUtils;
 import io.minio.*;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -14,10 +14,9 @@ import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.StringUtils;
-import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.mapper.*;
 import com.jzg.service.SysSystemService;
-import com.jzg.util.MinioUtils;
+import com.jzg.commons.util.MinioUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -82,7 +82,7 @@ public class UserController extends BaseController {
 
     @Operation(summary = "获取成员资源转移信息接口", description = "获取成员资源转移信息接口")
     @GetMapping(value = "/getTransferInfo")
-    public HttpResult getTransferInfo(@RequestParam String userId) {
+    public HttpResult<UserTransferInfoVo> getTransferInfo(@RequestParam String userId) {
         return HttpResult.ok(sysUserService.getTransferInfo(userId));
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -9,13 +9,13 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.PasswordUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
-import com.jzg.organization.utils.MinioUtils;
 import com.jzg.organization.service.*;
 import com.jzg.organization.state.UserState;
 import jakarta.annotation.Resource;
@@ -149,7 +149,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public boolean userQuitApply(String userId) {
-//        sysUserJzgInfoService.getById()
+        SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(userId);
+
         return false;
     }
 
@@ -296,12 +297,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional(rollbackFor = Exception.class)
     public HttpResult<Boolean> updateUserInfo(SysUserVo sysUserVo) {
         SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(sysUserVo.getId());
-        if (sysUserJzgInfo == null || sysUserJzgInfo.getStatus() == 0) {
+        if (Objects.isNull(sysUserJzgInfo)) {
             throw new SystemException("该业务员不存在");
         }
-        if (sysUserJzgInfo.getIsEnable() == 0) {
-            throw new SystemException("该业务员已被禁用");
-        }
+//        if (sysUserJzgInfo.getIsEnable() == 0) {
+//            throw new SystemException("该业务员已被禁用");
+//        }
         BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
         sysUserJzgInfoService.updateById(sysUserJzgInfo);
         return HttpResult.ok("修改业务员成功");

tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -32,7 +32,11 @@
             AND suji.dept_id = #{param.deptId}
         </if>
         <if test="param.name!= null and param.name!= ''">
-            AND (suji.name = #{param.name} or su.mobile = #{param.name}) or suji.work_number = #{param.name})
+            AND (
+            suji.name LIKE CONCAT('%', #{param.name}, '%')
+            OR su.mobile LIKE CONCAT('%', #{param.name}, '%')
+            OR suji.work_number LIKE CONCAT('%', #{param.name}, '%')
+            )
         </if>
     </select>