Three-Group
/
smart-cloud-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: Three-Group:master
Branches Tags
Three-Group:master_fei
Three-Group:master_dyf
Three-Group:master
Three-Group:dev
...
pull from: Three-Group:master_dyf
Branches Tags
Three-Group:master_fei
Three-Group:master_dyf
Three-Group:master
Three-Group:dev

No commits in common. "master" and "master_dyf" have entirely different histories.
master ... master_dyf

460 changed files with 4337 additions and 2024 deletions
Show Stats Expand all files Collapse all files

42
README.md
View File

@ -1,26 +1,26 @@
## 系统模块
~~~
com.muyu
├── muyu-ui // 前端框架 [80]
├── muyu-gateway // 网关模块 [8080]
├── muyu-auth // 认证中心 [9200]
├── muyu-common // 通用模块
│ └── muyu-common-core // 核心模块
│ └── muyu-common-datascope // 权限范围
│ └── muyu-common-datasource // 多数据源
│ └── muyu-common-log // 日志记录
│ └── muyu-common-redis // 缓存服务
│ └── muyu-common-seata // 分布式事务
│ └── muyu-common-security // 安全模块
│ └── muyu-common-swagger // 系统接口
│ └── muyu-common-system // 系统基础
├── muyu-modules // 业务模块
│ └── muyu-system // 系统模块 [9201]
│ └── muyu-gen // 代码生成 [9202]
│ └── muyu-job // 定时任务 [9203]
│ └── muyu-file // 文件服务 [9300]
├── muyu-visual // 图形化管理模块
│ └── muyu-visual-monitor // 监控中心 [9100]
com.etl
├── etl-ui // 前端框架 [80]
├── etl-gateway // 网关模块 [8080]
├── etl-auth // 认证中心 [9200]
├── etl-common // 通用模块
│ └── etl-common-core // 核心模块
│ └── etl-common-datascope // 权限范围
│ └── etl-common-datasource // 多数据源
│ └── etl-common-log // 日志记录
│ └── etl-common-redis // 缓存服务
│ └── etl-common-seata // 分布式事务
│ └── etl-common-security // 安全模块
│ └── etl-common-swagger // 系统接口
│ └── etl-common-system // 系统基础
├── etl-modules // 业务模块
│ └── etl-system // 系统模块 [9201]
│ └── etl-gen // 代码生成 [9202]
│ └── etl-job // 定时任务 [9203]
│ └── etl-file // 文件服务 [9300]
├── etl-visual // 图形化管理模块
│ └── etl-visual-monitor // 监控中心 [9100]
├──pom.xml // 公共依赖
~~~

4
bin/run-auth.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Auth<74><68><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-auth/target
cd ../etl-auth/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-auth.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-auth.jar
cd bin
pause

4
bin/run-gateway.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Gateway<61><79><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-gateway/target
cd ../etl-gateway/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-gateway.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-gateway.jar
cd bin
pause

4
bin/run-modules-file.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-File<6C><65><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-modules/muyu-file/target
cd ../etl-modules/etl-file/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-file.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-modules-file.jar
cd bin
pause

4
bin/run-modules-gen.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-Gen<65><6E><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-modules/muyu-gen/target
cd ../etl-modules/etl-gen/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-gen.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-modules-gen.jar
cd bin
pause

4
bin/run-modules-job.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-Job<6F><62><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-modules/muyu-job/target
cd ../etl-modules/etl-job/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-job.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-modules-job.jar
cd bin
pause

4
bin/run-modules-system.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-System<65><6D><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-modules/muyu-system/target
cd ../etl-modules/etl-system/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-system.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-modules-system.jar
cd bin
pause

4
bin/run-monitor.bat
View File

@ -4,11 +4,11 @@ echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Monitor<6F><72><EFBFBD>̡<EFBFBD>
echo.
cd %~dp0
cd ../muyu-visual/muyu-monitor/target
cd ../etl-visual/etl-monitor/target
set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-visual-monitor.jar
java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar etl-visual-monitor.jar
cd bin
pause

30
docker/copy.sh
View File

