From cb9ddf46812421278a30f0baa33f064b8971dad2 Mon Sep 17 00:00:00 2001 From: xiang Date: Sun, 22 Mar 2026 10:20:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/TokenController.java | 23 +--- xs-server/src/main/resources/application.yml | 19 +++- .../src/main/resources/logback-spring.xml | 102 ------------------ .../xservice/auth/service/entity/XMenuDO.java | 3 + .../repository/mapper/XUserMapper.java | 13 --- .../service/impl/XUserServiceImpl.java | 10 +- .../resources/mapper/user/XUserMapper.xml | 31 +----- 7 files changed, 28 insertions(+), 173 deletions(-) delete mode 100644 xs-server/src/main/resources/logback-spring.xml diff --git a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java index 40300e4..a7dc4ef 100644 --- a/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java +++ b/xs-server/src/main/java/com/xiang/xservice/auth/server/controller/TokenController.java @@ -1,6 +1,5 @@ package com.xiang.xservice.auth.server.controller; -import com.xiang.xservice.auth.api.api.TokenApi; import com.xiang.xservice.auth.api.dto.req.LoginRequest; import com.xiang.xservice.auth.api.dto.req.RefreshRequest; import com.xiang.xservice.auth.api.dto.req.RegisterRequest; @@ -29,7 +28,7 @@ import java.util.Objects; @Slf4j @RestController @RequiredArgsConstructor -public class TokenController implements TokenApi { +public class TokenController { private final XUserService userService; private final XMenuService menuService; @@ -83,26 +82,6 @@ public class TokenController implements TokenApi { return Result.error("操作失败"); } - @Override - @GetMapping("/private/user/getUserId") - public Result getUserId(@RequestParam("token") String token) { - try { - return Result.data(userService.getUserId(token)); - } catch (Exception e) { - return Result.error(e.getMessage()); - } - } - - @Override - @GetMapping("/private/user/getTenantId") - public Result getTenantId(@RequestParam("token") String token) { - try { - return Result.data(userService.getTenantId(token)); - } catch (Exception e) { - return Result.error(e.getMessage()); - } - } - @GetMapping("/private/menu/getRouter") diff --git a/xs-server/src/main/resources/application.yml b/xs-server/src/main/resources/application.yml index ded4169..31f7857 100644 --- a/xs-server/src/main/resources/application.yml +++ b/xs-server/src/main/resources/application.yml @@ -11,6 +11,16 @@ spring: main: allow-bean-definition-overriding: true headless: true + cloud: + loadbalancer: + retry: + enabled: false + cache: + enabled: true + cache: + type: caffeine + caffeine: + spec: initialCapacity=100,maximumSize=1000,expireAfterWrite=30s mybatis: mapper-locations: @@ -21,4 +31,11 @@ pagehelper: helperDialect: mysql reasonable: true support-methods-arguments: true - params: count=countSql \ No newline at end of file + params: count=countSql + +feign: + client: + config: + default: + connectTimeout: 1000 + readTimeout: 3000 \ No newline at end of file diff --git a/xs-server/src/main/resources/logback-spring.xml b/xs-server/src/main/resources/logback-spring.xml deleted file mode 100644 index 70102cf..0000000 --- a/xs-server/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - ${APP_NAME} - - - - - - - - - - - - - - %boldGreen(%contextName): %boldCyan(%d{yyyy-MM-dd HH:mm:ss:SSS}) %highlight([%c]) %boldMagenta([%t]) %boldCyan([%L]) %highlight([traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}]) %boldGreen([%p]) - %msg%n - - - UTF-8 - - - - - - - - ${LOG_HOME}/debug-%d{yyyy-MM-dd}.log - - ${LOG_MAX_HISTORY} - - - - %contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n - UTF-8 - - - - debug - ACCEPT - DENY - - - - - - - - ${LOG_HOME}/info-%d{yyyy-MM-dd}.log - - ${LOG_MAX_HISTORY} - - - - %contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n - UTF-8 - - - - - info - ACCEPT - DENY - - - - - - - - ${LOG_HOME}/error-%d{yyyy-MM-dd}.log - - ${LOG_MAX_HISTORY} - - - - %contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n - UTF-8 - - - - error - ACCEPT - DENY - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XMenuDO.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XMenuDO.java index e9f6d22..f29a91e 100644 --- a/xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XMenuDO.java +++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/entity/XMenuDO.java @@ -1,9 +1,11 @@ package com.xiang.xservice.auth.service.entity; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; import java.time.LocalDateTime; @@ -20,6 +22,7 @@ public class XMenuDO { private static final long serialVersionUID = 1L; /** 菜单ID */ + @TableId private Long menuId; /** 菜单名称 */ diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java index 4754798..3a1088b 100644 --- a/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java +++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/repository/mapper/XUserMapper.java @@ -21,13 +21,6 @@ public interface XUserMapper extends BaseMapper { */ XUser selectByUsername(String username); - /** - * 批量插入 - * @param list - * @return - */ - int insertBatch(List list); - /** * 查询用户列表 * @param user @@ -42,12 +35,6 @@ public interface XUserMapper extends BaseMapper { */ XUser getUserById(Long id); - /** - * 编辑用户 - * @param user - * @return - */ - int update(XUser user); /** * 批量删除 diff --git a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java index 4d1ce6e..aedda3d 100644 --- a/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java +++ b/xs-service/src/main/java/com/xiang/xservice/auth/service/service/impl/XUserServiceImpl.java @@ -165,7 +165,7 @@ public class XUserServiceImpl implements XUserService { // 4. db 存储token user.setToken(token); user.setRefreshToken(refreshToken); - userMapper.update(user); + userMapper.updateById(user); return loginResp; } @@ -257,7 +257,7 @@ public class XUserServiceImpl implements XUserService { user.setCreateTime(request.getDateTime()); user.setUpdateBy(request.getOperator()); user.setUpdateTime(request.getDateTime()); - return userMapper.update(user) > 0; + return userMapper.updateById(user) > 0; } @Override @@ -343,7 +343,7 @@ public class XUserServiceImpl implements XUserService { // 更新 Redis 和 DB redisService.set(RedisConstant.LOGIN_TOKEN + request.getUsername(), newToken, 3, TimeUnit.HOURS); user.setToken(newToken); - userMapper.update(user); + userMapper.updateById(user); LoginResp loginResp = new LoginResp(); loginResp.setToken(newToken); loginResp.setUsername(request.getUsername()); @@ -358,7 +358,7 @@ public class XUserServiceImpl implements XUserService { throw new BusinessException(Code01UserErrorCode.USER_NOT_EXISTS); } user.setStatus(status); - return userMapper.update(user) > 0; + return userMapper.updateById(user) > 0; } @Override @@ -391,6 +391,6 @@ public class XUserServiceImpl implements XUserService { } String encodePwd = passwordEncoder.encode(password); user.setPassword(encodePwd); - return userMapper.update(user) > 0; + return userMapper.updateById(user) > 0; } } diff --git a/xs-service/src/main/resources/mapper/user/XUserMapper.xml b/xs-service/src/main/resources/mapper/user/XUserMapper.xml index 949f3ea..a8622f0 100644 --- a/xs-service/src/main/resources/mapper/user/XUserMapper.xml +++ b/xs-service/src/main/resources/mapper/user/XUserMapper.xml @@ -44,40 +44,11 @@ token, refresh_token - - insert into x_user(name, username, password, email, phone, status, tenant_id) VALUES - - (#{item.name}, #{item.username}, #{item.password}, #{item.email}, #{item.phone}, #{item.status}, #{item.tenantId}) - - - + update x_user set del_flag = 1 where id = #{id} - - UPDATE x_user - - name = #{name}, - username = #{username}, - password = #{password}, - email = #{email}, - phone = #{phone}, - avatar = #{avatar}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - tenant_id = #{tenantId}, - token = #{token}, - refresh_token = #{refreshToken}, - status = #{status} - - WHERE id = #{id} - update x_user set del_flag = 1, update_time = #{time}, update_by = #{operator} where id in