diff --git a/src/main/java/com/youlai/boot/core/annotation/DataPermission.java b/src/main/java/com/youlai/boot/common/annotation/DataPermission.java similarity index 92% rename from src/main/java/com/youlai/boot/core/annotation/DataPermission.java rename to src/main/java/com/youlai/boot/common/annotation/DataPermission.java index 54ade2bd..10f0d00a 100644 --- a/src/main/java/com/youlai/boot/core/annotation/DataPermission.java +++ b/src/main/java/com/youlai/boot/common/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.annotation; +package com.youlai.boot.common.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/youlai/boot/core/annotation/Log.java b/src/main/java/com/youlai/boot/common/annotation/Log.java similarity index 94% rename from src/main/java/com/youlai/boot/core/annotation/Log.java rename to src/main/java/com/youlai/boot/common/annotation/Log.java index 3c9f605f..3d2002f4 100644 --- a/src/main/java/com/youlai/boot/core/annotation/Log.java +++ b/src/main/java/com/youlai/boot/common/annotation/Log.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.annotation; +package com.youlai.boot.common.annotation; import com.youlai.boot.common.enums.LogModuleEnum; diff --git a/src/main/java/com/youlai/boot/core/annotation/RepeatSubmit.java b/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java similarity index 91% rename from src/main/java/com/youlai/boot/core/annotation/RepeatSubmit.java rename to src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java index 8f4b13fc..39c71044 100644 --- a/src/main/java/com/youlai/boot/core/annotation/RepeatSubmit.java +++ b/src/main/java/com/youlai/boot/common/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.annotation; +package com.youlai.boot.common.annotation; import java.lang.annotation.*; diff --git a/src/main/java/com/youlai/boot/core/annotation/ValidField.java b/src/main/java/com/youlai/boot/common/annotation/ValidField.java similarity index 92% rename from src/main/java/com/youlai/boot/core/annotation/ValidField.java rename to src/main/java/com/youlai/boot/common/annotation/ValidField.java index e9ce5f00..78914916 100644 --- a/src/main/java/com/youlai/boot/core/annotation/ValidField.java +++ b/src/main/java/com/youlai/boot/common/annotation/ValidField.java @@ -1,4 +1,4 @@ -package com.youlai.boot.core.annotation; +package com.youlai.boot.common.annotation; import com.youlai.boot.core.validator.FieldValidator; diff --git a/src/main/java/com/youlai/boot/config/WebMvcConfig.java b/src/main/java/com/youlai/boot/config/WebMvcConfig.java index bcf23664..20f73586 100644 --- a/src/main/java/com/youlai/boot/config/WebMvcConfig.java +++ b/src/main/java/com/youlai/boot/config/WebMvcConfig.java @@ -14,15 +14,12 @@ import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.validation.beanvalidation.SpringConstraintValidatorFactory; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.math.BigInteger; -import java.util.Collections; import java.util.List; /** diff --git a/src/main/java/com/youlai/boot/config/WechatMiniAppConfig.java b/src/main/java/com/youlai/boot/config/WxMiniAppConfig.java similarity index 92% rename from src/main/java/com/youlai/boot/config/WechatMiniAppConfig.java rename to src/main/java/com/youlai/boot/config/WxMiniAppConfig.java index 129186fd..bbce096c 100644 --- a/src/main/java/com/youlai/boot/config/WechatMiniAppConfig.java +++ b/src/main/java/com/youlai/boot/config/WxMiniAppConfig.java @@ -16,9 +16,9 @@ import org.springframework.context.annotation.Configuration; * @since 2024/11/26 17:28 */ @Setter -@ConfigurationProperties(prefix = "wechat.miniapp") +@ConfigurationProperties(prefix = "wx.miniapp") @Configuration -public class WechatMiniAppConfig { +public class WxMiniAppConfig { private String appId; diff --git a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java index d64fb84c..4e89c810 100644 --- a/src/main/java/com/youlai/boot/core/aspect/LogAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/LogAspect.java @@ -48,7 +48,7 @@ public class LogAspect { private final HttpServletRequest request; private final ApplicationContext applicationContext; - @Pointcut("@annotation(com.youlai.boot.core.annotation.Log)") + @Pointcut("@annotation(com.youlai.boot.common.annotation.Log)") public void logPointcut() { } @@ -58,7 +58,7 @@ public class LogAspect { * @param joinPoint 切点 */ @AfterReturning(pointcut = "logPointcut() && @annotation(logAnnotation)", returning = "jsonResult") - public void doAfterReturning(JoinPoint joinPoint, com.youlai.boot.core.annotation.Log logAnnotation, Object jsonResult) { + public void doAfterReturning(JoinPoint joinPoint, com.youlai.boot.common.annotation.Log logAnnotation, Object jsonResult) { this.saveLog(joinPoint, null, jsonResult, logAnnotation); } @@ -77,7 +77,7 @@ public class LogAspect { /** * 保持日志 */ - private void saveLog(final JoinPoint joinPoint, final Exception e, Object jsonResult, com.youlai.boot.core.annotation.Log logAnnotation) { + private void saveLog(final JoinPoint joinPoint, final Exception e, Object jsonResult, com.youlai.boot.common.annotation.Log logAnnotation) { String requestURI = request.getRequestURI(); Long userId = null; diff --git a/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java index 12adc341..dbf783a2 100644 --- a/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java +++ b/src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java @@ -7,7 +7,7 @@ import com.youlai.boot.common.constant.RedisConstants; import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.common.exception.BusinessException; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.RepeatSubmit; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java b/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java index 227bb9f1..b9703448 100644 --- a/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java @@ -3,7 +3,7 @@ package com.youlai.boot.core.handler; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; -import com.youlai.boot.core.annotation.DataPermission; +import com.youlai.boot.common.annotation.DataPermission; import com.youlai.boot.common.base.IBaseEnum; import com.youlai.boot.common.enums.DataScopeEnum; import com.youlai.boot.core.security.util.SecurityUtils; diff --git a/src/main/java/com/youlai/boot/core/security/extension/WeChatAuthenticationProvider.java b/src/main/java/com/youlai/boot/core/security/extension/WechatAuthenticationProvider.java similarity index 91% rename from src/main/java/com/youlai/boot/core/security/extension/WeChatAuthenticationProvider.java rename to src/main/java/com/youlai/boot/core/security/extension/WechatAuthenticationProvider.java index 41602133..6a1831fe 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/WeChatAuthenticationProvider.java +++ b/src/main/java/com/youlai/boot/core/security/extension/WechatAuthenticationProvider.java @@ -24,14 +24,14 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; * @since 2.17.0 */ @Slf4j -public class WeChatAuthenticationProvider implements AuthenticationProvider { +public class WechatAuthenticationProvider implements AuthenticationProvider { private final UserService userService; private final WxMaService wxMaService; - public WeChatAuthenticationProvider(UserService userService, WxMaService wxMaService) { + public WechatAuthenticationProvider(UserService userService, WxMaService wxMaService) { this.userService = userService; this.wxMaService = wxMaService; } @@ -86,15 +86,14 @@ public class WeChatAuthenticationProvider implements AuthenticationProvider { SysUserDetails userDetails = new SysUserDetails(userAuthInfo); // 创建已认证的 WeChatAuthenticationToken - WeChatAuthenticationToken weChatAuthenticationToken = WeChatAuthenticationToken.authenticated( + return WechatAuthenticationToken.authenticated( userDetails, userDetails.getAuthorities() ); - return weChatAuthenticationToken; } @Override public boolean supports(Class authentication) { - return WeChatAuthenticationToken.class.isAssignableFrom(authentication); + return WechatAuthenticationToken.class.isAssignableFrom(authentication); } } diff --git a/src/main/java/com/youlai/boot/core/security/extension/WeChatAuthenticationToken.java b/src/main/java/com/youlai/boot/core/security/extension/WechatAuthenticationToken.java similarity index 82% rename from src/main/java/com/youlai/boot/core/security/extension/WeChatAuthenticationToken.java rename to src/main/java/com/youlai/boot/core/security/extension/WechatAuthenticationToken.java index fc8c7fcb..56854705 100644 --- a/src/main/java/com/youlai/boot/core/security/extension/WeChatAuthenticationToken.java +++ b/src/main/java/com/youlai/boot/core/security/extension/WechatAuthenticationToken.java @@ -12,7 +12,7 @@ import java.util.Collection; * @author Ray.Hao * @since 2024/12/2 */ -public class WeChatAuthenticationToken extends AbstractAuthenticationToken { +public class WechatAuthenticationToken extends AbstractAuthenticationToken { @Serial private static final long serialVersionUID = 621L; private final Object principal; @@ -22,7 +22,7 @@ public class WeChatAuthenticationToken extends AbstractAuthenticationToken { * * @param principal 微信用户信息 */ - public WeChatAuthenticationToken(Object principal) { + public WechatAuthenticationToken(Object principal) { // 没有授权信息时，设置为 null super(null); this.principal = principal; @@ -37,7 +37,7 @@ public class WeChatAuthenticationToken extends AbstractAuthenticationToken { * @param principal 微信用户信息 * @param authorities 授权信息 */ - public WeChatAuthenticationToken(Object principal, Collection authorities) { + public WechatAuthenticationToken(Object principal, Collection authorities) { super(authorities); this.principal = principal; // 认证通过 @@ -52,8 +52,8 @@ public class WeChatAuthenticationToken extends AbstractAuthenticationToken { * @param authorities 授权信息 * @return */ - public static WeChatAuthenticationToken authenticated(Object principal, Collection authorities) { - return new WeChatAuthenticationToken(principal, authorities); + public static WechatAuthenticationToken authenticated(Object principal, Collection authorities) { + return new WechatAuthenticationToken(principal, authorities); } @Override diff --git a/src/main/java/com/youlai/boot/core/validator/FieldValidator.java b/src/main/java/com/youlai/boot/core/validator/FieldValidator.java index 3872d303..d65d4f3c 100644 --- a/src/main/java/com/youlai/boot/core/validator/FieldValidator.java +++ b/src/main/java/com/youlai/boot/core/validator/FieldValidator.java @@ -1,6 +1,6 @@ package com.youlai.boot.core.validator; -import com.youlai.boot.core.annotation.ValidField; +import com.youlai.boot.common.annotation.ValidField; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java b/src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java index f9d7f03c..23b532ec 100644 --- a/src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java +++ b/src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java @@ -7,7 +7,7 @@ import com.youlai.boot.shared.auth.model.RefreshTokenRequest; import com.youlai.boot.shared.auth.service.AuthService; import com.youlai.boot.shared.auth.model.CaptchaResponse; import com.youlai.boot.shared.auth.model.AuthTokenResponse; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; /** * 认证控制层 * - * @author Ray + * @author Ray.Hao * @since 2022/10/16 */ @Tag(name = "01.认证中心") diff --git a/src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java b/src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java index 96c3f2c0..78bb6a74 100644 --- a/src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java +++ b/src/main/java/com/youlai/boot/shared/auth/service/impl/AuthServiceImpl.java @@ -9,7 +9,7 @@ import com.youlai.boot.common.constant.SecurityConstants; import com.youlai.boot.common.exception.BusinessException; import com.youlai.boot.common.result.ResultCode; import com.youlai.boot.config.property.CaptchaProperties; -import com.youlai.boot.core.security.extension.WeChatAuthenticationToken; +import com.youlai.boot.core.security.extension.WechatAuthenticationToken; import com.youlai.boot.core.security.util.SecurityUtils; import com.youlai.boot.shared.auth.enums.CaptchaTypeEnum; import com.youlai.boot.shared.auth.model.AuthTokenResponse; @@ -78,7 +78,7 @@ public class AuthServiceImpl implements AuthService { @Override public AuthTokenResponse wechatLogin(String code) { // 1. 创建用户微信认证的令牌（未认证） - WeChatAuthenticationToken authenticationToken = new WeChatAuthenticationToken(code); + WechatAuthenticationToken authenticationToken = new WechatAuthenticationToken(code); // 2. 执行认证（认证中） Authentication authentication = authenticationManager.authenticate(authenticationToken); diff --git a/src/main/java/com/youlai/boot/shared/auth/service/impl/JwtTokenService.java b/src/main/java/com/youlai/boot/shared/auth/service/impl/JwtTokenService.java index 801369d7..b27e27f4 100644 --- a/src/main/java/com/youlai/boot/shared/auth/service/impl/JwtTokenService.java +++ b/src/main/java/com/youlai/boot/shared/auth/service/impl/JwtTokenService.java @@ -59,17 +59,17 @@ public class JwtTokenService implements TokenService { */ @Override public AuthTokenResponse generateToken(Authentication authentication) { - int accessTokenExpiration = securityProperties.getJwt().getAccessTokenExpiration(); - int refreshTokenExpiration = securityProperties.getJwt().getRefreshTokenExpiration(); + int accessTokenTimeToLive = securityProperties.getJwt().getAccessTokenTimeToLive(); + int refreshTokenTimeToLive = securityProperties.getJwt().getRefreshTokenTimeToLive(); - String accessToken = generateToken(authentication, accessTokenExpiration); - String refreshToken = generateToken(authentication, refreshTokenExpiration); + String accessToken = generateToken(authentication, accessTokenTimeToLive); + String refreshToken = generateToken(authentication, refreshTokenTimeToLive); return AuthTokenResponse.builder() .accessToken(accessToken) .refreshToken(refreshToken) .tokenType("Bearer") - .expiresIn(accessTokenExpiration) + .expiresIn(accessTokenTimeToLive) .build(); } @@ -172,7 +172,7 @@ public class JwtTokenService implements TokenService { } Authentication authentication = parseToken(refreshToken); - int accessTokenExpiration = securityProperties.getJwt().getAccessTokenExpiration(); + int accessTokenExpiration = securityProperties.getJwt().getRefreshTokenTimeToLive(); String newAccessToken = generateToken(authentication, accessTokenExpiration); return AuthTokenResponse.builder() @@ -187,11 +187,11 @@ public class JwtTokenService implements TokenService { /** * 生成 JWT Token * - * @param authentication - * @param expiration + * @param authentication 认证信息 + * @param ttl 过期时间 * @return */ - private String generateToken(Authentication authentication, int expiration) { + private String generateToken(Authentication authentication, int ttl) { SysUserDetails userDetails = (SysUserDetails) authentication.getPrincipal(); @@ -210,8 +210,8 @@ public class JwtTokenService implements TokenService { payload.put(JWTPayload.ISSUED_AT, now); // 设置过期时间 -1 表示永不过期 - if (expiration != -1) { - Date expiresAt = DateUtil.offsetSecond(now, expiration); + if (ttl != -1) { + Date expiresAt = DateUtil.offsetSecond(now, ttl); payload.put(JWTPayload.EXPIRES_AT, expiresAt); } payload.put(JWTPayload.SUBJECT, authentication.getName()); diff --git a/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java b/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java index 91276831..50119908 100644 --- a/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java +++ b/src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java @@ -10,7 +10,7 @@ import com.youlai.boot.shared.codegen.model.form.GenConfigForm; import com.youlai.boot.shared.codegen.model.query.TablePageQuery; import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO; import com.youlai.boot.shared.codegen.model.vo.TablePageVO; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.shared.codegen.service.GenConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/youlai/boot/system/controller/ConfigController.java b/src/main/java/com/youlai/boot/system/controller/ConfigController.java index 2719229a..f10032e1 100644 --- a/src/main/java/com/youlai/boot/system/controller/ConfigController.java +++ b/src/main/java/com/youlai/boot/system/controller/ConfigController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.model.form.ConfigForm; import com.youlai.boot.system.model.query.ConfigPageQuery; import com.youlai.boot.system.model.vo.ConfigVO; diff --git a/src/main/java/com/youlai/boot/system/controller/DeptController.java b/src/main/java/com/youlai/boot/system/controller/DeptController.java index 350b6ef0..68b62ecf 100644 --- a/src/main/java/com/youlai/boot/system/controller/DeptController.java +++ b/src/main/java/com/youlai/boot/system/controller/DeptController.java @@ -1,13 +1,13 @@ package com.youlai.boot.system.controller; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.DeptForm; import com.youlai.boot.system.model.query.DeptQuery; import com.youlai.boot.system.model.vo.DeptVO; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.service.DeptService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java index 1ca058ed..8cf20f75 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictController.java @@ -6,9 +6,9 @@ import com.youlai.boot.common.result.Result; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.system.model.query.DictPageQuery; import com.youlai.boot.system.model.vo.DictPageVO; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.model.form.DictForm; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.model.vo.DictVO; import com.youlai.boot.system.service.DictService; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/youlai/boot/system/controller/DictDataController.java b/src/main/java/com/youlai/boot/system/controller/DictDataController.java index df04e3f3..f99c8256 100644 --- a/src/main/java/com/youlai/boot/system/controller/DictDataController.java +++ b/src/main/java/com/youlai/boot/system/controller/DictDataController.java @@ -1,8 +1,8 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.core.annotation.Log; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.PageResult; diff --git a/src/main/java/com/youlai/boot/system/controller/MenuController.java b/src/main/java/com/youlai/boot/system/controller/MenuController.java index ce87ebbb..3c072d56 100644 --- a/src/main/java/com/youlai/boot/system/controller/MenuController.java +++ b/src/main/java/com/youlai/boot/system/controller/MenuController.java @@ -2,13 +2,13 @@ package com.youlai.boot.system.controller; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.model.form.MenuForm; import com.youlai.boot.system.model.query.MenuQuery; import com.youlai.boot.system.model.vo.MenuVO; import com.youlai.boot.common.model.Option; import com.youlai.boot.system.model.vo.RouteVO; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.core.security.util.SecurityUtils; import com.youlai.boot.system.service.MenuService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/youlai/boot/system/controller/RoleController.java b/src/main/java/com/youlai/boot/system/controller/RoleController.java index 8aef5cb3..54cdcf33 100644 --- a/src/main/java/com/youlai/boot/system/controller/RoleController.java +++ b/src/main/java/com/youlai/boot/system/controller/RoleController.java @@ -2,14 +2,14 @@ package com.youlai.boot.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.boot.common.enums.LogModuleEnum; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.common.model.Option; import com.youlai.boot.common.result.PageResult; import com.youlai.boot.common.result.Result; import com.youlai.boot.system.model.form.RoleForm; import com.youlai.boot.system.model.query.RolePageQuery; import com.youlai.boot.system.model.vo.RolePageVO; -import com.youlai.boot.core.annotation.Log; +import com.youlai.boot.common.annotation.Log; import com.youlai.boot.system.service.RoleService; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/youlai/boot/system/controller/UserController.java b/src/main/java/com/youlai/boot/system/controller/UserController.java index f735f15c..c425d14a 100644 --- a/src/main/java/com/youlai/boot/system/controller/UserController.java +++ b/src/main/java/com/youlai/boot/system/controller/UserController.java @@ -4,8 +4,8 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.youlai.boot.core.annotation.Log; -import com.youlai.boot.core.annotation.RepeatSubmit; +import com.youlai.boot.common.annotation.Log; +import com.youlai.boot.common.annotation.RepeatSubmit; import com.youlai.boot.system.enums.ContactType; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.model.Option; diff --git a/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java index 2906244e..e00f27bf 100644 --- a/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/DeptMapper.java @@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.youlai.boot.core.annotation.DataPermission; +import com.youlai.boot.common.annotation.DataPermission; import com.youlai.boot.system.model.entity.Dept; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java index ca1a3bff..2f2e2c87 100644 --- a/src/main/java/com/youlai/boot/system/mapper/UserMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/UserMapper.java @@ -6,7 +6,7 @@ import com.youlai.boot.system.model.bo.UserBO; import com.youlai.boot.system.model.entity.User; import com.youlai.boot.system.model.query.UserPageQuery; import com.youlai.boot.system.model.form.UserForm; -import com.youlai.boot.core.annotation.DataPermission; +import com.youlai.boot.common.annotation.DataPermission; import com.youlai.boot.system.model.dto.UserAuthInfo; import com.youlai.boot.system.model.dto.UserExportDTO; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java index 6405339b..b6848db8 100644 --- a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java @@ -2,7 +2,7 @@ package com.youlai.boot.system.model.query; import cn.hutool.db.sql.Direction; import com.youlai.boot.common.base.BasePageQuery; -import com.youlai.boot.core.annotation.ValidField; +import com.youlai.boot.common.annotation.ValidField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode;