diff --git a/Dockerfile b/Dockerfile index 4237ef9..42aa44a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,22 +3,22 @@ FROM openjdk:17.0.2-oraclelinux8 MAINTAINER Lion Li -RUN mkdir -p /ruoyi/server/logs \ - /ruoyi/server/temp \ - /ruoyi/skywalking/agent +RUN mkdir -p /demo/server/logs \ + /demo/server/temp \ + /demo/skywalking/agent -WORKDIR /ruoyi/server +WORKDIR /demo/server ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} -ADD ./target/ruoyi-admin.jar ./app.jar +ADD ./target/demo-admin.jar ./app.jar ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ # 应用名称 如果想区分集群节点监控 改成不同的名称即可 - #-Dskywalking.agent.service_name=ruoyi-server \ - #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + #-Dskywalking.agent.service_name=demo-server \ + #-javaagent:/demo/skywalking/agent/skywalking-agent.jar \ -jar app.jar \ -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} diff --git a/pom.xml b/pom.xml index 56ab843..7561199 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.dromara - ruoyi-vue-plus + net.rzdata + demo 5.1.2 jar - RuoYi-Vue-Plus - https://gitee.com/dromara/RuoYi-Vue-Plus - RuoYi-Vue-Plus多租户管理系统 5.1.2 @@ -215,13 +212,6 @@ ${okhttp.version} - - - org.dromara.sms4j - sms4j-spring-boot-starter - ${sms4j.version} - - de.codecentric spring-boot-admin-starter-server diff --git a/script/bin/ry.bat b/script/bin/ry.bat index d214af4..6d6843f 100644 --- a/script/bin/ry.bat +++ b/script/bin/ry.bat @@ -2,7 +2,7 @@ rem 使用者应根据自身平台编码自行转换 防止乱码 例如 win使 @echo off rem jar平级目录 -set AppName=ruoyi-admin.jar +set AppName=demo-admin.jar rem JVM参数 set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC" diff --git a/script/bin/ry.sh b/script/bin/ry.sh index 0df25e7..f320fa9 100644 --- a/script/bin/ry.sh +++ b/script/bin/ry.sh @@ -1,6 +1,6 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 -AppName=ruoyi-admin.jar +AppName=demo-admin.jar # JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC" diff --git a/script/docker/database.yml b/script/docker/database.yml index 0368fd2..c2a24ff 100644 --- a/script/docker/database.yml +++ b/script/docker/database.yml @@ -26,7 +26,7 @@ services: # 时区上海 TZ: Asia/Shanghai ACCEPT_EULA: "Y" - SA_PASSWORD: "Ruoyi@123" + SA_PASSWORD: "Demo@123" ports: - "1433:1433" volumes: diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 63d819e..4a57562 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -78,9 +78,9 @@ services: # 时区上海 TZ: Asia/Shanghai # 管理后台用户名 - MINIO_ROOT_USER: ruoyi + MINIO_ROOT_USER: demo # 管理后台密码，最小8个字符 - MINIO_ROOT_PASSWORD: ruoyi123 + MINIO_ROOT_PASSWORD: demo123 # https需要指定域名 #MINIO_SERVER_URL: "https://xxx.com:9000" #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001" @@ -99,60 +99,32 @@ services: privileged: true network_mode: "host" - ruoyi-server1: - image: ruoyi/ruoyi-server:5.1.2 - container_name: ruoyi-server1 + demo-server1: + image: demo-server:5.1.2 + container_name: demo-server1 environment: # 时区上海 TZ: Asia/Shanghai SERVER_PORT: 8080 volumes: # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ + - /docker/server1/logs/:/demo/server/logs/ # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent +# - /docker/skywalking/agent/:/demo/skywalking/agent privileged: true network_mode: "host" - ruoyi-server2: - image: ruoyi/ruoyi-server:5.1.2 - container_name: ruoyi-server2 + demo-server2: + image: demo-server:5.1.2 + container_name: demo-server2 environment: # 时区上海 TZ: Asia/Shanghai SERVER_PORT: 8081 volumes: # 配置文件 - - /docker/server2/logs/:/ruoyi/server/logs/ + - /docker/server2/logs/:/demo/server/logs/ # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent +# - /docker/skywalking/agent/:/demo/skywalking/agent privileged: true network_mode: "host" - - ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:5.1.2 - container_name: ruoyi-monitor-admin - environment: - # 时区上海 - TZ: Asia/Shanghai - volumes: - # 配置文件 - - /docker/monitor/logs/:/ruoyi/monitor/logs - privileged: true - network_mode: "host" - - ruoyi-powerjob-server: - image: ruoyi/ruoyi-powerjob-server:5.1.2 - container_name: ruoyi-powerjob-server - environment: - # 时区上海 - TZ: Asia/Shanghai - ports: - - "7700:7700" - - "10086:10086" - - "10010:10010" - volumes: - - /docker/powerjob/logs/:/ruoyi/powerjob/logs - privileged: true - network_mode: "host" - diff --git a/script/docker/redis/conf/redis.conf b/script/docker/redis/conf/redis.conf index 72255c6..07b1516 100644 --- a/script/docker/redis/conf/redis.conf +++ b/script/docker/redis/conf/redis.conf @@ -1,5 +1,5 @@ # redis 密码 -requirepass ruoyi123 +requirepass demo123 # key 监听器配置 # notify-keyspace-events Ex diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql index 0dd725a..47a7f25 100644 --- a/script/sql/ry_vue_5.X.sql +++ b/script/sql/ry_vue_5.X.sql @@ -28,8 +28,7 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', 103, 1, sysdate(), null, null, '管理员'); -insert into sys_user values(2, 'lionli', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@qq.com', '15666666666', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', 103, 1, sysdate(), null, null, '测试员'); +insert into sys_user values(1, 'admin', '系统管理员', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', 103, 1, sysdate(), null, null, '管理员'); -- ---------------------------- -- 4、角色信息表 diff --git a/src/main/java/org/dromara/DromaraApplication.java b/src/main/java/net/rzdata/DemoApplication.java similarity index 69% rename from src/main/java/org/dromara/DromaraApplication.java rename to src/main/java/net/rzdata/DemoApplication.java index 63826da..d1a02e5 100644 --- a/src/main/java/org/dromara/DromaraApplication.java +++ b/src/main/java/net/rzdata/DemoApplication.java @@ -1,4 +1,4 @@ -package org.dromara; +package net.rzdata; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -13,13 +13,13 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt @SpringBootApplication @MapperScan("${mybatis-plus.mapperPackage}") -public class DromaraApplication { +public class DemoApplication { public static void main(String[] args) { - SpringApplication application = new SpringApplication(DromaraApplication.class); + SpringApplication application = new SpringApplication(DemoApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ Demo启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/src/main/java/org/dromara/DromaraServletInitializer.java b/src/main/java/net/rzdata/DemoServletInitializer.java similarity index 66% rename from src/main/java/org/dromara/DromaraServletInitializer.java rename to src/main/java/net/rzdata/DemoServletInitializer.java index 066a683..5bb1a80 100644 --- a/src/main/java/org/dromara/DromaraServletInitializer.java +++ b/src/main/java/net/rzdata/DemoServletInitializer.java @@ -1,4 +1,4 @@ -package org.dromara; +package net.rzdata; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer * * @author Lion Li */ -public class DromaraServletInitializer extends SpringBootServletInitializer { +public class DemoServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(DromaraApplication.class); + return application.sources(DemoApplication.class); } } diff --git a/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/src/main/java/net/rzdata/common/core/config/ApplicationConfig.java similarity index 91% rename from src/main/java/org/dromara/common/core/config/ApplicationConfig.java rename to src/main/java/net/rzdata/common/core/config/ApplicationConfig.java index af83a63..e068e6a 100644 --- a/src/main/java/org/dromara/common/core/config/ApplicationConfig.java +++ b/src/main/java/net/rzdata/common/core/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package net.rzdata.common.core.config; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/src/main/java/net/rzdata/common/core/config/AsyncConfig.java similarity index 86% rename from src/main/java/org/dromara/common/core/config/AsyncConfig.java rename to src/main/java/net/rzdata/common/core/config/AsyncConfig.java index 5cbdb39..6b35281 100644 --- a/src/main/java/org/dromara/common/core/config/AsyncConfig.java +++ b/src/main/java/net/rzdata/common/core/config/AsyncConfig.java @@ -1,10 +1,9 @@ -package org.dromara.common.core.config; +package net.rzdata.common.core.config; import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.SpringUtils; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; diff --git a/src/main/java/org/dromara/common/core/config/RuoYiConfig.java b/src/main/java/net/rzdata/common/core/config/DemoConfig.java similarity index 79% rename from src/main/java/org/dromara/common/core/config/RuoYiConfig.java rename to src/main/java/net/rzdata/common/core/config/DemoConfig.java index cc0d2df..3e009db 100644 --- a/src/main/java/org/dromara/common/core/config/RuoYiConfig.java +++ b/src/main/java/net/rzdata/common/core/config/DemoConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package net.rzdata.common.core.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,8 +12,8 @@ import org.springframework.stereotype.Component; @Data @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig { +@ConfigurationProperties(prefix = "demo") +public class DemoConfig { /** * 项目名称 diff --git a/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/src/main/java/net/rzdata/common/core/config/ThreadPoolConfig.java similarity index 92% rename from src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java rename to src/main/java/net/rzdata/common/core/config/ThreadPoolConfig.java index 9e1584e..2d6920f 100644 --- a/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ b/src/main/java/net/rzdata/common/core/config/ThreadPoolConfig.java @@ -1,11 +1,10 @@ -package org.dromara.common.core.config; +package net.rzdata.common.core.config; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.dromara.common.core.config.properties.ThreadPoolProperties; -import org.dromara.common.core.utils.Threads; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.core.config.properties.ThreadPoolProperties; +import net.rzdata.common.core.utils.Threads; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/src/main/java/net/rzdata/common/core/config/ValidatorConfig.java similarity index 97% rename from src/main/java/org/dromara/common/core/config/ValidatorConfig.java rename to src/main/java/net/rzdata/common/core/config/ValidatorConfig.java index 6b24a17..2577c80 100644 --- a/src/main/java/org/dromara/common/core/config/ValidatorConfig.java +++ b/src/main/java/net/rzdata/common/core/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config; +package net.rzdata.common.core.config; import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidator; diff --git a/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/src/main/java/net/rzdata/common/core/config/properties/ThreadPoolProperties.java similarity index 90% rename from src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java rename to src/main/java/net/rzdata/common/core/config/properties/ThreadPoolProperties.java index 820564f..370f2cc 100644 --- a/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java +++ b/src/main/java/net/rzdata/common/core/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.config.properties; +package net.rzdata.common.core.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/src/main/java/net/rzdata/common/core/constant/CacheConstants.java similarity index 89% rename from src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to src/main/java/net/rzdata/common/core/constant/CacheConstants.java index 67bc8e4..8db920c 100644 --- a/src/main/java/org/dromara/common/core/constant/CacheConstants.java +++ b/src/main/java/net/rzdata/common/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 缓存的key 常量 diff --git a/src/main/java/org/dromara/common/core/constant/CacheNames.java b/src/main/java/net/rzdata/common/core/constant/CacheNames.java similarity index 96% rename from src/main/java/org/dromara/common/core/constant/CacheNames.java rename to src/main/java/net/rzdata/common/core/constant/CacheNames.java index ff3575e..2027c48 100644 --- a/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ b/src/main/java/net/rzdata/common/core/constant/CacheNames.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 缓存组名称常量 diff --git a/src/main/java/org/dromara/common/core/constant/Constants.java b/src/main/java/net/rzdata/common/core/constant/Constants.java similarity index 95% rename from src/main/java/org/dromara/common/core/constant/Constants.java rename to src/main/java/net/rzdata/common/core/constant/Constants.java index e4251e7..49b3731 100644 --- a/src/main/java/org/dromara/common/core/constant/Constants.java +++ b/src/main/java/net/rzdata/common/core/constant/Constants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 通用常量信息 diff --git a/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/src/main/java/net/rzdata/common/core/constant/GlobalConstants.java similarity index 94% rename from src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to src/main/java/net/rzdata/common/core/constant/GlobalConstants.java index a522a8a..d4edae5 100644 --- a/src/main/java/org/dromara/common/core/constant/GlobalConstants.java +++ b/src/main/java/net/rzdata/common/core/constant/GlobalConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 全局的key常量 (业务无关的key) diff --git a/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/src/main/java/net/rzdata/common/core/constant/HttpStatus.java similarity index 96% rename from src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to src/main/java/net/rzdata/common/core/constant/HttpStatus.java index 85566e8..99d2b9d 100644 --- a/src/main/java/org/dromara/common/core/constant/HttpStatus.java +++ b/src/main/java/net/rzdata/common/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 返回状态码 diff --git a/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/src/main/java/net/rzdata/common/core/constant/TenantConstants.java similarity index 87% rename from src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to src/main/java/net/rzdata/common/core/constant/TenantConstants.java index 50a0696..2f44c18 100644 --- a/src/main/java/org/dromara/common/core/constant/TenantConstants.java +++ b/src/main/java/net/rzdata/common/core/constant/TenantConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 租户常量信息 diff --git a/src/main/java/org/dromara/common/core/constant/UserConstants.java b/src/main/java/net/rzdata/common/core/constant/UserConstants.java similarity index 97% rename from src/main/java/org/dromara/common/core/constant/UserConstants.java rename to src/main/java/net/rzdata/common/core/constant/UserConstants.java index 3a36b6d..dacdc9f 100644 --- a/src/main/java/org/dromara/common/core/constant/UserConstants.java +++ b/src/main/java/net/rzdata/common/core/constant/UserConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.constant; +package net.rzdata.common.core.constant; /** * 用户常量信息 diff --git a/src/main/java/org/dromara/common/core/domain/R.java b/src/main/java/net/rzdata/common/core/domain/R.java similarity index 96% rename from src/main/java/org/dromara/common/core/domain/R.java rename to src/main/java/net/rzdata/common/core/domain/R.java index be85805..126acd6 100644 --- a/src/main/java/org/dromara/common/core/domain/R.java +++ b/src/main/java/net/rzdata/common/core/domain/R.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.domain; +package net.rzdata.common.core.domain; -import org.dromara.common.core.constant.HttpStatus; +import net.rzdata.common.core.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/src/main/java/net/rzdata/common/core/domain/dto/RoleDTO.java similarity index 93% rename from src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java rename to src/main/java/net/rzdata/common/core/domain/dto/RoleDTO.java index 03d6166..fbffc87 100644 --- a/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java +++ b/src/main/java/net/rzdata/common/core/domain/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package net.rzdata.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/src/main/java/net/rzdata/common/core/domain/dto/UserOnlineDTO.java similarity index 95% rename from src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java rename to src/main/java/net/rzdata/common/core/domain/dto/UserOnlineDTO.java index 85ad202..790bcf6 100644 --- a/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java +++ b/src/main/java/net/rzdata/common/core/domain/dto/UserOnlineDTO.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.dto; +package net.rzdata.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/src/main/java/net/rzdata/common/core/domain/model/EmailLoginBody.java similarity index 92% rename from src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java rename to src/main/java/net/rzdata/common/core/domain/model/EmailLoginBody.java index ffde8c6..c7271af 100644 --- a/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java +++ b/src/main/java/net/rzdata/common/core/domain/model/EmailLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/src/main/java/net/rzdata/common/core/domain/model/LoginBody.java similarity index 93% rename from src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to src/main/java/net/rzdata/common/core/domain/model/LoginBody.java index 7fd5b70..3c5df50 100644 --- a/src/main/java/org/dromara/common/core/domain/model/LoginBody.java +++ b/src/main/java/net/rzdata/common/core/domain/model/LoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/src/main/java/net/rzdata/common/core/domain/model/LoginUser.java similarity index 95% rename from src/main/java/org/dromara/common/core/domain/model/LoginUser.java rename to src/main/java/net/rzdata/common/core/domain/model/LoginUser.java index 943fb08..9bf89e0 100644 --- a/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/src/main/java/net/rzdata/common/core/domain/model/LoginUser.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; -import org.dromara.common.core.domain.dto.RoleDTO; +import net.rzdata.common.core.domain.dto.RoleDTO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/src/main/java/net/rzdata/common/core/domain/model/PasswordLoginBody.java similarity index 59% rename from src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java rename to src/main/java/net/rzdata/common/core/domain/model/PasswordLoginBody.java index 22de8f2..8de37ce 100644 --- a/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java +++ b/src/main/java/net/rzdata/common/core/domain/model/PasswordLoginBody.java @@ -1,12 +1,11 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; +import net.rzdata.common.core.constant.UserConstants; import org.hibernate.validator.constraints.Length; -import static org.dromara.common.core.constant.UserConstants.*; - /** * 密码登录对象 * @@ -20,14 +19,14 @@ public class PasswordLoginBody extends LoginBody { * 用户名 */ @NotBlank(message = "{user.username.not.blank}") - @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") + @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") private String username; /** * 用户密码 */ @NotBlank(message = "{user.password.not.blank}") - @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") + @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") private String password; } diff --git a/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/src/main/java/net/rzdata/common/core/domain/model/RegisterBody.java similarity index 60% rename from src/main/java/org/dromara/common/core/domain/model/RegisterBody.java rename to src/main/java/net/rzdata/common/core/domain/model/RegisterBody.java index 440422b..50a04bc 100644 --- a/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java +++ b/src/main/java/net/rzdata/common/core/domain/model/RegisterBody.java @@ -1,12 +1,11 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; +import net.rzdata.common.core.constant.UserConstants; import org.hibernate.validator.constraints.Length; -import static org.dromara.common.core.constant.UserConstants.*; - /** * 用户注册对象 * @@ -20,14 +19,14 @@ public class RegisterBody extends LoginBody { * 用户名 */ @NotBlank(message = "{user.username.not.blank}") - @Length(min = USERNAME_MIN_LENGTH, max = USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") + @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") private String username; /** * 用户密码 */ @NotBlank(message = "{user.password.not.blank}") - @Length(min = PASSWORD_MIN_LENGTH, max = PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") + @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") private String password; private String userType; diff --git a/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/src/main/java/net/rzdata/common/core/domain/model/XcxLoginBody.java similarity index 90% rename from src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java rename to src/main/java/net/rzdata/common/core/domain/model/XcxLoginBody.java index 518fe2e..a1a064f 100644 --- a/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java +++ b/src/main/java/net/rzdata/common/core/domain/model/XcxLoginBody.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/src/main/java/net/rzdata/common/core/domain/model/XcxLoginUser.java similarity index 90% rename from src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java rename to src/main/java/net/rzdata/common/core/domain/model/XcxLoginUser.java index e5f3d6c..626bece 100644 --- a/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java +++ b/src/main/java/net/rzdata/common/core/domain/model/XcxLoginUser.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.domain.model; +package net.rzdata.common.core.domain.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/dromara/common/core/enums/DeviceType.java b/src/main/java/net/rzdata/common/core/enums/DeviceType.java similarity index 91% rename from src/main/java/org/dromara/common/core/enums/DeviceType.java rename to src/main/java/net/rzdata/common/core/enums/DeviceType.java index dbadfc2..381f357 100644 --- a/src/main/java/org/dromara/common/core/enums/DeviceType.java +++ b/src/main/java/net/rzdata/common/core/enums/DeviceType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package net.rzdata.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/dromara/common/core/enums/LoginType.java b/src/main/java/net/rzdata/common/core/enums/LoginType.java similarity index 94% rename from src/main/java/org/dromara/common/core/enums/LoginType.java rename to src/main/java/net/rzdata/common/core/enums/LoginType.java index f9cac66..86b774f 100644 --- a/src/main/java/org/dromara/common/core/enums/LoginType.java +++ b/src/main/java/net/rzdata/common/core/enums/LoginType.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package net.rzdata.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/dromara/common/core/enums/UserStatus.java b/src/main/java/net/rzdata/common/core/enums/UserStatus.java similarity index 90% rename from src/main/java/org/dromara/common/core/enums/UserStatus.java rename to src/main/java/net/rzdata/common/core/enums/UserStatus.java index be7e44d..8a6957c 100644 --- a/src/main/java/org/dromara/common/core/enums/UserStatus.java +++ b/src/main/java/net/rzdata/common/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.enums; +package net.rzdata.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/dromara/common/core/enums/UserType.java b/src/main/java/net/rzdata/common/core/enums/UserType.java similarity index 87% rename from src/main/java/org/dromara/common/core/enums/UserType.java rename to src/main/java/net/rzdata/common/core/enums/UserType.java index 69e4753..7ea80ce 100644 --- a/src/main/java/org/dromara/common/core/enums/UserType.java +++ b/src/main/java/net/rzdata/common/core/enums/UserType.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.enums; +package net.rzdata.common.core.enums; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/dromara/common/core/exception/ServiceException.java b/src/main/java/net/rzdata/common/core/exception/ServiceException.java similarity index 96% rename from src/main/java/org/dromara/common/core/exception/ServiceException.java rename to src/main/java/net/rzdata/common/core/exception/ServiceException.java index 4fb097a..1e0c873 100644 --- a/src/main/java/org/dromara/common/core/exception/ServiceException.java +++ b/src/main/java/net/rzdata/common/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception; +package net.rzdata.common.core.exception; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/src/main/java/net/rzdata/common/core/exception/base/BaseException.java similarity index 90% rename from src/main/java/org/dromara/common/core/exception/base/BaseException.java rename to src/main/java/net/rzdata/common/core/exception/base/BaseException.java index 40ce01b..9b799e9 100644 --- a/src/main/java/org/dromara/common/core/exception/base/BaseException.java +++ b/src/main/java/net/rzdata/common/core/exception/base/BaseException.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.exception.base; +package net.rzdata.common.core.exception.base; import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/exception/file/FileException.java b/src/main/java/net/rzdata/common/core/exception/file/FileException.java similarity index 73% rename from src/main/java/org/dromara/common/core/exception/file/FileException.java rename to src/main/java/net/rzdata/common/core/exception/file/FileException.java index d374fc0..fa408e1 100644 --- a/src/main/java/org/dromara/common/core/exception/file/FileException.java +++ b/src/main/java/net/rzdata/common/core/exception/file/FileException.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.exception.file; +package net.rzdata.common.core.exception.file; -import org.dromara.common.core.exception.base.BaseException; +import net.rzdata.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/src/main/java/net/rzdata/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 89% rename from src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java rename to src/main/java/net/rzdata/common/core/exception/file/FileNameLengthLimitExceededException.java index af98124..e3bfd56 100644 --- a/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/src/main/java/net/rzdata/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.file; +package net.rzdata.common.core.exception.file; import java.io.Serial; diff --git a/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/src/main/java/net/rzdata/common/core/exception/file/FileSizeLimitExceededException.java similarity index 88% rename from src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java rename to src/main/java/net/rzdata/common/core/exception/file/FileSizeLimitExceededException.java index 1eb8d40..4d375b4 100644 --- a/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java +++ b/src/main/java/net/rzdata/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.exception.file; +package net.rzdata.common.core.exception.file; import java.io.Serial; diff --git a/src/main/java/org/dromara/common/core/exception/user/UserException.java b/src/main/java/net/rzdata/common/core/exception/user/UserException.java similarity index 73% rename from src/main/java/org/dromara/common/core/exception/user/UserException.java rename to src/main/java/net/rzdata/common/core/exception/user/UserException.java index 024fed6..2653452 100644 --- a/src/main/java/org/dromara/common/core/exception/user/UserException.java +++ b/src/main/java/net/rzdata/common/core/exception/user/UserException.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.exception.user; +package net.rzdata.common.core.exception.user; -import org.dromara.common.core.exception.base.BaseException; +import net.rzdata.common.core.exception.base.BaseException; import java.io.Serial; diff --git a/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/src/main/java/net/rzdata/common/core/factory/YmlPropertySourceFactory.java similarity index 92% rename from src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java rename to src/main/java/net/rzdata/common/core/factory/YmlPropertySourceFactory.java index af61b90..34d2413 100644 --- a/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java +++ b/src/main/java/net/rzdata/common/core/factory/YmlPropertySourceFactory.java @@ -1,6 +1,6 @@ -package org.dromara.common.core.factory; +package net.rzdata.common.core.factory; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; diff --git a/src/main/java/org/dromara/common/core/service/ConfigService.java b/src/main/java/net/rzdata/common/core/service/ConfigService.java similarity index 86% rename from src/main/java/org/dromara/common/core/service/ConfigService.java rename to src/main/java/net/rzdata/common/core/service/ConfigService.java index 7328c69..a3b62ac 100644 --- a/src/main/java/org/dromara/common/core/service/ConfigService.java +++ b/src/main/java/net/rzdata/common/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package net.rzdata.common.core.service; /** * 通用 参数配置服务 diff --git a/src/main/java/org/dromara/common/core/service/DictService.java b/src/main/java/net/rzdata/common/core/service/DictService.java similarity index 97% rename from src/main/java/org/dromara/common/core/service/DictService.java rename to src/main/java/net/rzdata/common/core/service/DictService.java index b78a7f2..5ad6a3b 100644 --- a/src/main/java/org/dromara/common/core/service/DictService.java +++ b/src/main/java/net/rzdata/common/core/service/DictService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package net.rzdata.common.core.service; import java.util.Map; diff --git a/src/main/java/org/dromara/common/core/service/UserService.java b/src/main/java/net/rzdata/common/core/service/UserService.java similarity index 91% rename from src/main/java/org/dromara/common/core/service/UserService.java rename to src/main/java/net/rzdata/common/core/service/UserService.java index d6b312a..373c0bf 100644 --- a/src/main/java/org/dromara/common/core/service/UserService.java +++ b/src/main/java/net/rzdata/common/core/service/UserService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package net.rzdata.common.core.service; /** * 通用 用户服务 diff --git a/src/main/java/org/dromara/common/core/utils/DateUtils.java b/src/main/java/net/rzdata/common/core/utils/DateUtils.java similarity index 99% rename from src/main/java/org/dromara/common/core/utils/DateUtils.java rename to src/main/java/net/rzdata/common/core/utils/DateUtils.java index 72178a7..9ad0c60 100644 --- a/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/DateUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/src/main/java/net/rzdata/common/core/utils/MapstructUtils.java similarity index 98% rename from src/main/java/org/dromara/common/core/utils/MapstructUtils.java rename to src/main/java/net/rzdata/common/core/utils/MapstructUtils.java index b6acff7..daf8e1e 100644 --- a/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/MapstructUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/src/main/java/net/rzdata/common/core/utils/MessageUtils.java similarity index 95% rename from src/main/java/org/dromara/common/core/utils/MessageUtils.java rename to src/main/java/net/rzdata/common/core/utils/MessageUtils.java index 48dfc08..8febaed 100644 --- a/src/main/java/org/dromara/common/core/utils/MessageUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/MessageUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/src/main/java/net/rzdata/common/core/utils/ServletUtils.java similarity index 99% rename from src/main/java/org/dromara/common/core/utils/ServletUtils.java rename to src/main/java/net/rzdata/common/core/utils/ServletUtils.java index a1316eb..a1f5316 100644 --- a/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.JakartaServletUtil; diff --git a/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/src/main/java/net/rzdata/common/core/utils/SpringUtils.java similarity index 97% rename from src/main/java/org/dromara/common/core/utils/SpringUtils.java rename to src/main/java/net/rzdata/common/core/utils/SpringUtils.java index ab50539..66db5f4 100644 --- a/src/main/java/org/dromara/common/core/utils/SpringUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import cn.hutool.extra.spring.SpringUtil; import org.springframework.aop.framework.AopContext; diff --git a/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/src/main/java/net/rzdata/common/core/utils/StreamUtils.java similarity index 99% rename from src/main/java/org/dromara/common/core/utils/StreamUtils.java rename to src/main/java/net/rzdata/common/core/utils/StreamUtils.java index 967612e..c1deb17 100644 --- a/src/main/java/org/dromara/common/core/utils/StreamUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/src/main/java/org/dromara/common/core/utils/StringUtils.java b/src/main/java/net/rzdata/common/core/utils/StringUtils.java similarity index 99% rename from src/main/java/org/dromara/common/core/utils/StringUtils.java rename to src/main/java/net/rzdata/common/core/utils/StringUtils.java index 5e4db50..332c5e2 100644 --- a/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/src/main/java/org/dromara/common/core/utils/Threads.java b/src/main/java/net/rzdata/common/core/utils/Threads.java similarity index 98% rename from src/main/java/org/dromara/common/core/utils/Threads.java rename to src/main/java/net/rzdata/common/core/utils/Threads.java index ae6cfa3..9e97245 100644 --- a/src/main/java/org/dromara/common/core/utils/Threads.java +++ b/src/main/java/net/rzdata/common/core/utils/Threads.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/src/main/java/net/rzdata/common/core/utils/TreeBuildUtils.java similarity index 90% rename from src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java rename to src/main/java/net/rzdata/common/core/utils/TreeBuildUtils.java index d0163e6..95eb7ae 100644 --- a/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/TreeBuildUtils.java @@ -1,11 +1,11 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; -import org.dromara.common.core.utils.reflect.ReflectUtils; +import net.rzdata.common.core.utils.reflect.ReflectUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/src/main/java/net/rzdata/common/core/utils/ValidatorUtils.java similarity index 94% rename from src/main/java/org/dromara/common/core/utils/ValidatorUtils.java rename to src/main/java/net/rzdata/common/core/utils/ValidatorUtils.java index f94f916..e3d9b77 100644 --- a/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/ValidatorUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils; +package net.rzdata.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/src/main/java/net/rzdata/common/core/utils/file/FileUtils.java similarity index 96% rename from src/main/java/org/dromara/common/core/utils/file/FileUtils.java rename to src/main/java/net/rzdata/common/core/utils/file/FileUtils.java index 573b207..1d73da0 100644 --- a/src/main/java/org/dromara/common/core/utils/file/FileUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package net.rzdata.common.core.utils.file; import cn.hutool.core.io.FileUtil; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/src/main/java/net/rzdata/common/core/utils/file/MimeTypeUtils.java similarity index 96% rename from src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java rename to src/main/java/net/rzdata/common/core/utils/file/MimeTypeUtils.java index 23fa2cf..de7231c 100644 --- a/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.utils.file; +package net.rzdata.common.core.utils.file; /** * 媒体类型工具类 diff --git a/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/src/main/java/net/rzdata/common/core/utils/ip/AddressUtils.java similarity index 89% rename from src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java rename to src/main/java/net/rzdata/common/core/utils/ip/AddressUtils.java index 3f7cd57..b39bc89 100644 --- a/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/ip/AddressUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.ip; +package net.rzdata.common.core.utils.ip; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/src/main/java/net/rzdata/common/core/utils/ip/RegionUtils.java similarity index 93% rename from src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java rename to src/main/java/net/rzdata/common/core/utils/ip/RegionUtils.java index 6e2a44e..d43dc37 100644 --- a/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/ip/RegionUtils.java @@ -1,10 +1,10 @@ -package org.dromara.common.core.utils.ip; +package net.rzdata.common.core.utils.ip; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.core.util.ObjectUtil; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.file.FileUtils; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.file.FileUtils; import lombok.extern.slf4j.Slf4j; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/src/main/java/net/rzdata/common/core/utils/reflect/ReflectUtils.java similarity index 95% rename from src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java rename to src/main/java/net/rzdata/common/core/utils/reflect/ReflectUtils.java index 367e8c9..dff0a02 100644 --- a/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ b/src/main/java/net/rzdata/common/core/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package org.dromara.common.core.utils.reflect; +package net.rzdata.common.core.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/src/main/java/net/rzdata/common/core/utils/sql/SqlUtil.java similarity index 94% rename from src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java rename to src/main/java/net/rzdata/common/core/utils/sql/SqlUtil.java index 3e109b2..3556884 100644 --- a/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java +++ b/src/main/java/net/rzdata/common/core/utils/sql/SqlUtil.java @@ -1,8 +1,8 @@ -package org.dromara.common.core.utils.sql; +package net.rzdata.common.core.utils.sql; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; /** * sql操作工具类 diff --git a/src/main/java/org/dromara/common/core/validate/AddGroup.java b/src/main/java/net/rzdata/common/core/validate/AddGroup.java similarity index 65% rename from src/main/java/org/dromara/common/core/validate/AddGroup.java rename to src/main/java/net/rzdata/common/core/validate/AddGroup.java index 0275899..c2a4b56 100644 --- a/src/main/java/org/dromara/common/core/validate/AddGroup.java +++ b/src/main/java/net/rzdata/common/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package net.rzdata.common.core.validate; /** * 校验分组 add diff --git a/src/main/java/org/dromara/common/core/validate/EditGroup.java b/src/main/java/net/rzdata/common/core/validate/EditGroup.java similarity index 66% rename from src/main/java/org/dromara/common/core/validate/EditGroup.java rename to src/main/java/net/rzdata/common/core/validate/EditGroup.java index 77c5040..72d5cf7 100644 --- a/src/main/java/org/dromara/common/core/validate/EditGroup.java +++ b/src/main/java/net/rzdata/common/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package net.rzdata.common.core.validate; /** * 校验分组 edit diff --git a/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/src/main/java/net/rzdata/common/core/validate/QueryGroup.java similarity index 66% rename from src/main/java/org/dromara/common/core/validate/QueryGroup.java rename to src/main/java/net/rzdata/common/core/validate/QueryGroup.java index 02a0ac2..6cbcdac 100644 --- a/src/main/java/org/dromara/common/core/validate/QueryGroup.java +++ b/src/main/java/net/rzdata/common/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.validate; +package net.rzdata.common.core.validate; /** * 校验分组 query diff --git a/src/main/java/org/dromara/common/core/xss/Xss.java b/src/main/java/net/rzdata/common/core/xss/Xss.java similarity index 94% rename from src/main/java/org/dromara/common/core/xss/Xss.java rename to src/main/java/net/rzdata/common/core/xss/Xss.java index eed495f..2fb58dc 100644 --- a/src/main/java/org/dromara/common/core/xss/Xss.java +++ b/src/main/java/net/rzdata/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package net.rzdata.common.core.xss; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/org/dromara/common/core/xss/XssValidator.java b/src/main/java/net/rzdata/common/core/xss/XssValidator.java similarity index 93% rename from src/main/java/org/dromara/common/core/xss/XssValidator.java rename to src/main/java/net/rzdata/common/core/xss/XssValidator.java index 9c32563..7d9a318 100644 --- a/src/main/java/org/dromara/common/core/xss/XssValidator.java +++ b/src/main/java/net/rzdata/common/core/xss/XssValidator.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.xss; +package net.rzdata.common.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/src/main/java/net/rzdata/common/doc/config/SpringDocConfig.java similarity index 93% rename from src/main/java/org/dromara/common/doc/config/SpringDocConfig.java rename to src/main/java/net/rzdata/common/doc/config/SpringDocConfig.java index b7cf886..c13eb76 100644 --- a/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ b/src/main/java/net/rzdata/common/doc/config/SpringDocConfig.java @@ -1,14 +1,13 @@ -package org.dromara.common.doc.config; +package net.rzdata.common.doc.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.doc.config.properties.SpringDocProperties; -import org.dromara.common.doc.handler.OpenApiHandler; -import org.springdoc.core.configuration.SpringDocConfiguration; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.doc.handler.OpenApiHandler; +import net.rzdata.common.doc.config.properties.SpringDocProperties; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.OpenApiCustomizer; import org.springdoc.core.customizers.ServerBaseUrlCustomizer; @@ -17,7 +16,6 @@ import org.springdoc.core.providers.JavadocProvider; import org.springdoc.core.service.OpenAPIService; import org.springdoc.core.service.SecurityService; import org.springdoc.core.utils.PropertyResolverUtils; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.web.ServerProperties; diff --git a/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/src/main/java/net/rzdata/common/doc/config/properties/SpringDocProperties.java similarity index 97% rename from src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java rename to src/main/java/net/rzdata/common/doc/config/properties/SpringDocProperties.java index eae3b4c..b2ed32e 100644 --- a/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java +++ b/src/main/java/net/rzdata/common/doc/config/properties/SpringDocProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.config.properties; +package net.rzdata.common.doc.config.properties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/src/main/java/net/rzdata/common/doc/handler/OpenApiHandler.java similarity index 99% rename from src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java rename to src/main/java/net/rzdata/common/doc/handler/OpenApiHandler.java index a35cc64..4ce65ff 100644 --- a/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ b/src/main/java/net/rzdata/common/doc/handler/OpenApiHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.doc.handler; +package net.rzdata.common.doc.handler; import cn.hutool.core.io.IoUtil; import io.swagger.v3.core.jackson.TypeNameResolver; diff --git a/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/src/main/java/net/rzdata/common/encrypt/annotation/ApiEncrypt.java similarity index 87% rename from src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java rename to src/main/java/net/rzdata/common/encrypt/annotation/ApiEncrypt.java index 7f52de8..434aedb 100644 --- a/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java +++ b/src/main/java/net/rzdata/common/encrypt/annotation/ApiEncrypt.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.annotation; +package net.rzdata.common.encrypt.annotation; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/src/main/java/net/rzdata/common/encrypt/annotation/EncryptField.java similarity index 81% rename from src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java rename to src/main/java/net/rzdata/common/encrypt/annotation/EncryptField.java index d357d72..3cf553d 100644 --- a/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java +++ b/src/main/java/net/rzdata/common/encrypt/annotation/EncryptField.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.annotation; +package net.rzdata.common.encrypt.annotation; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/src/main/java/net/rzdata/common/encrypt/config/ApiDecryptAutoConfiguration.java similarity index 83% rename from src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java rename to src/main/java/net/rzdata/common/encrypt/config/ApiDecryptAutoConfiguration.java index f30b3eb..d2e769b 100644 --- a/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java +++ b/src/main/java/net/rzdata/common/encrypt/config/ApiDecryptAutoConfiguration.java @@ -1,9 +1,8 @@ -package org.dromara.common.encrypt.config; +package net.rzdata.common.encrypt.config; import jakarta.servlet.DispatcherType; -import org.dromara.common.encrypt.filter.CryptoFilter; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.encrypt.filter.CryptoFilter; +import net.rzdata.common.encrypt.properties.ApiDecryptProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/src/main/java/net/rzdata/common/encrypt/config/EncryptorAutoConfiguration.java similarity index 75% rename from src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java rename to src/main/java/net/rzdata/common/encrypt/config/EncryptorAutoConfiguration.java index 6888630..5807a0f 100644 --- a/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/src/main/java/net/rzdata/common/encrypt/config/EncryptorAutoConfiguration.java @@ -1,11 +1,10 @@ -package org.dromara.common.encrypt.config; +package net.rzdata.common.encrypt.config; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; -import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import net.rzdata.common.encrypt.interceptor.MybatisDecryptInterceptor; +import net.rzdata.common.encrypt.interceptor.MybatisEncryptInterceptor; +import net.rzdata.common.encrypt.properties.EncryptorProperties; +import net.rzdata.common.encrypt.core.EncryptorManager; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/src/main/java/net/rzdata/common/encrypt/core/EncryptContext.java similarity index 77% rename from src/main/java/org/dromara/common/encrypt/core/EncryptContext.java rename to src/main/java/net/rzdata/common/encrypt/core/EncryptContext.java index 2f02eaf..3399b50 100644 --- a/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java +++ b/src/main/java/net/rzdata/common/encrypt/core/EncryptContext.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package net.rzdata.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; import lombok.Data; /** diff --git a/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/src/main/java/net/rzdata/common/encrypt/core/EncryptorManager.java similarity index 96% rename from src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java rename to src/main/java/net/rzdata/common/encrypt/core/EncryptorManager.java index 498b4b8..2360f96 100644 --- a/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java +++ b/src/main/java/net/rzdata/common/encrypt/core/EncryptorManager.java @@ -1,8 +1,8 @@ -package org.dromara.common.encrypt.core; +package net.rzdata.common.encrypt.core; import cn.hutool.core.util.ReflectUtil; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.encrypt.annotation.EncryptField; +import net.rzdata.common.encrypt.annotation.EncryptField; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/src/main/java/net/rzdata/common/encrypt/core/IEncryptor.java similarity index 78% rename from src/main/java/org/dromara/common/encrypt/core/IEncryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/IEncryptor.java index dbc4420..eddee87 100644 --- a/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/IEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core; +package net.rzdata.common.encrypt.core; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; /** * 加解者 diff --git a/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/src/main/java/net/rzdata/common/encrypt/core/encryptor/AbstractEncryptor.java similarity index 62% rename from src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/encryptor/AbstractEncryptor.java index 858d229..16335a0 100644 --- a/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/encryptor/AbstractEncryptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.core.encryptor; +package net.rzdata.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.IEncryptor; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.core.IEncryptor; /** * 所有加密执行者的基类 diff --git a/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/src/main/java/net/rzdata/common/encrypt/core/encryptor/AesEncryptor.java similarity index 80% rename from src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/encryptor/AesEncryptor.java index e4dc597..ee2ab3d 100644 --- a/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/encryptor/AesEncryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package net.rzdata.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.utils.EncryptUtils; /** * AES算法实现 diff --git a/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/src/main/java/net/rzdata/common/encrypt/core/encryptor/Base64Encryptor.java similarity index 75% rename from src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/encryptor/Base64Encryptor.java index 0028548..bb443e3 100644 --- a/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/encryptor/Base64Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package net.rzdata.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.utils.EncryptUtils; /** * Base64算法实现 diff --git a/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/src/main/java/net/rzdata/common/encrypt/core/encryptor/RsaEncryptor.java similarity index 81% rename from src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/encryptor/RsaEncryptor.java index 5f03a4b..a75c7dc 100644 --- a/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/encryptor/RsaEncryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package net.rzdata.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.utils.EncryptUtils; /** diff --git a/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/src/main/java/net/rzdata/common/encrypt/core/encryptor/Sm2Encryptor.java similarity index 81% rename from src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/encryptor/Sm2Encryptor.java index aec5d82..ba159a2 100644 --- a/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/encryptor/Sm2Encryptor.java @@ -1,10 +1,10 @@ -package org.dromara.common.encrypt.core.encryptor; +package net.rzdata.common.encrypt.core.encryptor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.utils.EncryptUtils; /** * sm2算法实现 diff --git a/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/src/main/java/net/rzdata/common/encrypt/core/encryptor/Sm4Encryptor.java similarity index 80% rename from src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java rename to src/main/java/net/rzdata/common/encrypt/core/encryptor/Sm4Encryptor.java index adaf674..b696e0e 100644 --- a/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java +++ b/src/main/java/net/rzdata/common/encrypt/core/encryptor/Sm4Encryptor.java @@ -1,9 +1,9 @@ -package org.dromara.common.encrypt.core.encryptor; +package net.rzdata.common.encrypt.core.encryptor; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.utils.EncryptUtils; /** * sm4算法实现 diff --git a/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/src/main/java/net/rzdata/common/encrypt/enumd/AlgorithmType.java similarity index 86% rename from src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java rename to src/main/java/net/rzdata/common/encrypt/enumd/AlgorithmType.java index 26ee1ee..e6db1b1 100644 --- a/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java +++ b/src/main/java/net/rzdata/common/encrypt/enumd/AlgorithmType.java @@ -1,8 +1,8 @@ -package org.dromara.common.encrypt.enumd; +package net.rzdata.common.encrypt.enumd; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.encrypt.core.encryptor.*; +import net.rzdata.common.encrypt.core.encryptor.*; /** * 算法名称 diff --git a/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/src/main/java/net/rzdata/common/encrypt/enumd/EncodeType.java similarity index 85% rename from src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java rename to src/main/java/net/rzdata/common/encrypt/enumd/EncodeType.java index f471221..85786cc 100644 --- a/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java +++ b/src/main/java/net/rzdata/common/encrypt/enumd/EncodeType.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.enumd; +package net.rzdata.common.encrypt.enumd; /** * 编码类型 diff --git a/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/src/main/java/net/rzdata/common/encrypt/filter/CryptoFilter.java similarity index 92% rename from src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java rename to src/main/java/net/rzdata/common/encrypt/filter/CryptoFilter.java index 8d898c0..62b90be 100644 --- a/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java +++ b/src/main/java/net/rzdata/common/encrypt/filter/CryptoFilter.java @@ -1,15 +1,15 @@ -package org.dromara.common.encrypt.filter; +package net.rzdata.common.encrypt.filter; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.common.core.constant.HttpStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import net.rzdata.common.core.constant.HttpStatus; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.encrypt.annotation.ApiEncrypt; +import net.rzdata.common.encrypt.properties.ApiDecryptProperties; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.web.method.HandlerMethod; diff --git a/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/src/main/java/net/rzdata/common/encrypt/filter/DecryptRequestBodyWrapper.java similarity index 94% rename from src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java rename to src/main/java/net/rzdata/common/encrypt/filter/DecryptRequestBodyWrapper.java index 98f4bc7..24c039f 100644 --- a/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/src/main/java/net/rzdata/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -1,12 +1,12 @@ -package org.dromara.common.encrypt.filter; +package net.rzdata.common.encrypt.filter; import cn.hutool.core.io.IoUtil; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.core.constant.Constants; +import net.rzdata.common.encrypt.utils.EncryptUtils; import org.springframework.http.MediaType; import java.io.BufferedReader; diff --git a/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/src/main/java/net/rzdata/common/encrypt/filter/EncryptResponseBodyWrapper.java similarity index 97% rename from src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java rename to src/main/java/net/rzdata/common/encrypt/filter/EncryptResponseBodyWrapper.java index 05cf444..8641ce6 100644 --- a/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java +++ b/src/main/java/net/rzdata/common/encrypt/filter/EncryptResponseBodyWrapper.java @@ -1,11 +1,11 @@ -package org.dromara.common.encrypt.filter; +package net.rzdata.common.encrypt.filter; import cn.hutool.core.util.RandomUtil; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.WriteListener; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; -import org.dromara.common.encrypt.utils.EncryptUtils; +import net.rzdata.common.encrypt.utils.EncryptUtils; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/src/main/java/net/rzdata/common/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 89% rename from src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java rename to src/main/java/net/rzdata/common/encrypt/interceptor/MybatisDecryptInterceptor.java index 7c2508f..e77dfd2 100644 --- a/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/src/main/java/net/rzdata/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -1,19 +1,19 @@ -package org.dromara.common.encrypt.interceptor; +package net.rzdata.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import net.rzdata.common.core.utils.StringUtils; import org.apache.ibatis.executor.resultset.ResultSetHandler; import org.apache.ibatis.plugin.*; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import net.rzdata.common.encrypt.annotation.EncryptField; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.core.EncryptorManager; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.properties.EncryptorProperties; import java.lang.reflect.Field; import java.sql.Statement; diff --git a/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/src/main/java/net/rzdata/common/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 90% rename from src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java rename to src/main/java/net/rzdata/common/encrypt/interceptor/MybatisEncryptInterceptor.java index 152f7db..73fb743 100644 --- a/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/src/main/java/net/rzdata/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -1,22 +1,22 @@ -package org.dromara.common.encrypt.interceptor; +package net.rzdata.common.encrypt.interceptor; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import net.rzdata.common.core.utils.StringUtils; import org.apache.ibatis.executor.parameter.ParameterHandler; import org.apache.ibatis.plugin.Interceptor; import org.apache.ibatis.plugin.Intercepts; import org.apache.ibatis.plugin.Invocation; import org.apache.ibatis.plugin.Signature; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.core.EncryptContext; -import org.dromara.common.encrypt.core.EncryptorManager; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; -import org.dromara.common.encrypt.properties.EncryptorProperties; +import net.rzdata.common.encrypt.annotation.EncryptField; +import net.rzdata.common.encrypt.core.EncryptContext; +import net.rzdata.common.encrypt.core.EncryptorManager; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.properties.EncryptorProperties; import java.lang.reflect.Field; import java.sql.PreparedStatement; diff --git a/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/src/main/java/net/rzdata/common/encrypt/properties/ApiDecryptProperties.java similarity index 91% rename from src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java rename to src/main/java/net/rzdata/common/encrypt/properties/ApiDecryptProperties.java index 6aadb3e..f8c1812 100644 --- a/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ b/src/main/java/net/rzdata/common/encrypt/properties/ApiDecryptProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.properties; +package net.rzdata.common.encrypt.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/src/main/java/net/rzdata/common/encrypt/properties/EncryptorProperties.java similarity index 81% rename from src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java rename to src/main/java/net/rzdata/common/encrypt/properties/EncryptorProperties.java index ba445c1..2e944f2 100644 --- a/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java +++ b/src/main/java/net/rzdata/common/encrypt/properties/EncryptorProperties.java @@ -1,7 +1,7 @@ -package org.dromara.common.encrypt.properties; +package net.rzdata.common.encrypt.properties; -import org.dromara.common.encrypt.enumd.AlgorithmType; -import org.dromara.common.encrypt.enumd.EncodeType; +import net.rzdata.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.enumd.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/src/main/java/net/rzdata/common/encrypt/utils/EncryptUtils.java similarity index 99% rename from src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java rename to src/main/java/net/rzdata/common/encrypt/utils/EncryptUtils.java index 8e34843..0e490eb 100644 --- a/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/src/main/java/net/rzdata/common/encrypt/utils/EncryptUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.encrypt.utils; +package net.rzdata.common.encrypt.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; diff --git a/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/src/main/java/net/rzdata/common/excel/annotation/CellMerge.java similarity index 76% rename from src/main/java/org/dromara/common/excel/annotation/CellMerge.java rename to src/main/java/net/rzdata/common/excel/annotation/CellMerge.java index bbdaaa1..65c9e2c 100644 --- a/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ b/src/main/java/net/rzdata/common/excel/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package net.rzdata.common.excel.annotation; -import org.dromara.common.excel.core.CellMergeStrategy; +import net.rzdata.common.excel.core.CellMergeStrategy; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/src/main/java/net/rzdata/common/excel/annotation/ExcelDictFormat.java similarity index 85% rename from src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java rename to src/main/java/net/rzdata/common/excel/annotation/ExcelDictFormat.java index 5c51842..4349ae2 100644 --- a/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java +++ b/src/main/java/net/rzdata/common/excel/annotation/ExcelDictFormat.java @@ -1,6 +1,6 @@ -package org.dromara.common.excel.annotation; +package net.rzdata.common.excel.annotation; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/src/main/java/net/rzdata/common/excel/annotation/ExcelEnumFormat.java similarity index 92% rename from src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java rename to src/main/java/net/rzdata/common/excel/annotation/ExcelEnumFormat.java index 290379d..c7be97b 100644 --- a/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java +++ b/src/main/java/net/rzdata/common/excel/annotation/ExcelEnumFormat.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.annotation; +package net.rzdata.common.excel.annotation; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/src/main/java/net/rzdata/common/excel/convert/ExcelBigNumberConvert.java similarity index 97% rename from src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java rename to src/main/java/net/rzdata/common/excel/convert/ExcelBigNumberConvert.java index 07cc4c4..9133eaa 100644 --- a/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java +++ b/src/main/java/net/rzdata/common/excel/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package net.rzdata.common.excel.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/src/main/java/net/rzdata/common/excel/convert/ExcelDictConvert.java similarity index 88% rename from src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java rename to src/main/java/net/rzdata/common/excel/convert/ExcelDictConvert.java index 61eeabf..95ea3ed 100644 --- a/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java +++ b/src/main/java/net/rzdata/common/excel/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package net.rzdata.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,11 +9,11 @@ import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.excel.utils.ExcelUtil; +import net.rzdata.common.core.service.DictService; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.utils.ExcelUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/src/main/java/net/rzdata/common/excel/convert/ExcelEnumConvert.java similarity index 95% rename from src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java rename to src/main/java/net/rzdata/common/excel/convert/ExcelEnumConvert.java index b948ea7..715cf59 100644 --- a/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java +++ b/src/main/java/net/rzdata/common/excel/convert/ExcelEnumConvert.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.convert; +package net.rzdata.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,8 +9,8 @@ import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.ExcelEnumFormat; +import net.rzdata.common.core.utils.reflect.ReflectUtils; +import net.rzdata.common.excel.annotation.ExcelEnumFormat; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/src/main/java/net/rzdata/common/excel/core/CellMergeStrategy.java similarity index 97% rename from src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java rename to src/main/java/net/rzdata/common/excel/core/CellMergeStrategy.java index bcb5be7..40be4f3 100644 --- a/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java +++ b/src/main/java/net/rzdata/common/excel/core/CellMergeStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import cn.hutool.core.collection.CollUtil; import com.alibaba.excel.annotation.ExcelProperty; @@ -8,11 +8,11 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import net.rzdata.common.core.utils.reflect.ReflectUtils; +import net.rzdata.common.excel.annotation.CellMerge; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.util.CellRangeAddress; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.excel.annotation.CellMerge; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/src/main/java/net/rzdata/common/excel/core/DefaultExcelListener.java similarity index 94% rename from src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java rename to src/main/java/net/rzdata/common/excel/core/DefaultExcelListener.java index b6fa0b4..581a742 100644 --- a/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ b/src/main/java/net/rzdata/common/excel/core/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelAnalysisException; import com.alibaba.excel.exception.ExcelDataConvertException; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.ValidatorUtils; +import net.rzdata.common.json.utils.JsonUtils; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/src/main/java/net/rzdata/common/excel/core/DefaultExcelResult.java similarity index 97% rename from src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java rename to src/main/java/net/rzdata/common/excel/core/DefaultExcelResult.java index 7373e12..6fd9d66 100644 --- a/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java +++ b/src/main/java/net/rzdata/common/excel/core/DefaultExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/src/main/java/net/rzdata/common/excel/core/DropDownOptions.java similarity index 98% rename from src/main/java/org/dromara/common/excel/core/DropDownOptions.java rename to src/main/java/net/rzdata/common/excel/core/DropDownOptions.java index 8b53a0c..db2a60d 100644 --- a/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ b/src/main/java/net/rzdata/common/excel/core/DropDownOptions.java @@ -1,10 +1,10 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.exception.ServiceException; +import net.rzdata.common.core.exception.ServiceException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/src/main/java/net/rzdata/common/excel/core/ExcelDownHandler.java similarity index 97% rename from src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java rename to src/main/java/net/rzdata/common/excel/core/ExcelDownHandler.java index 3b791ea..9fea92b 100644 --- a/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ b/src/main/java/net/rzdata/common/excel/core/ExcelDownHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; @@ -12,16 +12,16 @@ import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.extern.slf4j.Slf4j; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.service.DictService; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.annotation.ExcelEnumFormat; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.WorkbookUtil; import org.apache.poi.xssf.usermodel.XSSFDataValidation; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; import java.lang.reflect.Field; import java.util.*; diff --git a/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/src/main/java/net/rzdata/common/excel/core/ExcelListener.java similarity index 84% rename from src/main/java/org/dromara/common/excel/core/ExcelListener.java rename to src/main/java/net/rzdata/common/excel/core/ExcelListener.java index 2d0340f..fd67716 100644 --- a/src/main/java/org/dromara/common/excel/core/ExcelListener.java +++ b/src/main/java/net/rzdata/common/excel/core/ExcelListener.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import com.alibaba.excel.read.listener.ReadListener; diff --git a/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/src/main/java/net/rzdata/common/excel/core/ExcelResult.java similarity index 88% rename from src/main/java/org/dromara/common/excel/core/ExcelResult.java rename to src/main/java/net/rzdata/common/excel/core/ExcelResult.java index 0c2a418..d0b3353 100644 --- a/src/main/java/org/dromara/common/excel/core/ExcelResult.java +++ b/src/main/java/net/rzdata/common/excel/core/ExcelResult.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.core; +package net.rzdata.common.excel.core; import java.util.List; diff --git a/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/src/main/java/net/rzdata/common/excel/utils/ExcelUtil.java similarity index 98% rename from src/main/java/org/dromara/common/excel/utils/ExcelUtil.java rename to src/main/java/net/rzdata/common/excel/utils/ExcelUtil.java index a6c14ad..58aed8f 100644 --- a/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java +++ b/src/main/java/net/rzdata/common/excel/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package org.dromara.common.excel.utils; +package net.rzdata.common.excel.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -14,10 +14,10 @@ import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; -import org.dromara.common.excel.convert.ExcelBigNumberConvert; -import org.dromara.common.excel.core.*; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.file.FileUtils; +import net.rzdata.common.excel.convert.ExcelBigNumberConvert; +import net.rzdata.common.excel.core.*; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/src/main/java/net/rzdata/common/idempotent/annotation/RepeatSubmit.java similarity index 91% rename from src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to src/main/java/net/rzdata/common/idempotent/annotation/RepeatSubmit.java index 42ae802..2fecf1a 100644 --- a/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java +++ b/src/main/java/net/rzdata/common/idempotent/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.annotation; +package net.rzdata.common.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/src/main/java/net/rzdata/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 90% rename from src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to src/main/java/net/rzdata/common/idempotent/aspectj/RepeatSubmitAspect.java index 016fe0f..f14d8ec 100644 --- a/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ b/src/main/java/net/rzdata/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,18 +1,18 @@ -package org.dromara.common.idempotent.aspectj; +package net.rzdata.common.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.redis.utils.RedisUtils; +import net.rzdata.common.core.constant.GlobalConstants; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.idempotent.annotation.RepeatSubmit; +import net.rzdata.common.json.utils.JsonUtils; +import net.rzdata.common.redis.utils.RedisUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.aspectj.lang.JoinPoint; diff --git a/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/src/main/java/net/rzdata/common/idempotent/config/IdempotentConfig.java similarity index 57% rename from src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java rename to src/main/java/net/rzdata/common/idempotent/config/IdempotentConfig.java index 9786e08..366831d 100644 --- a/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java +++ b/src/main/java/net/rzdata/common/idempotent/config/IdempotentConfig.java @@ -1,10 +1,8 @@ -package org.dromara.common.idempotent.config; +package net.rzdata.common.idempotent.config; -import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.idempotent.aspectj.RepeatSubmitAspect; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConfiguration; /** * 幂等功能配置 diff --git a/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/src/main/java/net/rzdata/common/json/config/JacksonConfig.java similarity index 88% rename from src/main/java/org/dromara/common/json/config/JacksonConfig.java rename to src/main/java/net/rzdata/common/json/config/JacksonConfig.java index 908e276..985f84b 100644 --- a/src/main/java/org/dromara/common/json/config/JacksonConfig.java +++ b/src/main/java/net/rzdata/common/json/config/JacksonConfig.java @@ -1,14 +1,12 @@ -package org.dromara.common.json.config; +package net.rzdata.common.json.config; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import org.dromara.common.json.handler.BigNumberSerializer; +import net.rzdata.common.json.handler.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/src/main/java/net/rzdata/common/json/handler/BigNumberSerializer.java similarity index 96% rename from src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java rename to src/main/java/net/rzdata/common/json/handler/BigNumberSerializer.java index f2a7c2d..90313f1 100644 --- a/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java +++ b/src/main/java/net/rzdata/common/json/handler/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.handler; +package net.rzdata.common.json.handler; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/src/main/java/net/rzdata/common/json/utils/JsonUtils.java similarity index 95% rename from src/main/java/org/dromara/common/json/utils/JsonUtils.java rename to src/main/java/net/rzdata/common/json/utils/JsonUtils.java index 42af8da..269d581 100644 --- a/src/main/java/org/dromara/common/json/utils/JsonUtils.java +++ b/src/main/java/net/rzdata/common/json/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.json.utils; +package net.rzdata.common.json.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -7,8 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/src/main/java/net/rzdata/common/log/event/LogininforEvent.java similarity index 94% rename from src/main/java/org/dromara/common/log/event/LogininforEvent.java rename to src/main/java/net/rzdata/common/log/event/LogininforEvent.java index e54693c..e38f584 100644 --- a/src/main/java/org/dromara/common/log/event/LogininforEvent.java +++ b/src/main/java/net/rzdata/common/log/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package org.dromara.common.log.event; +package net.rzdata.common.log.event; import lombok.Data; diff --git a/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/src/main/java/net/rzdata/common/mybatis/annotation/DataColumn.java similarity index 89% rename from src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java rename to src/main/java/net/rzdata/common/mybatis/annotation/DataColumn.java index aca470f..17f37db 100644 --- a/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java +++ b/src/main/java/net/rzdata/common/mybatis/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package net.rzdata.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/src/main/java/net/rzdata/common/mybatis/annotation/DataPermission.java similarity index 84% rename from src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java rename to src/main/java/net/rzdata/common/mybatis/annotation/DataPermission.java index f4351e3..08d245d 100644 --- a/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java +++ b/src/main/java/net/rzdata/common/mybatis/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.annotation; +package net.rzdata.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/src/main/java/net/rzdata/common/mybatis/config/MybatisPlusConfig.java similarity index 91% rename from src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java rename to src/main/java/net/rzdata/common/mybatis/config/MybatisPlusConfig.java index dd118f2..82ebb5b 100644 --- a/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/src/main/java/net/rzdata/common/mybatis/config/MybatisPlusConfig.java @@ -1,8 +1,7 @@ -package org.dromara.common.mybatis.config; +package net.rzdata.common.mybatis.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.autoconfigure.DdlApplicationRunner; -import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; @@ -10,12 +9,11 @@ import com.baomidou.mybatisplus.extension.ddl.IDdl; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler; -import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor; +import net.rzdata.common.core.factory.YmlPropertySourceFactory; +import net.rzdata.common.mybatis.handler.InjectionMetaObjectHandler; +import net.rzdata.common.mybatis.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/src/main/java/net/rzdata/common/mybatis/core/domain/BaseEntity.java similarity index 96% rename from src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java rename to src/main/java/net/rzdata/common/mybatis/core/domain/BaseEntity.java index 898483c..f39548c 100644 --- a/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/src/main/java/net/rzdata/common/mybatis/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.domain; +package net.rzdata.common.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/src/main/java/net/rzdata/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 98% rename from src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java rename to src/main/java/net/rzdata/common/mybatis/core/mapper/BaseMapperPlus.java index 9018a79..c04574e 100644 --- a/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/src/main/java/net/rzdata/common/mybatis/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.mapper; +package net.rzdata.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; +import net.rzdata.common.core.utils.MapstructUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; -import org.dromara.common.core.utils.MapstructUtils; import java.io.Serializable; import java.util.Collection; diff --git a/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/src/main/java/net/rzdata/common/mybatis/core/page/PageQuery.java similarity index 94% rename from src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java rename to src/main/java/net/rzdata/common/mybatis/core/page/PageQuery.java index 8ef4a57..33dc7de 100644 --- a/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/src/main/java/net/rzdata/common/mybatis/core/page/PageQuery.java @@ -1,12 +1,12 @@ -package org.dromara.common.mybatis.core.page; +package net.rzdata.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.sql.SqlUtil; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.sql.SqlUtil; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/src/main/java/net/rzdata/common/mybatis/core/page/TableDataInfo.java similarity index 97% rename from src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java rename to src/main/java/net/rzdata/common/mybatis/core/page/TableDataInfo.java index a4b6799..99b53e1 100644 --- a/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/src/main/java/net/rzdata/common/mybatis/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.core.page; +package net.rzdata.common.mybatis.core.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/src/main/java/net/rzdata/common/mybatis/enums/DataBaseType.java similarity index 89% rename from src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java rename to src/main/java/net/rzdata/common/mybatis/enums/DataBaseType.java index 93487e9..4d40a83 100644 --- a/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java +++ b/src/main/java/net/rzdata/common/mybatis/enums/DataBaseType.java @@ -1,6 +1,6 @@ -package org.dromara.common.mybatis.enums; +package net.rzdata.common.mybatis.enums; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/src/main/java/net/rzdata/common/mybatis/enums/DataScopeType.java similarity index 88% rename from src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java rename to src/main/java/net/rzdata/common/mybatis/enums/DataScopeType.java index dbbcaec..4f7e6b0 100644 --- a/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java +++ b/src/main/java/net/rzdata/common/mybatis/enums/DataScopeType.java @@ -1,9 +1,9 @@ -package org.dromara.common.mybatis.enums; +package net.rzdata.common.mybatis.enums; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.helper.DataPermissionHelper; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.common.mybatis.helper.DataPermissionHelper; /** * 数据权限类型 diff --git a/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/src/main/java/net/rzdata/common/mybatis/handler/InjectionMetaObjectHandler.java similarity index 90% rename from src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java rename to src/main/java/net/rzdata/common/mybatis/handler/InjectionMetaObjectHandler.java index 4c565ed..87dca8d 100644 --- a/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/src/main/java/net/rzdata/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -1,12 +1,12 @@ -package org.dromara.common.mybatis.handler; +package net.rzdata.common.mybatis.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.satoken.utils.LoginHelper; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.common.mybatis.core.domain.BaseEntity; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/src/main/java/net/rzdata/common/mybatis/handler/MybatisExceptionHandler.java similarity index 94% rename from src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java rename to src/main/java/net/rzdata/common/mybatis/handler/MybatisExceptionHandler.java index c517fa7..75a1ade 100644 --- a/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java +++ b/src/main/java/net/rzdata/common/mybatis/handler/MybatisExceptionHandler.java @@ -1,6 +1,6 @@ -package org.dromara.common.mybatis.handler; +package net.rzdata.common.mybatis.handler; -import org.dromara.common.core.domain.R; +import net.rzdata.common.core.domain.R; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.MyBatisSystemException; import org.springframework.dao.DuplicateKeyException; diff --git a/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/src/main/java/net/rzdata/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 91% rename from src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java rename to src/main/java/net/rzdata/common/mybatis/handler/PlusDataPermissionHandler.java index 2f81145..16c4b79 100644 --- a/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/src/main/java/net/rzdata/common/mybatis/handler/PlusDataPermissionHandler.java @@ -1,26 +1,26 @@ -package org.dromara.common.mybatis.handler; +package net.rzdata.common.mybatis.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; +import net.rzdata.common.core.domain.dto.RoleDTO; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.satoken.utils.LoginHelper; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.Parenthesis; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.parser.CCJSqlParserUtil; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.enums.DataScopeType; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.satoken.utils.LoginHelper; +import net.rzdata.common.mybatis.annotation.DataColumn; +import net.rzdata.common.mybatis.annotation.DataPermission; +import net.rzdata.common.mybatis.enums.DataScopeType; +import net.rzdata.common.mybatis.helper.DataPermissionHelper; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.expression.BeanResolver; import org.springframework.expression.ExpressionParser; diff --git a/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/src/main/java/net/rzdata/common/mybatis/helper/DataBaseHelper.java similarity index 91% rename from src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java rename to src/main/java/net/rzdata/common/mybatis/helper/DataBaseHelper.java index bb20f4b..8e1b415 100644 --- a/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/src/main/java/net/rzdata/common/mybatis/helper/DataBaseHelper.java @@ -1,10 +1,10 @@ -package org.dromara.common.mybatis.helper; +package net.rzdata.common.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.mybatis.enums.DataBaseType; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.mybatis.enums.DataBaseType; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -14,7 +14,6 @@ import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import java.util.Set; /** * 数据库助手 diff --git a/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/src/main/java/net/rzdata/common/mybatis/helper/DataPermissionHelper.java similarity index 98% rename from src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java rename to src/main/java/net/rzdata/common/mybatis/helper/DataPermissionHelper.java index 7f6ab1f..5580d96 100644 --- a/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java +++ b/src/main/java/net/rzdata/common/mybatis/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.helper; +package net.rzdata.common.mybatis.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; diff --git a/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/src/main/java/net/rzdata/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 96% rename from src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java rename to src/main/java/net/rzdata/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index 0ab0c11..e3ce4ef 100644 --- a/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/src/main/java/net/rzdata/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -1,4 +1,4 @@ -package org.dromara.common.mybatis.interceptor; +package net.rzdata.common.mybatis.interceptor; import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.util.ArrayUtil; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; +import net.rzdata.common.mybatis.annotation.DataColumn; +import net.rzdata.common.mybatis.handler.PlusDataPermissionHandler; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.delete.Delete; import net.sf.jsqlparser.statement.select.PlainSelect; diff --git a/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/src/main/java/net/rzdata/common/ratelimiter/annotation/RateLimiter.java similarity index 87% rename from src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to src/main/java/net/rzdata/common/ratelimiter/annotation/RateLimiter.java index de09752..696e663 100644 --- a/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java +++ b/src/main/java/net/rzdata/common/ratelimiter/annotation/RateLimiter.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.annotation; +package net.rzdata.common.ratelimiter.annotation; -import org.dromara.common.ratelimiter.enums.LimitType; +import net.rzdata.common.ratelimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/src/main/java/net/rzdata/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 91% rename from src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to src/main/java/net/rzdata/common/ratelimiter/aspectj/RateLimiterAspect.java index 8f3a5ca..fd73722 100644 --- a/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java +++ b/src/main/java/net/rzdata/common/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,14 +1,14 @@ -package org.dromara.common.ratelimiter.aspectj; +package net.rzdata.common.ratelimiter.aspectj; import cn.hutool.core.util.ArrayUtil; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; -import org.dromara.common.redis.utils.RedisUtils; +import net.rzdata.common.core.constant.GlobalConstants; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.ratelimiter.annotation.RateLimiter; +import net.rzdata.common.ratelimiter.enums.LimitType; +import net.rzdata.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/src/main/java/net/rzdata/common/ratelimiter/config/RateLimiterConfig.java similarity index 56% rename from src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to src/main/java/net/rzdata/common/ratelimiter/config/RateLimiterConfig.java index 6ccea0d..c0f75a6 100644 --- a/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java +++ b/src/main/java/net/rzdata/common/ratelimiter/config/RateLimiterConfig.java @@ -1,10 +1,8 @@ -package org.dromara.common.ratelimiter.config; +package net.rzdata.common.ratelimiter.config; -import org.dromara.common.ratelimiter.aspectj.RateLimiterAspect; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.ratelimiter.aspectj.RateLimiterAspect; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConfiguration; /** * @author guangxin diff --git a/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/src/main/java/net/rzdata/common/ratelimiter/enums/LimitType.java similarity index 85% rename from src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to src/main/java/net/rzdata/common/ratelimiter/enums/LimitType.java index b7f059f..a5fa1d1 100644 --- a/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java +++ b/src/main/java/net/rzdata/common/ratelimiter/enums/LimitType.java @@ -1,4 +1,4 @@ -package org.dromara.common.ratelimiter.enums; +package net.rzdata.common.ratelimiter.enums; /** * 限流类型 diff --git a/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/src/main/java/net/rzdata/common/redis/config/RedisConfig.java similarity index 95% rename from src/main/java/org/dromara/common/redis/config/RedisConfig.java rename to src/main/java/net/rzdata/common/redis/config/RedisConfig.java index f6d452a..23893a2 100644 --- a/src/main/java/org/dromara/common/redis/config/RedisConfig.java +++ b/src/main/java/net/rzdata/common/redis/config/RedisConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config; +package net.rzdata.common.redis.config; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -6,15 +6,14 @@ import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.config.properties.RedissonProperties; -import org.dromara.common.redis.handler.KeyPrefixHandler; -import org.dromara.common.redis.manager.PlusSpringCacheManager; +import net.rzdata.common.redis.config.properties.RedissonProperties; +import net.rzdata.common.redis.handler.KeyPrefixHandler; +import net.rzdata.common.redis.manager.PlusSpringCacheManager; import org.redisson.client.codec.StringCodec; import org.redisson.codec.CompositeCodec; import org.redisson.codec.TypedJsonJacksonCodec; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; diff --git a/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/src/main/java/net/rzdata/common/redis/config/properties/RedissonProperties.java similarity index 98% rename from src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java rename to src/main/java/net/rzdata/common/redis/config/properties/RedissonProperties.java index ebec786..ab6fc47 100644 --- a/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java +++ b/src/main/java/net/rzdata/common/redis/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.redis.config.properties; +package net.rzdata.common.redis.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/src/main/java/net/rzdata/common/redis/handler/KeyPrefixHandler.java similarity index 92% rename from src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java rename to src/main/java/net/rzdata/common/redis/handler/KeyPrefixHandler.java index 3bf3e34..5380cfa 100644 --- a/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java +++ b/src/main/java/net/rzdata/common/redis/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.handler; +package net.rzdata.common.redis.handler; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/src/main/java/net/rzdata/common/redis/manager/PlusSpringCacheManager.java similarity index 98% rename from src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java rename to src/main/java/net/rzdata/common/redis/manager/PlusSpringCacheManager.java index 08ebc78..d8c77ba 100644 --- a/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java +++ b/src/main/java/net/rzdata/common/redis/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.common.redis.manager; +package net.rzdata.common.redis.manager; -import org.dromara.common.redis.utils.RedisUtils; +import net.rzdata.common.redis.utils.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; diff --git a/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/src/main/java/net/rzdata/common/redis/utils/CacheUtils.java similarity index 95% rename from src/main/java/org/dromara/common/redis/utils/CacheUtils.java rename to src/main/java/net/rzdata/common/redis/utils/CacheUtils.java index 42a88d6..e36f158 100644 --- a/src/main/java/org/dromara/common/redis/utils/CacheUtils.java +++ b/src/main/java/net/rzdata/common/redis/utils/CacheUtils.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.utils; +package net.rzdata.common.redis.utils; -import org.dromara.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.RMap; diff --git a/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/src/main/java/net/rzdata/common/redis/utils/QueueUtils.java similarity index 98% rename from src/main/java/org/dromara/common/redis/utils/QueueUtils.java rename to src/main/java/net/rzdata/common/redis/utils/QueueUtils.java index 4587e64..d9e1920 100644 --- a/src/main/java/org/dromara/common/redis/utils/QueueUtils.java +++ b/src/main/java/net/rzdata/common/redis/utils/QueueUtils.java @@ -1,6 +1,6 @@ -package org.dromara.common.redis.utils; +package net.rzdata.common.redis.utils; -import org.dromara.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/src/main/java/net/rzdata/common/redis/utils/RedisUtils.java similarity index 99% rename from src/main/java/org/dromara/common/redis/utils/RedisUtils.java rename to src/main/java/net/rzdata/common/redis/utils/RedisUtils.java index ce32055..91123f0 100644 --- a/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/src/main/java/net/rzdata/common/redis/utils/RedisUtils.java @@ -1,8 +1,8 @@ -package org.dromara.common.redis.utils; +package net.rzdata.common.redis.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.SpringUtils; import org.redisson.api.*; import java.time.Duration; diff --git a/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/src/main/java/net/rzdata/common/satoken/config/SaTokenConfig.java similarity index 77% rename from src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java rename to src/main/java/net/rzdata/common/satoken/config/SaTokenConfig.java index 55ff7bf..e5931aa 100644 --- a/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java +++ b/src/main/java/net/rzdata/common/satoken/config/SaTokenConfig.java @@ -1,13 +1,12 @@ -package org.dromara.common.satoken.config; +package net.rzdata.common.satoken.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; -import org.dromara.common.core.factory.YmlPropertySourceFactory; -import org.dromara.common.satoken.core.dao.PlusSaTokenDao; -import org.dromara.common.satoken.core.service.SaPermissionImpl; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.core.factory.YmlPropertySourceFactory; +import net.rzdata.common.satoken.core.dao.PlusSaTokenDao; +import net.rzdata.common.satoken.core.service.SaPermissionImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/src/main/java/net/rzdata/common/satoken/core/dao/PlusSaTokenDao.java similarity index 97% rename from src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java rename to src/main/java/net/rzdata/common/satoken/core/dao/PlusSaTokenDao.java index d885962..d3abd1f 100644 --- a/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java +++ b/src/main/java/net/rzdata/common/satoken/core/dao/PlusSaTokenDao.java @@ -1,8 +1,8 @@ -package org.dromara.common.satoken.core.dao; +package net.rzdata.common.satoken.core.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; -import org.dromara.common.redis.utils.RedisUtils; +import net.rzdata.common.redis.utils.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/src/main/java/net/rzdata/common/satoken/core/service/SaPermissionImpl.java similarity index 86% rename from src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java rename to src/main/java/net/rzdata/common/satoken/core/service/SaPermissionImpl.java index 1cef9a7..747e448 100644 --- a/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/src/main/java/net/rzdata/common/satoken/core/service/SaPermissionImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.satoken.core.service; +package net.rzdata.common.satoken.core.service; import cn.dev33.satoken.stp.StpInterface; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.satoken.utils.LoginHelper; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.enums.UserType; +import net.rzdata.common.satoken.utils.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/src/main/java/net/rzdata/common/satoken/utils/LoginHelper.java similarity index 95% rename from src/main/java/org/dromara/common/satoken/utils/LoginHelper.java rename to src/main/java/net/rzdata/common/satoken/utils/LoginHelper.java index aad6409..e560fac 100644 --- a/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/src/main/java/net/rzdata/common/satoken/utils/LoginHelper.java @@ -1,4 +1,4 @@ -package org.dromara.common.satoken.utils; +package net.rzdata.common.satoken.utils; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -9,9 +9,9 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.UserType; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.enums.UserType; import java.util.function.Supplier; diff --git a/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/src/main/java/net/rzdata/common/security/config/SecurityConfig.java similarity index 85% rename from src/main/java/org/dromara/common/security/config/SecurityConfig.java rename to src/main/java/net/rzdata/common/security/config/SecurityConfig.java index c21fd93..e0eeb4c 100644 --- a/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/src/main/java/net/rzdata/common/security/config/SecurityConfig.java @@ -1,18 +1,17 @@ -package org.dromara.common.security.config; +package net.rzdata.common.security.config; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.security.config.properties.SecurityProperties; -import org.dromara.common.security.handler.AllUrlHandler; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.common.security.config.properties.SecurityProperties; +import net.rzdata.common.security.handler.AllUrlHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; diff --git a/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java b/src/main/java/net/rzdata/common/security/config/properties/SecurityProperties.java similarity index 84% rename from src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java rename to src/main/java/net/rzdata/common/security/config/properties/SecurityProperties.java index be1cc6e..aa068d6 100644 --- a/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java +++ b/src/main/java/net/rzdata/common/security/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.config.properties; +package net.rzdata.common.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/src/main/java/net/rzdata/common/security/handler/AllUrlHandler.java similarity index 93% rename from src/main/java/org/dromara/common/security/handler/AllUrlHandler.java rename to src/main/java/net/rzdata/common/security/handler/AllUrlHandler.java index a0c6ada..296fbe4 100644 --- a/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java +++ b/src/main/java/net/rzdata/common/security/handler/AllUrlHandler.java @@ -1,7 +1,7 @@ -package org.dromara.common.security.handler; +package net.rzdata.common.security.handler; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.SpringUtils; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.method.HandlerMethod; diff --git a/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java b/src/main/java/net/rzdata/common/security/handler/GlobalExceptionHandler.java similarity index 96% rename from src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java rename to src/main/java/net/rzdata/common/security/handler/GlobalExceptionHandler.java index a4dcfe3..2ec8473 100644 --- a/src/main/java/org/dromara/common/security/handler/GlobalExceptionHandler.java +++ b/src/main/java/net/rzdata/common/security/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.security.handler; +package net.rzdata.common.security.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -9,10 +9,10 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.exception.base.BaseException; -import org.dromara.common.core.utils.StreamUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.exception.base.BaseException; +import net.rzdata.common.core.utils.StreamUtils; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.validation.BindException; import org.springframework.web.HttpRequestMethodNotSupportedException; diff --git a/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/src/main/java/net/rzdata/common/sensitive/annotation/Sensitive.java similarity index 78% rename from src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java rename to src/main/java/net/rzdata/common/sensitive/annotation/Sensitive.java index 1dfc896..b6da68e 100644 --- a/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java +++ b/src/main/java/net/rzdata/common/sensitive/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package org.dromara.common.sensitive.annotation; +package net.rzdata.common.sensitive.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.sensitive.handler.SensitiveHandler; +import net.rzdata.common.sensitive.core.SensitiveStrategy; +import net.rzdata.common.sensitive.handler.SensitiveHandler; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/src/main/java/net/rzdata/common/sensitive/core/SensitiveService.java similarity index 85% rename from src/main/java/org/dromara/common/sensitive/core/SensitiveService.java rename to src/main/java/net/rzdata/common/sensitive/core/SensitiveService.java index 7b5264b..07006c3 100644 --- a/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java +++ b/src/main/java/net/rzdata/common/sensitive/core/SensitiveService.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package net.rzdata.common.sensitive.core; /** * 脱敏服务 diff --git a/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/src/main/java/net/rzdata/common/sensitive/core/SensitiveStrategy.java similarity index 95% rename from src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java rename to src/main/java/net/rzdata/common/sensitive/core/SensitiveStrategy.java index 9d1978a..9cbeab7 100644 --- a/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java +++ b/src/main/java/net/rzdata/common/sensitive/core/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.core; +package net.rzdata.common.sensitive.core; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/src/main/java/net/rzdata/common/sensitive/handler/SensitiveHandler.java similarity index 88% rename from src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java rename to src/main/java/net/rzdata/common/sensitive/handler/SensitiveHandler.java index c76c83a..f220cd1 100644 --- a/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java +++ b/src/main/java/net/rzdata/common/sensitive/handler/SensitiveHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.sensitive.handler; +package net.rzdata.common.sensitive.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveService; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.sensitive.annotation.Sensitive; +import net.rzdata.common.sensitive.core.SensitiveService; +import net.rzdata.common.sensitive.core.SensitiveStrategy; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/src/main/java/org/dromara/common/translation/annotation/Translation.java b/src/main/java/net/rzdata/common/translation/annotation/Translation.java similarity index 87% rename from src/main/java/org/dromara/common/translation/annotation/Translation.java rename to src/main/java/net/rzdata/common/translation/annotation/Translation.java index c24aa6f..785b332 100644 --- a/src/main/java/org/dromara/common/translation/annotation/Translation.java +++ b/src/main/java/net/rzdata/common/translation/annotation/Translation.java @@ -1,8 +1,8 @@ -package org.dromara.common.translation.annotation; +package net.rzdata.common.translation.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.dromara.common.translation.core.handler.TranslationHandler; +import net.rzdata.common.translation.core.handler.TranslationHandler; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/src/main/java/net/rzdata/common/translation/annotation/TranslationType.java similarity index 73% rename from src/main/java/org/dromara/common/translation/annotation/TranslationType.java rename to src/main/java/net/rzdata/common/translation/annotation/TranslationType.java index 43bfab0..ab73ea3 100644 --- a/src/main/java/org/dromara/common/translation/annotation/TranslationType.java +++ b/src/main/java/net/rzdata/common/translation/annotation/TranslationType.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.annotation; +package net.rzdata.common.translation.annotation; -import org.dromara.common.translation.core.TranslationInterface; +import net.rzdata.common.translation.core.TranslationInterface; import java.lang.annotation.*; diff --git a/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/src/main/java/net/rzdata/common/translation/config/TranslationConfig.java similarity index 78% rename from src/main/java/org/dromara/common/translation/config/TranslationConfig.java rename to src/main/java/net/rzdata/common/translation/config/TranslationConfig.java index 6515c5a..4c115ee 100644 --- a/src/main/java/org/dromara/common/translation/config/TranslationConfig.java +++ b/src/main/java/net/rzdata/common/translation/config/TranslationConfig.java @@ -1,15 +1,14 @@ -package org.dromara.common.translation.config; +package net.rzdata.common.translation.config; import com.fasterxml.jackson.databind.ObjectMapper; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.core.TranslationInterface; -import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier; -import org.dromara.common.translation.core.handler.TranslationHandler; +import net.rzdata.common.translation.annotation.TranslationType; +import net.rzdata.common.translation.core.TranslationInterface; +import net.rzdata.common.translation.core.handler.TranslationBeanSerializerModifier; +import net.rzdata.common.translation.core.handler.TranslationHandler; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.context.annotation.Configuration; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/src/main/java/net/rzdata/common/translation/constant/TransConstant.java similarity index 90% rename from src/main/java/org/dromara/common/translation/constant/TransConstant.java rename to src/main/java/net/rzdata/common/translation/constant/TransConstant.java index 38fb0bc..ef88c1c 100644 --- a/src/main/java/org/dromara/common/translation/constant/TransConstant.java +++ b/src/main/java/net/rzdata/common/translation/constant/TransConstant.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.constant; +package net.rzdata.common.translation.constant; /** * 翻译常量 diff --git a/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/src/main/java/net/rzdata/common/translation/core/TranslationInterface.java similarity index 76% rename from src/main/java/org/dromara/common/translation/core/TranslationInterface.java rename to src/main/java/net/rzdata/common/translation/core/TranslationInterface.java index e4d6dd3..be977d2 100644 --- a/src/main/java/org/dromara/common/translation/core/TranslationInterface.java +++ b/src/main/java/net/rzdata/common/translation/core/TranslationInterface.java @@ -1,6 +1,6 @@ -package org.dromara.common.translation.core; +package net.rzdata.common.translation.core; -import org.dromara.common.translation.annotation.TranslationType; +import net.rzdata.common.translation.annotation.TranslationType; /** * 翻译接口 (实现类需标注 {@link TranslationType} 注解标明翻译类型) diff --git a/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/src/main/java/net/rzdata/common/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 95% rename from src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java rename to src/main/java/net/rzdata/common/translation/core/handler/TranslationBeanSerializerModifier.java index 727672f..76ec00b 100644 --- a/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java +++ b/src/main/java/net/rzdata/common/translation/core/handler/TranslationBeanSerializerModifier.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package net.rzdata.common.translation.core.handler; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/src/main/java/net/rzdata/common/translation/core/handler/TranslationHandler.java similarity index 88% rename from src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java rename to src/main/java/net/rzdata/common/translation/core/handler/TranslationHandler.java index bb9615b..8589095 100644 --- a/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java +++ b/src/main/java/net/rzdata/common/translation/core/handler/TranslationHandler.java @@ -1,4 +1,4 @@ -package org.dromara.common.translation.core.handler; +package net.rzdata.common.translation.core.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.core.TranslationInterface; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.reflect.ReflectUtils; +import net.rzdata.common.translation.annotation.Translation; +import net.rzdata.common.translation.core.TranslationInterface; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/src/main/java/net/rzdata/common/translation/core/impl/DictTypeTranslationImpl.java similarity index 61% rename from src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java rename to src/main/java/net/rzdata/common/translation/core/impl/DictTypeTranslationImpl.java index 859a93e..8e411c7 100644 --- a/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java +++ b/src/main/java/net/rzdata/common/translation/core/impl/DictTypeTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package net.rzdata.common.translation.core.impl; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import net.rzdata.common.core.service.DictService; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.translation.core.TranslationInterface; +import net.rzdata.common.translation.annotation.TranslationType; +import net.rzdata.common.translation.constant.TransConstant; import lombok.AllArgsConstructor; /** diff --git a/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/src/main/java/net/rzdata/common/translation/core/impl/NicknameTranslationImpl.java similarity index 62% rename from src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java rename to src/main/java/net/rzdata/common/translation/core/impl/NicknameTranslationImpl.java index ac65f5a..e377f06 100644 --- a/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/src/main/java/net/rzdata/common/translation/core/impl/NicknameTranslationImpl.java @@ -1,10 +1,10 @@ -package org.dromara.common.translation.core.impl; +package net.rzdata.common.translation.core.impl; import lombok.AllArgsConstructor; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import net.rzdata.common.core.service.UserService; +import net.rzdata.common.translation.core.TranslationInterface; +import net.rzdata.common.translation.annotation.TranslationType; +import net.rzdata.common.translation.constant.TransConstant; /** * 用户名称翻译实现 diff --git a/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/src/main/java/net/rzdata/common/translation/core/impl/UserNameTranslationImpl.java similarity index 62% rename from src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java rename to src/main/java/net/rzdata/common/translation/core/impl/UserNameTranslationImpl.java index 96f1cd3..0a996ba 100644 --- a/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java +++ b/src/main/java/net/rzdata/common/translation/core/impl/UserNameTranslationImpl.java @@ -1,9 +1,9 @@ -package org.dromara.common.translation.core.impl; +package net.rzdata.common.translation.core.impl; -import org.dromara.common.core.service.UserService; -import org.dromara.common.translation.annotation.TranslationType; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.common.translation.core.TranslationInterface; +import net.rzdata.common.core.service.UserService; +import net.rzdata.common.translation.core.TranslationInterface; +import net.rzdata.common.translation.annotation.TranslationType; +import net.rzdata.common.translation.constant.TransConstant; import lombok.AllArgsConstructor; /** diff --git a/src/main/java/org/dromara/common/web/config/FilterConfig.java b/src/main/java/net/rzdata/common/web/config/FilterConfig.java similarity index 85% rename from src/main/java/org/dromara/common/web/config/FilterConfig.java rename to src/main/java/net/rzdata/common/web/config/FilterConfig.java index 727923b..3f0a338 100644 --- a/src/main/java/org/dromara/common/web/config/FilterConfig.java +++ b/src/main/java/net/rzdata/common/web/config/FilterConfig.java @@ -1,11 +1,10 @@ -package org.dromara.common.web.config; +package net.rzdata.common.web.config; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.web.config.properties.XssProperties; -import org.dromara.common.web.filter.RepeatableFilter; -import org.dromara.common.web.filter.XssFilter; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.web.filter.RepeatableFilter; +import net.rzdata.common.web.filter.XssFilter; +import net.rzdata.common.web.config.properties.XssProperties; import jakarta.servlet.DispatcherType; -import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/src/main/java/org/dromara/common/web/config/I18nConfig.java b/src/main/java/net/rzdata/common/web/config/I18nConfig.java similarity index 60% rename from src/main/java/org/dromara/common/web/config/I18nConfig.java rename to src/main/java/net/rzdata/common/web/config/I18nConfig.java index feffd29..9b8d90c 100644 --- a/src/main/java/org/dromara/common/web/config/I18nConfig.java +++ b/src/main/java/net/rzdata/common/web/config/I18nConfig.java @@ -1,8 +1,6 @@ -package org.dromara.common.web.config; +package net.rzdata.common.web.config; -import org.dromara.common.web.core.I18nLocaleResolver; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; +import net.rzdata.common.web.core.I18nLocaleResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; diff --git a/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/src/main/java/net/rzdata/common/web/config/ResourcesConfig.java similarity index 90% rename from src/main/java/org/dromara/common/web/config/ResourcesConfig.java rename to src/main/java/net/rzdata/common/web/config/ResourcesConfig.java index aed178b..7b72c2c 100644 --- a/src/main/java/org/dromara/common/web/config/ResourcesConfig.java +++ b/src/main/java/net/rzdata/common/web/config/ResourcesConfig.java @@ -1,7 +1,6 @@ -package org.dromara.common.web.config; +package net.rzdata.common.web.config; -import org.dromara.common.web.interceptor.PlusWebInvokeTimeInterceptor; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.web.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; diff --git a/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/src/main/java/net/rzdata/common/web/config/UndertowConfig.java similarity index 96% rename from src/main/java/org/dromara/common/web/config/UndertowConfig.java rename to src/main/java/net/rzdata/common/web/config/UndertowConfig.java index 5ce3959..532cb66 100644 --- a/src/main/java/org/dromara/common/web/config/UndertowConfig.java +++ b/src/main/java/net/rzdata/common/web/config/UndertowConfig.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.config; +package net.rzdata.common.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; diff --git a/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/src/main/java/net/rzdata/common/web/config/properties/XssProperties.java similarity index 90% rename from src/main/java/org/dromara/common/web/config/properties/XssProperties.java rename to src/main/java/net/rzdata/common/web/config/properties/XssProperties.java index ecf4f33..b32ff3e 100644 --- a/src/main/java/org/dromara/common/web/config/properties/XssProperties.java +++ b/src/main/java/net/rzdata/common/web/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.config.properties; +package net.rzdata.common.web.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/dromara/common/web/core/BaseController.java b/src/main/java/net/rzdata/common/web/core/BaseController.java similarity index 83% rename from src/main/java/org/dromara/common/web/core/BaseController.java rename to src/main/java/net/rzdata/common/web/core/BaseController.java index fd01dda..b9d0538 100644 --- a/src/main/java/org/dromara/common/web/core/BaseController.java +++ b/src/main/java/net/rzdata/common/web/core/BaseController.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.core; +package net.rzdata.common.web.core; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.utils.StringUtils; /** * web层通用数据处理 diff --git a/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/src/main/java/net/rzdata/common/web/core/I18nLocaleResolver.java similarity index 95% rename from src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java rename to src/main/java/net/rzdata/common/web/core/I18nLocaleResolver.java index 98ddd06..ce3de3a 100644 --- a/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/src/main/java/net/rzdata/common/web/core/I18nLocaleResolver.java @@ -1,4 +1,4 @@ -package org.dromara.common.web.core; +package net.rzdata.common.web.core; import org.springframework.web.servlet.LocaleResolver; diff --git a/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/src/main/java/net/rzdata/common/web/filter/RepeatableFilter.java similarity index 92% rename from src/main/java/org/dromara/common/web/filter/RepeatableFilter.java rename to src/main/java/net/rzdata/common/web/filter/RepeatableFilter.java index e0a3bf2..d52be80 100644 --- a/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java +++ b/src/main/java/net/rzdata/common/web/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.filter; +package net.rzdata.common.web.filter; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import org.springframework.http.MediaType; import jakarta.servlet.*; diff --git a/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/src/main/java/net/rzdata/common/web/filter/RepeatedlyRequestWrapper.java similarity index 95% rename from src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java rename to src/main/java/net/rzdata/common/web/filter/RepeatedlyRequestWrapper.java index 8933225..4476691 100644 --- a/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java +++ b/src/main/java/net/rzdata/common/web/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package org.dromara.common.web.filter; +package net.rzdata.common.web.filter; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.constant.Constants; +import net.rzdata.common.core.constant.Constants; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; diff --git a/src/main/java/org/dromara/common/web/filter/XssFilter.java b/src/main/java/net/rzdata/common/web/filter/XssFilter.java similarity index 95% rename from src/main/java/org/dromara/common/web/filter/XssFilter.java rename to src/main/java/net/rzdata/common/web/filter/XssFilter.java index a6cbe8c..ad66570 100644 --- a/src/main/java/org/dromara/common/web/filter/XssFilter.java +++ b/src/main/java/net/rzdata/common/web/filter/XssFilter.java @@ -1,6 +1,6 @@ -package org.dromara.common.web.filter; +package net.rzdata.common.web.filter; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import org.springframework.http.HttpMethod; import jakarta.servlet.*; diff --git a/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/src/main/java/net/rzdata/common/web/filter/XssHttpServletRequestWrapper.java similarity index 96% rename from src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java rename to src/main/java/net/rzdata/common/web/filter/XssHttpServletRequestWrapper.java index 4a425c5..5d68e7e 100644 --- a/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java +++ b/src/main/java/net/rzdata/common/web/filter/XssHttpServletRequestWrapper.java @@ -1,9 +1,9 @@ -package org.dromara.common.web.filter; +package net.rzdata.common.web.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/src/main/java/net/rzdata/common/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 92% rename from src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java rename to src/main/java/net/rzdata/common/web/interceptor/PlusWebInvokeTimeInterceptor.java index 1b4ce3d..8831f6b 100644 --- a/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/src/main/java/net/rzdata/common/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,12 +1,12 @@ -package org.dromara.common.web.interceptor; +package net.rzdata.common.web.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import com.alibaba.ttl.TransmittableThreadLocal; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.web.filter.RepeatedlyRequestWrapper; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.web.filter.RepeatedlyRequestWrapper; +import net.rzdata.common.json.utils.JsonUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/src/main/java/net/rzdata/common/websocket/config/WebSocketConfig.java similarity index 83% rename from src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java rename to src/main/java/net/rzdata/common/websocket/config/WebSocketConfig.java index b2f036e..a2bb367 100644 --- a/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java +++ b/src/main/java/net/rzdata/common/websocket/config/WebSocketConfig.java @@ -1,11 +1,10 @@ -package org.dromara.common.websocket.config; +package net.rzdata.common.websocket.config; import cn.hutool.core.util.StrUtil; -import org.dromara.common.websocket.config.properties.WebSocketProperties; -import org.dromara.common.websocket.handler.PlusWebSocketHandler; -import org.dromara.common.websocket.interceptor.PlusWebSocketInterceptor; -import org.dromara.common.websocket.listener.WebSocketTopicListener; -import org.springframework.boot.autoconfigure.AutoConfiguration; +import net.rzdata.common.websocket.interceptor.PlusWebSocketInterceptor; +import net.rzdata.common.websocket.config.properties.WebSocketProperties; +import net.rzdata.common.websocket.handler.PlusWebSocketHandler; +import net.rzdata.common.websocket.listener.WebSocketTopicListener; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/src/main/java/net/rzdata/common/websocket/config/properties/WebSocketProperties.java similarity index 87% rename from src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java rename to src/main/java/net/rzdata/common/websocket/config/properties/WebSocketProperties.java index d629fe5..886e783 100644 --- a/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java +++ b/src/main/java/net/rzdata/common/websocket/config/properties/WebSocketProperties.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.config.properties; +package net.rzdata.common.websocket.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/src/main/java/net/rzdata/common/websocket/constant/WebSocketConstants.java similarity index 90% rename from src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java rename to src/main/java/net/rzdata/common/websocket/constant/WebSocketConstants.java index 54eb447..b338c5a 100644 --- a/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java +++ b/src/main/java/net/rzdata/common/websocket/constant/WebSocketConstants.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.constant; +package net.rzdata.common.websocket.constant; /** * websocket的常量配置 diff --git a/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/src/main/java/net/rzdata/common/websocket/dto/WebSocketMessageDto.java similarity index 91% rename from src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java rename to src/main/java/net/rzdata/common/websocket/dto/WebSocketMessageDto.java index e2d4456..5114ebc 100644 --- a/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java +++ b/src/main/java/net/rzdata/common/websocket/dto/WebSocketMessageDto.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.dto; +package net.rzdata.common.websocket.dto; import lombok.Data; diff --git a/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/src/main/java/net/rzdata/common/websocket/handler/PlusWebSocketHandler.java similarity index 89% rename from src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java rename to src/main/java/net/rzdata/common/websocket/handler/PlusWebSocketHandler.java index fc576c7..57e1f31 100644 --- a/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java +++ b/src/main/java/net/rzdata/common/websocket/handler/PlusWebSocketHandler.java @@ -1,11 +1,11 @@ -package org.dromara.common.websocket.handler; +package net.rzdata.common.websocket.handler; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.websocket.constant.WebSocketConstants; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.websocket.constant.WebSocketConstants; +import net.rzdata.common.websocket.holder.WebSocketSessionHolder; +import net.rzdata.common.websocket.utils.WebSocketUtils; +import net.rzdata.common.websocket.dto.WebSocketMessageDto; import org.springframework.web.socket.*; import org.springframework.web.socket.handler.AbstractWebSocketHandler; diff --git a/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/src/main/java/net/rzdata/common/websocket/holder/WebSocketSessionHolder.java similarity index 96% rename from src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java rename to src/main/java/net/rzdata/common/websocket/holder/WebSocketSessionHolder.java index de8c5a7..6e83b40 100644 --- a/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java +++ b/src/main/java/net/rzdata/common/websocket/holder/WebSocketSessionHolder.java @@ -1,4 +1,4 @@ -package org.dromara.common.websocket.holder; +package net.rzdata.common.websocket.holder; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/src/main/java/net/rzdata/common/websocket/interceptor/PlusWebSocketInterceptor.java similarity index 84% rename from src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java rename to src/main/java/net/rzdata/common/websocket/interceptor/PlusWebSocketInterceptor.java index 1dc4120..5b277b9 100644 --- a/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java +++ b/src/main/java/net/rzdata/common/websocket/interceptor/PlusWebSocketInterceptor.java @@ -1,7 +1,7 @@ -package org.dromara.common.websocket.interceptor; +package net.rzdata.common.websocket.interceptor; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.satoken.utils.LoginHelper; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.satoken.utils.LoginHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; @@ -10,7 +10,7 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import java.util.Map; -import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; +import static net.rzdata.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; /** * WebSocket握手请求的拦截器 diff --git a/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/src/main/java/net/rzdata/common/websocket/listener/WebSocketTopicListener.java similarity index 88% rename from src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java rename to src/main/java/net/rzdata/common/websocket/listener/WebSocketTopicListener.java index 01528d0..9615f36 100644 --- a/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java +++ b/src/main/java/net/rzdata/common/websocket/listener/WebSocketTopicListener.java @@ -1,8 +1,8 @@ -package org.dromara.common.websocket.listener; +package net.rzdata.common.websocket.listener; import cn.hutool.core.collection.CollUtil; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; -import org.dromara.common.websocket.utils.WebSocketUtils; +import net.rzdata.common.websocket.utils.WebSocketUtils; +import net.rzdata.common.websocket.holder.WebSocketSessionHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; diff --git a/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/src/main/java/net/rzdata/common/websocket/utils/WebSocketUtils.java similarity index 92% rename from src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java rename to src/main/java/net/rzdata/common/websocket/utils/WebSocketUtils.java index 086599c..904c63a 100644 --- a/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java +++ b/src/main/java/net/rzdata/common/websocket/utils/WebSocketUtils.java @@ -1,12 +1,12 @@ -package org.dromara.common.websocket.utils; +package net.rzdata.common.websocket.utils; import cn.hutool.core.collection.CollUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.holder.WebSocketSessionHolder; +import net.rzdata.common.redis.utils.RedisUtils; +import net.rzdata.common.websocket.dto.WebSocketMessageDto; +import net.rzdata.common.websocket.holder.WebSocketSessionHolder; import org.springframework.web.socket.PongMessage; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketMessage; @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; +import static net.rzdata.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC; /** * 工具类 diff --git a/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/src/main/java/net/rzdata/demo/controller/RedisCacheController.java similarity index 94% rename from src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to src/main/java/net/rzdata/demo/controller/RedisCacheController.java index 341880c..ec2890a 100644 --- a/src/main/java/org/dromara/demo/controller/RedisCacheController.java +++ b/src/main/java/net/rzdata/demo/controller/RedisCacheController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import net.rzdata.common.core.constant.CacheNames; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/src/main/java/org/dromara/demo/controller/RedisLockController.java b/src/main/java/net/rzdata/demo/controller/RedisLockController.java similarity index 96% rename from src/main/java/org/dromara/demo/controller/RedisLockController.java rename to src/main/java/net/rzdata/demo/controller/RedisLockController.java index b7e0962..9bd50d5 100644 --- a/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/src/main/java/net/rzdata/demo/controller/RedisLockController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import org.dromara.common.core.domain.R; +import net.rzdata.common.core.domain.R; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/src/main/java/net/rzdata/demo/controller/RedisPubSubController.java similarity index 89% rename from src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to src/main/java/net/rzdata/demo/controller/RedisPubSubController.java index bdbf033..ee9f63a 100644 --- a/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/src/main/java/net/rzdata/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.RedisUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/src/main/java/net/rzdata/demo/controller/RedisRateLimiterController.java similarity index 88% rename from src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java rename to src/main/java/net/rzdata/demo/controller/RedisRateLimiterController.java index f8adf7d..7401ab6 100644 --- a/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java +++ b/src/main/java/net/rzdata/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.ratelimiter.annotation.RateLimiter; +import net.rzdata.common.ratelimiter.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/src/main/java/net/rzdata/demo/controller/Swagger3DemoController.java similarity index 91% rename from src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to src/main/java/net/rzdata/demo/controller/Swagger3DemoController.java index bb02f98..d09350e 100644 --- a/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java +++ b/src/main/java/net/rzdata/demo/controller/Swagger3DemoController.java @@ -1,6 +1,6 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; +import net.rzdata.common.core.domain.R; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/org/dromara/demo/controller/TestBatchController.java b/src/main/java/net/rzdata/demo/controller/TestBatchController.java similarity index 92% rename from src/main/java/org/dromara/demo/controller/TestBatchController.java rename to src/main/java/net/rzdata/demo/controller/TestBatchController.java index af8c77b..af97bab 100644 --- a/src/main/java/org/dromara/demo/controller/TestBatchController.java +++ b/src/main/java/net/rzdata/demo/controller/TestBatchController.java @@ -1,10 +1,10 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.mapper.TestDemoMapper; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.demo.domain.TestDemo; +import net.rzdata.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/org/dromara/demo/controller/TestDemoController.java b/src/main/java/net/rzdata/demo/controller/TestDemoController.java similarity index 81% rename from src/main/java/org/dromara/demo/controller/TestDemoController.java rename to src/main/java/net/rzdata/demo/controller/TestDemoController.java index d057a98..d882d4d 100644 --- a/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/src/main/java/net/rzdata/demo/controller/TestDemoController.java @@ -1,27 +1,27 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.bo.TestDemoImportVo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.service.ITestDemoService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.core.validate.QueryGroup; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.ValidatorUtils; +import net.rzdata.common.excel.core.ExcelResult; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.idempotent.annotation.RepeatSubmit; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.demo.domain.TestDemo; +import net.rzdata.demo.domain.bo.TestDemoBo; +import net.rzdata.demo.domain.bo.TestDemoImportVo; +import net.rzdata.demo.domain.vo.TestDemoVo; +import net.rzdata.demo.service.ITestDemoService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/src/main/java/net/rzdata/demo/controller/TestEncryptController.java similarity index 88% rename from src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to src/main/java/net/rzdata/demo/controller/TestEncryptController.java index 2b6886d..b38d540 100644 --- a/src/main/java/org/dromara/demo/controller/TestEncryptController.java +++ b/src/main/java/net/rzdata/demo/controller/TestEncryptController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.demo.domain.TestDemoEncrypt; -import org.dromara.demo.mapper.TestDemoEncryptMapper; +import net.rzdata.common.core.domain.R; +import net.rzdata.demo.domain.TestDemoEncrypt; +import net.rzdata.demo.mapper.TestDemoEncryptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/org/dromara/demo/controller/TestExcelController.java b/src/main/java/net/rzdata/demo/controller/TestExcelController.java similarity index 95% rename from src/main/java/org/dromara/demo/controller/TestExcelController.java rename to src/main/java/net/rzdata/demo/controller/TestExcelController.java index 3fd124c..5631e5f 100644 --- a/src/main/java/org/dromara/demo/controller/TestExcelController.java +++ b/src/main/java/net/rzdata/demo/controller/TestExcelController.java @@ -1,15 +1,15 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; import cn.hutool.core.collection.CollUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.listener.ExportDemoListener; -import org.dromara.demo.service.IExportExcelService; +import net.rzdata.demo.domain.vo.ExportDemoVo; +import net.rzdata.demo.listener.ExportDemoListener; +import net.rzdata.demo.service.IExportExcelService; +import net.rzdata.common.excel.core.ExcelResult; +import net.rzdata.common.excel.utils.ExcelUtil; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/org/dromara/demo/controller/TestI18nController.java b/src/main/java/net/rzdata/demo/controller/TestI18nController.java similarity index 92% rename from src/main/java/org/dromara/demo/controller/TestI18nController.java rename to src/main/java/net/rzdata/demo/controller/TestI18nController.java index 40393c5..e1d4392 100644 --- a/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/src/main/java/net/rzdata/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.MessageUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.utils.MessageUtils; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/src/main/java/net/rzdata/demo/controller/TestSensitiveController.java similarity index 85% rename from src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to src/main/java/net/rzdata/demo/controller/TestSensitiveController.java index eba0552..7a9456e 100644 --- a/src/main/java/org/dromara/demo/controller/TestSensitiveController.java +++ b/src/main/java/net/rzdata/demo/controller/TestSensitiveController.java @@ -1,11 +1,11 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.common.sensitive.annotation.Sensitive; +import net.rzdata.common.sensitive.core.SensitiveStrategy; import lombok.Data; -import org.dromara.common.sensitive.core.SensitiveService; +import net.rzdata.common.sensitive.core.SensitiveService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/org/dromara/demo/controller/TestTreeController.java b/src/main/java/net/rzdata/demo/controller/TestTreeController.java similarity index 82% rename from src/main/java/org/dromara/demo/controller/TestTreeController.java rename to src/main/java/net/rzdata/demo/controller/TestTreeController.java index de61919..800d0fb 100644 --- a/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/src/main/java/net/rzdata/demo/controller/TestTreeController.java @@ -1,20 +1,20 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.web.core.BaseController; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.service.ITestTreeService; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.core.validate.QueryGroup; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.idempotent.annotation.RepeatSubmit; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.demo.domain.bo.TestTreeBo; +import net.rzdata.demo.domain.vo.TestTreeVo; +import net.rzdata.demo.service.ITestTreeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/demo/controller/WeSocketController.java b/src/main/java/net/rzdata/demo/controller/WeSocketController.java similarity index 78% rename from src/main/java/org/dromara/demo/controller/WeSocketController.java rename to src/main/java/net/rzdata/demo/controller/WeSocketController.java index 699a5e6..cc6d199 100644 --- a/src/main/java/org/dromara/demo/controller/WeSocketController.java +++ b/src/main/java/net/rzdata/demo/controller/WeSocketController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller; +package net.rzdata.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.websocket.dto.WebSocketMessageDto; -import org.dromara.common.websocket.utils.WebSocketUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.websocket.dto.WebSocketMessageDto; +import net.rzdata.common.websocket.utils.WebSocketUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/net/rzdata/demo/controller/package-info.java b/src/main/java/net/rzdata/demo/controller/package-info.java new file mode 100644 index 0000000..a2e145c --- /dev/null +++ b/src/main/java/net/rzdata/demo/controller/package-info.java @@ -0,0 +1 @@ +package net.rzdata.demo.controller; diff --git a/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/src/main/java/net/rzdata/demo/controller/queue/BoundedQueueController.java similarity index 92% rename from src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java rename to src/main/java/net/rzdata/demo/controller/queue/BoundedQueueController.java index 30ec27f..70c21a7 100644 --- a/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java +++ b/src/main/java/net/rzdata/demo/controller/queue/BoundedQueueController.java @@ -1,11 +1,9 @@ -package org.dromara.demo.controller.queue; +package net.rzdata.demo.controller.queue; -import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.redisson.api.RBoundedBlockingQueue; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/src/main/java/net/rzdata/demo/controller/queue/DelayedQueueController.java similarity index 95% rename from src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java rename to src/main/java/net/rzdata/demo/controller/queue/DelayedQueueController.java index fb2aade..5315ca0 100644 --- a/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java +++ b/src/main/java/net/rzdata/demo/controller/queue/DelayedQueueController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller.queue; +package net.rzdata.demo.controller.queue; import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/src/main/java/net/rzdata/demo/controller/queue/PriorityDemo.java similarity index 91% rename from src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java rename to src/main/java/net/rzdata/demo/controller/queue/PriorityDemo.java index e2449b5..7fb63b8 100644 --- a/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java +++ b/src/main/java/net/rzdata/demo/controller/queue/PriorityDemo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.controller.queue; +package net.rzdata.demo.controller.queue; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/src/main/java/net/rzdata/demo/controller/queue/PriorityQueueController.java similarity index 95% rename from src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java rename to src/main/java/net/rzdata/demo/controller/queue/PriorityQueueController.java index 02c7396..675ddfa 100644 --- a/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java +++ b/src/main/java/net/rzdata/demo/controller/queue/PriorityQueueController.java @@ -1,8 +1,8 @@ -package org.dromara.demo.controller.queue; +package net.rzdata.demo.controller.queue; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/org/dromara/demo/domain/TestDemo.java b/src/main/java/net/rzdata/demo/domain/TestDemo.java similarity index 90% rename from src/main/java/org/dromara/demo/domain/TestDemo.java rename to src/main/java/net/rzdata/demo/domain/TestDemo.java index 613c478..a0ce86d 100644 --- a/src/main/java/org/dromara/demo/domain/TestDemo.java +++ b/src/main/java/net/rzdata/demo/domain/TestDemo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain; +package net.rzdata.demo.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/src/main/java/net/rzdata/demo/domain/TestDemoEncrypt.java similarity index 93% rename from src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java rename to src/main/java/net/rzdata/demo/domain/TestDemoEncrypt.java index bdcd596..47d85db 100644 --- a/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java +++ b/src/main/java/net/rzdata/demo/domain/TestDemoEncrypt.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain; +package net.rzdata.demo.domain; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.enumd.AlgorithmType; +import net.rzdata.common.encrypt.annotation.EncryptField; +import net.rzdata.common.encrypt.enumd.AlgorithmType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/dromara/demo/domain/TestTree.java b/src/main/java/net/rzdata/demo/domain/TestTree.java similarity index 91% rename from src/main/java/org/dromara/demo/domain/TestTree.java rename to src/main/java/net/rzdata/demo/domain/TestTree.java index 384946f..10d3afa 100644 --- a/src/main/java/org/dromara/demo/domain/TestTree.java +++ b/src/main/java/net/rzdata/demo/domain/TestTree.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain; +package net.rzdata.demo.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/src/main/java/net/rzdata/demo/domain/bo/TestDemoBo.java similarity index 83% rename from src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java rename to src/main/java/net/rzdata/demo/domain/bo/TestDemoBo.java index 484a05e..77b0fab 100644 --- a/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java +++ b/src/main/java/net/rzdata/demo/domain/bo/TestDemoBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package net.rzdata.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestDemo; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/src/main/java/net/rzdata/demo/domain/bo/TestDemoImportVo.java similarity index 96% rename from src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to src/main/java/net/rzdata/demo/domain/bo/TestDemoImportVo.java index 85c5b04..637d408 100644 --- a/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java +++ b/src/main/java/net/rzdata/demo/domain/bo/TestDemoImportVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.bo; +package net.rzdata.demo.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/src/main/java/net/rzdata/demo/domain/bo/TestTreeBo.java similarity index 79% rename from src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java rename to src/main/java/net/rzdata/demo/domain/bo/TestTreeBo.java index caea362..85eedd6 100644 --- a/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java +++ b/src/main/java/net/rzdata/demo/domain/bo/TestTreeBo.java @@ -1,9 +1,9 @@ -package org.dromara.demo.domain.bo; +package net.rzdata.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.demo.domain.TestTree; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/net/rzdata/demo/domain/package-info.java b/src/main/java/net/rzdata/demo/domain/package-info.java new file mode 100644 index 0000000..f902de4 --- /dev/null +++ b/src/main/java/net/rzdata/demo/domain/package-info.java @@ -0,0 +1 @@ +package net.rzdata.demo.domain; diff --git a/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/src/main/java/net/rzdata/demo/domain/vo/ExportDemoVo.java similarity index 87% rename from src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java rename to src/main/java/net/rzdata/demo/domain/vo/ExportDemoVo.java index 95fa0d1..fee39a2 100644 --- a/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java +++ b/src/main/java/net/rzdata/demo/domain/vo/ExportDemoVo.java @@ -1,4 +1,4 @@ -package org.dromara.demo.domain.vo; +package net.rzdata.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -7,13 +7,13 @@ import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.annotation.ExcelEnumFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.common.excel.convert.ExcelEnumConvert; +import net.rzdata.common.core.enums.UserStatus; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.annotation.ExcelEnumFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; +import net.rzdata.common.excel.convert.ExcelEnumConvert; /** * 带有下拉选的Excel导出 diff --git a/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/src/main/java/net/rzdata/demo/domain/vo/TestDemoVo.java similarity index 90% rename from src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java rename to src/main/java/net/rzdata/demo/domain/vo/TestDemoVo.java index aa894c6..4947304 100644 --- a/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/src/main/java/net/rzdata/demo/domain/vo/TestDemoVo.java @@ -1,10 +1,10 @@ -package org.dromara.demo.domain.vo; +package net.rzdata.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.demo.domain.TestDemo; +import net.rzdata.common.translation.annotation.Translation; +import net.rzdata.common.translation.constant.TransConstant; +import net.rzdata.demo.domain.TestDemo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/src/main/java/net/rzdata/demo/domain/vo/TestTreeVo.java similarity index 92% rename from src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java rename to src/main/java/net/rzdata/demo/domain/vo/TestTreeVo.java index 9616224..d9fa371 100644 --- a/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/src/main/java/net/rzdata/demo/domain/vo/TestTreeVo.java @@ -1,8 +1,8 @@ -package org.dromara.demo.domain.vo; +package net.rzdata.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.demo.domain.TestTree; +import net.rzdata.demo.domain.TestTree; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/src/main/java/net/rzdata/demo/listener/ExportDemoListener.java similarity index 86% rename from src/main/java/org/dromara/demo/listener/ExportDemoListener.java rename to src/main/java/net/rzdata/demo/listener/ExportDemoListener.java index 7bd4e1e..032aeb2 100644 --- a/src/main/java/org/dromara/demo/listener/ExportDemoListener.java +++ b/src/main/java/net/rzdata/demo/listener/ExportDemoListener.java @@ -1,13 +1,13 @@ -package org.dromara.demo.listener; +package net.rzdata.demo.listener; import cn.hutool.core.util.NumberUtil; import com.alibaba.excel.context.AnalysisContext; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.core.DefaultExcelListener; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.demo.domain.vo.ExportDemoVo; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.core.utils.ValidatorUtils; +import net.rzdata.common.excel.core.DefaultExcelListener; +import net.rzdata.common.excel.core.DropDownOptions; +import net.rzdata.demo.domain.vo.ExportDemoVo; import java.util.List; diff --git a/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java b/src/main/java/net/rzdata/demo/mapper/TestDemoEncryptMapper.java similarity index 52% rename from src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java rename to src/main/java/net/rzdata/demo/mapper/TestDemoEncryptMapper.java index 601f97a..443ee0e 100644 --- a/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java +++ b/src/main/java/net/rzdata/demo/mapper/TestDemoEncryptMapper.java @@ -1,7 +1,7 @@ -package org.dromara.demo.mapper; +package net.rzdata.demo.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemoEncrypt; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.demo.domain.TestDemoEncrypt; /** * 测试加密功能 diff --git a/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/src/main/java/net/rzdata/demo/mapper/TestDemoMapper.java similarity index 82% rename from src/main/java/org/dromara/demo/mapper/TestDemoMapper.java rename to src/main/java/net/rzdata/demo/mapper/TestDemoMapper.java index b26da11..9888786 100644 --- a/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/src/main/java/net/rzdata/demo/mapper/TestDemoMapper.java @@ -1,15 +1,15 @@ -package org.dromara.demo.mapper; +package net.rzdata.demo.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.vo.TestDemoVo; +import net.rzdata.common.mybatis.annotation.DataColumn; +import net.rzdata.common.mybatis.annotation.DataPermission; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.demo.domain.TestDemo; +import net.rzdata.demo.domain.vo.TestDemoVo; import java.util.Collection; import java.util.List; diff --git a/src/main/java/net/rzdata/demo/mapper/TestTreeMapper.java b/src/main/java/net/rzdata/demo/mapper/TestTreeMapper.java new file mode 100644 index 0000000..0606e1e --- /dev/null +++ b/src/main/java/net/rzdata/demo/mapper/TestTreeMapper.java @@ -0,0 +1,20 @@ +package net.rzdata.demo.mapper; + +import net.rzdata.common.mybatis.annotation.DataColumn; +import net.rzdata.common.mybatis.annotation.DataPermission; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.demo.domain.TestTree; +import net.rzdata.demo.domain.vo.TestTreeVo; + +/** + * 测试树表Mapper接口 + * + * @author Lion Li + * @date 2021-07-26 + */ +@DataPermission({ + @DataColumn(key = "userName", value = "user_id") +}) +public interface TestTreeMapper extends BaseMapperPlus { + +} diff --git a/src/main/java/net/rzdata/demo/mapper/package-info.java b/src/main/java/net/rzdata/demo/mapper/package-info.java new file mode 100644 index 0000000..f21b9f2 --- /dev/null +++ b/src/main/java/net/rzdata/demo/mapper/package-info.java @@ -0,0 +1 @@ +package net.rzdata.demo.mapper; diff --git a/src/main/java/org/dromara/demo/service/IExportExcelService.java b/src/main/java/net/rzdata/demo/service/IExportExcelService.java similarity index 89% rename from src/main/java/org/dromara/demo/service/IExportExcelService.java rename to src/main/java/net/rzdata/demo/service/IExportExcelService.java index 4dfa5ef..3e6d9a3 100644 --- a/src/main/java/org/dromara/demo/service/IExportExcelService.java +++ b/src/main/java/net/rzdata/demo/service/IExportExcelService.java @@ -1,4 +1,4 @@ -package org.dromara.demo.service; +package net.rzdata.demo.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/org/dromara/demo/service/ITestDemoService.java b/src/main/java/net/rzdata/demo/service/ITestDemoService.java similarity index 81% rename from src/main/java/org/dromara/demo/service/ITestDemoService.java rename to src/main/java/net/rzdata/demo/service/ITestDemoService.java index bca4192..3cab465 100644 --- a/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/src/main/java/net/rzdata/demo/service/ITestDemoService.java @@ -1,10 +1,10 @@ -package org.dromara.demo.service; +package net.rzdata.demo.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.demo.domain.TestDemo; +import net.rzdata.demo.domain.bo.TestDemoBo; +import net.rzdata.demo.domain.vo.TestDemoVo; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/dromara/demo/service/ITestTreeService.java b/src/main/java/net/rzdata/demo/service/ITestTreeService.java similarity index 88% rename from src/main/java/org/dromara/demo/service/ITestTreeService.java rename to src/main/java/net/rzdata/demo/service/ITestTreeService.java index 9155201..b13b1a9 100644 --- a/src/main/java/org/dromara/demo/service/ITestTreeService.java +++ b/src/main/java/net/rzdata/demo/service/ITestTreeService.java @@ -1,7 +1,7 @@ -package org.dromara.demo.service; +package net.rzdata.demo.service; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; +import net.rzdata.demo.domain.bo.TestTreeBo; +import net.rzdata.demo.domain.vo.TestTreeVo; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/src/main/java/net/rzdata/demo/service/impl/ExportExcelServiceImpl.java similarity index 95% rename from src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java rename to src/main/java/net/rzdata/demo/service/impl/ExportExcelServiceImpl.java index 0240e02..d77f15f 100644 --- a/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/src/main/java/net/rzdata/demo/service/impl/ExportExcelServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.demo.service.impl; +package net.rzdata.demo.service.impl; import cn.hutool.core.util.StrUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.demo.domain.vo.ExportDemoVo; -import org.dromara.demo.service.IExportExcelService; +import net.rzdata.common.core.enums.UserStatus; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.excel.core.DropDownOptions; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.demo.domain.vo.ExportDemoVo; +import net.rzdata.demo.service.IExportExcelService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/src/main/java/net/rzdata/demo/service/impl/TestDemoServiceImpl.java similarity index 87% rename from src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java rename to src/main/java/net/rzdata/demo/service/impl/TestDemoServiceImpl.java index b3c6ec2..6f21a7f 100644 --- a/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/src/main/java/net/rzdata/demo/service/impl/TestDemoServiceImpl.java @@ -1,17 +1,17 @@ -package org.dromara.demo.service.impl; +package net.rzdata.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.demo.domain.TestDemo; -import org.dromara.demo.domain.bo.TestDemoBo; -import org.dromara.demo.domain.vo.TestDemoVo; -import org.dromara.demo.mapper.TestDemoMapper; -import org.dromara.demo.service.ITestDemoService; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.demo.domain.TestDemo; +import net.rzdata.demo.domain.bo.TestDemoBo; +import net.rzdata.demo.domain.vo.TestDemoVo; +import net.rzdata.demo.mapper.TestDemoMapper; +import net.rzdata.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/src/main/java/net/rzdata/demo/service/impl/TestTreeServiceImpl.java similarity index 86% rename from src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java rename to src/main/java/net/rzdata/demo/service/impl/TestTreeServiceImpl.java index 463934c..ef7070f 100644 --- a/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/src/main/java/net/rzdata/demo/service/impl/TestTreeServiceImpl.java @@ -1,14 +1,14 @@ -package org.dromara.demo.service.impl; +package net.rzdata.demo.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.bo.TestTreeBo; -import org.dromara.demo.domain.vo.TestTreeVo; -import org.dromara.demo.mapper.TestTreeMapper; -import org.dromara.demo.service.ITestTreeService; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.demo.domain.TestTree; +import net.rzdata.demo.domain.bo.TestTreeBo; +import net.rzdata.demo.domain.vo.TestTreeVo; +import net.rzdata.demo.mapper.TestTreeMapper; +import net.rzdata.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/net/rzdata/demo/service/impl/package-info.java b/src/main/java/net/rzdata/demo/service/impl/package-info.java new file mode 100644 index 0000000..8a26193 --- /dev/null +++ b/src/main/java/net/rzdata/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package net.rzdata.demo.service.impl; diff --git a/src/main/java/net/rzdata/demo/service/package-info.java b/src/main/java/net/rzdata/demo/service/package-info.java new file mode 100644 index 0000000..2c100f8 --- /dev/null +++ b/src/main/java/net/rzdata/demo/service/package-info.java @@ -0,0 +1 @@ +package net.rzdata.demo.service; diff --git a/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/src/main/java/net/rzdata/system/controller/monitor/CacheController.java similarity index 90% rename from src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to src/main/java/net/rzdata/system/controller/monitor/CacheController.java index 6b7499a..a26ce14 100644 --- a/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ b/src/main/java/net/rzdata/system/controller/monitor/CacheController.java @@ -1,9 +1,9 @@ -package org.dromara.system.controller.monitor; +package net.rzdata.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.vo.CacheListInfoVo; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.system.domain.vo.CacheListInfoVo; import lombok.RequiredArgsConstructor; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.springframework.data.redis.connection.RedisConnection; diff --git a/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/src/main/java/net/rzdata/system/controller/monitor/SysLogininforController.java similarity index 79% rename from src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to src/main/java/net/rzdata/system/controller/monitor/SysLogininforController.java index 03ff488..ba7ecdb 100644 --- a/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/src/main/java/net/rzdata/system/controller/monitor/SysLogininforController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.monitor; +package net.rzdata.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.service.ISysLogininforService; +import net.rzdata.common.core.constant.GlobalConstants; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.common.redis.utils.RedisUtils; +import net.rzdata.system.domain.bo.SysLogininforBo; +import net.rzdata.system.domain.vo.SysLogininforVo; +import net.rzdata.system.service.ISysLogininforService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/src/main/java/net/rzdata/system/controller/monitor/SysUserOnlineController.java similarity index 84% rename from src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to src/main/java/net/rzdata/system/controller/monitor/SysUserOnlineController.java index 6e5b795..d49a566 100644 --- a/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/src/main/java/net/rzdata/system/controller/monitor/SysUserOnlineController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.monitor; +package net.rzdata.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserOnline; +import net.rzdata.common.core.constant.CacheConstants; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.domain.dto.UserOnlineDTO; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.SysUserOnline; +import net.rzdata.common.redis.utils.RedisUtils; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; diff --git a/src/main/java/org/dromara/system/controller/system/SysClientController.java b/src/main/java/net/rzdata/system/controller/system/SysClientController.java similarity index 82% rename from src/main/java/org/dromara/system/controller/system/SysClientController.java rename to src/main/java/net/rzdata/system/controller/system/SysClientController.java index d9c0d2a..c249894 100644 --- a/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysClientController.java @@ -1,21 +1,21 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.service.ISysClientService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.idempotent.annotation.RepeatSubmit; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.bo.SysClientBo; +import net.rzdata.system.domain.vo.SysClientVo; +import net.rzdata.system.service.ISysClientService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/src/main/java/net/rzdata/system/controller/system/SysConfigController.java similarity index 88% rename from src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to src/main/java/net/rzdata/system/controller/system/SysConfigController.java index e22f981..23a655d 100644 --- a/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysConfigController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.service.ISysConfigService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.bo.SysConfigBo; +import net.rzdata.system.domain.vo.SysConfigVo; +import net.rzdata.system.service.ISysConfigService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/src/main/java/net/rzdata/system/controller/system/SysDictDataController.java similarity index 84% rename from src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to src/main/java/net/rzdata/system/controller/system/SysDictDataController.java index 094ef7c..28763f7 100644 --- a/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysDictDataController.java @@ -1,18 +1,18 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.service.ISysDictDataService; -import org.dromara.system.service.ISysDictTypeService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.bo.SysDictDataBo; +import net.rzdata.system.domain.vo.SysDictDataVo; +import net.rzdata.system.service.ISysDictDataService; +import net.rzdata.system.service.ISysDictTypeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/src/main/java/net/rzdata/system/controller/system/SysDictTypeController.java similarity index 87% rename from src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to src/main/java/net/rzdata/system/controller/system/SysDictTypeController.java index 18e2c5f..32e7f46 100644 --- a/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysDictTypeController.java @@ -1,16 +1,16 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.service.ISysDictTypeService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.bo.SysDictTypeBo; +import net.rzdata.system.domain.vo.SysDictTypeVo; +import net.rzdata.system.service.ISysDictTypeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/src/main/java/net/rzdata/system/controller/system/SysMenuController.java similarity index 88% rename from src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to src/main/java/net/rzdata/system/controller/system/SysMenuController.java index d677859..aa5be4e 100644 --- a/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysMenuController.java @@ -1,22 +1,22 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.tree.Tree; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MenuTreeSelectVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.service.ISysMenuService; +import net.rzdata.common.core.constant.TenantConstants; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.SysMenu; +import net.rzdata.system.domain.bo.SysMenuBo; +import net.rzdata.system.domain.vo.MenuTreeSelectVo; +import net.rzdata.system.domain.vo.RouterVo; +import net.rzdata.system.domain.vo.SysMenuVo; +import net.rzdata.system.service.ISysMenuService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/src/main/java/net/rzdata/system/controller/system/SysProfileController.java similarity index 80% rename from src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to src/main/java/net/rzdata/system/controller/system/SysProfileController.java index 8fd82bc..580fc61 100644 --- a/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysProfileController.java @@ -1,19 +1,19 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.bo.SysUserPasswordBo; -import org.dromara.system.domain.bo.SysUserProfileBo; -import org.dromara.system.domain.vo.ProfileVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysUserService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.encrypt.annotation.ApiEncrypt; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.domain.bo.SysUserPasswordBo; +import net.rzdata.system.domain.bo.SysUserProfileBo; +import net.rzdata.system.domain.vo.ProfileVo; +import net.rzdata.system.domain.vo.SysUserVo; +import net.rzdata.system.service.ISysUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/src/main/java/net/rzdata/system/controller/system/SysRoleController.java similarity index 90% rename from src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to src/main/java/net/rzdata/system/controller/system/SysRoleController.java index 9a8ef36..ec0fbbe 100644 --- a/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysRoleController.java @@ -1,20 +1,20 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.domain.R; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.SysUserRole; +import net.rzdata.system.domain.bo.SysRoleBo; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.domain.vo.SysRoleVo; +import net.rzdata.system.domain.vo.SysUserVo; +import net.rzdata.system.service.ISysRoleService; +import net.rzdata.system.service.ISysUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/controller/system/SysUserController.java b/src/main/java/net/rzdata/system/controller/system/SysUserController.java similarity index 88% rename from src/main/java/org/dromara/system/controller/system/SysUserController.java rename to src/main/java/net/rzdata/system/controller/system/SysUserController.java index b2e80f9..60ca68f 100644 --- a/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/src/main/java/net/rzdata/system/controller/system/SysUserController.java @@ -1,31 +1,30 @@ -package org.dromara.system.controller.system; +package net.rzdata.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.listener.SysUserImportListener; -import org.dromara.system.service.ISysRoleService; -import org.dromara.system.service.ISysUserService; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.encrypt.annotation.ApiEncrypt; +import net.rzdata.common.excel.core.ExcelResult; +import net.rzdata.common.excel.utils.ExcelUtil; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.common.web.core.BaseController; +import net.rzdata.system.domain.bo.SysRoleBo; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.domain.vo.*; +import net.rzdata.system.listener.SysUserImportListener; +import net.rzdata.system.service.ISysRoleService; +import net.rzdata.system.service.ISysUserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/org/dromara/system/domain/SysCache.java b/src/main/java/net/rzdata/system/domain/SysCache.java similarity index 90% rename from src/main/java/org/dromara/system/domain/SysCache.java rename to src/main/java/net/rzdata/system/domain/SysCache.java index e398a20..6f93e89 100644 --- a/src/main/java/org/dromara/system/domain/SysCache.java +++ b/src/main/java/net/rzdata/system/domain/SysCache.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/system/domain/SysClient.java b/src/main/java/net/rzdata/system/domain/SysClient.java similarity index 92% rename from src/main/java/org/dromara/system/domain/SysClient.java rename to src/main/java/net/rzdata/system/domain/SysClient.java index 0f681be..7ffe604 100644 --- a/src/main/java/org/dromara/system/domain/SysClient.java +++ b/src/main/java/net/rzdata/system/domain/SysClient.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/dromara/system/domain/SysConfig.java b/src/main/java/net/rzdata/system/domain/SysConfig.java similarity index 89% rename from src/main/java/org/dromara/system/domain/SysConfig.java rename to src/main/java/net/rzdata/system/domain/SysConfig.java index 60a4ced..710b68c 100644 --- a/src/main/java/org/dromara/system/domain/SysConfig.java +++ b/src/main/java/net/rzdata/system/domain/SysConfig.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.mybatis.core.domain.BaseEntity; /** * 参数配置表 sys_config diff --git a/src/main/java/org/dromara/system/domain/SysDictData.java b/src/main/java/net/rzdata/system/domain/SysDictData.java similarity index 88% rename from src/main/java/org/dromara/system/domain/SysDictData.java rename to src/main/java/net/rzdata/system/domain/SysDictData.java index 6ab01cf..4d104f5 100644 --- a/src/main/java/org/dromara/system/domain/SysDictData.java +++ b/src/main/java/net/rzdata/system/domain/SysDictData.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.mybatis.core.domain.BaseEntity; /** * 字典数据表 sys_dict_data diff --git a/src/main/java/org/dromara/system/domain/SysDictType.java b/src/main/java/net/rzdata/system/domain/SysDictType.java similarity index 87% rename from src/main/java/org/dromara/system/domain/SysDictType.java rename to src/main/java/net/rzdata/system/domain/SysDictType.java index c8f099b..e151266 100644 --- a/src/main/java/org/dromara/system/domain/SysDictType.java +++ b/src/main/java/net/rzdata/system/domain/SysDictType.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.mybatis.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type diff --git a/src/main/java/org/dromara/system/domain/SysLogininfor.java b/src/main/java/net/rzdata/system/domain/SysLogininfor.java similarity index 97% rename from src/main/java/org/dromara/system/domain/SysLogininfor.java rename to src/main/java/net/rzdata/system/domain/SysLogininfor.java index e646fc8..17875c8 100644 --- a/src/main/java/org/dromara/system/domain/SysLogininfor.java +++ b/src/main/java/net/rzdata/system/domain/SysLogininfor.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/org/dromara/system/domain/SysMenu.java b/src/main/java/net/rzdata/system/domain/SysMenu.java similarity index 94% rename from src/main/java/org/dromara/system/domain/SysMenu.java rename to src/main/java/net/rzdata/system/domain/SysMenu.java index 6b498a3..6be9a60 100644 --- a/src/main/java/org/dromara/system/domain/SysMenu.java +++ b/src/main/java/net/rzdata/system/domain/SysMenu.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.core.constant.Constants; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/dromara/system/domain/SysRole.java b/src/main/java/net/rzdata/system/domain/SysRole.java similarity index 93% rename from src/main/java/org/dromara/system/domain/SysRole.java rename to src/main/java/net/rzdata/system/domain/SysRole.java index e76d5cb..7bd53a7 100644 --- a/src/main/java/org/dromara/system/domain/SysRole.java +++ b/src/main/java/net/rzdata/system/domain/SysRole.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.mybatis.core.domain.BaseEntity; /** * 角色表 sys_role diff --git a/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/src/main/java/net/rzdata/system/domain/SysRoleMenu.java similarity index 92% rename from src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to src/main/java/net/rzdata/system/domain/SysRoleMenu.java index ba28f17..3135374 100644 --- a/src/main/java/org/dromara/system/domain/SysRoleMenu.java +++ b/src/main/java/net/rzdata/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/org/dromara/system/domain/SysUser.java b/src/main/java/net/rzdata/system/domain/SysUser.java similarity index 92% rename from src/main/java/org/dromara/system/domain/SysUser.java rename to src/main/java/net/rzdata/system/domain/SysUser.java index 872eabe..f11bde2 100644 --- a/src/main/java/org/dromara/system/domain/SysUser.java +++ b/src/main/java/net/rzdata/system/domain/SysUser.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.mybatis.core.domain.BaseEntity; import java.util.Date; diff --git a/src/main/java/org/dromara/system/domain/SysUserOnline.java b/src/main/java/net/rzdata/system/domain/SysUserOnline.java similarity index 95% rename from src/main/java/org/dromara/system/domain/SysUserOnline.java rename to src/main/java/net/rzdata/system/domain/SysUserOnline.java index 8ceb1a2..849f973 100644 --- a/src/main/java/org/dromara/system/domain/SysUserOnline.java +++ b/src/main/java/net/rzdata/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/SysUserRole.java b/src/main/java/net/rzdata/system/domain/SysUserRole.java similarity index 92% rename from src/main/java/org/dromara/system/domain/SysUserRole.java rename to src/main/java/net/rzdata/system/domain/SysUserRole.java index 0a50e80..6e09fbc 100644 --- a/src/main/java/org/dromara/system/domain/SysUserRole.java +++ b/src/main/java/net/rzdata/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain; +package net.rzdata.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/src/main/java/net/rzdata/system/domain/bo/SysClientBo.java similarity index 86% rename from src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysClientBo.java index e5f5ffa..1b2434b 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysClientBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; -import org.dromara.system.domain.SysClient; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import net.rzdata.common.core.validate.AddGroup; +import net.rzdata.common.core.validate.EditGroup; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysClient; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/src/main/java/net/rzdata/system/domain/bo/SysConfigBo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysConfigBo.java index 257935d..342e48a 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysConfigBo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysConfig; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysConfig; /** * 参数配置业务对象 sys_config diff --git a/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/src/main/java/net/rzdata/system/domain/bo/SysDictDataBo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysDictDataBo.java index 8119152..2fe1308 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysDictDataBo.java @@ -1,13 +1,12 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictData; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysDictData; /** * 字典数据业务对象 sys_dict_data diff --git a/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/src/main/java/net/rzdata/system/domain/bo/SysDictTypeBo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysDictTypeBo.java index 39257f7..80858b0 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysDictTypeBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,8 +6,8 @@ import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysDictType; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysDictType; /** * 字典类型业务对象 sys_dict_type diff --git a/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/src/main/java/net/rzdata/system/domain/bo/SysLogininforBo.java similarity index 93% rename from src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysLogininforBo.java index 8cce254..e2ac2d6 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysLogininforBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; -import org.dromara.system.domain.SysLogininfor; +import net.rzdata.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/src/main/java/net/rzdata/system/domain/bo/SysMenuBo.java similarity index 93% rename from src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysMenuBo.java index 498280a..2b4c9e6 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysMenuBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import com.fasterxml.jackson.annotation.JsonInclude; import io.github.linpeilie.annotations.AutoMapper; @@ -7,8 +7,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysMenu; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysMenu; /** * 菜单权限业务对象 sys_menu diff --git a/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/src/main/java/net/rzdata/system/domain/bo/SysRoleBo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysRoleBo.java index 2e98e44..ba7be80 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysRoleBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -7,9 +7,9 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysRole; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysRole; /** * 角色信息业务对象 sys_role diff --git a/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/src/main/java/net/rzdata/system/domain/bo/SysUserBo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysUserBo.java index 756833a..bfecd97 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysUserBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -7,10 +7,10 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.domain.SysUser; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.xss.Xss; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.system.domain.SysUser; /** * 用户信息业务对象 sys_user diff --git a/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/src/main/java/net/rzdata/system/domain/bo/SysUserPasswordBo.java similarity index 93% rename from src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysUserPasswordBo.java index 8615fcd..bd77c41 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysUserPasswordBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/src/main/java/net/rzdata/system/domain/bo/SysUserProfileBo.java similarity index 80% rename from src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to src/main/java/net/rzdata/system/domain/bo/SysUserProfileBo.java index fb4c605..f6c6546 100644 --- a/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java +++ b/src/main/java/net/rzdata/system/domain/bo/SysUserProfileBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.domain.bo; +package net.rzdata.system.domain.bo; -import org.dromara.common.core.xss.Xss; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; +import net.rzdata.common.core.xss.Xss; +import net.rzdata.common.mybatis.core.domain.BaseEntity; +import net.rzdata.common.sensitive.annotation.Sensitive; +import net.rzdata.common.sensitive.core.SensitiveStrategy; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Size; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/src/main/java/net/rzdata/system/domain/vo/CacheListInfoVo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java rename to src/main/java/net/rzdata/system/domain/vo/CacheListInfoVo.java index f827cba..d3e99a4 100644 --- a/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/CacheListInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/src/main/java/net/rzdata/system/domain/vo/MenuTreeSelectVo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java rename to src/main/java/net/rzdata/system/domain/vo/MenuTreeSelectVo.java index 0724538..00a9526 100644 --- a/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/MenuTreeSelectVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/src/main/java/net/rzdata/system/domain/vo/MetaVo.java similarity index 92% rename from src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to src/main/java/net/rzdata/system/domain/vo/MetaVo.java index f720cd7..68561d8 100644 --- a/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.StringUtils; import lombok.Data; /** diff --git a/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/src/main/java/net/rzdata/system/domain/vo/ProfileVo.java similarity index 87% rename from src/main/java/org/dromara/system/domain/vo/ProfileVo.java rename to src/main/java/net/rzdata/system/domain/vo/ProfileVo.java index dfc966c..f6fcea6 100644 --- a/src/main/java/org/dromara/system/domain/vo/ProfileVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/ProfileVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/src/main/java/net/rzdata/system/domain/vo/RouterVo.java similarity index 96% rename from src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to src/main/java/net/rzdata/system/domain/vo/RouterVo.java index 0d576ef..83c7c07 100644 --- a/src/main/java/org/dromara/system/domain/vo/RouterVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/src/main/java/net/rzdata/system/domain/vo/SysClientVo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysClientVo.java index 34f24eb..d1d50f0 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysClientVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; -import org.dromara.system.domain.SysClient; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; +import net.rzdata.system.domain.SysClient; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/src/main/java/net/rzdata/system/domain/vo/SysConfigVo.java similarity index 87% rename from src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysConfigVo.java index f896000..8c411c3 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysConfigVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysConfig; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; +import net.rzdata.system.domain.SysConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/src/main/java/net/rzdata/system/domain/vo/SysDictDataVo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysDictDataVo.java index 83ea619..f48f278 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysDictDataVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysDictData; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; +import net.rzdata.system.domain.SysDictData; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/src/main/java/net/rzdata/system/domain/vo/SysDictTypeVo.java similarity index 92% rename from src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysDictTypeVo.java index 4b2e9b0..0909e8d 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysDictTypeVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.system.domain.SysDictType; +import net.rzdata.system.domain.SysDictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/src/main/java/net/rzdata/system/domain/vo/SysLogininforVo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysLogininforVo.java index 3292159..6b367f3 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysLogininforVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysLogininfor; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; +import net.rzdata.system.domain.SysLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/src/main/java/net/rzdata/system/domain/vo/SysMenuVo.java similarity index 95% rename from src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysMenuVo.java index 9e75e79..a4dfe54 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysMenuVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; -import org.dromara.system.domain.SysMenu; +import net.rzdata.system.domain.SysMenu; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/src/main/java/net/rzdata/system/domain/vo/SysRoleVo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysRoleVo.java index cba0188..2629ddd 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysRoleVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.domain.SysRole; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; +import net.rzdata.system.domain.SysRole; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/src/main/java/net/rzdata/system/domain/vo/SysUserExportVo.java similarity index 91% rename from src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysUserExportVo.java index ac37ed2..f7b1253 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysUserExportVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/src/main/java/net/rzdata/system/domain/vo/SysUserImportVo.java similarity index 89% rename from src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysUserImportVo.java index c851616..9606ab6 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; +import net.rzdata.common.excel.annotation.ExcelDictFormat; +import net.rzdata.common.excel.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/src/main/java/net/rzdata/system/domain/vo/SysUserInfoVo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysUserInfoVo.java index fd85331..645eff3 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysUserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/src/main/java/net/rzdata/system/domain/vo/SysUserVo.java similarity index 85% rename from src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to src/main/java/net/rzdata/system/domain/vo/SysUserVo.java index 321c73e..48bdd8a 100644 --- a/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/SysUserVo.java @@ -1,12 +1,12 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.domain.SysUser; +import net.rzdata.common.sensitive.annotation.Sensitive; +import net.rzdata.common.sensitive.core.SensitiveStrategy; +import net.rzdata.common.translation.annotation.Translation; +import net.rzdata.common.translation.constant.TransConstant; +import net.rzdata.system.domain.SysUser; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; diff --git a/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/src/main/java/net/rzdata/system/domain/vo/UserInfoVo.java similarity index 90% rename from src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to src/main/java/net/rzdata/system/domain/vo/UserInfoVo.java index 48fa92a..3350d85 100644 --- a/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java +++ b/src/main/java/net/rzdata/system/domain/vo/UserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.domain.vo; +package net.rzdata.system.domain.vo; import lombok.Data; diff --git a/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/src/main/java/net/rzdata/system/listener/SysUserImportListener.java similarity index 87% rename from src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to src/main/java/net/rzdata/system/listener/SysUserImportListener.java index c20a4ec..6432a4a 100644 --- a/src/main/java/org/dromara/system/listener/SysUserImportListener.java +++ b/src/main/java/net/rzdata/system/listener/SysUserImportListener.java @@ -1,21 +1,21 @@ -package org.dromara.system.listener; +package net.rzdata.system.listener; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.excel.core.ExcelListener; -import org.dromara.common.excel.core.ExcelResult; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserImportVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.service.ISysConfigService; -import org.dromara.system.service.ISysUserService; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.ValidatorUtils; +import net.rzdata.common.excel.core.ExcelListener; +import net.rzdata.common.excel.core.ExcelResult; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.domain.vo.SysUserImportVo; +import net.rzdata.system.domain.vo.SysUserVo; +import net.rzdata.system.service.ISysConfigService; +import net.rzdata.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/src/main/java/net/rzdata/system/mapper/SysClientMapper.java b/src/main/java/net/rzdata/system/mapper/SysClientMapper.java new file mode 100644 index 0000000..b09aeb3 --- /dev/null +++ b/src/main/java/net/rzdata/system/mapper/SysClientMapper.java @@ -0,0 +1,15 @@ +package net.rzdata.system.mapper; + +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysClient; +import net.rzdata.system.domain.vo.SysClientVo; + +/** + * 授权管理Mapper接口 + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +public interface SysClientMapper extends BaseMapperPlus { + +} diff --git a/src/main/java/net/rzdata/system/mapper/SysConfigMapper.java b/src/main/java/net/rzdata/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..d14f603 --- /dev/null +++ b/src/main/java/net/rzdata/system/mapper/SysConfigMapper.java @@ -0,0 +1,14 @@ +package net.rzdata.system.mapper; + +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysConfig; +import net.rzdata.system.domain.vo.SysConfigVo; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +public interface SysConfigMapper extends BaseMapperPlus { + +} diff --git a/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/src/main/java/net/rzdata/system/mapper/SysDictDataMapper.java similarity index 72% rename from src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to src/main/java/net/rzdata/system/mapper/SysDictDataMapper.java index c2f1a7c..c3f49ec 100644 --- a/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java +++ b/src/main/java/net/rzdata/system/mapper/SysDictDataMapper.java @@ -1,9 +1,9 @@ -package org.dromara.system.mapper; +package net.rzdata.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.vo.SysDictDataVo; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysDictData; +import net.rzdata.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/src/main/java/net/rzdata/system/mapper/SysDictTypeMapper.java b/src/main/java/net/rzdata/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..ca88e96 --- /dev/null +++ b/src/main/java/net/rzdata/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,14 @@ +package net.rzdata.system.mapper; + +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysDictType; +import net.rzdata.system.domain.vo.SysDictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictTypeMapper extends BaseMapperPlus { + +} diff --git a/src/main/java/net/rzdata/system/mapper/SysLogininforMapper.java b/src/main/java/net/rzdata/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..10e2d31 --- /dev/null +++ b/src/main/java/net/rzdata/system/mapper/SysLogininforMapper.java @@ -0,0 +1,14 @@ +package net.rzdata.system.mapper; + +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysLogininfor; +import net.rzdata.system.domain.vo.SysLogininforVo; + +/** + * 系统访问日志情况信息 数据层 + * + * @author Lion Li + */ +public interface SysLogininforMapper extends BaseMapperPlus { + +} diff --git a/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/src/main/java/net/rzdata/system/mapper/SysMenuMapper.java similarity index 89% rename from src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to src/main/java/net/rzdata/system/mapper/SysMenuMapper.java index b2be0e9..b7b20cf 100644 --- a/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/src/main/java/net/rzdata/system/mapper/SysMenuMapper.java @@ -1,12 +1,12 @@ -package org.dromara.system.mapper; +package net.rzdata.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.system.domain.SysMenu; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysMenuVo; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysMenu; +import net.rzdata.system.domain.vo.SysMenuVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/src/main/java/net/rzdata/system/mapper/SysRoleMapper.java similarity index 84% rename from src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to src/main/java/net/rzdata/system/mapper/SysRoleMapper.java index 0c74c51..b268324 100644 --- a/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/src/main/java/net/rzdata/system/mapper/SysRoleMapper.java @@ -1,13 +1,13 @@ -package org.dromara.system.mapper; +package net.rzdata.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.vo.SysRoleVo; +import net.rzdata.common.mybatis.annotation.DataColumn; +import net.rzdata.common.mybatis.annotation.DataPermission; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysRole; +import net.rzdata.system.domain.vo.SysRoleVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/src/main/java/net/rzdata/system/mapper/SysRoleMenuMapper.java similarity index 52% rename from src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to src/main/java/net/rzdata/system/mapper/SysRoleMenuMapper.java index 0a657b4..8203d68 100644 --- a/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/net/rzdata/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package net.rzdata.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysRoleMenu; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/src/main/java/net/rzdata/system/mapper/SysUserMapper.java similarity index 90% rename from src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to src/main/java/net/rzdata/system/mapper/SysUserMapper.java index d6913fd..5d26ede 100644 --- a/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/src/main/java/net/rzdata/system/mapper/SysUserMapper.java @@ -1,14 +1,14 @@ -package org.dromara.system.mapper; +package net.rzdata.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import net.rzdata.common.mybatis.annotation.DataColumn; +import net.rzdata.common.mybatis.annotation.DataPermission; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserVo; +import net.rzdata.system.domain.SysUser; +import net.rzdata.system.domain.vo.SysUserVo; import java.util.List; diff --git a/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/src/main/java/net/rzdata/system/mapper/SysUserRoleMapper.java similarity index 62% rename from src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to src/main/java/net/rzdata/system/mapper/SysUserRoleMapper.java index e2f706c..5764e9d 100644 --- a/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/net/rzdata/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package org.dromara.system.mapper; +package net.rzdata.system.mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysUserRole; +import net.rzdata.common.mybatis.core.mapper.BaseMapperPlus; +import net.rzdata.system.domain.SysUserRole; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/ISysClientService.java b/src/main/java/net/rzdata/system/service/ISysClientService.java similarity index 77% rename from src/main/java/org/dromara/system/service/ISysClientService.java rename to src/main/java/net/rzdata/system/service/ISysClientService.java index db48d4b..c37a590 100644 --- a/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/src/main/java/net/rzdata/system/service/ISysClientService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.SysClient; +import net.rzdata.system.domain.vo.SysClientVo; +import net.rzdata.system.domain.bo.SysClientBo; import java.util.Collection; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/ISysConfigService.java b/src/main/java/net/rzdata/system/service/ISysConfigService.java similarity index 86% rename from src/main/java/org/dromara/system/service/ISysConfigService.java rename to src/main/java/net/rzdata/system/service/ISysConfigService.java index 82eb3b0..5593841 100644 --- a/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/src/main/java/net/rzdata/system/service/ISysConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.bo.SysConfigBo; +import net.rzdata.system.domain.vo.SysConfigVo; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/src/main/java/net/rzdata/system/service/ISysDataScopeService.java similarity index 87% rename from src/main/java/org/dromara/system/service/ISysDataScopeService.java rename to src/main/java/net/rzdata/system/service/ISysDataScopeService.java index 9fb291c..886434f 100644 --- a/src/main/java/org/dromara/system/service/ISysDataScopeService.java +++ b/src/main/java/net/rzdata/system/service/ISysDataScopeService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package net.rzdata.system.service; /** * 通用 数据权限 服务 diff --git a/src/main/java/org/dromara/system/service/ISysDictDataService.java b/src/main/java/net/rzdata/system/service/ISysDictDataService.java similarity index 84% rename from src/main/java/org/dromara/system/service/ISysDictDataService.java rename to src/main/java/net/rzdata/system/service/ISysDictDataService.java index 30442ce..2fe2ca7 100644 --- a/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/src/main/java/net/rzdata/system/service/ISysDictDataService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.bo.SysDictDataBo; +import net.rzdata.system.domain.vo.SysDictDataVo; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/src/main/java/net/rzdata/system/service/ISysDictTypeService.java similarity index 86% rename from src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to src/main/java/net/rzdata/system/service/ISysDictTypeService.java index 3b32d6c..bdd32e3 100644 --- a/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/src/main/java/net/rzdata/system/service/ISysDictTypeService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.bo.SysDictTypeBo; +import net.rzdata.system.domain.vo.SysDictDataVo; +import net.rzdata.system.domain.vo.SysDictTypeVo; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/ISysLogininforService.java b/src/main/java/net/rzdata/system/service/ISysLogininforService.java similarity index 77% rename from src/main/java/org/dromara/system/service/ISysLogininforService.java rename to src/main/java/net/rzdata/system/service/ISysLogininforService.java index 6b3b7a6..84b2844 100644 --- a/src/main/java/org/dromara/system/service/ISysLogininforService.java +++ b/src/main/java/net/rzdata/system/service/ISysLogininforService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.bo.SysLogininforBo; +import net.rzdata.system.domain.vo.SysLogininforVo; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/ISysMenuService.java b/src/main/java/net/rzdata/system/service/ISysMenuService.java similarity index 93% rename from src/main/java/org/dromara/system/service/ISysMenuService.java rename to src/main/java/net/rzdata/system/service/ISysMenuService.java index 72d705e..59d9378 100644 --- a/src/main/java/org/dromara/system/service/ISysMenuService.java +++ b/src/main/java/net/rzdata/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package net.rzdata.system.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; +import net.rzdata.system.domain.SysMenu; +import net.rzdata.system.domain.bo.SysMenuBo; +import net.rzdata.system.domain.vo.RouterVo; +import net.rzdata.system.domain.vo.SysMenuVo; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/dromara/system/service/ISysPermissionService.java b/src/main/java/net/rzdata/system/service/ISysPermissionService.java similarity index 92% rename from src/main/java/org/dromara/system/service/ISysPermissionService.java rename to src/main/java/net/rzdata/system/service/ISysPermissionService.java index 0116df5..bb3e05e 100644 --- a/src/main/java/org/dromara/system/service/ISysPermissionService.java +++ b/src/main/java/net/rzdata/system/service/ISysPermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.system.service; +package net.rzdata.system.service; import java.util.Set; diff --git a/src/main/java/org/dromara/system/service/ISysRoleService.java b/src/main/java/net/rzdata/system/service/ISysRoleService.java similarity index 92% rename from src/main/java/org/dromara/system/service/ISysRoleService.java rename to src/main/java/net/rzdata/system/service/ISysRoleService.java index d2ee61f..3f2814e 100644 --- a/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/src/main/java/net/rzdata/system/service/ISysRoleService.java @@ -1,10 +1,10 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.SysUserRole; +import net.rzdata.system.domain.bo.SysRoleBo; +import net.rzdata.system.domain.vo.SysRoleVo; import java.util.List; import java.util.Set; diff --git a/src/main/java/org/dromara/system/service/ISysUserService.java b/src/main/java/net/rzdata/system/service/ISysUserService.java similarity index 94% rename from src/main/java/org/dromara/system/service/ISysUserService.java rename to src/main/java/net/rzdata/system/service/ISysUserService.java index d8be432..73c43a9 100644 --- a/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/src/main/java/net/rzdata/system/service/ISysUserService.java @@ -1,9 +1,9 @@ -package org.dromara.system.service; +package net.rzdata.system.service; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysUserVo; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.domain.vo.SysUserVo; import java.util.List; diff --git a/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysClientServiceImpl.java similarity index 89% rename from src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysClientServiceImpl.java index aecaf66..204346d 100644 --- a/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.bo.SysClientBo; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.system.mapper.SysClientMapper; -import org.dromara.system.service.ISysClientService; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.SysClient; +import net.rzdata.system.domain.bo.SysClientBo; +import net.rzdata.system.domain.vo.SysClientVo; +import net.rzdata.system.mapper.SysClientMapper; +import net.rzdata.system.service.ISysClientService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysConfigServiceImpl.java similarity index 89% rename from src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysConfigServiceImpl.java index b64f4af..a0ff7df 100644 --- a/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; @@ -7,21 +7,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.ConfigService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.bo.SysConfigBo; -import org.dromara.system.domain.vo.SysConfigVo; -import org.dromara.system.mapper.SysConfigMapper; -import org.dromara.system.service.ISysConfigService; +import net.rzdata.common.core.constant.CacheNames; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.service.ConfigService; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.SysConfig; +import net.rzdata.common.redis.utils.CacheUtils; +import net.rzdata.system.domain.bo.SysConfigBo; +import net.rzdata.system.domain.vo.SysConfigVo; +import net.rzdata.system.mapper.SysConfigMapper; +import net.rzdata.system.service.ISysConfigService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysDictDataServiceImpl.java similarity index 85% rename from src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysDictDataServiceImpl.java index 74d4454..1661b36 100644 --- a/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysDictDataServiceImpl.java @@ -1,20 +1,20 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.domain.SysDictData; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.bo.SysDictDataBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.service.ISysDictDataService; +import net.rzdata.common.core.constant.CacheNames; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.SysDictData; +import net.rzdata.common.redis.utils.CacheUtils; +import net.rzdata.system.domain.bo.SysDictDataBo; +import net.rzdata.system.domain.vo.SysDictDataVo; +import net.rzdata.system.mapper.SysDictDataMapper; +import net.rzdata.system.service.ISysDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysDictTypeServiceImpl.java similarity index 89% rename from src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysDictTypeServiceImpl.java index 346d6bc..c1c6b3c 100644 --- a/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.dev33.satoken.context.SaHolder; import cn.hutool.core.collection.CollUtil; @@ -7,25 +7,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.domain.SysDictData; -import org.dromara.system.domain.SysDictType; -import org.dromara.system.domain.bo.SysDictTypeBo; -import org.dromara.system.domain.vo.SysDictDataVo; -import org.dromara.system.domain.vo.SysDictTypeVo; -import org.dromara.system.mapper.SysDictDataMapper; -import org.dromara.system.mapper.SysDictTypeMapper; -import org.dromara.system.service.ISysDictTypeService; +import net.rzdata.common.core.constant.CacheConstants; +import net.rzdata.common.core.constant.CacheNames; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.service.DictService; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.system.domain.SysDictData; +import net.rzdata.system.domain.SysDictType; +import net.rzdata.common.redis.utils.CacheUtils; +import net.rzdata.system.domain.bo.SysDictTypeBo; +import net.rzdata.system.domain.vo.SysDictDataVo; +import net.rzdata.system.domain.vo.SysDictTypeVo; +import net.rzdata.system.mapper.SysDictDataMapper; +import net.rzdata.system.mapper.SysDictTypeMapper; +import net.rzdata.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysLogininforServiceImpl.java similarity index 87% rename from src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysLogininforServiceImpl.java index c642851..b57ca2f 100644 --- a/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysLogininforServiceImpl.java @@ -1,26 +1,26 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.bo.SysLogininforBo; -import org.dromara.system.domain.vo.SysLogininforVo; -import org.dromara.system.mapper.SysLogininforMapper; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysLogininforService; +import net.rzdata.common.core.constant.Constants; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.ip.AddressUtils; +import net.rzdata.common.log.event.LogininforEvent; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysLogininfor; +import net.rzdata.system.domain.SysClient; +import net.rzdata.system.domain.bo.SysLogininforBo; +import net.rzdata.system.domain.vo.SysLogininforVo; +import net.rzdata.system.mapper.SysLogininforMapper; +import net.rzdata.system.service.ISysClientService; +import net.rzdata.system.service.ISysLogininforService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysMenuServiceImpl.java similarity index 92% rename from src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysMenuServiceImpl.java index 5fd6af9..53a4a27 100644 --- a/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -8,23 +8,23 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysMenu; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.bo.SysMenuBo; -import org.dromara.system.domain.vo.MetaVo; -import org.dromara.system.domain.vo.RouterVo; -import org.dromara.system.domain.vo.SysMenuVo; -import org.dromara.system.mapper.SysMenuMapper; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.service.ISysMenuService; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.TreeBuildUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysMenu; +import net.rzdata.system.domain.SysRoleMenu; +import net.rzdata.system.domain.SysRole; +import net.rzdata.system.domain.bo.SysMenuBo; +import net.rzdata.system.domain.vo.MetaVo; +import net.rzdata.system.domain.vo.RouterVo; +import net.rzdata.system.domain.vo.SysMenuVo; +import net.rzdata.system.mapper.SysMenuMapper; +import net.rzdata.system.mapper.SysRoleMapper; +import net.rzdata.system.mapper.SysRoleMenuMapper; +import net.rzdata.system.service.ISysMenuService; import org.springframework.stereotype.Service; import java.util.*; diff --git a/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysPermissionServiceImpl.java similarity index 81% rename from src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysPermissionServiceImpl.java index 9852821..1f719cf 100644 --- a/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysPermissionServiceImpl.java @@ -1,10 +1,10 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.service.ISysMenuService; -import org.dromara.system.service.ISysPermissionService; -import org.dromara.system.service.ISysRoleService; +import net.rzdata.common.core.constant.TenantConstants; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.service.ISysMenuService; +import net.rzdata.system.service.ISysPermissionService; +import net.rzdata.system.service.ISysRoleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysRoleServiceImpl.java similarity index 93% rename from src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysRoleServiceImpl.java index 4f0b105..e2f50f8 100644 --- a/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -12,25 +12,25 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysRoleBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysRoleMenuMapper; -import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.service.ISysRoleService; +import net.rzdata.common.core.constant.TenantConstants; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysRoleMenu; +import net.rzdata.system.domain.SysUserRole; +import net.rzdata.system.domain.SysRole; +import net.rzdata.system.domain.bo.SysRoleBo; +import net.rzdata.system.domain.vo.SysRoleVo; +import net.rzdata.system.mapper.SysRoleMapper; +import net.rzdata.system.mapper.SysRoleMenuMapper; +import net.rzdata.system.mapper.SysUserRoleMapper; +import net.rzdata.system.service.ISysRoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysSensitiveServiceImpl.java similarity index 83% rename from src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysSensitiveServiceImpl.java index 3285af0..817edb6 100644 --- a/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysSensitiveServiceImpl.java @@ -1,9 +1,9 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.dev33.satoken.stp.StpUtil; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.sensitive.core.SensitiveService; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.common.sensitive.core.SensitiveService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/src/main/java/net/rzdata/system/service/impl/SysUserServiceImpl.java similarity index 93% rename from src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to src/main/java/net/rzdata/system/service/impl/SysUserServiceImpl.java index 2f227a3..7dd2de6 100644 --- a/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/net/rzdata/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.service.impl; +package net.rzdata.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; @@ -11,25 +11,25 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.SysUserRole; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.SysRoleVo; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysRoleMapper; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.mapper.SysUserRoleMapper; -import org.dromara.system.service.ISysUserService; +import net.rzdata.common.core.constant.CacheNames; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.service.UserService; +import net.rzdata.common.core.utils.MapstructUtils; +import net.rzdata.common.core.utils.StreamUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.mybatis.core.page.PageQuery; +import net.rzdata.common.mybatis.core.page.TableDataInfo; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysUserRole; +import net.rzdata.system.domain.SysUser; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.domain.vo.SysRoleVo; +import net.rzdata.system.domain.vo.SysUserVo; +import net.rzdata.system.mapper.SysRoleMapper; +import net.rzdata.system.mapper.SysUserMapper; +import net.rzdata.system.mapper.SysUserRoleMapper; +import net.rzdata.system.service.ISysUserService; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/dromara/web/controller/AuthController.java b/src/main/java/net/rzdata/web/controller/AuthController.java similarity index 72% rename from src/main/java/org/dromara/web/controller/AuthController.java rename to src/main/java/net/rzdata/web/controller/AuthController.java index 140862d..26552f5 100644 --- a/src/main/java/org/dromara/web/controller/AuthController.java +++ b/src/main/java/net/rzdata/web/controller/AuthController.java @@ -1,27 +1,27 @@ -package org.dromara.web.controller; +package net.rzdata.web.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.LoginBody; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.common.websocket.utils.WebSocketUtils; -import org.dromara.system.domain.SysClient; -import org.dromara.system.service.ISysClientService; -import org.dromara.system.service.ISysConfigService; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.dromara.web.service.SysRegisterService; +import net.rzdata.common.core.constant.UserConstants; +import net.rzdata.common.core.domain.R; +import net.rzdata.common.core.domain.model.LoginBody; +import net.rzdata.common.core.domain.model.RegisterBody; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.core.utils.StringUtils; +import net.rzdata.common.core.utils.ValidatorUtils; +import net.rzdata.common.websocket.utils.WebSocketUtils; +import net.rzdata.web.service.SysLoginService; +import net.rzdata.common.encrypt.annotation.ApiEncrypt; +import net.rzdata.common.json.utils.JsonUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysClient; +import net.rzdata.system.service.ISysClientService; +import net.rzdata.system.service.ISysConfigService; +import net.rzdata.web.domain.vo.LoginVo; +import net.rzdata.web.service.IAuthStrategy; +import net.rzdata.web.service.SysRegisterService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -77,7 +77,7 @@ public class AuthController { Long userId = LoginHelper.getUserId(); scheduledExecutorService.schedule(() -> { - WebSocketUtils.sendMessage(userId, "欢迎登录RuoYi-Vue-Plus后台管理系统"); + WebSocketUtils.sendMessage(userId, "欢迎登录后台管理系统"); }, 3, TimeUnit.SECONDS); return R.ok(loginVo); } diff --git a/src/main/java/org/dromara/web/controller/IndexController.java b/src/main/java/net/rzdata/web/controller/IndexController.java similarity index 65% rename from src/main/java/org/dromara/web/controller/IndexController.java rename to src/main/java/net/rzdata/web/controller/IndexController.java index c444f28..dc706e9 100644 --- a/src/main/java/org/dromara/web/controller/IndexController.java +++ b/src/main/java/net/rzdata/web/controller/IndexController.java @@ -1,8 +1,8 @@ -package org.dromara.web.controller; +package net.rzdata.web.controller; import cn.dev33.satoken.annotation.SaIgnore; -import org.dromara.common.core.config.RuoYiConfig; -import org.dromara.common.core.utils.StringUtils; +import net.rzdata.common.core.config.DemoConfig; +import net.rzdata.common.core.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -20,13 +20,13 @@ public class IndexController { /** * 系统基础配置 */ - private final RuoYiConfig ruoyiConfig; + private final DemoConfig demoConfig; /** * 访问首页，提示语 */ @GetMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", demoConfig.getName(), demoConfig.getVersion()); } } diff --git a/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/src/main/java/net/rzdata/web/domain/vo/LoginVo.java similarity index 96% rename from src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to src/main/java/net/rzdata/web/domain/vo/LoginVo.java index 834afe5..7d0bb78 100644 --- a/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ b/src/main/java/net/rzdata/web/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package net.rzdata.web.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/src/main/java/org/dromara/web/listener/UserActionListener.java b/src/main/java/net/rzdata/web/listener/UserActionListener.java similarity index 86% rename from src/main/java/org/dromara/web/listener/UserActionListener.java rename to src/main/java/net/rzdata/web/listener/UserActionListener.java index caf2b49..1d56314 100644 --- a/src/main/java/org/dromara/web/listener/UserActionListener.java +++ b/src/main/java/net/rzdata/web/listener/UserActionListener.java @@ -1,4 +1,4 @@ -package org.dromara.web.listener; +package net.rzdata.web.listener; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.listener.SaTokenListener; @@ -7,18 +7,18 @@ import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheConstants; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.domain.dto.UserOnlineDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.web.service.SysLoginService; +import net.rzdata.common.core.constant.CacheConstants; +import net.rzdata.common.core.constant.Constants; +import net.rzdata.common.core.domain.dto.UserOnlineDTO; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.core.utils.ip.AddressUtils; +import net.rzdata.common.log.event.LogininforEvent; +import net.rzdata.web.service.SysLoginService; +import net.rzdata.common.redis.utils.RedisUtils; +import net.rzdata.common.satoken.utils.LoginHelper; import org.springframework.stereotype.Component; import java.time.Duration; diff --git a/src/main/java/org/dromara/web/service/IAuthStrategy.java b/src/main/java/net/rzdata/web/service/IAuthStrategy.java similarity index 74% rename from src/main/java/org/dromara/web/service/IAuthStrategy.java rename to src/main/java/net/rzdata/web/service/IAuthStrategy.java index d4f9c73..8d0a989 100644 --- a/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/src/main/java/net/rzdata/web/service/IAuthStrategy.java @@ -1,10 +1,10 @@ -package org.dromara.web.service; +package net.rzdata.web.service; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.system.domain.SysClient; -import org.dromara.web.domain.vo.LoginVo; +import net.rzdata.common.core.exception.ServiceException; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.web.domain.vo.LoginVo; +import net.rzdata.system.domain.SysClient; /** * 授权策略 diff --git a/src/main/java/org/dromara/web/service/SysLoginService.java b/src/main/java/net/rzdata/web/service/SysLoginService.java similarity index 82% rename from src/main/java/org/dromara/web/service/SysLoginService.java rename to src/main/java/net/rzdata/web/service/SysLoginService.java index ae95992..b758813 100644 --- a/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/src/main/java/net/rzdata/web/service/SysLoginService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package net.rzdata.web.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -6,24 +6,24 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.GlobalConstants; -import org.dromara.common.core.domain.dto.RoleDTO; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.DateUtils; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.common.mybatis.helper.DataPermissionHelper; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysPermissionService; +import net.rzdata.common.core.constant.Constants; +import net.rzdata.common.core.constant.GlobalConstants; +import net.rzdata.common.core.domain.dto.RoleDTO; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.exception.user.UserException; +import net.rzdata.common.core.utils.DateUtils; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.log.event.LogininforEvent; +import net.rzdata.common.core.enums.LoginType; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.mybatis.helper.DataPermissionHelper; +import net.rzdata.common.redis.utils.RedisUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysUser; +import net.rzdata.system.domain.vo.SysUserVo; +import net.rzdata.system.mapper.SysUserMapper; +import net.rzdata.system.service.ISysPermissionService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/dromara/web/service/SysRegisterService.java b/src/main/java/net/rzdata/web/service/SysRegisterService.java similarity index 77% rename from src/main/java/org/dromara/web/service/SysRegisterService.java rename to src/main/java/net/rzdata/web/service/SysRegisterService.java index 767e870..35d769e 100644 --- a/src/main/java/org/dromara/web/service/SysRegisterService.java +++ b/src/main/java/net/rzdata/web/service/SysRegisterService.java @@ -1,21 +1,21 @@ -package org.dromara.web.service; +package net.rzdata.web.service; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.enums.UserType; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.ServletUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.log.event.LogininforEvent; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.system.service.ISysUserService; +import net.rzdata.common.core.constant.Constants; +import net.rzdata.common.core.domain.model.RegisterBody; +import net.rzdata.common.core.enums.UserType; +import net.rzdata.common.core.exception.user.UserException; +import net.rzdata.common.core.utils.MessageUtils; +import net.rzdata.common.core.utils.ServletUtils; +import net.rzdata.common.core.utils.SpringUtils; +import net.rzdata.common.log.event.LogininforEvent; +import net.rzdata.system.domain.SysUser; +import net.rzdata.system.domain.bo.SysUserBo; +import net.rzdata.system.mapper.SysUserMapper; +import net.rzdata.system.service.ISysUserService; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/src/main/java/net/rzdata/web/service/impl/PasswordAuthStrategy.java similarity index 78% rename from src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to src/main/java/net/rzdata/web/service/impl/PasswordAuthStrategy.java index d4ca7ca..14e7192 100644 --- a/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/src/main/java/net/rzdata/web/service/impl/PasswordAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package net.rzdata.web.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.SaLoginModel; @@ -7,21 +7,21 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.domain.model.LoginUser; -import org.dromara.common.core.domain.model.PasswordLoginBody; -import org.dromara.common.core.enums.LoginType; -import org.dromara.common.core.enums.UserStatus; -import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.ValidatorUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import net.rzdata.common.core.domain.model.LoginUser; +import net.rzdata.common.core.domain.model.PasswordLoginBody; +import net.rzdata.common.core.enums.LoginType; +import net.rzdata.common.core.enums.UserStatus; +import net.rzdata.common.core.exception.user.UserException; +import net.rzdata.common.core.utils.ValidatorUtils; +import net.rzdata.web.service.SysLoginService; +import net.rzdata.common.json.utils.JsonUtils; +import net.rzdata.common.satoken.utils.LoginHelper; +import net.rzdata.system.domain.SysClient; +import net.rzdata.system.domain.SysUser; +import net.rzdata.system.domain.vo.SysUserVo; +import net.rzdata.system.mapper.SysUserMapper; +import net.rzdata.web.domain.vo.LoginVo; +import net.rzdata.web.service.IAuthStrategy; import org.springframework.stereotype.Service; /** diff --git a/src/main/java/org/dromara/demo/controller/package-info.java b/src/main/java/org/dromara/demo/controller/package-info.java deleted file mode 100644 index 16c30f8..0000000 --- a/src/main/java/org/dromara/demo/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.controller; diff --git a/src/main/java/org/dromara/demo/domain/package-info.java b/src/main/java/org/dromara/demo/domain/package-info.java deleted file mode 100644 index cb7d83f..0000000 --- a/src/main/java/org/dromara/demo/domain/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.domain; diff --git a/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java b/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java deleted file mode 100644 index 65f51b8..0000000 --- a/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.dromara.demo.mapper; - -import org.dromara.common.mybatis.annotation.DataColumn; -import org.dromara.common.mybatis.annotation.DataPermission; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.demo.domain.TestTree; -import org.dromara.demo.domain.vo.TestTreeVo; - -/** - * 测试树表Mapper接口 - * - * @author Lion Li - * @date 2021-07-26 - */ -@DataPermission({ - @DataColumn(key = "userName", value = "user_id") -}) -public interface TestTreeMapper extends BaseMapperPlus { - -} diff --git a/src/main/java/org/dromara/demo/mapper/package-info.java b/src/main/java/org/dromara/demo/mapper/package-info.java deleted file mode 100644 index ff1c4df..0000000 --- a/src/main/java/org/dromara/demo/mapper/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.mapper; diff --git a/src/main/java/org/dromara/demo/service/impl/package-info.java b/src/main/java/org/dromara/demo/service/impl/package-info.java deleted file mode 100644 index 7011984..0000000 --- a/src/main/java/org/dromara/demo/service/impl/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.service.impl; diff --git a/src/main/java/org/dromara/demo/service/package-info.java b/src/main/java/org/dromara/demo/service/package-info.java deleted file mode 100644 index 16727ff..0000000 --- a/src/main/java/org/dromara/demo/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.dromara.demo.service; diff --git a/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/src/main/java/org/dromara/system/mapper/SysClientMapper.java deleted file mode 100644 index 15bcfb4..0000000 --- a/src/main/java/org/dromara/system/mapper/SysClientMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysClient; -import org.dromara.system.domain.vo.SysClientVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 授权管理Mapper接口 - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -public interface SysClientMapper extends BaseMapperPlus { - -} diff --git a/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/src/main/java/org/dromara/system/mapper/SysConfigMapper.java deleted file mode 100644 index 0eaaee8..0000000 --- a/src/main/java/org/dromara/system/mapper/SysConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysConfig; -import org.dromara.system.domain.vo.SysConfigVo; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -public interface SysConfigMapper extends BaseMapperPlus { - -} diff --git a/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java deleted file mode 100644 index 9a9bdd5..0000000 --- a/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.system.domain.SysDictType; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.vo.SysDictTypeVo; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictTypeMapper extends BaseMapperPlus { - -} diff --git a/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java deleted file mode 100644 index 85edd1d..0000000 --- a/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.domain.SysLogininfor; -import org.dromara.system.domain.vo.SysLogininforVo; - -/** - * 系统访问日志情况信息 数据层 - * - * @author Lion Li - */ -public interface SysLogininforMapper extends BaseMapperPlus { - -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dcffb01..ad3b8fa 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: demo password: 123456 --- # 数据源配置 @@ -98,7 +98,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: ${demo.name} # 最小空闲连接数 connectionMinimumIdleSize: 8 # 连接池大小 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 174510f..5670755 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ --- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp +spring.servlet.multipart.location: /demo/server/temp --- # 监控中心配置 spring.boot.admin.client: @@ -8,7 +8,7 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: demo password: 123456 --- # 数据源配置 @@ -101,7 +101,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: ${demo.name} # 最小空闲连接数 connectionMinimumIdleSize: 32 # 连接池大小 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 37552cf..dd60d5e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 -ruoyi: +demo: # 名称 - name: RuoYi-Vue-Plus + name: demo # 版本 version: ${revision} # 版权年份 @@ -32,7 +32,7 @@ server: # 日志配置 logging: level: - org.dromara: @logging.level@ + net.rzdata: @logging.level@ org.springframework: warn tech.powerjob.worker.background: warn config: classpath:logback-plus.xml @@ -48,7 +48,7 @@ user: # Spring配置 spring: application: - name: ${ruoyi.name} + name: ${demo.name} # 资源信息 messages: # 国际化资源文件路径 @@ -112,11 +112,11 @@ security: mybatis-plus: # 不支持多包, 如有需要可在注解配置 或 提升扫包等级 # 例如 com.**.**.mapper - mapperPackage: org.dromara.**.mapper + mapperPackage: net.rzdata.**.mapper # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: org.dromara.**.domain + typeAliasesPackage: net.rzdata.**.domain global-config: dbConfig: # 主键类型 @@ -160,16 +160,11 @@ springdoc: # persistAuthorization: true info: # 标题 - title: '标题：${ruoyi.name}多租户管理系统_接口文档' + title: '标题：${demo.name}多租户管理系统_接口文档' # 描述 description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' # 版本 - version: '版本号: ${ruoyi.version}' - # 作者信息 - contact: - name: Lion Li - email: crazylionli@163.com - url: https://gitee.com/dromara/RuoYi-Vue-Plus + version: '版本号: ${demo.version}' components: # 鉴权方式配置 security-schemes: @@ -180,13 +175,13 @@ springdoc: #这里定义了两个分组，可定义多个，也可以不定义 group-configs: - group: 1.演示模块 - packages-to-scan: org.dromara.demo + packages-to-scan: net.rzdata.demo - group: 2.通用模块 - packages-to-scan: org.dromara.web + packages-to-scan: net.rzdata.web - group: 3.系统模块 - packages-to-scan: org.dromara.system + packages-to-scan: net.rzdata.system - group: 4.代码生成模块 - packages-to-scan: org.dromara.generator + packages-to-scan: net.rzdata.generator # 防止XSS攻击 xss: diff --git a/src/main/resources/mapper/demo/TestDemoMapper.xml b/src/main/resources/mapper/demo/TestDemoMapper.xml index dbf89a3..f9309d1 100644 --- a/src/main/resources/mapper/demo/TestDemoMapper.xml +++ b/src/main/resources/mapper/demo/TestDemoMapper.xml @@ -2,9 +2,9 @@ - + - SELECT * FROM test_demo ${ew.customSqlSegment} diff --git a/src/main/resources/mapper/demo/TestTreeMapper.xml b/src/main/resources/mapper/demo/TestTreeMapper.xml index d7975ec..106b789 100644 --- a/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/SysClientMapper.xml b/src/main/resources/mapper/system/SysClientMapper.xml index fd150ad..b7c4348 100644 --- a/src/main/resources/mapper/system/SysClientMapper.xml +++ b/src/main/resources/mapper/system/SysClientMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/SysConfigMapper.xml b/src/main/resources/mapper/system/SysConfigMapper.xml index e542a10..8b0bc4b 100644 --- a/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/SysDictDataMapper.xml b/src/main/resources/mapper/system/SysDictDataMapper.xml index 6bcce51..6948352 100644 --- a/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/SysDictTypeMapper.xml b/src/main/resources/mapper/system/SysDictTypeMapper.xml index 6975da4..86b9372 100644 --- a/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/SysLogininforMapper.xml b/src/main/resources/mapper/system/SysLogininforMapper.xml index c64b551..2af7312 100644 --- a/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/src/main/resources/mapper/system/SysMenuMapper.xml b/src/main/resources/mapper/system/SysMenuMapper.xml index fad1812..3adb152 100644 --- a/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,9 +2,9 @@ - + - + select u.user_id from sys_user u diff --git a/src/test/java/org/dromara/test/AssertUnitTest.java b/src/test/java/net/rzdata/test/AssertUnitTest.java similarity index 97% rename from src/test/java/org/dromara/test/AssertUnitTest.java rename to src/test/java/net/rzdata/test/AssertUnitTest.java index dba2323..11c62a6 100644 --- a/src/test/java/org/dromara/test/AssertUnitTest.java +++ b/src/test/java/net/rzdata/test/AssertUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package net.rzdata.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/dromara/test/DemoUnitTest.java b/src/test/java/net/rzdata/test/DemoUnitTest.java similarity index 86% rename from src/test/java/org/dromara/test/DemoUnitTest.java rename to src/test/java/net/rzdata/test/DemoUnitTest.java index 5b3dfdc..52ed3dc 100644 --- a/src/test/java/org/dromara/test/DemoUnitTest.java +++ b/src/test/java/net/rzdata/test/DemoUnitTest.java @@ -1,6 +1,6 @@ -package org.dromara.test; +package net.rzdata.test; -import org.dromara.common.core.config.RuoYiConfig; +import net.rzdata.common.core.config.DemoConfig; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -17,19 +17,19 @@ import java.util.concurrent.TimeUnit; public class DemoUnitTest { @Autowired - private RuoYiConfig ruoYiConfig; + private DemoConfig demoConfig; @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") @Test public void testTest() { - System.out.println(ruoYiConfig); + System.out.println(demoConfig); } @Disabled @DisplayName("测试 @Disabled 注解") @Test public void testDisabled() { - System.out.println(ruoYiConfig); + System.out.println(demoConfig); } @Timeout(value = 2L, unit = TimeUnit.SECONDS) @@ -37,7 +37,7 @@ public class DemoUnitTest { @Test public void testTimeout() throws InterruptedException { Thread.sleep(3000); - System.out.println(ruoYiConfig); + System.out.println(demoConfig); } diff --git a/src/test/java/org/dromara/test/ParamUnitTest.java b/src/test/java/net/rzdata/test/ParamUnitTest.java similarity index 96% rename from src/test/java/org/dromara/test/ParamUnitTest.java rename to src/test/java/net/rzdata/test/ParamUnitTest.java index 1db51df..6871b16 100644 --- a/src/test/java/org/dromara/test/ParamUnitTest.java +++ b/src/test/java/net/rzdata/test/ParamUnitTest.java @@ -1,6 +1,6 @@ -package org.dromara.test; +package net.rzdata.test; -import org.dromara.common.core.enums.UserType; +import net.rzdata.common.core.enums.UserType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/org/dromara/test/TagUnitTest.java b/src/test/java/net/rzdata/test/TagUnitTest.java similarity index 97% rename from src/test/java/org/dromara/test/TagUnitTest.java rename to src/test/java/net/rzdata/test/TagUnitTest.java index b50afa6..1003d73 100644 --- a/src/test/java/org/dromara/test/TagUnitTest.java +++ b/src/test/java/net/rzdata/test/TagUnitTest.java @@ -1,4 +1,4 @@ -package org.dromara.test; +package net.rzdata.test; import org.junit.jupiter.api.*; import org.springframework.boot.test.context.SpringBootTest;