修改ruoyi包名为hr

.gitignore

@@ -0,0 +1,4 @@
+.idea/
+target/
+.DS_Store
+logs/**

README.md

@@ -24,7 +24,7 @@
 ## 系统模块
 
 ~~~
-com.ruoyi     
+com.hr     
 ├── ruoyi-ui              // 前端框架 [80]
 ├── ruoyi-gateway         // 网关模块 [8080]
 ├── ruoyi-auth            // 认证中心 [9200]

hr-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java → hr-auth/src/main/java/com/hr/auth/RuoYiAuthApplication.java

@@ -1,9 +1,9 @@
-package com.ruoyi.auth;
+package com.hr.auth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.hr.common.security.annotation.EnableRyFeignClients;
 
 /**
  * 认证授权中心

hr-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java → hr-auth/src/main/java/com/hr/auth/controller/TokenController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.controller;
+package com.hr.auth.controller;
 
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,15 +6,15 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.auth.form.LoginBody;
-import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.service.SysLoginService;
+import com.hr.auth.form.LoginBody;
+import com.hr.auth.form.RegisterBody;
+import com.hr.auth.service.SysLoginService;
 import com.hr.common.core.domain.R;
 import com.hr.common.core.utils.JwtUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.security.auth.AuthUtil;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.security.auth.AuthUtil;
+import com.hr.common.security.service.TokenService;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.model.LoginUser;
 
 /**

hr-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java → hr-auth/src/main/java/com/hr/auth/form/LoginBody.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.form;
+package com.hr.auth.form;
 
 /**
  * 用户登录对象

hr-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java → hr-auth/src/main/java/com/hr/auth/form/RegisterBody.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.form;
+package com.hr.auth.form;
 
 /**
  * 用户注册对象

hr-auth/src/main/java/com/ruoyi/auth/service/Miyao.java → hr-auth/src/main/java/com/hr/auth/service/Miyao.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.service;
+package com.hr.auth.service;
 
 import com.hr.common.core.constant.SecurityConstants;
 import com.hr.common.core.utils.JwtUtils;

hr-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java → hr-auth/src/main/java/com/hr/auth/service/SysLoginService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.service;
+package com.hr.auth.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -13,8 +13,8 @@ import com.hr.common.core.text.Convert;
 import com.hr.common.core.utils.DateUtils;
 import com.hr.common.core.utils.StringUtils;
 import com.hr.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.redis.service.RedisService;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.RemoteUserService;
 import com.hr.system.api.domain.SysUser;
 import com.hr.system.api.model.LoginUser;

hr-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java → hr-auth/src/main/java/com/hr/auth/service/SysPasswordService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.service;
+package com.hr.auth.service;
 
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,8 +6,8 @@ import org.springframework.stereotype.Component;
 import com.hr.common.core.constant.CacheConstants;
 import com.hr.common.core.constant.Constants;
 import com.hr.common.core.exception.ServiceException;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.redis.service.RedisService;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.domain.SysUser;
 
 /**

hr-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java → hr-auth/src/main/java/com/hr/auth/service/SysRecordLogService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.auth.service;
+package com.hr.auth.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

hr-auth/src/main/resources/logback.xml

@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.hr" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

hr-common/hr-common-core/src/main/java/com/hr/common/core/constant/Constants.java

@@ -120,16 +120,16 @@ public class Constants
     /**
      * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
      */
-    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
+    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.hr" };
 
     /**
      * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
      */