@ -14,28 +14,28 @@ cp ../sql/ry_config_20220929.sql ./mysql/db
# copy html
echo "begin copy html "
cp -r ../muyu-ui/dist/** ./nginx/html/dist
cp -r ../etl-ui/dist/** ./nginx/html/dist
# copy jar
echo "begin copy muyu-gateway "
cp ../muyu-gateway/target/muyu-gateway.jar ./muyu/gateway/jar
echo "begin copy etl-gateway "
cp ../etl-gateway/target/etl-gateway.jar ./etl/gateway/jar
echo "begin copy muyu-auth "
cp ../muyu-auth/target/muyu-auth.jar ./muyu/auth/jar
echo "begin copy etl-auth "
cp ../etl-auth/target/etl-auth.jar ./etl/auth/jar
echo "begin copy muyu-visual "
cp ../muyu-visual/muyu-monitor/target/muyu-visual-monitor.jar ./muyu/visual/monitor/jar
echo "begin copy etl-visual "
cp ../etl-visual/etl-monitor/target/etl-visual-monitor.jar ./etl/visual/monitor/jar
echo "begin copy muyu-modules-system "
cp ../muyu-modules/muyu-system/target/muyu-modules-system.jar ./muyu/modules/system/jar
echo "begin copy etl-modules-system "
cp ../etl-modules/etl-system/target/etl-modules-system.jar ./etl/modules/system/jar
echo "begin copy muyu-modules-file "
cp ../muyu-modules/muyu-file/target/muyu-modules-file.jar ./muyu/modules/file/jar
echo "begin copy etl-modules-file "
cp ../etl-modules/etl-file/target/etl-modules-file.jar ./etl/modules/file/jar
echo "begin copy muyu-modules-job "
cp ../muyu-modules/muyu-job/target/muyu-modules-job.jar ./muyu/modules/job/jar
echo "begin copy etl-modules-job "
cp ../etl-modules/etl-job/target/etl-modules-job.jar ./etl/modules/job/jar
echo "begin copy muyu-modules-gen "
cp ../muyu-modules/muyu-gen/target/muyu-modules-gen.jar ./muyu/modules/gen/jar
echo "begin copy etl-modules-gen "
cp ../etl-modules/etl-gen/target/etl-modules-gen.jar ./etl/modules/gen/jar

4
docker/deploy.sh
View File

@ -26,12 +26,12 @@ port(){
# 启动基础环境（必须）
base(){
docker-compose up -d muyu-mysql muyu-redis muyu-nacos
docker-compose up -d etl-mysql etl-redis etl-nacos
}
# 启动程序模块（必须）
modules(){
docker-compose up -d muyu-nginx muyu-gateway muyu-auth muyu-modules-system
docker-compose up -d etl-nginx etl-gateway etl-auth etl-modules-system
}
# 关闭所有环境/模块

96
docker/docker-compose.yml
View File

@ -1,7 +1,7 @@
version : '3.8'
services:
muyu-nacos:
container_name: muyu-nacos
etl-nacos:
container_name: etl-nacos
image: nacos/nacos-server
build:
context: ./nacos
@ -15,9 +15,9 @@ services:
- "9848:9848"
- "9849:9849"
depends_on:
- muyu-mysql
muyu-mysql:
container_name: muyu-mysql
- etl-mysql
etl-mysql:
container_name: etl-mysql
image: mysql:5.7
build:
context: ./mysql
@ -38,103 +38,103 @@ services:
environment:
MYSQL_DATABASE: 'ry-cloud'
MYSQL_ROOT_PASSWORD: password
muyu-redis:
container_name: muyu-redis
etl-redis:
container_name: etl-redis
image: redis
build:
context: ./redis
ports:
- "6379:6379"
volumes:
- ./redis/conf/redis.conf:/home/muyu/redis/redis.conf
- ./redis/conf/redis.conf:/home/etl/redis/redis.conf
- ./redis/data:/data
command: redis-server /home/muyu/redis/redis.conf
muyu-nginx:
container_name: muyu-nginx
command: redis-server /home/etl/redis/redis.conf
etl-nginx:
container_name: etl-nginx
image: nginx
build:
context: ./nginx
ports:
- "80:80"
volumes:
- ./nginx/html/dist:/home/muyu/projects/muyu-ui
- ./nginx/html/dist:/home/etl/projects/etl-ui
- ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
- ./nginx/logs:/var/log/nginx
- ./nginx/conf.d:/etc/nginx/conf.d
depends_on:
- muyu-gateway
- etl-gateway
links:
- muyu-gateway
muyu-gateway:
container_name: muyu-gateway
- etl-gateway
etl-gateway:
container_name: etl-gateway
build:
context: ./muyu/gateway
context: ./etl/gateway
dockerfile: dockerfile
ports:
- "8080:8080"
depends_on:
- muyu-redis
- etl-redis
links:
- muyu-redis
muyu-auth:
container_name: muyu-auth
- etl-redis
etl-auth:
container_name: etl-auth
build:
context: ./muyu/auth
context: ./etl/auth
dockerfile: dockerfile
ports:
- "9200:9200"
depends_on:
- muyu-redis
- etl-redis
links:
- muyu-redis
muyu-modules-system:
container_name: muyu-modules-system
- etl-redis
etl-modules-system:
container_name: etl-modules-system
build:
context: ./muyu/modules/system
context: ./etl/modules/system
dockerfile: dockerfile
ports:
- "9201:9201"
depends_on:
- muyu-redis
- muyu-mysql
- etl-redis
- etl-mysql
links:
- muyu-redis
- muyu-mysql
muyu-modules-gen:
container_name: muyu-modules-gen
- etl-redis
- etl-mysql
etl-modules-gen:
container_name: etl-modules-gen
build:
context: ./muyu/modules/gen
context: ./etl/modules/gen
dockerfile: dockerfile
ports:
- "9202:9202"
depends_on:
- muyu-mysql
- etl-mysql
links:
- muyu-mysql
muyu-modules-job:
container_name: muyu-modules-job
- etl-mysql
etl-modules-job:
container_name: etl-modules-job
build:
context: ./muyu/modules/job
context: ./etl/modules/job
dockerfile: dockerfile
ports:
- "9203:9203"
depends_on:
- muyu-mysql
- etl-mysql
links:
- muyu-mysql
muyu-modules-file:
container_name: muyu-modules-file
- etl-mysql
etl-modules-file:
container_name: etl-modules-file
build:
context: ./muyu/modules/file
context: ./etl/modules/file
dockerfile: dockerfile
ports:
- "9300:9300"
volumes:
- ./muyu/uploadPath:/home/muyu/uploadPath
muyu-visual-monitor:
container_name: muyu-visual-monitor
- ./etl/uploadPath:/home/etl/uploadPath
etl-visual-monitor:
container_name: etl-visual-monitor
build:
context: ./muyu/visual/monitor
context: ./etl/visual/monitor
dockerfile: dockerfile
ports:
- "9100:9100"

15
docker/etl/auth/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-auth.jar /home/etl/etl-auth.jar
# 启动认证服务
ENTRYPOINT ["java","-jar","etl-auth.jar"]

0
docker/muyu/auth/jar/readme.txt → docker/etl/auth/jar/readme.txt
View File

15
docker/etl/gateway/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-gateway.jar /home/etl/etl-gateway.jar
# 启动网关服务
ENTRYPOINT ["java","-jar","etl-gateway.jar"]

0
docker/muyu/gateway/jar/readme.txt → docker/etl/gateway/jar/readme.txt
View File

15
docker/etl/modules/file/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-modules-file.jar /home/etl/etl-modules-file.jar
# 启动文件服务
ENTRYPOINT ["java","-jar","etl-modules-file.jar"]

0
docker/muyu/modules/file/jar/readme.txt → docker/etl/modules/file/jar/readme.txt
View File

15
docker/etl/modules/gen/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-modules-gen.jar /home/etl/etl-modules-gen.jar
# 启动代码生成服务
ENTRYPOINT ["java","-jar","etl-modules-gen.jar"]

0
docker/muyu/modules/gen/jar/readme.txt → docker/etl/modules/gen/jar/readme.txt
View File

15
docker/etl/modules/job/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-modules-job.jar /home/etl/etl-modules-job.jar
# 启动定时任务服务
ENTRYPOINT ["java","-jar","etl-modules-job.jar"]

0
docker/muyu/modules/job/jar/readme.txt → docker/etl/modules/job/jar/readme.txt
View File

15
docker/etl/modules/system/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-modules-system.jar /home/etl/etl-modules-system.jar
# 启动系统服务
ENTRYPOINT ["java","-jar","etl-modules-system.jar"]

0
docker/muyu/modules/system/jar/readme.txt → docker/etl/modules/system/jar/readme.txt
View File

15
docker/etl/visual/monitor/dockerfile 100644
View File

@ -0,0 +1,15 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER etl
# 挂载目录
VOLUME /home/etl
# 创建目录
RUN mkdir -p /home/etl
# 指定路径
WORKDIR /home/etl
# 复制jar文件到路径
COPY ./jar/etl-visual-monitor.jar /home/etl/etl-visual-monitor.jar
# 启动系统服务
ENTRYPOINT ["java","-jar","etl-visual-monitor.jar"]

0
docker/muyu/visual/monitor/jar/readme.txt → docker/etl/visual/monitor/jar/readme.txt
View File

15
docker/muyu/auth/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-auth.jar /home/muyu/muyu-auth.jar
# 启动认证服务
ENTRYPOINT ["java","-jar","muyu-auth.jar"]

15
docker/muyu/gateway/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-gateway.jar /home/muyu/muyu-gateway.jar
# 启动网关服务
ENTRYPOINT ["java","-jar","muyu-gateway.jar"]

15
docker/muyu/modules/file/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-modules-file.jar /home/muyu/muyu-modules-file.jar
# 启动文件服务
ENTRYPOINT ["java","-jar","muyu-modules-file.jar"]

15
docker/muyu/modules/gen/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-modules-gen.jar /home/muyu/muyu-modules-gen.jar
# 启动代码生成服务
ENTRYPOINT ["java","-jar","muyu-modules-gen.jar"]

15
docker/muyu/modules/job/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-modules-job.jar /home/muyu/muyu-modules-job.jar
# 启动定时任务服务
ENTRYPOINT ["java","-jar","muyu-modules-job.jar"]

15
docker/muyu/modules/system/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-modules-system.jar /home/muyu/muyu-modules-system.jar
# 启动系统服务
ENTRYPOINT ["java","-jar","muyu-modules-system.jar"]

15
docker/muyu/visual/monitor/dockerfile
View File

@ -1,15 +0,0 @@
# 基础镜像
FROM openjdk:8-jre
# author
MAINTAINER muyu
# 挂载目录
VOLUME /home/muyu
# 创建目录
RUN mkdir -p /home/muyu
# 指定路径
WORKDIR /home/muyu
# 复制jar文件到路径
COPY ./jar/muyu-visual-monitor.jar /home/muyu/muyu-visual-monitor.jar
# 启动系统服务
ENTRYPOINT ["java","-jar","muyu-visual-monitor.jar"]

2
docker/mysql/dockerfile
View File

@ -1,7 +1,7 @@
# 基础镜像
FROM mysql:5.7
# author
MAINTAINER muyu
MAINTAINER etl
# 执行sql脚本
ADD ./db/*.sql /docker-entrypoint-initdb.d/

4
docker/nacos/conf/application.properties
View File

@ -1,6 +1,6 @@
spring.datasource.platform=mysql
db.num=1
db.url.0=jdbc:mysql://muyu-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
db.url.0=jdbc:mysql://etl-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
db.user=root
db.password=password
@ -16,7 +16,7 @@ management.metrics.export.influx.enabled=false
server.tomcat.accesslog.enabled=true
server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
server.tomcat.basedir=/home/muyu/nacos/tomcat/logs
server.tomcat.basedir=/home/etl/nacos/tomcat/logs
nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**

2
docker/nacos/dockerfile
View File

@ -1,7 +1,7 @@
# 基础镜像
FROM nacos/nacos-server
# author
MAINTAINER muyu
MAINTAINER etl
# 复制conf文件到路径
COPY ./conf/application.properties /home/nacos/conf/application.properties

4
docker/nginx/conf/nginx.conf
View File

@ -15,7 +15,7 @@ http {
server_name localhost;
location / {
root /home/muyu/projects/muyu-ui;
root /home/etl/projects/etl-ui;
try_files $uri $uri/ /index.html;
index index.html index.htm;
}
@ -25,7 +25,7 @@ http {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://muyu-gateway:8080/;
proxy_pass http://etl-gateway:8080/;
}
# 避免actuator暴露

10
docker/nginx/dockerfile
View File

@ -1,15 +1,15 @@
# 基础镜像
FROM nginx
# author
MAINTAINER muyu
MAINTAINER etl
# 挂载目录
VOLUME /home/muyu/projects/muyu-ui
VOLUME /home/etl/projects/etl-ui
# 创建目录
RUN mkdir -p /home/muyu/projects/muyu-ui
RUN mkdir -p /home/etl/projects/etl-ui
# 指定路径
WORKDIR /home/muyu/projects/muyu-ui
WORKDIR /home/etl/projects/etl-ui
# 复制conf文件到路径
COPY ./conf/nginx.conf /etc/nginx/nginx.conf
# 复制html文件到路径
COPY ./html/dist /home/muyu/projects/muyu-ui
COPY ./html/dist /home/etl/projects/etl-ui

10
docker/redis/dockerfile
View File

@ -1,13 +1,13 @@
# 基础镜像
FROM redis
# author
MAINTAINER muyu
MAINTAINER etl
# 挂载目录
VOLUME /home/muyu/redis
VOLUME /home/etl/redis
# 创建目录
RUN mkdir -p /home/muyu/redis
RUN mkdir -p /home/etl/redis
# 指定路径
WORKDIR /home/muyu/redis
WORKDIR /home/etl/redis
# 复制conf文件到路径
COPY ./conf/redis.conf /home/muyu/redis/redis.conf
COPY ./conf/redis.conf /home/etl/redis/redis.conf

14
muyu-auth/pom.xml → etl-auth/pom.xml
View File

@ -2,16 +2,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.muyu</groupId>
<artifactId>muyu</artifactId>
<groupId>com.etl</groupId>
<artifactId>etl-cloud</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>muyu-auth</artifactId>
<artifactId>etl-auth</artifactId>
<description>
muyu-auth认证授权中心
etl-auth认证授权中心
</description>
<dependencies>
@ -46,10 +46,10 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- MuYu Common Security-->
<!-- ETL Common Security-->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>muyu-common-security</artifactId>
<groupId>com.etl</groupId>
<artifactId>etl-common-security</artifactId>
</dependency>
</dependencies>

10
muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java → etl-auth/src/main/java/com/etl/auth/ETLAuthApplication.java
View File

@ -1,6 +1,6 @@
package com.muyu.auth;
package com.etl.auth;
import com.muyu.common.security.annotation.EnableMyFeignClients;
import com.etl.common.security.annotation.EnableMyFeignClients;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@ -8,12 +8,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* 认证授权中心
*
* @author muyu
* @author etl
*/
@EnableMyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
public class MuYuAuthApplication {
public class ETLAuthApplication {
public static void main (String[] args) {
SpringApplication.run(MuYuAuthApplication.class, args);
SpringApplication.run(ETLAuthApplication.class, args);
}
}

24
muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java → etl-auth/src/main/java/com/etl/auth/controller/TokenController.java
View File

@ -1,15 +1,15 @@
package com.muyu.auth.controller;
package com.etl.auth.controller;
import com.muyu.auth.form.LoginBody;
import com.muyu.auth.form.RegisterBody;
import com.muyu.auth.service.SysLoginService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.JwtUtils;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.security.auth.AuthUtil;
import com.muyu.common.security.service.TokenService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.LoginUser;
import com.etl.auth.form.LoginBody;
import com.etl.auth.form.RegisterBody;
import com.etl.auth.service.SysLoginService;
import com.etl.common.core.domain.Result;
import com.etl.common.core.utils.JwtUtils;
import com.etl.common.core.utils.StringUtils;
import com.etl.common.security.auth.AuthUtil;
import com.etl.common.security.service.TokenService;
import com.etl.common.security.utils.SecurityUtils;
import com.etl.common.system.domain.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* token 控制
*
* @author muyu
* @author etl
*/
@RestController
public class TokenController {

4
muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java → etl-auth/src/main/java/com/etl/auth/form/LoginBody.java
View File

@ -1,9 +1,9 @@
package com.muyu.auth.form;
package com.etl.auth.form;
/**
* 用户登录对象
*
* @author muyu
* @author etl
*/
public class LoginBody {
/**

4
muyu-auth/src/main/java/com/muyu/auth/form/RegisterBody.java → etl-auth/src/main/java/com/etl/auth/form/RegisterBody.java
View File

@ -1,9 +1,9 @@
package com.muyu.auth.form;
package com.etl.auth.form;
/**
* 用户注册对象
*
* @author muyu
* @author etl
*/
public class RegisterBody extends LoginBody {

34
muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java → etl-auth/src/main/java/com/etl/auth/service/SysLoginService.java
View File

@ -1,27 +1,27 @@
package com.muyu.auth.service;
package com.etl.auth.service;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.UserConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.enums.UserStatus;
import com.muyu.common.core.exception.ServiceException;
import com.muyu.common.core.text.Convert;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.ip.IpUtils;
import com.muyu.common.redis.service.RedisService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.remote.RemoteUserService;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
import com.etl.common.core.constant.CacheConstants;
import com.etl.common.core.constant.Constants;
import com.etl.common.core.constant.SecurityConstants;
import com.etl.common.core.constant.UserConstants;
import com.etl.common.core.domain.Result;
import com.etl.common.core.enums.UserStatus;
import com.etl.common.core.exception.ServiceException;
import com.etl.common.core.text.Convert;
import com.etl.common.core.utils.StringUtils;
import com.etl.common.core.utils.ip.IpUtils;
import com.etl.common.redis.service.RedisService;
import com.etl.common.security.utils.SecurityUtils;
import com.etl.common.system.remote.RemoteUserService;
import com.etl.common.system.domain.SysUser;
import com.etl.common.system.domain.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 登录校验方法
*
* @author muyu
* @author etl
*/
@Component
public class SysLoginService {

16
muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java → etl-auth/src/main/java/com/etl/auth/service/SysPasswordService.java
View File

@ -1,11 +1,11 @@
package com.muyu.auth.service;
package com.etl.auth.service;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.exception.ServiceException;
import com.muyu.common.redis.service.RedisService;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.SysUser;
import com.etl.common.core.constant.CacheConstants;
import com.etl.common.core.constant.Constants;
import com.etl.common.core.exception.ServiceException;
import com.etl.common.redis.service.RedisService;
import com.etl.common.security.utils.SecurityUtils;
import com.etl.common.system.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit;
/**
* 登录密码方法
*
* @author muyu
* @author etl
*/
@Component
public class SysPasswordService {

16
muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java → etl-auth/src/main/java/com/etl/auth/service/SysRecordLogService.java
View File

@ -1,18 +1,18 @@
package com.muyu.auth.service;
package com.etl.auth.service;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.ip.IpUtils;
import com.muyu.common.system.remote.RemoteLogService;
import com.muyu.common.system.domain.SysLogininfor;
import com.etl.common.core.constant.Constants;
import com.etl.common.core.constant.SecurityConstants;
import com.etl.common.core.utils.StringUtils;
import com.etl.common.core.utils.ip.IpUtils;
import com.etl.common.system.remote.RemoteLogService;
import com.etl.common.system.domain.SysLogininfor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 记录日志方法
*
* @author muyu
* @author etl
*/
@Component
public class SysRecordLogService {

0
muyu-auth/src/main/resources/banner.txt → etl-auth/src/main/resources/banner.txt
View File

8
muyu-auth/src/main/resources/bootstrap.yml → etl-auth/src/main/resources/bootstrap.yml
View File

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: muyu-auth
name: etl-auth
profiles:
# 环境配置
active: dev
@ -15,15 +15,13 @@ spring:
discovery:
# 服务注册地址
server-addr: 111.229.102.61:8848
# 命名空间
namespace: muyu
namespace: etl
config:
# 配置中心地址
server-addr: 111.229.102.61:8848
#命名空间
namespace: muyu
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
namespace: etl

4
muyu-modules/muyu-job/src/main/resources/logback.xml → etl-auth/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 日志存放路径 -->
<property name="log.path" value="logs/muyu-job"/>
<property name="log.path" value="logs/etl-auth"/>
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
@ -58,7 +58,7 @@
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.muyu" level="info"/>
<logger name="com.etl" level="info"/>
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn"/>

13
muyu-common/muyu-common-core/pom.xml → etl-common/etl-common-core/pom.xml
View File

@ -3,16 +3,16 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.muyu</groupId>
<artifactId>muyu-common</artifactId>
<groupId>com.etl</groupId>
<artifactId>etl-common</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>muyu-common-core</artifactId>
<artifactId>etl-common-core</artifactId>
<description>
muyu-common-core核心模块
etl-common-core核心模块
</description>
<dependencies>
@ -136,6 +136,11 @@
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
</dependencies>
</project>

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/annotation/Excel.java
View File

@ -1,6 +1,6 @@
package com.muyu.common.core.annotation;
package com.etl.common.core.annotation;
import com.muyu.common.core.utils.poi.ExcelHandlerAdapter;
import com.etl.common.core.utils.poi.ExcelHandlerAdapter;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors;
@ -13,7 +13,7 @@ import java.math.BigDecimal;
/**
* 自定义导出Excel数据注解
*
* @author muyu
* @author etl
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excels.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/annotation/Excels.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.annotation;
package com.etl.common.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -8,7 +8,7 @@ import java.lang.annotation.Target;
/**
* Excel注解集
*
* @author muyu
* @author etl
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/CacheConstants.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* 缓存常量信息
*
* @author muyu
* @author etl
*/
public class CacheConstants {
/**

10
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/Constants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/Constants.java
View File

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

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/GenConstants.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* 代码生成通用常量
*
* @author muyu
* @author etl
*/
public class GenConstants {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/HttpStatus.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/HttpStatus.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* 返回状态码
*
* @author muyu
* @author etl
*/
public class HttpStatus {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/ScheduleConstants.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* 任务调度通用常量
*
* @author muyu
* @author etl
*/
public class ScheduleConstants {
public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/SecurityConstants.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* 权限相关通用常量
*
* @author muyu
* @author etl
*/
public class SecurityConstants {
/**

23
etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/ServiceNameConstants.java 100644
View File

@ -0,0 +1,23 @@
package com.etl.common.core.constant;
/**
* 服务名称
*
* @author etl
*/
public class ServiceNameConstants {
/**
* 认证服务的serviceid
*/
public static final String AUTH_SERVICE = "etl-auth";
/**
* 系统模块的serviceid
*/
public static final String SYSTEM_SERVICE = "etl-system";
/**
* 文件服务的serviceid
*/
public static final String FILE_SERVICE = "etl-file";
}

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/TokenConstants.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* Token的Key常量
*
* @author muyu
* @author etl
*/
public class TokenConstants {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/constant/UserConstants.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.constant;
package com.etl.common.core.constant;
/**
* 用户常量信息
*
* @author muyu
* @author etl
*/
public class UserConstants {
/**

10
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/context/SecurityContextHolder.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.context;
package com.etl.common.core.context;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.text.Convert;
import com.muyu.common.core.utils.StringUtils;
import com.etl.common.core.constant.SecurityConstants;
import com.etl.common.core.text.Convert;
import com.etl.common.core.utils.StringUtils;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -12,7 +12,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 获取当前线程变量中的 用户id、用户名称、Token等信息
* 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
*
* @author muyu
* @author etl
*/
public class SecurityContextHolder {
private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();

8
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/domain/Result.java
View File

@ -1,7 +1,7 @@
package com.muyu.common.core.domain;
package com.etl.common.core.domain;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.constant.HttpStatus;
import com.etl.common.core.constant.Constants;
import com.etl.common.core.constant.HttpStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -12,7 +12,7 @@ import java.io.Serializable;
/**
* 响应信息主体
*
* @author muyu
* @author etl
*/
@Data
@Builder

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/enums/UserStatus.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.enums;
package com.etl.common.core.enums;
/**
* 用户状态
*
* @author muyu
* @author etl
*/
public enum UserStatus {
OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/CaptchaException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 验证码错误异常类
*
* @author muyu
* @author etl
*/
public class CaptchaException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/CheckedException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 检查异常
*
* @author muyu
* @author etl
*/
public class CheckedException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/DemoModeException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 演示模式异常
*
* @author muyu
* @author etl
*/
public class DemoModeException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/GlobalException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 全局异常
*
* @author muyu
* @author etl
*/
public class GlobalException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/InnerAuthException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 内部认证异常
*
* @author muyu
* @author etl
*/
public class InnerAuthException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/PreAuthorizeException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 权限异常
*
* @author muyu
* @author etl
*/
public class PreAuthorizeException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/ServiceException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 业务异常
*
* @author muyu
* @author etl
*/
public final class ServiceException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/UtilException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception;
package com.etl.common.core.exception;
/**
* 工具类异常
*
* @author muyu
* @author etl
*/
public class UtilException extends RuntimeException {
private static final long serialVersionUID = 8247610319171014183L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/auth/NotLoginException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.auth;
package com.etl.common.core.exception.auth;
/**
* 未能通过的登录认证异常
*
* @author muyu
* @author etl
*/
public class NotLoginException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/auth/NotPermissionException.java
View File

@ -1,11 +1,11 @@
package com.muyu.common.core.exception.auth;
package com.etl.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;
/**
* 未能通过的权限认证异常
*
* @author muyu
* @author etl
*/
public class NotPermissionException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/auth/NotRoleException.java
View File

@ -1,11 +1,11 @@
package com.muyu.common.core.exception.auth;
package com.etl.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;
/**
* 未能通过的角色认证异常
*
* @author muyu
* @author etl
*/
public class NotRoleException extends RuntimeException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/base/BaseException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.base;
package com.etl.common.core.exception.base;
/**
* 基础异常
*
* @author muyu
* @author etl
*/
public class BaseException extends RuntimeException {
private static final long serialVersionUID = 1L;

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/file/FileException.java
View File

@ -1,11 +1,11 @@
package com.muyu.common.core.exception.file;
package com.etl.common.core.exception.file;
import com.muyu.common.core.exception.base.BaseException;
import com.etl.common.core.exception.base.BaseException;
/**
* 文件信息异常类
*
* @author muyu
* @author etl
*/
public class FileException extends BaseException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.file;
package com.etl.common.core.exception.file;
/**
* 文件名称超长限制异常类
*
* @author muyu
* @author etl
*/
public class FileNameLengthLimitExceededException extends FileException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/file/FileSizeLimitExceededException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.file;
package com.etl.common.core.exception.file;
/**
* 文件名大小限制异常类
*
* @author muyu
* @author etl
*/
public class FileSizeLimitExceededException extends FileException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/file/FileUploadException.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.exception.file;
package com.etl.common.core.exception.file;
import java.io.PrintStream;
import java.io.PrintWriter;
@ -6,7 +6,7 @@ import java.io.PrintWriter;
/**
* 文件上传异常类
*
* @author muyu
* @author etl
*/
public class FileUploadException extends Exception {

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/file/InvalidExtensionException.java
View File

@ -1,11 +1,11 @@
package com.muyu.common.core.exception.file;
package com.etl.common.core.exception.file;
import java.util.Arrays;
/**
* 文件上传 误异常类
*
* @author muyu
* @author etl
*/
public class InvalidExtensionException extends FileUploadException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/job/TaskException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.job;
package com.etl.common.core.exception.job;
/**
* 计划策略异常
*
* @author muyu
* @author etl
*/
public class TaskException extends Exception {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/user/CaptchaExpireException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.user;
package com.etl.common.core.exception.user;
/**
* 验证码失效异常类
*
* @author muyu
* @author etl
*/
public class CaptchaExpireException extends UserException {
private static final long serialVersionUID = 1L;

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/user/UserException.java
View File

@ -1,11 +1,11 @@
package com.muyu.common.core.exception.user;
package com.etl.common.core.exception.user;
import com.muyu.common.core.exception.base.BaseException;
import com.etl.common.core.exception.base.BaseException;
/**
* 用户信息异常类
*
* @author muyu
* @author etl
*/
public class UserException extends BaseException {
private static final long serialVersionUID = 1L;

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/exception/user/UserPasswordNotMatchException.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.exception.user;
package com.etl.common.core.exception.user;
/**
* 用户密码不正确或不符合规范异常类
*
* @author muyu
* @author etl
*/
public class UserPasswordNotMatchException extends UserException {
private static final long serialVersionUID = 1L;

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/text/CharsetKit.java
View File

@ -1,6 +1,6 @@
package com.muyu.common.core.text;
package com.etl.common.core.text;
import com.muyu.common.core.utils.StringUtils;
import com.etl.common.core.utils.StringUtils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets;
/**
* 字符集工具类
*
* @author muyu
* @author etl
*/
public class CharsetKit {
/**

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/text/Convert.java
View File

@ -1,6 +1,6 @@
package com.muyu.common.core.text;
package com.etl.common.core.text;
import com.muyu.common.core.utils.StringUtils;
import com.etl.common.core.utils.StringUtils;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -13,7 +13,7 @@ import java.util.Set;
/**
* 类型转换器
*
* @author muyu
* @author etl
*/
public class Convert {
/**

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/text/StrFormatter.java
View File

@ -1,11 +1,11 @@
package com.muyu.common.core.text;
package com.etl.common.core.text;
import com.muyu.common.core.utils.StringUtils;
import com.etl.common.core.utils.StringUtils;
/**
* 字符串格式化
*
* @author muyu
* @author etl
*/
public class StrFormatter {
public static final String EMPTY_JSON = "{}";

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/DateUtils.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import org.apache.commons.lang3.time.DateFormatUtils;
@ -11,7 +11,7 @@ import java.util.Date;
/**
* 时间工具类
*
* @author muyu
* @author etl
*/
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY = "yyyy";

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/ExceptionUtil.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import org.apache.commons.lang3.exception.ExceptionUtils;
@ -8,7 +8,7 @@ import java.io.StringWriter;
/**
* 错误信息处理类。
*
* @author muyu
* @author etl
*/
public class ExceptionUtil {
/**

10
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/JwtUtils.java
View File

@ -1,8 +1,8 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.TokenConstants;
import com.muyu.common.core.text.Convert;
import com.etl.common.core.constant.SecurityConstants;
import com.etl.common.core.constant.TokenConstants;
import com.etl.common.core.text.Convert;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@ -12,7 +12,7 @@ import java.util.Map;
/**
* Jwt工具类
*
* @author muyu
* @author etl
*/
public class JwtUtils {
public static String secret = TokenConstants.SECRET;

10
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/PageUtils.java
View File

@ -1,14 +1,14 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import com.github.pagehelper.PageHelper;
import com.muyu.common.core.utils.sql.SqlUtil;
import com.muyu.common.core.web.page.PageDomain;
import com.muyu.common.core.web.page.TableSupport;
import com.etl.common.core.utils.sql.SqlUtil;
import com.etl.common.core.web.page.PageDomain;
import com.etl.common.core.web.page.TableSupport;
/**
* 分页工具类
*
* @author muyu
* @author etl
*/
public class PageUtils extends PageHelper {
/**

10
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/ServletUtils.java
View File

@ -1,9 +1,9 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import com.alibaba.fastjson2.JSON;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.text.Convert;
import com.etl.common.core.constant.Constants;
import com.etl.common.core.domain.Result;
import com.etl.common.core.text.Convert;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@ -31,7 +31,7 @@ import java.util.Map;
/**
* 客户端工具类
*
* @author muyu
* @author etl
*/
public class ServletUtils {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/SpringUtils.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;
@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
/**
* spring工具类 方便在非spring管理环境中获取bean
*
* @author muyu
* @author etl
*/
@Component
public final class SpringUtils implements BeanFactoryPostProcessor {

8
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/StringUtils.java
View File

@ -1,7 +1,7 @@
package com.muyu.common.core.utils;
package com.etl.common.core.utils;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.text.StrFormatter;
import com.etl.common.core.constant.Constants;
import com.etl.common.core.text.StrFormatter;
import org.springframework.util.AntPathMatcher;
import java.util.Collection;
@ -11,7 +11,7 @@ import java.util.Map;
/**
* 字符串工具类
*
* @author muyu
* @author etl
*/
public class StringUtils extends org.apache.commons.lang3.StringUtils {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/bean/BeanUtils.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils.bean;
package com.etl.common.core.utils.bean;
import java.lang.reflect.Method;
import java.util.ArrayList;
@ -9,7 +9,7 @@ import java.util.regex.Pattern;
/**
* Bean 工具类
*
* @author muyu
* @author etl
*/
public class BeanUtils extends org.springframework.beans.BeanUtils {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/bean/BeanValidators.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils.bean;
package com.etl.common.core.utils.bean;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
@ -8,7 +8,7 @@ import java.util.Set;
/**
* bean对象属性验证
*
* @author muyu
* @author etl
*/
public class BeanValidators {
public static void validateWithException (Validator validator, Object object, Class<?>... groups)

8
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/file/FileTypeUtils.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils.file;
package com.etl.common.core.utils.file;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
@ -10,13 +10,13 @@ import java.util.Objects;
/**
* 文件类型工具类
*
* @author muyu
* @author etl
*/
public class FileTypeUtils {
/**
* 获取文件类型
* <p>
* 例如: muyu.txt, 返回: txt
* 例如: etl.txt, 返回: txt
*
* @param file 文件名
*
@ -32,7 +32,7 @@ public class FileTypeUtils {
/**
* 获取文件类型
* <p>
* 例如: muyu.txt, 返回: txt
* 例如: etl.txt, 返回: txt
*
* @param fileName 文件名
*

6
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/file/FileUtils.java
View File

@ -1,6 +1,6 @@
package com.muyu.common.core.utils.file;
package com.etl.common.core.utils.file;
import com.muyu.common.core.utils.StringUtils;
import com.etl.common.core.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
import javax.servlet.http.HttpServletRequest;
@ -12,7 +12,7 @@ import java.nio.charset.StandardCharsets;
/**
* 文件处理工具类
*
* @author muyu
* @author etl
*/
public class FileUtils {
/**

4
muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java → etl-common/etl-common-core/src/main/java/com/etl/common/core/utils/file/ImageUtils.java
View File

@ -1,4 +1,4 @@
package com.muyu.common.core.utils.file;
package com.etl.common.core.utils.file;
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
@ -13,7 +13,7 @@ import java.util.Arrays;
/**
* 图片处理工具类
*
* @author muyu
* @author etl
*/
public class ImageUtils {
private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);

Some files were not shown because too many files have changed in this diff Show More