修改包名
This commit is contained in:
parent
635725e36c
commit
98e278dd39
14
Dockerfile
14
Dockerfile
@ -3,22 +3,22 @@ FROM openjdk:17.0.2-oraclelinux8
|
|||||||
|
|
||||||
MAINTAINER Lion Li
|
MAINTAINER Lion Li
|
||||||
|
|
||||||
RUN mkdir -p /ruoyi/server/logs \
|
RUN mkdir -p /demo/server/logs \
|
||||||
/ruoyi/server/temp \
|
/demo/server/temp \
|
||||||
/ruoyi/skywalking/agent
|
/demo/skywalking/agent
|
||||||
|
|
||||||
WORKDIR /ruoyi/server
|
WORKDIR /demo/server
|
||||||
|
|
||||||
ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
|
ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
|
||||||
|
|
||||||
EXPOSE ${SERVER_PORT}
|
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} \
|
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
|
||||||
# 应用名称 如果想区分集群节点监控 改成不同的名称即可
|
# 应用名称 如果想区分集群节点监控 改成不同的名称即可
|
||||||
#-Dskywalking.agent.service_name=ruoyi-server \
|
#-Dskywalking.agent.service_name=demo-server \
|
||||||
#-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
|
#-javaagent:/demo/skywalking/agent/skywalking-agent.jar \
|
||||||
-jar app.jar \
|
-jar app.jar \
|
||||||
-XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}
|
-XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}
|
||||||
|
|
||||||
|
14
pom.xml
14
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">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>org.dromara</groupId>
|
<groupId>net.rzdata</groupId>
|
||||||
<artifactId>ruoyi-vue-plus</artifactId>
|
<artifactId>demo</artifactId>
|
||||||
<version>5.1.2</version>
|
<version>5.1.2</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>RuoYi-Vue-Plus</name>
|
|
||||||
<url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
|
|
||||||
<description>RuoYi-Vue-Plus多租户管理系统</description>
|
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>5.1.2</revision>
|
<revision>5.1.2</revision>
|
||||||
@ -215,13 +212,6 @@
|
|||||||
<version>${okhttp.version}</version>
|
<version>${okhttp.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--短信sms4j-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.dromara.sms4j</groupId>
|
|
||||||
<artifactId>sms4j-spring-boot-starter</artifactId>
|
|
||||||
<version>${sms4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>de.codecentric</groupId>
|
<groupId>de.codecentric</groupId>
|
||||||
<artifactId>spring-boot-admin-starter-server</artifactId>
|
<artifactId>spring-boot-admin-starter-server</artifactId>
|
||||||
|
@ -2,7 +2,7 @@ rem 使用者应根据自身平台编码自行转换 防止乱码 例如 win使
|
|||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
rem jar平级目录
|
rem jar平级目录
|
||||||
set AppName=ruoyi-admin.jar
|
set AppName=demo-admin.jar
|
||||||
|
|
||||||
rem JVM参数
|
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"
|
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"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# ./ry.sh start 启动 stop 停止 restart 重启 status 状态
|
# ./ry.sh start 启动 stop 停止 restart 重启 status 状态
|
||||||
AppName=ruoyi-admin.jar
|
AppName=demo-admin.jar
|
||||||
|
|
||||||
# JVM参数
|
# 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"
|
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"
|
||||||
|
@ -26,7 +26,7 @@ services:
|
|||||||
# 时区上海
|
# 时区上海
|
||||||
TZ: Asia/Shanghai
|
TZ: Asia/Shanghai
|
||||||
ACCEPT_EULA: "Y"
|
ACCEPT_EULA: "Y"
|
||||||
SA_PASSWORD: "Ruoyi@123"
|
SA_PASSWORD: "Demo@123"
|
||||||
ports:
|
ports:
|
||||||
- "1433:1433"
|
- "1433:1433"
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -78,9 +78,9 @@ services:
|
|||||||
# 时区上海
|
# 时区上海
|
||||||
TZ: Asia/Shanghai
|
TZ: Asia/Shanghai
|
||||||
# 管理后台用户名
|
# 管理后台用户名
|
||||||
MINIO_ROOT_USER: ruoyi
|
MINIO_ROOT_USER: demo
|
||||||
# 管理后台密码,最小8个字符
|
# 管理后台密码,最小8个字符
|
||||||
MINIO_ROOT_PASSWORD: ruoyi123
|
MINIO_ROOT_PASSWORD: demo123
|
||||||
# https需要指定域名
|
# https需要指定域名
|
||||||
#MINIO_SERVER_URL: "https://xxx.com:9000"
|
#MINIO_SERVER_URL: "https://xxx.com:9000"
|
||||||
#MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
|
#MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
|
||||||
@ -99,60 +99,32 @@ services:
|
|||||||
privileged: true
|
privileged: true
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
|
|
||||||
ruoyi-server1:
|
demo-server1:
|
||||||
image: ruoyi/ruoyi-server:5.1.2
|
image: demo-server:5.1.2
|
||||||
container_name: ruoyi-server1
|
container_name: demo-server1
|
||||||
environment:
|
environment:
|
||||||
# 时区上海
|
# 时区上海
|
||||||
TZ: Asia/Shanghai
|
TZ: Asia/Shanghai
|
||||||
SERVER_PORT: 8080
|
SERVER_PORT: 8080
|
||||||
volumes:
|
volumes:
|
||||||
# 配置文件
|
# 配置文件
|
||||||
- /docker/server1/logs/:/ruoyi/server/logs/
|
- /docker/server1/logs/:/demo/server/logs/
|
||||||
# skywalking 探针
|
# skywalking 探针
|
||||||
# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
|
# - /docker/skywalking/agent/:/demo/skywalking/agent
|
||||||
privileged: true
|
privileged: true
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
|
|
||||||
ruoyi-server2:
|
demo-server2:
|
||||||
image: ruoyi/ruoyi-server:5.1.2
|
image: demo-server:5.1.2
|
||||||
container_name: ruoyi-server2
|
container_name: demo-server2
|
||||||
environment:
|
environment:
|
||||||
# 时区上海
|
# 时区上海
|
||||||
TZ: Asia/Shanghai
|
TZ: Asia/Shanghai
|
||||||
SERVER_PORT: 8081
|
SERVER_PORT: 8081
|
||||||
volumes:
|
volumes:
|
||||||
# 配置文件
|
# 配置文件
|
||||||
- /docker/server2/logs/:/ruoyi/server/logs/
|
- /docker/server2/logs/:/demo/server/logs/
|
||||||
# skywalking 探针
|
# skywalking 探针
|
||||||
# - /docker/skywalking/agent/:/ruoyi/skywalking/agent
|
# - /docker/skywalking/agent/:/demo/skywalking/agent
|
||||||
privileged: true
|
privileged: true
|
||||||
network_mode: "host"
|
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"
|
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# redis 密码
|
# redis 密码
|
||||||
requirepass ruoyi123
|
requirepass demo123
|
||||||
|
|
||||||
# key 监听器配置
|
# key 监听器配置
|
||||||
# notify-keyspace-events Ex
|
# notify-keyspace-events Ex
|
||||||
|
@ -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(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, '管理员');
|
||||||
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, '测试员');
|
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 4、角色信息表
|
-- 4、角色信息表
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara;
|
package net.rzdata;
|
||||||
|
|
||||||
import org.mybatis.spring.annotation.MapperScan;
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
@ -13,13 +13,13 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
|
|||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@MapperScan("${mybatis-plus.mapperPackage}")
|
@MapperScan("${mybatis-plus.mapperPackage}")
|
||||||
public class DromaraApplication {
|
public class DemoApplication {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SpringApplication application = new SpringApplication(DromaraApplication.class);
|
SpringApplication application = new SpringApplication(DemoApplication.class);
|
||||||
application.setApplicationStartup(new BufferingApplicationStartup(2048));
|
application.setApplicationStartup(new BufferingApplicationStartup(2048));
|
||||||
application.run(args);
|
application.run(args);
|
||||||
System.out.println("(♥◠‿◠)ノ゙ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)゙");
|
System.out.println("(♥◠‿◠)ノ゙ Demo启动成功 ლ(´ڡ`ლ)゙");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara;
|
package net.rzdata;
|
||||||
|
|
||||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||||
@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
|
|||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author Lion Li
|
||||||
*/
|
*/
|
||||||
public class DromaraServletInitializer extends SpringBootServletInitializer {
|
public class DemoServletInitializer extends SpringBootServletInitializer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
|
||||||
return application.sources(DromaraApplication.class);
|
return application.sources(DemoApplication.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -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.boot.autoconfigure.AutoConfiguration;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
@ -1,10 +1,9 @@
|
|||||||
package org.dromara.common.core.config;
|
package net.rzdata.common.core.config;
|
||||||
|
|
||||||
import cn.hutool.core.util.ArrayUtil;
|
import cn.hutool.core.util.ArrayUtil;
|
||||||
import org.dromara.common.core.exception.ServiceException;
|
import net.rzdata.common.core.exception.ServiceException;
|
||||||
import org.dromara.common.core.utils.SpringUtils;
|
import net.rzdata.common.core.utils.SpringUtils;
|
||||||
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
|
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.scheduling.annotation.AsyncConfigurer;
|
import org.springframework.scheduling.annotation.AsyncConfigurer;
|
||||||
import org.springframework.scheduling.annotation.EnableAsync;
|
import org.springframework.scheduling.annotation.EnableAsync;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.config;
|
package net.rzdata.common.core.config;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
@ -12,8 +12,8 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Component
|
@Component
|
||||||
@ConfigurationProperties(prefix = "ruoyi")
|
@ConfigurationProperties(prefix = "demo")
|
||||||
public class RuoYiConfig {
|
public class DemoConfig {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 项目名称
|
* 项目名称
|
@ -1,11 +1,10 @@
|
|||||||
package org.dromara.common.core.config;
|
package net.rzdata.common.core.config;
|
||||||
|
|
||||||
import jakarta.annotation.PreDestroy;
|
import jakarta.annotation.PreDestroy;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
|
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
|
||||||
import org.dromara.common.core.config.properties.ThreadPoolProperties;
|
import net.rzdata.common.core.config.properties.ThreadPoolProperties;
|
||||||
import org.dromara.common.core.utils.Threads;
|
import net.rzdata.common.core.utils.Threads;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.config;
|
package net.rzdata.common.core.config;
|
||||||
|
|
||||||
import jakarta.validation.Validator;
|
import jakarta.validation.Validator;
|
||||||
import org.hibernate.validator.HibernateValidator;
|
import org.hibernate.validator.HibernateValidator;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.config.properties;
|
package net.rzdata.common.core.config.properties;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 缓存的key 常量
|
* 缓存的key 常量
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 缓存组名称常量
|
* 缓存组名称常量
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用常量信息
|
* 通用常量信息
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 全局的key常量 (业务无关的key)
|
* 全局的key常量 (业务无关的key)
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 返回状态码
|
* 返回状态码
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 租户常量信息
|
* 租户常量信息
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.constant;
|
package net.rzdata.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户常量信息
|
* 用户常量信息
|
@ -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.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.domain.dto;
|
package net.rzdata.common.core.domain.dto;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.domain.dto;
|
package net.rzdata.common.core.domain.dto;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -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.Email;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.domain.model;
|
package net.rzdata.common.core.domain.model;
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
@ -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.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
@ -1,12 +1,11 @@
|
|||||||
package org.dromara.common.core.domain.model;
|
package net.rzdata.common.core.domain.model;
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import net.rzdata.common.core.constant.UserConstants;
|
||||||
import org.hibernate.validator.constraints.Length;
|
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}")
|
@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;
|
private String username;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户密码
|
* 用户密码
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "{user.password.not.blank}")
|
@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 password;
|
||||||
|
|
||||||
}
|
}
|
@ -1,12 +1,11 @@
|
|||||||
package org.dromara.common.core.domain.model;
|
package net.rzdata.common.core.domain.model;
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import net.rzdata.common.core.constant.UserConstants;
|
||||||
import org.hibernate.validator.constraints.Length;
|
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}")
|
@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;
|
private String username;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户密码
|
* 用户密码
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "{user.password.not.blank}")
|
@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 password;
|
||||||
|
|
||||||
private String userType;
|
private String userType;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.domain.model;
|
package net.rzdata.common.core.domain.model;
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.domain.model;
|
package net.rzdata.common.core.domain.model;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.enums;
|
package net.rzdata.common.core.enums;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.enums;
|
package net.rzdata.common.core.enums;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.enums;
|
package net.rzdata.common.core.enums;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
@ -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.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.exception;
|
package net.rzdata.common.core.exception;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
@ -1,8 +1,8 @@
|
|||||||
package org.dromara.common.core.exception.base;
|
package net.rzdata.common.core.exception.base;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.dromara.common.core.utils.MessageUtils;
|
import net.rzdata.common.core.utils.MessageUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -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;
|
import java.io.Serial;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.exception.file;
|
package net.rzdata.common.core.exception.file;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.exception.file;
|
package net.rzdata.common.core.exception.file;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
@ -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;
|
import java.io.Serial;
|
||||||
|
|
@ -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.beans.factory.config.YamlPropertiesFactoryBean;
|
||||||
import org.springframework.core.env.PropertiesPropertySource;
|
import org.springframework.core.env.PropertiesPropertySource;
|
||||||
import org.springframework.core.env.PropertySource;
|
import org.springframework.core.env.PropertySource;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.service;
|
package net.rzdata.common.core.service;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用 参数配置服务
|
* 通用 参数配置服务
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.service;
|
package net.rzdata.common.core.service;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.service;
|
package net.rzdata.common.core.service;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用 用户服务
|
* 通用 用户服务
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.utils;
|
package net.rzdata.common.core.utils;
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -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.collection.CollUtil;
|
||||||
import cn.hutool.core.map.MapUtil;
|
import cn.hutool.core.map.MapUtil;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.utils;
|
package net.rzdata.common.core.utils;
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -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.core.convert.Convert;
|
||||||
import cn.hutool.extra.servlet.JakartaServletUtil;
|
import cn.hutool.extra.servlet.JakartaServletUtil;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.utils;
|
package net.rzdata.common.core.utils;
|
||||||
|
|
||||||
import cn.hutool.extra.spring.SpringUtil;
|
import cn.hutool.extra.spring.SpringUtil;
|
||||||
import org.springframework.aop.framework.AopContext;
|
import org.springframework.aop.framework.AopContext;
|
@ -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.collection.CollUtil;
|
||||||
import cn.hutool.core.map.MapUtil;
|
import cn.hutool.core.map.MapUtil;
|
@ -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.collection.CollUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.utils;
|
package net.rzdata.common.core.utils;
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -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.collection.CollUtil;
|
||||||
import cn.hutool.core.lang.tree.Tree;
|
import cn.hutool.core.lang.tree.Tree;
|
||||||
import cn.hutool.core.lang.tree.TreeNodeConfig;
|
import cn.hutool.core.lang.tree.TreeNodeConfig;
|
||||||
import cn.hutool.core.lang.tree.TreeUtil;
|
import cn.hutool.core.lang.tree.TreeUtil;
|
||||||
import cn.hutool.core.lang.tree.parser.NodeParser;
|
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.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.utils;
|
package net.rzdata.common.core.utils;
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
@ -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 cn.hutool.core.io.FileUtil;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.utils.file;
|
package net.rzdata.common.core.utils.file;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 媒体类型工具类
|
* 媒体类型工具类
|
@ -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.core.net.NetUtil;
|
||||||
import cn.hutool.http.HtmlUtil;
|
import cn.hutool.http.HtmlUtil;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
@ -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.FileUtil;
|
||||||
import cn.hutool.core.io.resource.ClassPathResource;
|
import cn.hutool.core.io.resource.ClassPathResource;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import org.dromara.common.core.exception.ServiceException;
|
import net.rzdata.common.core.exception.ServiceException;
|
||||||
import org.dromara.common.core.utils.file.FileUtils;
|
import net.rzdata.common.core.utils.file.FileUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.lionsoul.ip2region.xdb.Searcher;
|
import org.lionsoul.ip2region.xdb.Searcher;
|
||||||
|
|
@ -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 cn.hutool.core.util.ReflectUtil;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
@ -1,8 +1,8 @@
|
|||||||
package org.dromara.common.core.utils.sql;
|
package net.rzdata.common.core.utils.sql;
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sql操作工具类
|
* sql操作工具类
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.validate;
|
package net.rzdata.common.core.validate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验分组 add
|
* 校验分组 add
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.validate;
|
package net.rzdata.common.core.validate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验分组 edit
|
* 校验分组 edit
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.validate;
|
package net.rzdata.common.core.validate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验分组 query
|
* 校验分组 query
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.core.xss;
|
package net.rzdata.common.core.xss;
|
||||||
|
|
||||||
import jakarta.validation.Constraint;
|
import jakarta.validation.Constraint;
|
||||||
import jakarta.validation.Payload;
|
import jakarta.validation.Payload;
|
@ -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.core.util.ReUtil;
|
||||||
import cn.hutool.http.HtmlUtil;
|
import cn.hutool.http.HtmlUtil;
|
@ -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.OpenAPI;
|
||||||
import io.swagger.v3.oas.models.Paths;
|
import io.swagger.v3.oas.models.Paths;
|
||||||
import io.swagger.v3.oas.models.info.Info;
|
import io.swagger.v3.oas.models.info.Info;
|
||||||
import io.swagger.v3.oas.models.security.SecurityRequirement;
|
import io.swagger.v3.oas.models.security.SecurityRequirement;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.doc.config.properties.SpringDocProperties;
|
import net.rzdata.common.doc.handler.OpenApiHandler;
|
||||||
import org.dromara.common.doc.handler.OpenApiHandler;
|
import net.rzdata.common.doc.config.properties.SpringDocProperties;
|
||||||
import org.springdoc.core.configuration.SpringDocConfiguration;
|
|
||||||
import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
|
import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
|
||||||
import org.springdoc.core.customizers.OpenApiCustomizer;
|
import org.springdoc.core.customizers.OpenApiCustomizer;
|
||||||
import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
|
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.OpenAPIService;
|
||||||
import org.springdoc.core.service.SecurityService;
|
import org.springdoc.core.service.SecurityService;
|
||||||
import org.springdoc.core.utils.PropertyResolverUtils;
|
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.ConditionalOnMissingBean;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.autoconfigure.web.ServerProperties;
|
import org.springframework.boot.autoconfigure.web.ServerProperties;
|
@ -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.Components;
|
||||||
import io.swagger.v3.oas.models.ExternalDocumentation;
|
import io.swagger.v3.oas.models.ExternalDocumentation;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.doc.handler;
|
package net.rzdata.common.doc.handler;
|
||||||
|
|
||||||
import cn.hutool.core.io.IoUtil;
|
import cn.hutool.core.io.IoUtil;
|
||||||
import io.swagger.v3.core.jackson.TypeNameResolver;
|
import io.swagger.v3.core.jackson.TypeNameResolver;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.encrypt.annotation;
|
package net.rzdata.common.encrypt.annotation;
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
import java.lang.annotation.*;
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
package org.dromara.common.encrypt.annotation;
|
package net.rzdata.common.encrypt.annotation;
|
||||||
|
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
import java.lang.annotation.*;
|
||||||
|
|
@ -1,9 +1,8 @@
|
|||||||
package org.dromara.common.encrypt.config;
|
package net.rzdata.common.encrypt.config;
|
||||||
|
|
||||||
import jakarta.servlet.DispatcherType;
|
import jakarta.servlet.DispatcherType;
|
||||||
import org.dromara.common.encrypt.filter.CryptoFilter;
|
import net.rzdata.common.encrypt.filter.CryptoFilter;
|
||||||
import org.dromara.common.encrypt.properties.ApiDecryptProperties;
|
import net.rzdata.common.encrypt.properties.ApiDecryptProperties;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
@ -1,11 +1,10 @@
|
|||||||
package org.dromara.common.encrypt.config;
|
package net.rzdata.common.encrypt.config;
|
||||||
|
|
||||||
import org.dromara.common.encrypt.core.EncryptorManager;
|
import net.rzdata.common.encrypt.interceptor.MybatisDecryptInterceptor;
|
||||||
import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor;
|
import net.rzdata.common.encrypt.interceptor.MybatisEncryptInterceptor;
|
||||||
import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
|
import net.rzdata.common.encrypt.properties.EncryptorProperties;
|
||||||
import org.dromara.common.encrypt.properties.EncryptorProperties;
|
import net.rzdata.common.encrypt.core.EncryptorManager;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
@ -1,7 +1,7 @@
|
|||||||
package org.dromara.common.encrypt.core;
|
package net.rzdata.common.encrypt.core;
|
||||||
|
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
@ -1,8 +1,8 @@
|
|||||||
package org.dromara.common.encrypt.core;
|
package net.rzdata.common.encrypt.core;
|
||||||
|
|
||||||
import cn.hutool.core.util.ReflectUtil;
|
import cn.hutool.core.util.ReflectUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
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.lang.reflect.Field;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
@ -1,7 +1,7 @@
|
|||||||
package org.dromara.common.encrypt.core;
|
package net.rzdata.common.encrypt.core;
|
||||||
|
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 加解者
|
* 加解者
|
@ -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 net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.core.IEncryptor;
|
import net.rzdata.common.encrypt.core.IEncryptor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所有加密执行者的基类
|
* 所有加密执行者的基类
|
@ -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 net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* AES算法实现
|
* AES算法实现
|
@ -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 net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base64算法实现
|
* Base64算法实现
|
@ -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 net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.encrypt.core.EncryptContext;
|
import net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
@ -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 net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.encrypt.core.EncryptContext;
|
import net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sm2算法实现
|
* sm2算法实现
|
@ -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 net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sm4算法实现
|
* sm4算法实现
|
@ -1,8 +1,8 @@
|
|||||||
package org.dromara.common.encrypt.enumd;
|
package net.rzdata.common.encrypt.enumd;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.dromara.common.encrypt.core.encryptor.*;
|
import net.rzdata.common.encrypt.core.encryptor.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 算法名称
|
* 算法名称
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.encrypt.enumd;
|
package net.rzdata.common.encrypt.enumd;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 编码类型
|
* 编码类型
|
@ -1,15 +1,15 @@
|
|||||||
package org.dromara.common.encrypt.filter;
|
package net.rzdata.common.encrypt.filter;
|
||||||
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import jakarta.servlet.*;
|
import jakarta.servlet.*;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import org.dromara.common.core.constant.HttpStatus;
|
import net.rzdata.common.core.constant.HttpStatus;
|
||||||
import org.dromara.common.core.exception.ServiceException;
|
import net.rzdata.common.core.exception.ServiceException;
|
||||||
import org.dromara.common.core.utils.SpringUtils;
|
import net.rzdata.common.core.utils.SpringUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.encrypt.annotation.ApiEncrypt;
|
import net.rzdata.common.encrypt.annotation.ApiEncrypt;
|
||||||
import org.dromara.common.encrypt.properties.ApiDecryptProperties;
|
import net.rzdata.common.encrypt.properties.ApiDecryptProperties;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.web.method.HandlerMethod;
|
import org.springframework.web.method.HandlerMethod;
|
@ -1,12 +1,12 @@
|
|||||||
package org.dromara.common.encrypt.filter;
|
package net.rzdata.common.encrypt.filter;
|
||||||
|
|
||||||
import cn.hutool.core.io.IoUtil;
|
import cn.hutool.core.io.IoUtil;
|
||||||
import jakarta.servlet.ReadListener;
|
import jakarta.servlet.ReadListener;
|
||||||
import jakarta.servlet.ServletInputStream;
|
import jakarta.servlet.ServletInputStream;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletRequestWrapper;
|
import jakarta.servlet.http.HttpServletRequestWrapper;
|
||||||
import org.dromara.common.core.constant.Constants;
|
import net.rzdata.common.core.constant.Constants;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
@ -1,11 +1,11 @@
|
|||||||
package org.dromara.common.encrypt.filter;
|
package net.rzdata.common.encrypt.filter;
|
||||||
|
|
||||||
import cn.hutool.core.util.RandomUtil;
|
import cn.hutool.core.util.RandomUtil;
|
||||||
import jakarta.servlet.ServletOutputStream;
|
import jakarta.servlet.ServletOutputStream;
|
||||||
import jakarta.servlet.WriteListener;
|
import jakarta.servlet.WriteListener;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import jakarta.servlet.http.HttpServletResponseWrapper;
|
import jakarta.servlet.http.HttpServletResponseWrapper;
|
||||||
import org.dromara.common.encrypt.utils.EncryptUtils;
|
import net.rzdata.common.encrypt.utils.EncryptUtils;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
@ -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.collection.CollUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.apache.ibatis.executor.resultset.ResultSetHandler;
|
import org.apache.ibatis.executor.resultset.ResultSetHandler;
|
||||||
import org.apache.ibatis.plugin.*;
|
import org.apache.ibatis.plugin.*;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.encrypt.annotation.EncryptField;
|
||||||
import org.dromara.common.encrypt.annotation.EncryptField;
|
import net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.core.EncryptContext;
|
import net.rzdata.common.encrypt.core.EncryptorManager;
|
||||||
import org.dromara.common.encrypt.core.EncryptorManager;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.properties.EncryptorProperties;
|
||||||
import org.dromara.common.encrypt.properties.EncryptorProperties;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.sql.Statement;
|
import java.sql.Statement;
|
@ -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.collection.CollUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.apache.ibatis.executor.parameter.ParameterHandler;
|
import org.apache.ibatis.executor.parameter.ParameterHandler;
|
||||||
import org.apache.ibatis.plugin.Interceptor;
|
import org.apache.ibatis.plugin.Interceptor;
|
||||||
import org.apache.ibatis.plugin.Intercepts;
|
import org.apache.ibatis.plugin.Intercepts;
|
||||||
import org.apache.ibatis.plugin.Invocation;
|
import org.apache.ibatis.plugin.Invocation;
|
||||||
import org.apache.ibatis.plugin.Signature;
|
import org.apache.ibatis.plugin.Signature;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.encrypt.annotation.EncryptField;
|
||||||
import org.dromara.common.encrypt.annotation.EncryptField;
|
import net.rzdata.common.encrypt.core.EncryptContext;
|
||||||
import org.dromara.common.encrypt.core.EncryptContext;
|
import net.rzdata.common.encrypt.core.EncryptorManager;
|
||||||
import org.dromara.common.encrypt.core.EncryptorManager;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.properties.EncryptorProperties;
|
||||||
import org.dromara.common.encrypt.properties.EncryptorProperties;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.encrypt.properties;
|
package net.rzdata.common.encrypt.properties;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
@ -1,7 +1,7 @@
|
|||||||
package org.dromara.common.encrypt.properties;
|
package net.rzdata.common.encrypt.properties;
|
||||||
|
|
||||||
import org.dromara.common.encrypt.enumd.AlgorithmType;
|
import net.rzdata.common.encrypt.enumd.AlgorithmType;
|
||||||
import org.dromara.common.encrypt.enumd.EncodeType;
|
import net.rzdata.common.encrypt.enumd.EncodeType;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
@ -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.codec.Base64;
|
||||||
import cn.hutool.core.util.ArrayUtil;
|
import cn.hutool.core.util.ArrayUtil;
|
@ -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.*;
|
import java.lang.annotation.*;
|
||||||
|
|
@ -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.*;
|
import java.lang.annotation.*;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package org.dromara.common.excel.annotation;
|
package net.rzdata.common.excel.annotation;
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
import java.lang.annotation.*;
|
||||||
|
|
@ -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.convert.Convert;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
@ -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.annotation.AnnotationUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
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.ReadCellData;
|
||||||
import com.alibaba.excel.metadata.data.WriteCellData;
|
import com.alibaba.excel.metadata.data.WriteCellData;
|
||||||
import com.alibaba.excel.metadata.property.ExcelContentProperty;
|
import com.alibaba.excel.metadata.property.ExcelContentProperty;
|
||||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
import net.rzdata.common.core.service.DictService;
|
||||||
import org.dromara.common.core.service.DictService;
|
import net.rzdata.common.core.utils.SpringUtils;
|
||||||
import org.dromara.common.core.utils.SpringUtils;
|
import net.rzdata.common.core.utils.StringUtils;
|
||||||
import org.dromara.common.core.utils.StringUtils;
|
import net.rzdata.common.excel.annotation.ExcelDictFormat;
|
||||||
import org.dromara.common.excel.utils.ExcelUtil;
|
import net.rzdata.common.excel.utils.ExcelUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
@ -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.annotation.AnnotationUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
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.ReadCellData;
|
||||||
import com.alibaba.excel.metadata.data.WriteCellData;
|
import com.alibaba.excel.metadata.data.WriteCellData;
|
||||||
import com.alibaba.excel.metadata.property.ExcelContentProperty;
|
import com.alibaba.excel.metadata.property.ExcelContentProperty;
|
||||||
import org.dromara.common.core.utils.reflect.ReflectUtils;
|
import net.rzdata.common.core.utils.reflect.ReflectUtils;
|
||||||
import org.dromara.common.excel.annotation.ExcelEnumFormat;
|
import net.rzdata.common.excel.annotation.ExcelEnumFormat;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user