-    public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.job.task" };
+    public static final String[] JOB_WHITELIST_STR = { "com.hr.job.task" };
 
     /**
      * 定时任务违规的字符
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
+            "org.springframework", "org.apache", "com.hr.common.core.utils.file" };
 }

hr-common/hr-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java → hr-common/hr-common-datascope/src/main/java/com/hr/common/datascope/annotation/DataScope.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.datascope.annotation;
+package com.hr.common.datascope.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

hr-common/hr-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java → hr-common/hr-common-datascope/src/main/java/com/hr/common/datascope/aspect/DataScopeAspect.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.datascope.aspect;
+package com.hr.common.datascope.aspect;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,8 +11,8 @@ import com.hr.common.core.context.SecurityContextHolder;
 import com.hr.common.core.text.Convert;
 import com.hr.common.core.utils.StringUtils;
 import com.hr.common.core.web.domain.BaseEntity;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.datascope.annotation.DataScope;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.domain.SysRole;
 import com.hr.system.api.domain.SysUser;
 import com.hr.system.api.model.LoginUser;

hr-common/hr-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-com.ruoyi.common.datascope.aspect.DataScopeAspect
+com.hr.common.datascope.aspect.DataScopeAspect

hr-common/hr-common-datascope/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.hr.common.datascope.aspect.DataScopeAspect

hr-common/hr-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java → hr-common/hr-common-datasource/src/main/java/com/hr/common/datasource/annotation/Master.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.datasource.annotation;
+package com.hr.common.datasource.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

hr-common/hr-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java → hr-common/hr-common-datasource/src/main/java/com/hr/common/datasource/annotation/Slave.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.datasource.annotation;
+package com.hr.common.datasource.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/annotation/Log.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.log.annotation;
+package com.hr.common.log.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.log.enums.OperatorType;
+import com.hr.common.log.enums.BusinessType;
+import com.hr.common.log.enums.OperatorType;
 
 /**
  * 自定义操作日志记录注解

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/aspect/LogAspect.java

@@ -1,9 +1,12 @@
-package com.ruoyi.common.log.aspect;
+package com.hr.common.log.aspect;
 
 import java.util.Collection;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.hr.common.log.annotation.Log;
+import com.hr.common.log.service.AsyncLogService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -24,11 +27,9 @@ import com.hr.common.core.utils.ExceptionUtil;
 import com.hr.common.core.utils.ServletUtils;
 import com.hr.common.core.utils.StringUtils;
 import com.hr.common.core.utils.ip.IpUtils;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessStatus;
-import com.ruoyi.common.log.filter.PropertyPreExcludeFilter;
-import com.ruoyi.common.log.service.AsyncLogService;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.log.enums.BusinessStatus;
+import com.hr.common.log.filter.PropertyPreExcludeFilter;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.domain.SysOperLog;
 
 /**

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/enums/BusinessStatus.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.log.enums;
+package com.hr.common.log.enums;
 
 /**
  * 操作状态

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/enums/BusinessType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.log.enums;
+package com.hr.common.log.enums;
 
 /**
  * 业务操作类型

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/enums/OperatorType.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.log.enums;
+package com.hr.common.log.enums;
 
 /**
  * 操作人类别

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/filter/PropertyPreExcludeFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.log.filter;
+package com.hr.common.log.filter;
 
 import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
 

hr-common/hr-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java → hr-common/hr-common-log/src/main/java/com/hr/common/log/service/AsyncLogService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.log.service;
+package com.hr.common.log.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

hr-common/hr-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
-com.ruoyi.common.log.service.AsyncLogService
-com.ruoyi.common.log.aspect.LogAspect
+com.hr.common.log.service.AsyncLogService
+com.hr.common.log.aspect.LogAspect

hr-common/hr-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java → hr-common/hr-common-redis/src/main/java/com/hr/common/redis/configure/FastJson2JsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.redis.configure;
+package com.hr.common.redis.configure;
 
 import java.nio.charset.Charset;
 import org.springframework.data.redis.serializer.RedisSerializer;

hr-common/hr-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java → hr-common/hr-common-redis/src/main/java/com/hr/common/redis/configure/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.redis.configure;
+package com.hr.common.redis.configure;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;

hr-common/hr-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java → hr-common/hr-common-redis/src/main/java/com/hr/common/redis/service/RedisService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.redis.service;
+package com.hr.common.redis.service;
 
 import java.util.Collection;
 import java.util.Iterator;

hr-common/hr-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,2 @@
-com.ruoyi.common.redis.configure.RedisConfig
-com.ruoyi.common.redis.service.RedisService
+com.hr.common.redis.configure.RedisConfig
+com.hr.common.redis.service.RedisService

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/EnableCustomConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -10,8 +10,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
-import com.ruoyi.common.security.config.ApplicationConfig;
-import com.ruoyi.common.security.feign.FeignAutoConfiguration;
+import com.hr.common.security.config.ApplicationConfig;
+import com.hr.common.security.feign.FeignAutoConfiguration;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -20,7 +20,7 @@ import com.ruoyi.common.security.feign.FeignAutoConfiguration;
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
-@MapperScan("com.ruoyi.**.mapper")
+@MapperScan("com.hr.**.mapper")
 // 开启线程异步执行
 @EnableAsync
 // 自动加载类

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig2.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/EnableCustomConfig2.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
-import com.ruoyi.common.security.config.ApplicationConfig;
-import com.ruoyi.common.security.feign.FeignAutoConfiguration;
+import com.hr.common.security.config.ApplicationConfig;
+import com.hr.common.security.feign.FeignAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/EnableRyFeignClients.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import java.lang.annotation.*;
@@ -17,7 +17,7 @@ public @interface EnableRyFeignClients
 {
     String[] value() default {};
 
-    String[] basePackages() default { "com.ruoyi" };
+    String[] basePackages() default { "com.hr" };
 
     Class<?>[] basePackageClasses() default {};
 

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/InnerAuth.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 import java.lang.annotation.*;
 

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/Logical.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 /**
  * 权限注解的验证模式

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/RequiresLogin.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/RequiresPermissions.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/annotation/RequiresRoles.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.annotation;
+package com.hr.common.security.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/aspect/InnerAuthAspect.java

@@ -1,5 +1,6 @@
-package com.ruoyi.common.security.aspect;
+package com.hr.common.security.aspect;
 
+import com.hr.common.security.annotation.InnerAuth;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -9,7 +10,6 @@ import com.hr.common.core.constant.SecurityConstants;
 import com.hr.common.core.exception.InnerAuthException;
 import com.hr.common.core.utils.ServletUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.security.annotation.InnerAuth;
 
 /**
  * 内部服务调用验证处理

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/aspect/PreAuthorizeAspect.java

@@ -1,16 +1,17 @@
-package com.ruoyi.common.security.aspect;
+package com.hr.common.security.aspect;
 
 import java.lang.reflect.Method;
+
+import com.hr.common.security.annotation.RequiresLogin;
+import com.hr.common.security.annotation.RequiresPermissions;
+import com.hr.common.security.annotation.RequiresRoles;
+import com.hr.common.security.auth.AuthUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.security.annotation.RequiresLogin;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
-import com.ruoyi.common.security.auth.AuthUtil;
 
 /**
  * 基于 Spring Aop 的注解鉴权
@@ -31,9 +32,9 @@ public class PreAuthorizeAspect
     /**
      * 定义AOP签名 (切入所有使用鉴权注解的方法)
      */
-    public static final String POINTCUT_SIGN = " @annotation(com.ruoyi.common.security.annotation.RequiresLogin) || "
-            + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || "
-            + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)";
+    public static final String POINTCUT_SIGN = " @annotation(com.hr.common.security.annotation.RequiresLogin) || "
+            + "@annotation(com.hr.common.security.annotation.RequiresPermissions) || "
+            + "@annotation(com.hr.common.security.annotation.RequiresRoles)";
 
     /**
      * 声明AOP签名

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/auth/AuthLogic.java

@@ -1,8 +1,13 @@
-package com.ruoyi.common.security.auth;
+package com.hr.common.security.auth;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+
+import com.hr.common.security.annotation.Logical;
+import com.hr.common.security.annotation.RequiresLogin;
+import com.hr.common.security.annotation.RequiresPermissions;
+import com.hr.common.security.annotation.RequiresRoles;
 import org.springframework.util.PatternMatchUtils;
 import com.hr.common.core.context.SecurityContextHolder;
 import com.hr.common.core.exception.auth.NotLoginException;
@@ -10,12 +15,8 @@ import com.hr.common.core.exception.auth.NotPermissionException;
 import com.hr.common.core.exception.auth.NotRoleException;
 import com.hr.common.core.utils.SpringUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.security.annotation.Logical;
-import com.ruoyi.common.security.annotation.RequiresLogin;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.security.service.TokenService;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.model.LoginUser;
 
 /**

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/auth/AuthUtil.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.security.auth;
+package com.hr.common.security.auth;
 
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
+import com.hr.common.security.annotation.RequiresPermissions;
+import com.hr.common.security.annotation.RequiresRoles;
 import com.hr.system.api.model.LoginUser;
 
 /**

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.config;
+package com.hr.common.security.config;
 
 import java.util.TimeZone;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/config/WebMvcConfig.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.security.config;
+package com.hr.common.security.config;
 
+import com.hr.common.security.interceptor.HeaderInterceptor;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.ruoyi.common.security.interceptor.HeaderInterceptor;
 
 /**
  * 拦截器配置

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/feign/FeignAutoConfiguration.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.feign;
+package com.hr.common.security.feign;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/feign/FeignRequestInterceptor.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.feign;
+package com.hr.common.security.feign;
 
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/handler/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.handler;
+package com.hr.common.security.handler;
 
 import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/interceptor/HeaderInterceptor.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.interceptor;
+package com.hr.common.security.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -8,8 +8,8 @@ import com.hr.common.core.constant.SecurityConstants;
 import com.hr.common.core.context.SecurityContextHolder;
 import com.hr.common.core.utils.ServletUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.security.auth.AuthUtil;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.security.auth.AuthUtil;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.model.LoginUser;
 
 /**

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/service/TokenService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.service;
+package com.hr.common.security.service;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -15,8 +15,8 @@ import com.hr.common.core.utils.ServletUtils;
 import com.hr.common.core.utils.StringUtils;
 import com.hr.common.core.utils.ip.IpUtils;
 import com.hr.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.hr.common.redis.service.RedisService;
+import com.hr.common.security.utils.SecurityUtils;
 import com.hr.system.api.model.LoginUser;
 
 /**

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/utils/DictUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.utils;
+package com.hr.common.security.utils;
 
 import java.util.Collection;
 import java.util.List;
@@ -6,7 +6,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.hr.common.core.constant.CacheConstants;
 import com.hr.common.core.utils.SpringUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.redis.service.RedisService;
+import com.hr.common.redis.service.RedisService;
 import com.hr.system.api.domain.SysDictData;
 
 /**

hr-common/hr-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java → hr-common/hr-common-security/src/main/java/com/hr/common/security/utils/SecurityUtils.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.security.utils;
+package com.hr.common.security.utils;
 
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

hr-common/hr-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
-com.ruoyi.common.security.config.WebMvcConfig
-com.ruoyi.common.security.service.TokenService
-com.ruoyi.common.security.aspect.PreAuthorizeAspect
-com.ruoyi.common.security.aspect.InnerAuthAspect
-com.ruoyi.common.security.handler.GlobalExceptionHandler
+com.hr.common.security.config.WebMvcConfig
+com.hr.common.security.service.TokenService
+com.hr.common.security.aspect.PreAuthorizeAspect
+com.hr.common.security.aspect.InnerAuthAspect
+com.hr.common.security.handler.GlobalExceptionHandler

hr-common/hr-common-sensitive/src/main/java/com/ruoyi/common/sensitive/annotation/Sensitive.java → hr-common/hr-common-sensitive/src/main/java/com/hr/common/sensitive/annotation/Sensitive.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.sensitive.annotation;
+package com.hr.common.sensitive.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.ruoyi.common.sensitive.config.SensitiveJsonSerializer;
-import com.ruoyi.common.sensitive.enums.DesensitizedType;
+import com.hr.common.sensitive.config.SensitiveJsonSerializer;
+import com.hr.common.sensitive.enums.DesensitizedType;
 
 /**
  * 数据脱敏注解

hr-common/hr-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java → hr-common/hr-common-sensitive/src/main/java/com/hr/common/sensitive/config/SensitiveJsonSerializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.sensitive.config;
+package com.hr.common.sensitive.config;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -10,8 +10,8 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.hr.common.core.constant.UserConstants;
 import com.hr.common.core.context.SecurityContextHolder;
-import com.ruoyi.common.sensitive.annotation.Sensitive;
-import com.ruoyi.common.sensitive.enums.DesensitizedType;
+import com.hr.common.sensitive.annotation.Sensitive;
+import com.hr.common.sensitive.enums.DesensitizedType;
 
 /**
  * 数据脱敏序列化过滤

hr-common/hr-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java → hr-common/hr-common-sensitive/src/main/java/com/hr/common/sensitive/enums/DesensitizedType.java

@@ -1,7 +1,9 @@
-package com.ruoyi.common.sensitive.enums;
+package com.hr.common.sensitive.enums;
 
 import java.util.function.Function;
-import com.ruoyi.common.sensitive.utils.DesensitizedUtil;
+
+import com.hr.common.sensitive.utils.DesensitizedUtil;
+import com.hr.common.sensitive.utils.DesensitizedUtil;
 
 /**
  * 脱敏类型

hr-common/hr-common-sensitive/src/main/java/com/ruoyi/common/sensitive/utils/DesensitizedUtil.java → hr-common/hr-common-sensitive/src/main/java/com/hr/common/sensitive/utils/DesensitizedUtil.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.sensitive.utils;
+package com.hr.common.sensitive.utils;
 
 import com.hr.common.core.utils.StringUtils;
 

hr-common/hr-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java → hr-common/hr-common-swagger/src/main/java/com/hr/common/swagger/config/SpringDocAutoConfiguration.java

@@ -1,12 +1,13 @@
-package com.ruoyi.common.swagger.config;
+package com.hr.common.swagger.config;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.hr.common.swagger.config.properties.SpringDocProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import com.ruoyi.common.swagger.config.properties.SpringDocProperties;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;

hr-common/hr-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SpringDocProperties.java → hr-common/hr-common-swagger/src/main/java/com/hr/common/swagger/config/properties/SpringDocProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.swagger.config.properties;
+package com.hr.common.swagger.config.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;

hr-common/hr-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1 @@
-com.ruoyi.common.swagger.config.SpringDocAutoConfiguration
+com.hr.common.swagger.config.SpringDocAutoConfiguration

hr-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java → hr-gateway/src/main/java/com/hr/gateway/RuoYiGatewayApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway;
+package com.hr.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

hr-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java → hr-gateway/src/main/java/com/hr/gateway/config/CaptchaConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.config;
+package com.hr.gateway.config;
 
 import java.util.Properties;
 import org.springframework.context.annotation.Bean;
@@ -63,7 +63,7 @@ public class CaptchaConfig
         // KAPTCHA_SESSION_KEY
         properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
         // 验证码文本生成器
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.gateway.config.KaptchaTextCreator");
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.hr.gateway.config.KaptchaTextCreator");
         // 验证码文本字符间距 默认为2
         properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
         // 验证码文本字符长度 默认为5

hr-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java → hr-gateway/src/main/java/com/hr/gateway/config/GatewayConfig.java

@@ -1,10 +1,10 @@
-package com.ruoyi.gateway.config;
+package com.hr.gateway.config;
 
+import com.hr.gateway.handler.SentinelFallbackHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import com.ruoyi.gateway.handler.SentinelFallbackHandler;
 
 /**
  * 网关限流配置

hr-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java → hr-gateway/src/main/java/com/hr/gateway/config/KaptchaTextCreator.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.config;
+package com.hr.gateway.config;
 
 import java.util.Random;
 import com.google.code.kaptcha.text.impl.DefaultTextCreator;

hr-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java → hr-gateway/src/main/java/com/hr/gateway/config/RouterFunctionConfiguration.java

@@ -1,5 +1,6 @@
-package com.ruoyi.gateway.config;
+package com.hr.gateway.config;
 
+import com.hr.gateway.handler.ValidateCodeHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -7,7 +8,6 @@ import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.server.RequestPredicates;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
-import com.ruoyi.gateway.handler.ValidateCodeHandler;
 
 /**
  * 路由配置信息

hr-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java → hr-gateway/src/main/java/com/hr/gateway/config/SpringDocConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.config;
+package com.hr.gateway.config;
 
 import java.util.Set;
 import java.util.stream.Collectors;

hr-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java → hr-gateway/src/main/java/com/hr/gateway/config/properties/CaptchaProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.config.properties;
+package com.hr.gateway.config.properties;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;

hr-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java → hr-gateway/src/main/java/com/hr/gateway/config/properties/IgnoreWhiteProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.config.properties;
+package com.hr.gateway.config.properties;
 
 import java.util.ArrayList;
 import java.util.List;

hr-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java → hr-gateway/src/main/java/com/hr/gateway/config/properties/XssProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.config.properties;
+package com.hr.gateway.config.properties;
 
 import java.util.ArrayList;
 import java.util.List;

hr-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java → hr-gateway/src/main/java/com/hr/gateway/filter/AuthFilter.java

@@ -1,5 +1,6 @@
-package com.ruoyi.gateway.filter;
+package com.hr.gateway.filter;
 
+import com.hr.gateway.config.properties.IgnoreWhiteProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +17,7 @@ import com.hr.common.core.constant.TokenConstants;
 import com.hr.common.core.utils.JwtUtils;
 import com.hr.common.core.utils.ServletUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties;
+import com.hr.common.redis.service.RedisService;
 import io.jsonwebtoken.Claims;
 import reactor.core.publisher.Mono;
 

hr-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java → hr-gateway/src/main/java/com/hr/gateway/filter/BlackListUrlFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.filter;
+package com.hr.gateway.filter;
 
 import java.util.ArrayList;
 import java.util.List;

hr-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java → hr-gateway/src/main/java/com/hr/gateway/filter/ValidateCodeFilter.java

@@ -1,8 +1,11 @@
-package com.ruoyi.gateway.filter;
+package com.hr.gateway.filter;
 
 import java.nio.CharBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.atomic.AtomicReference;
+
+import com.hr.gateway.config.properties.CaptchaProperties;
+import com.hr.gateway.service.ValidateCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
@@ -14,8 +17,6 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hr.common.core.utils.ServletUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.gateway.config.properties.CaptchaProperties;
-import com.ruoyi.gateway.service.ValidateCodeService;
 import reactor.core.publisher.Flux;
 
 /**

hr-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java → hr-gateway/src/main/java/com/hr/gateway/filter/XssFilter.java

@@ -1,6 +1,8 @@
-package com.ruoyi.gateway.filter;
+package com.hr.gateway.filter;
 
 import java.nio.charset.StandardCharsets;
+
+import com.hr.gateway.config.properties.XssProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -20,7 +22,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import com.hr.common.core.utils.StringUtils;
 import com.hr.common.core.utils.html.EscapeUtil;
-import com.ruoyi.gateway.config.properties.XssProperties;
 import io.netty.buffer.ByteBufAllocator;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

hr-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java → hr-gateway/src/main/java/com/hr/gateway/handler/GatewayExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.handler;
+package com.hr.gateway.handler;
 
 import org.springframework.cloud.gateway.support.NotFoundException;
 import org.slf4j.Logger;

hr-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java → hr-gateway/src/main/java/com/hr/gateway/handler/SentinelFallbackHandler.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.handler;
+package com.hr.gateway.handler;
 
 import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
 import com.alibaba.csp.sentinel.slots.block.BlockException;

hr-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java → hr-gateway/src/main/java/com/hr/gateway/handler/ValidateCodeHandler.java

@@ -1,6 +1,8 @@
-package com.ruoyi.gateway.handler;
+package com.hr.gateway.handler;
 
 import java.io.IOException;
+
+import com.hr.gateway.service.ValidateCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
@@ -10,7 +12,6 @@ import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import com.hr.common.core.exception.CaptchaException;
 import com.hr.common.core.web.domain.AjaxResult;
-import com.ruoyi.gateway.service.ValidateCodeService;
 import reactor.core.publisher.Mono;
 
 /**

hr-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java → hr-gateway/src/main/java/com/hr/gateway/service/ValidateCodeService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gateway.service;
+package com.hr.gateway.service;
 
 import java.io.IOException;
 import com.hr.common.core.exception.CaptchaException;

hr-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java → hr-gateway/src/main/java/com/hr/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -1,10 +1,12 @@
-package com.ruoyi.gateway.service.impl;
+package com.hr.gateway.service.impl;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
+
+import com.hr.gateway.config.properties.CaptchaProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.FastByteArrayOutputStream;
@@ -16,9 +18,8 @@ import com.hr.common.core.utils.StringUtils;
 import com.hr.common.core.utils.sign.Base64;
 import com.hr.common.core.utils.uuid.IdUtils;
 import com.hr.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.gateway.config.properties.CaptchaProperties;
-import com.ruoyi.gateway.service.ValidateCodeService;
+import com.hr.common.redis.service.RedisService;
+import com.hr.gateway.service.ValidateCodeService;
 
 /**
  * 验证码实现处理

hr-gateway/src/main/resources/logback.xml

@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.hr" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

hr-modules/hr-file/src/main/resources/logback.xml

@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.hr" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

hr-modules/hr-gen/pom.xml

@@ -52,12 +52,12 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
-        
-        <!-- RuoYi Common Log -->
+
         <dependency>
             <groupId>com.hr</groupId>
             <artifactId>hr-common-log</artifactId>
         </dependency>
+        <!-- RuoYi Common Log -->
         
         <!-- RuoYi Common Swagger -->
         <dependency>

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java → hr-modules/hr-gen/src/main/java/com/hr/gen/RuoYiGenApplication.java

@@ -1,9 +1,11 @@
-package com.ruoyi.gen;
+package com.hr.gen;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import com.ruoyi.common.security.annotation.EnableCustomConfig;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.hr.common.security.annotation.EnableCustomConfig;
+import com.hr.common.security.annotation.EnableRyFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 代码生成
@@ -13,6 +15,8 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 @EnableCustomConfig
 @EnableRyFeignClients
 @SpringBootApplication
+@MapperScan("com.hr.**.mapper")
+@EnableFeignClients(basePackages = "com.hr.system.api")
 public class RuoYiGenApplication
 {
     public static void main(String[] args)

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java → hr-modules/hr-gen/src/main/java/com/hr/gen/config/GenConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gen.config;
+package com.hr.gen.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/controller/GenController.java → hr-modules/hr-gen/src/main/java/com/hr/gen/controller/GenController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gen.controller;
+package com.hr.gen.controller;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -20,14 +20,14 @@ import com.hr.common.core.text.Convert;
 import com.hr.common.core.web.controller.BaseController;
 import com.hr.common.core.web.domain.AjaxResult;
 import com.hr.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.gen.config.GenConfig;
-import com.ruoyi.gen.domain.GenTable;
-import com.ruoyi.gen.domain.GenTableColumn;
-import com.ruoyi.gen.service.IGenTableColumnService;
-import com.ruoyi.gen.service.IGenTableService;
+import com.hr.common.log.annotation.Log;
+import com.hr.common.log.enums.BusinessType;
+import com.hr.common.security.annotation.RequiresPermissions;
+import com.hr.gen.config.GenConfig;
+import com.hr.gen.domain.GenTable;
+import com.hr.gen.domain.GenTableColumn;
+import com.hr.gen.service.IGenTableColumnService;
+import com.hr.gen.service.IGenTableService;
 
 /**
  * 代码生成 操作处理

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java → hr-modules/hr-gen/src/main/java/com/hr/gen/domain/GenTable.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gen.domain;
+package com.hr.gen.domain;
 
 import java.util.List;
 import javax.validation.Valid;

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java → hr-modules/hr-gen/src/main/java/com/hr/gen/domain/GenTableColumn.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gen.domain;
+package com.hr.gen.domain;
 
 import javax.validation.constraints.NotBlank;
 import com.hr.common.core.utils.StringUtils;

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java → hr-modules/hr-gen/src/main/java/com/hr/gen/mapper/GenTableColumnMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.gen.mapper;
+package com.hr.gen.mapper;
 
 import java.util.List;
-import com.ruoyi.gen.domain.GenTableColumn;
+import com.hr.gen.domain.GenTableColumn;
 
 /**
  * 业务字段 数据层

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java → hr-modules/hr-gen/src/main/java/com/hr/gen/mapper/GenTableMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.gen.mapper;
+package com.hr.gen.mapper;
 
 import java.util.List;
-import com.ruoyi.gen.domain.GenTable;
+import com.hr.gen.domain.GenTable;
 
 /**
  * 业务 数据层

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java → hr-modules/hr-gen/src/main/java/com/hr/gen/service/GenTableColumnServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.gen.service;
+package com.hr.gen.service;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hr.common.core.text.Convert;
-import com.ruoyi.gen.domain.GenTableColumn;
-import com.ruoyi.gen.mapper.GenTableColumnMapper;
+import com.hr.gen.domain.GenTableColumn;
+import com.hr.gen.mapper.GenTableColumnMapper;
 
 /**
  * 业务字段 服务层实现

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java → hr-modules/hr-gen/src/main/java/com/hr/gen/service/GenTableServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gen.service;
+package com.hr.gen.service;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -28,14 +28,14 @@ import com.hr.common.core.constant.GenConstants;
 import com.hr.common.core.exception.ServiceException;
 import com.hr.common.core.text.CharsetKit;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.gen.domain.GenTable;
-import com.ruoyi.gen.domain.GenTableColumn;
-import com.ruoyi.gen.mapper.GenTableColumnMapper;
-import com.ruoyi.gen.mapper.GenTableMapper;
-import com.ruoyi.gen.util.GenUtils;
-import com.ruoyi.gen.util.VelocityInitializer;
-import com.ruoyi.gen.util.VelocityUtils;
+import com.hr.common.security.utils.SecurityUtils;
+import com.hr.gen.domain.GenTable;
+import com.hr.gen.domain.GenTableColumn;
+import com.hr.gen.mapper.GenTableColumnMapper;
+import com.hr.gen.mapper.GenTableMapper;
+import com.hr.gen.util.GenUtils;
+import com.hr.gen.util.VelocityInitializer;
+import com.hr.gen.util.VelocityUtils;
 
 /**
  * 业务 服务层实现

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java → hr-modules/hr-gen/src/main/java/com/hr/gen/service/IGenTableColumnService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.gen.service;
+package com.hr.gen.service;
 
 import java.util.List;
-import com.ruoyi.gen.domain.GenTableColumn;
+import com.hr.gen.domain.GenTableColumn;
 
 /**
  * 业务字段 服务层

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java → hr-modules/hr-gen/src/main/java/com/hr/gen/service/IGenTableService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.gen.service;
+package com.hr.gen.service;
 
 import java.util.List;
 import java.util.Map;
-import com.ruoyi.gen.domain.GenTable;
+import com.hr.gen.domain.GenTable;
 
 /**
  * 业务 服务层

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java → hr-modules/hr-gen/src/main/java/com/hr/gen/util/GenUtils.java

@@ -1,12 +1,13 @@
-package com.ruoyi.gen.util;
+package com.hr.gen.util;
 
 import java.util.Arrays;
+
+import com.hr.gen.config.GenConfig;
+import com.hr.gen.domain.GenTable;
+import com.hr.gen.domain.GenTableColumn;
 import org.apache.commons.lang3.RegExUtils;
 import com.hr.common.core.constant.GenConstants;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.gen.config.GenConfig;
-import com.ruoyi.gen.domain.GenTable;
-import com.ruoyi.gen.domain.GenTableColumn;
 
 /**
  * 代码生成器 工具类

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java → hr-modules/hr-gen/src/main/java/com/hr/gen/util/VelocityInitializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.gen.util;
+package com.hr.gen.util;
 
 import java.util.Properties;
 import org.apache.velocity.app.Velocity;

hr-modules/hr-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java → hr-modules/hr-gen/src/main/java/com/hr/gen/util/VelocityUtils.java

@@ -1,17 +1,18 @@
-package com.ruoyi.gen.util;
+package com.hr.gen.util;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
+import com.hr.gen.domain.GenTable;
+import com.hr.gen.domain.GenTableColumn;
 import org.apache.velocity.VelocityContext;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hr.common.core.constant.GenConstants;
 import com.hr.common.core.utils.DateUtils;
 import com.hr.common.core.utils.StringUtils;
-import com.ruoyi.gen.domain.GenTable;
-import com.ruoyi.gen.domain.GenTableColumn;
 
 /**
  * 模板工具类

hr-modules/hr-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.1.168:8848
+        username: nacosReadUser
+        password: nacosReadUser*
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.1.168:8848
+        username: nacosReadUser
+        password: nacosReadUser*
         # 配置文件格式
         file-extension: yml
         # 共享配置

hr-modules/hr-gen/src/main/resources/logback.xml

@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.hr" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

hr-modules/hr-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.gen.mapper.GenTableColumnMapper">
+<mapper namespace="com.hr.gen.mapper.GenTableColumnMapper">
 
     <resultMap type="GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />

hr-modules/hr-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.gen.mapper.GenTableMapper">
+<mapper namespace="com.hr.gen.mapper.GenTableMapper">
 
 	<resultMap type="GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"          />

hr-modules/hr-gen/src/main/resources/vm/java/controller.java.vm

@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.hr.common.log.annotation.Log;
+import com.hr.common.log.enums.BusinessType;
+import com.hr.common.security.annotation.RequiresPermissions;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
 import com.hr.common.core.web.controller.BaseController;

hr-modules/hr-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java → hr-modules/hr-job/src/main/java/com/hr/job/RuoYiJobApplication.java

@@ -1,9 +1,9 @@
-package com.ruoyi.job;
+package com.hr.job;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import com.ruoyi.common.security.annotation.EnableCustomConfig;
-import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import com.hr.common.security.annotation.EnableCustomConfig;
+import com.hr.common.security.annotation.EnableRyFeignClients;
 
 /**
  * 定时任务