diff --git a/README.md b/README.md index cf4627d..57fdf1e 100644 --- a/README.md +++ b/README.md @@ -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.zhilian +├── zhilian-ui // 前端框架 [80] +├── zhilian-gateway // 网关模块 [8080] +├── zhilian-auth // 认证中心 [9200] +├── zhilian-common // 通用模块 +│ └── zhilian-common-core // 核心模块 +│ └── zhilian-common-datascope // 权限范围 +│ └── zhilian-common-datasource // 多数据源 +│ └── zhilian-common-log // 日志记录 +│ └── zhilian-common-redis // 缓存服务 +│ └── zhilian-common-seata // 分布式事务 +│ └── zhilian-common-security // 安全模块 +│ └── zhilian-common-swagger // 系统接口 +│ └── zhilian-common-system // 系统基础 +├── zhilian-modules // 业务模块 +│ └── zhilian-system // 系统模块 [9201] +│ └── zhilian-gen // 代码生成 [9202] +│ └── zhilian-job // 定时任务 [9203] +│ └── zhilian-file // 文件服务 [9300] +├── zhilian-visual // 图形化管理模块 +│ └── zhilian-visual-monitor // 监控中心 [9100] ├──pom.xml // 公共依赖 ~~~ diff --git a/bin/run-auth.bat b/bin/run-auth.bat index b1920f4..a838454 100644 --- a/bin/run-auth.bat +++ b/bin/run-auth.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Auth���̡� echo. cd %~dp0 -cd ../muyu-auth/target +cd ../zhilian-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 zhilian-auth.jar cd bin pause diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat index ed93b8e..c14875f 100644 --- a/bin/run-gateway.bat +++ b/bin/run-gateway.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Gateway���̡� echo. cd %~dp0 -cd ../muyu-gateway/target +cd ../zhilian-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 zhilian-gateway.jar cd bin pause diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat index 4e97ab9..b9f4c42 100644 --- a/bin/run-modules-file.bat +++ b/bin/run-modules-file.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Modules-File���̡� echo. cd %~dp0 -cd ../muyu-modules/muyu-file/target +cd ../zhilian-modules/zhilian-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 zhilian-modules-file.jar cd bin pause diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat index be9d9c6..d788c3e 100644 --- a/bin/run-modules-gen.bat +++ b/bin/run-modules-gen.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Modules-Gen���̡� echo. cd %~dp0 -cd ../muyu-modules/muyu-gen/target +cd ../zhilian-modules/zhilian-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 zhilian-modules-gen.jar cd bin pause diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat index a6ce652..52f2032 100644 --- a/bin/run-modules-job.bat +++ b/bin/run-modules-job.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Modules-Job���̡� echo. cd %~dp0 -cd ../muyu-modules/muyu-job/target +cd ../zhilian-modules/zhilian-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 zhilian-modules-job.jar cd bin pause diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat index fc727b2..8bbbf75 100644 --- a/bin/run-modules-system.bat +++ b/bin/run-modules-system.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Modules-System���̡� echo. cd %~dp0 -cd ../muyu-modules/muyu-system/target +cd ../zhilian-modules/zhilian-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 zhilian-modules-system.jar cd bin pause diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat index 8a8bc01..1f814c4 100644 --- a/bin/run-monitor.bat +++ b/bin/run-monitor.bat @@ -4,11 +4,11 @@ echo [��Ϣ] ʹ��Jar��������Monitor���̡� echo. cd %~dp0 -cd ../muyu-visual/muyu-monitor/target +cd ../zhilian-visual/zhilian-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 zhilian-visual-monitor.jar cd bin pause diff --git a/docker/copy.sh b/docker/copy.sh index 0496600..e807e8f 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -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 ../zhilian-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 zhilian-gateway " +cp ../zhilian-gateway/target/zhilian-gateway.jar ./zhilian/gateway/jar -echo "begin copy muyu-auth " -cp ../muyu-auth/target/muyu-auth.jar ./muyu/auth/jar +echo "begin copy zhilian-auth " +cp ../zhilian-auth/target/zhilian-auth.jar ./zhilian/auth/jar -echo "begin copy muyu-visual " -cp ../muyu-visual/muyu-monitor/target/muyu-visual-monitor.jar ./muyu/visual/monitor/jar +echo "begin copy zhilian-visual " +cp ../zhilian-visual/zhilian-monitor/target/zhilian-visual-monitor.jar ./zhilian/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 zhilian-modules-system " +cp ../zhilian-modules/zhilian-system/target/zhilian-modules-system.jar ./zhilian/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 zhilian-modules-file " +cp ../zhilian-modules/zhilian-file/target/zhilian-modules-file.jar ./zhilian/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 zhilian-modules-job " +cp ../zhilian-modules/zhilian-job/target/zhilian-modules-job.jar ./zhilian/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 zhilian-modules-gen " +cp ../zhilian-modules/zhilian-gen/target/zhilian-modules-gen.jar ./zhilian/modules/gen/jar diff --git a/docker/deploy.sh b/docker/deploy.sh index b980f64..cd9ba6e 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -26,12 +26,12 @@ port(){ # 启动基础环境（必须） base(){ - docker-compose up -d muyu-mysql muyu-redis muyu-nacos + docker-compose up -d zhilian-mysql zhilian-redis zhilian-nacos } # 启动程序模块（必须） modules(){ - docker-compose up -d muyu-nginx muyu-gateway muyu-auth muyu-modules-system + docker-compose up -d zhilian-nginx zhilian-gateway zhilian-auth zhilian-modules-system } # 关闭所有环境/模块 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c6d1d41..2b57211 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version : '3.8' services: - muyu-nacos: - container_name: muyu-nacos + zhilian-nacos: + container_name: zhilian-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 + - zhilian-mysql + zhilian-mysql: + container_name: zhilian-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 + zhilian-redis: + container_name: zhilian-redis image: redis build: context: ./redis ports: - "6379:6379" volumes: - - ./redis/conf/redis.conf:/home/muyu/redis/redis.conf + - ./redis/conf/redis.conf:/home/zhilian/redis/redis.conf - ./redis/data:/data - command: redis-server /home/muyu/redis/redis.conf - muyu-nginx: - container_name: muyu-nginx + command: redis-server /home/zhilian/redis/redis.conf + zhilian-nginx: + container_name: zhilian-nginx image: nginx build: context: ./nginx ports: - "80:80" volumes: - - ./nginx/html/dist:/home/muyu/projects/muyu-ui + - ./nginx/html/dist:/home/zhilian/projects/zhilian-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 + - zhilian-gateway links: - - muyu-gateway - muyu-gateway: - container_name: muyu-gateway + - zhilian-gateway + zhilian-gateway: + container_name: zhilian-gateway build: - context: ./muyu/gateway + context: ./zhilian/gateway dockerfile: dockerfile ports: - "8080:8080" depends_on: - - muyu-redis + - zhilian-redis links: - - muyu-redis - muyu-auth: - container_name: muyu-auth + - zhilian-redis + zhilian-auth: + container_name: zhilian-auth build: - context: ./muyu/auth + context: ./zhilian/auth dockerfile: dockerfile ports: - "9200:9200" depends_on: - - muyu-redis + - zhilian-redis links: - - muyu-redis - muyu-modules-system: - container_name: muyu-modules-system + - zhilian-redis + zhilian-modules-system: + container_name: zhilian-modules-system build: - context: ./muyu/modules/system + context: ./zhilian/modules/system dockerfile: dockerfile ports: - "9201:9201" depends_on: - - muyu-redis - - muyu-mysql + - zhilian-redis + - zhilian-mysql links: - - muyu-redis - - muyu-mysql - muyu-modules-gen: - container_name: muyu-modules-gen + - zhilian-redis + - zhilian-mysql + zhilian-modules-gen: + container_name: zhilian-modules-gen build: - context: ./muyu/modules/gen + context: ./zhilian/modules/gen dockerfile: dockerfile ports: - "9202:9202" depends_on: - - muyu-mysql + - zhilian-mysql links: - - muyu-mysql - muyu-modules-job: - container_name: muyu-modules-job + - zhilian-mysql + zhilian-modules-job: + container_name: zhilian-modules-job build: - context: ./muyu/modules/job + context: ./zhilian/modules/job dockerfile: dockerfile ports: - "9203:9203" depends_on: - - muyu-mysql + - zhilian-mysql links: - - muyu-mysql - muyu-modules-file: - container_name: muyu-modules-file + - zhilian-mysql + zhilian-modules-file: + container_name: zhilian-modules-file build: - context: ./muyu/modules/file + context: ./zhilian/modules/file dockerfile: dockerfile ports: - "9300:9300" volumes: - - ./muyu/uploadPath:/home/muyu/uploadPath - muyu-visual-monitor: - container_name: muyu-visual-monitor + - ./zhilian/uploadPath:/home/zhilian/uploadPath + zhilian-visual-monitor: + container_name: zhilian-visual-monitor build: - context: ./muyu/visual/monitor + context: ./zhilian/visual/monitor dockerfile: dockerfile ports: - "9100:9100" diff --git a/docker/muyu/auth/dockerfile b/docker/muyu/auth/dockerfile index 2ad5344..3485d42 100644 --- a/docker/muyu/auth/dockerfile +++ b/docker/muyu/auth/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-auth.jar /home/muyu/muyu-auth.jar +COPY ./jar/zhilian-auth.jar /home/zhilian/zhilian-auth.jar # 启动认证服务 -ENTRYPOINT ["java","-jar","muyu-auth.jar"] +ENTRYPOINT ["java","-jar","zhilianzhilian-auth.jar"] diff --git a/docker/muyu/gateway/dockerfile b/docker/muyu/gateway/dockerfile index 31d1287..7ad9928 100644 --- a/docker/muyu/gateway/dockerfile +++ b/docker/muyu/gateway/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-gateway.jar /home/muyu/muyu-gateway.jar +COPY ./jar/zhilian-gateway.jar /home/zhilian/zhilian-gateway.jar # 启动网关服务 -ENTRYPOINT ["java","-jar","muyu-gateway.jar"] +ENTRYPOINT ["java","-jar","zhilianzhilian-gateway.jar"] diff --git a/docker/muyu/modules/file/dockerfile b/docker/muyu/modules/file/dockerfile index 195fd9c..459551e 100644 --- a/docker/muyu/modules/file/dockerfile +++ b/docker/muyu/modules/file/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-modules-file.jar /home/muyu/muyu-modules-file.jar +COPY ./jar/zhilian-modules-file.jar /home/zhilian/zhilian-modules-file.jar # 启动文件服务 -ENTRYPOINT ["java","-jar","muyu-modules-file.jar"] +ENTRYPOINT ["java","-jar","zhilian-modules-file.jar"] diff --git a/docker/muyu/modules/gen/dockerfile b/docker/muyu/modules/gen/dockerfile index 832c9b7..2f0c4e1 100644 --- a/docker/muyu/modules/gen/dockerfile +++ b/docker/muyu/modules/gen/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-modules-gen.jar /home/muyu/muyu-modules-gen.jar +COPY ./jar/zhilian-modules-gen.jar /home/zhilian/zhilian-modules-gen.jar # 启动代码生成服务 -ENTRYPOINT ["java","-jar","muyu-modules-gen.jar"] +ENTRYPOINT ["java","-jar","zhilian-modules-gen.jar"] diff --git a/docker/muyu/modules/job/dockerfile b/docker/muyu/modules/job/dockerfile index 128b96e..eda6693 100644 --- a/docker/muyu/modules/job/dockerfile +++ b/docker/muyu/modules/job/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-modules-job.jar /home/muyu/muyu-modules-job.jar +COPY ./jar/zhilian-modules-job.jar /home/zhilian/zhilian-modules-job.jar # 启动定时任务服务 -ENTRYPOINT ["java","-jar","muyu-modules-job.jar"] +ENTRYPOINT ["java","-jar","zhilian-modules-job.jar"] diff --git a/docker/muyu/modules/system/dockerfile b/docker/muyu/modules/system/dockerfile index 79a68de..db45706 100644 --- a/docker/muyu/modules/system/dockerfile +++ b/docker/muyu/modules/system/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-modules-system.jar /home/muyu/muyu-modules-system.jar +COPY ./jar/zhilian-modules-system.jar /home/zhilian/zhilian-modules-system.jar # 启动系统服务 -ENTRYPOINT ["java","-jar","muyu-modules-system.jar"] +ENTRYPOINT ["java","-jar","zhilian-modules-system.jar"] diff --git a/docker/muyu/visual/monitor/dockerfile b/docker/muyu/visual/monitor/dockerfile index 5a48299..55fd22d 100644 --- a/docker/muyu/visual/monitor/dockerfile +++ b/docker/muyu/visual/monitor/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM openjdk:8-jre # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu +VOLUME /home/zhilian # 创建目录 -RUN mkdir -p /home/muyu +RUN mkdir -p /home/zhilian # 指定路径 -WORKDIR /home/muyu +WORKDIR /home/zhilian # 复制jar文件到路径 -COPY ./jar/muyu-visual-monitor.jar /home/muyu/muyu-visual-monitor.jar +COPY ./jar/zhilian-visual-monitor.jar /home/zhilian/zhilian-visual-monitor.jar # 启动系统服务 -ENTRYPOINT ["java","-jar","muyu-visual-monitor.jar"] +ENTRYPOINT ["java","-jar","zhilian-visual-monitor.jar"] diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile index 19bb23f..f279b0e 100644 --- a/docker/mysql/dockerfile +++ b/docker/mysql/dockerfile @@ -1,7 +1,7 @@ # 基础镜像 FROM mysql:5.7 # author -MAINTAINER muyu +MAINTAINER zhilian # 执行sql脚本 ADD ./db/*.sql /docker-entrypoint-initdb.d/ diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index 1dd247a..74fe1ad 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -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://zhilian-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/zhilian/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/** diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile index 6942d96..e41cccb 100644 --- a/docker/nacos/dockerfile +++ b/docker/nacos/dockerfile @@ -1,7 +1,7 @@ # 基础镜像 FROM nacos/nacos-server # author -MAINTAINER muyu +MAINTAINER zhilian # 复制conf文件到路径 COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 64f13eb..2f2a42c 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -15,7 +15,7 @@ http { server_name localhost; location / { - root /home/muyu/projects/muyu-ui; + root /home/zhilian/projects/zhilian-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://zhilian-gateway:8080/; } # 避免actuator暴露 diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile index c3d3fb2..bc195d2 100644 --- a/docker/nginx/dockerfile +++ b/docker/nginx/dockerfile @@ -1,15 +1,15 @@ # 基础镜像 FROM nginx # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu/projects/muyu-ui +VOLUME /home/zhilian/projects/zhilian-ui # 创建目录 -RUN mkdir -p /home/muyu/projects/muyu-ui +RUN mkdir -p /home/zhilian/projects/zhilian-ui # 指定路径 -WORKDIR /home/muyu/projects/muyu-ui +WORKDIR /home/zhilian/projects/zhilian-ui # 复制conf文件到路径 COPY ./conf/nginx.conf /etc/nginx/nginx.conf # 复制html文件到路径 -COPY ./html/dist /home/muyu/projects/muyu-ui +COPY ./html/dist /home/zhilian/projects/zhilian-ui diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile index 2dc9477..f8094c5 100644 --- a/docker/redis/dockerfile +++ b/docker/redis/dockerfile @@ -1,13 +1,13 @@ # 基础镜像 FROM redis # author -MAINTAINER muyu +MAINTAINER zhilian # 挂载目录 -VOLUME /home/muyu/redis +VOLUME /home/zhilian/redis # 创建目录 -RUN mkdir -p /home/muyu/redis +RUN mkdir -p /home/zhilian/redis # 指定路径 -WORKDIR /home/muyu/redis +WORKDIR /home/zhilian/redis # 复制conf文件到路径 -COPY ./conf/redis.conf /home/muyu/redis/redis.conf +COPY ./conf/redis.conf /home/zhilian/redis/redis.conf diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java deleted file mode 100644 index 25c918e..0000000 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.common.core.constant; - -/** - * 服务名称 - * - * @author muyu - */ -public class ServiceNameConstants { - /** - * 认证服务的serviceid - */ - public static final String AUTH_SERVICE = "muyu-auth"; - - /** - * 系统模块的serviceid - */ - public static final String SYSTEM_SERVICE = "muyu-system"; - - /** - * 文件服务的serviceid - */ - public static final String FILE_SERVICE = "muyu-file"; -} diff --git a/muyu-common/muyu-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 526ea23..0000000 --- a/muyu-common/muyu-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.muyu.common.core.utils.SpringUtils diff --git a/muyu-common/muyu-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8f4967b..0000000 --- a/muyu-common/muyu-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.muyu.common.datascope.aspect.DataScopeAspect diff --git a/muyu-common/muyu-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index e46e773..0000000 --- a/muyu-common/muyu-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.muyu.common.log.service.AsyncLogService -com.muyu.common.log.aspect.LogAspect diff --git a/muyu-common/muyu-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 27b030e..0000000 --- a/muyu-common/muyu-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.muyu.common.redis.configure.RedisConfig -com.muyu.common.redis.service.RedisService diff --git a/muyu-common/muyu-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f4e76b1..0000000 --- a/muyu-common/muyu-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -com.muyu.common.security.config.WebMvcConfig -com.muyu.common.security.service.TokenService -com.muyu.common.security.aspect.PreAuthorizeAspect -com.muyu.common.security.aspect.InnerAuthAspect -com.muyu.common.security.handler.GlobalExceptionHandler diff --git a/muyu-common/muyu-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b15b749..0000000 --- a/muyu-common/muyu-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -# com.muyu.common.swagger.config.SwaggerAutoConfiguration -# com.muyu.common.swagger.config.SwaggerWebConfiguration -# com.muyu.common.swagger.config.SwaggerBeanPostProcessor diff --git a/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b9a11b8..0000000 --- a/muyu-common/muyu-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -com.muyu.common.system.remote.factory.RemoteUserFallbackFactory -com.muyu.common.system.remote.factory.RemoteLogFallbackFactory -com.muyu.common.system.remote.factory.RemoteFileFallbackFactory diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml deleted file mode 100644 index 2a0ed38..0000000 --- a/muyu-common/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - com.muyu - smart-cloud-server - 3.6.3 - - 4.0.0 - - - muyu-common-log - muyu-common-core - muyu-common-redis - muyu-common-seata - muyu-common-swagger - muyu-common-security - muyu-common-datascope - muyu-common-datasource - muyu-common-system - - - muyu-common - pom - - - muyu-common通用模块 - - - diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java deleted file mode 100644 index a6898bf..0000000 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.gen; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 代码生成 - * - * @author muyu - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class MuYuGenApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuGenApplication.class, args); - } -} diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java deleted file mode 100644 index f6a79c0..0000000 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.job; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 定时任务 - * - * @author muyu - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class MuYuJobApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuJobApplication.class, args); - } -} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java deleted file mode 100644 index 8dab51e..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.system; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 系统模块 - * - * @author muyu - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class MuYuSystemApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuSystemApplication.class, args); - } -} diff --git a/muyu-modules/muyu-system/src/main/resources/logback.xml b/muyu-modules/muyu-system/src/main/resources/logback.xml deleted file mode 100644 index aa340cd..0000000 --- a/muyu-modules/muyu-system/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml deleted file mode 100644 index 1276c8e..0000000 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Tomcat -server: - port: 9100 - -# Spring -spring: - application: - # 应用名称 - name: muyu-monitor - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/muyu-visual/muyu-monitor/src/main/resources/logback.xml b/muyu-visual/muyu-monitor/src/main/resources/logback.xml deleted file mode 100644 index 66e0d25..0000000 --- a/muyu-visual/muyu-monitor/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 48d0915..e13b455 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.muyu + com.zhilian smart-cloud-server 3.6.3 - muyu + zhilian 微服务系统 - 3.6.3 + 3.6.3 UTF-8 UTF-8 17 @@ -35,6 +35,7 @@ 8.2.2 4.1.2 2.14.3 + 3.8.1 @@ -145,76 +146,76 @@ - com.muyu - muyu-common-core - ${muyu.version} + com.zhilian + zhilian-common-core + ${zhilian.version} - com.muyu - muyu-common-swagger - ${muyu.version} + com.zhilian + zhilian-common-swagger + ${zhilian.version} - com.muyu - muyu-common-security - ${muyu.version} + com.zhilian + zhilian-common-security + ${zhilian.version} - com.muyu - muyu-common-datascope - ${muyu.version} + com.zhilian + zhilian-common-datascope + ${zhilian.version} - com.muyu - muyu-common-datasource - ${muyu.version} + com.zhilian + zhilian-common-datasource + ${zhilian.version} - com.muyu - muyu-common-seata - ${muyu.version} + com.zhilian + zhilian-common-seata + ${zhilian.version} - com.muyu - muyu-common-log - ${muyu.version} + com.zhilian + zhilian-common-log + ${zhilian.version} - com.muyu - muyu-common-redis - ${muyu.version} + com.zhilian + zhilian-common-redis + ${zhilian.version} - com.muyu - muyu-common-system - ${muyu.version} + com.zhilian + zhilian-common-system + ${zhilian.version} - muyu-auth - muyu-gateway - muyu-visual - muyu-modules - muyu-common + zhilian-auth + zhilian-gateway + zhilian-visual + zhilian-modules + zhilian-common pom @@ -231,12 +232,19 @@ org.apache.maven.plugins maven-compiler-plugin + ${maven-compiler-plugin.version} ${java.version} ${java.version} ${project.build.sourceEncoding} + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + @@ -277,7 +285,7 @@ releases releases - http://nexus.muyu.com:8081/repository/maven-releases/ + http://nexus.zhilian.com:8081/repository/maven-releases/ @@ -285,7 +293,7 @@ public aliyun nexus - http://nexus.muyu.com:8081/repository/maven-public/ + http://nexus.zhilian.com:8081/repository/maven-public/ true @@ -296,7 +304,7 @@ public aliyun nexus - http://nexus.muyu.com:8081/repository/maven-public/ + http://nexus.zhilian.com:8081/repository/maven-public/ true diff --git a/sql/ry_20230706.sql b/sql/ry_20230706.sql index 8365034..d7d44fc 100644 --- a/sql/ry_20230706.sql +++ b/sql/ry_20230706.sql @@ -162,7 +162,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://muyu.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); +insert into sys_menu values('4', '若依官网', '0', '4', 'http://zhilian.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); diff --git a/sql/ry_config_20220929.sql b/sql/ry_config_20220929.sql index a426ae7..3497130 100644 --- a/sql/ry_config_20220929.sql +++ b/sql/ry_config_20220929.sql @@ -1,12 +1,10 @@ -DROP DATABASE IF EXISTS `ry-config`; -CREATE DATABASE `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + + SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -USE `ry-config`; - /******************************************/ /* 表名称 = config_info */ /******************************************/ @@ -34,14 +32,14 @@ CREATE TABLE `config_info` ( insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema, encrypted_data_key) values (1,'application-dev.yml','DEFAULT_GROUP','spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n','aaa73b809cfd4d0058893aa13da57806','2020-05-20 12:00:00','2022-04-24 10:26:34','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml',NULL,''), -(2,'muyu-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: muyu-auth\n uri: lb://muyu-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: muyu-gen\n uri: lb://muyu-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: muyu-job\n uri: lb://muyu-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: muyu-system\n uri: lb://muyu-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: muyu-file\n uri: lb://muyu-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n','57cec5abd0e0a6b77d853750344a9dc0','2020-05-14 14:17:55','2022-09-29 02:48:32','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), -(3,'muyu-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n','8bd9dada9a94822feeab40de55efced6','2020-11-20 00:00:00','2022-09-29 02:48:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), -(4,'muyu-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: muyu\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2022-09-29 02:48:54','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), -(5,'muyu-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.muyu.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By muyu\n licenseUrl: https://muyu.vip','48e0ed4a040c402bdc2444213a82c910','2020-11-20 00:00:00','2022-09-29 02:49:09','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), -(6,'muyu-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.muyu.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By muyu\n licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n # 作者\n author: muyu\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.muyu.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), -(7,'muyu-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.muyu.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By muyu\n licenseUrl: https://muyu.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), -(8,'muyu-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/muyu/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), -(9,'sentinel-muyu-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"muyu-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"muyu-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"muyu-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"muyu-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,''); +(2,'zhilian-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: zhilian-auth\n uri: lb://zhilian-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: zhilian-gen\n uri: lb://zhilian-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: zhilian-job\n uri: lb://zhilian-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: zhilian-system\n uri: lb://zhilian-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: zhilian-file\n uri: lb://zhilian-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n','57cec5abd0e0a6b77d853750344a9dc0','2020-05-14 14:17:55','2022-09-29 02:48:32','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), +(3,'zhilian-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n','8bd9dada9a94822feeab40de55efced6','2020-11-20 00:00:00','2022-09-29 02:48:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), +(4,'zhilian-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: zhilian\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2022-09-29 02:48:54','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), +(5,'zhilian-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.zhilian.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By zhilian\n licenseUrl: https://zhilian.vip','48e0ed4a040c402bdc2444213a82c910','2020-11-20 00:00:00','2022-09-29 02:49:09','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), +(6,'zhilian-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/zl-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.zhilian.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By zhilian\n licenseUrl: https://zhilian.vip\n\n# 代码生成\ngen:\n # 作者\n author: zhilian\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.zhilian.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), +(7,'zhilian-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/zl-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.zhilian.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By zhilian\n licenseUrl: https://zhilian.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), +(8,'zhilian-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/zhilian/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), +(9,'sentinel-zhilian-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"zhilian-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"zhilian-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"zhilian-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"zhilian-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,''); /******************************************/ diff --git a/sql/ry_seata_20210128.sql b/sql/ry_seata_20210128.sql index 41163c1..c74f6c7 100644 --- a/sql/ry_seata_20210128.sql +++ b/sql/ry_seata_20210128.sql @@ -1,11 +1,11 @@ -DROP DATABASE IF EXISTS `ry-seata`; +DROP DATABASE IF EXISTS `zl-seata`; -CREATE DATABASE `ry-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +CREATE DATABASE `zl-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -USE `ry-seata`; +USE `zl-seata`; -- -------------------------------- The script used when storeMode is 'db' -------------------------------- -- the table to store GlobalSession data diff --git a/muyu-auth/pom.xml b/zhilian-auth/pom.xml similarity index 90% rename from muyu-auth/pom.xml rename to zhilian-auth/pom.xml index 938dced..bfa3ba8 100644 --- a/muyu-auth/pom.xml +++ b/zhilian-auth/pom.xml @@ -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"> - com.muyu + com.zhilian smart-cloud-server 3.6.3 4.0.0 - muyu-auth + zhilian-auth - muyu-auth认证授权中心 + zhilian-auth认证授权中心 @@ -46,10 +46,10 @@ spring-boot-starter-actuator - + - com.muyu - muyu-common-security + com.zhilian + zhilian-common-security diff --git a/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java b/zhilian-auth/src/main/java/com/zhilian/auth/ZhiLianAuthApplication.java similarity index 63% rename from muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java rename to zhilian-auth/src/main/java/com/zhilian/auth/ZhiLianAuthApplication.java index 7283b5a..3f558a6 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/ZhiLianAuthApplication.java @@ -1,6 +1,6 @@ -package com.muyu.auth; +package com.zhilian.auth; -import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.zhilian.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 zhilian */ @EnableMyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class MuYuAuthApplication { +public class ZhiLianAuthApplication { public static void main (String[] args) { - SpringApplication.run(MuYuAuthApplication.class, args); + SpringApplication.run(ZhiLianAuthApplication.class, args); } } diff --git a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/zhilian-auth/src/main/java/com/zhilian/auth/controller/TokenController.java similarity index 78% rename from muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java rename to zhilian-auth/src/main/java/com/zhilian/auth/controller/TokenController.java index 960a13f..c1265cf 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/controller/TokenController.java @@ -1,15 +1,15 @@ -package com.muyu.auth.controller; +package com.zhilian.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.zhilian.auth.form.LoginBody; +import com.zhilian.auth.form.RegisterBody; +import com.zhilian.auth.service.SysLoginService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.JwtUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.auth.AuthUtil; +import com.zhilian.common.security.service.TokenService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.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 zhilian */ @RestController public class TokenController { diff --git a/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java b/zhilian-auth/src/main/java/com/zhilian/auth/form/LoginBody.java similarity index 90% rename from muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java rename to zhilian-auth/src/main/java/com/zhilian/auth/form/LoginBody.java index 999ad44..681b1a1 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/form/LoginBody.java @@ -1,9 +1,9 @@ -package com.muyu.auth.form; +package com.zhilian.auth.form; /** * 用户登录对象 * - * @author muyu + * @author zhilian */ public class LoginBody { /** diff --git a/muyu-auth/src/main/java/com/muyu/auth/form/RegisterBody.java b/zhilian-auth/src/main/java/com/zhilian/auth/form/RegisterBody.java similarity index 62% rename from muyu-auth/src/main/java/com/muyu/auth/form/RegisterBody.java rename to zhilian-auth/src/main/java/com/zhilian/auth/form/RegisterBody.java index c2a4d5a..044b1f8 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/form/RegisterBody.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/form/RegisterBody.java @@ -1,9 +1,9 @@ -package com.muyu.auth.form; +package com.zhilian.auth.form; /** * 用户注册对象 * - * @author muyu + * @author zhilian */ public class RegisterBody extends LoginBody { diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/zhilian-auth/src/main/java/com/zhilian/auth/service/SysLoginService.java similarity index 85% rename from muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java rename to zhilian-auth/src/main/java/com/zhilian/auth/service/SysLoginService.java index ff0af1a..eed75f4 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/service/SysLoginService.java @@ -1,27 +1,27 @@ -package com.muyu.auth.service; +package com.zhilian.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.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.enums.UserStatus; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.ip.IpUtils; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.remote.RemoteUserService; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.common.system.domain.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** * 登录校验方法 * - * @author muyu + * @author zhilian */ @Component public class SysLoginService { diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java b/zhilian-auth/src/main/java/com/zhilian/auth/service/SysPasswordService.java similarity index 85% rename from muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java rename to zhilian-auth/src/main/java/com/zhilian/auth/service/SysPasswordService.java index 5f3c126..6b787ba 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/service/SysPasswordService.java @@ -1,11 +1,11 @@ -package com.muyu.auth.service; +package com.zhilian.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.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.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 zhilian */ @Component public class SysPasswordService { diff --git a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java b/zhilian-auth/src/main/java/com/zhilian/auth/service/SysRecordLogService.java similarity index 74% rename from muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java rename to zhilian-auth/src/main/java/com/zhilian/auth/service/SysRecordLogService.java index 2d4de80..847ce81 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java +++ b/zhilian-auth/src/main/java/com/zhilian/auth/service/SysRecordLogService.java @@ -1,18 +1,18 @@ -package com.muyu.auth.service; +package com.zhilian.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.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.ip.IpUtils; +import com.zhilian.common.system.remote.RemoteLogService; +import com.zhilian.common.system.domain.SysLogininfor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** * 记录日志方法 * - * @author muyu + * @author zhilian */ @Component public class SysRecordLogService { diff --git a/muyu-auth/src/main/resources/banner.txt b/zhilian-auth/src/main/resources/banner.txt similarity index 100% rename from muyu-auth/src/main/resources/banner.txt rename to zhilian-auth/src/main/resources/banner.txt diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/zhilian-auth/src/main/resources/bootstrap.yml similarity index 81% rename from muyu-auth/src/main/resources/bootstrap.yml rename to zhilian-auth/src/main/resources/bootstrap.yml index b309a3d..94f1a14 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/zhilian-auth/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-auth + name: zhilian-auth profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-auth/src/main/resources/logback.xml b/zhilian-auth/src/main/resources/logback.xml similarity index 96% rename from muyu-auth/src/main/resources/logback.xml rename to zhilian-auth/src/main/resources/logback.xml index 328fc49..229f267 100644 --- a/muyu-auth/src/main/resources/logback.xml +++ b/zhilian-auth/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/zhilian-common/pom.xml b/zhilian-common/pom.xml new file mode 100644 index 0000000..ceac357 --- /dev/null +++ b/zhilian-common/pom.xml @@ -0,0 +1,30 @@ + + + + com.zhilian + smart-cloud-server + 3.6.3 + + 4.0.0 + + + zhilian-common-log + zhilian-common-core + zhilian-common-redis + zhilian-common-seata + zhilian-common-swagger + zhilian-common-security + zhilian-common-datascope + zhilian-common-datasource + zhilian-common-system + + + zhilian-common + pom + + + zhilian-common通用模块 + + + diff --git a/muyu-common/muyu-common-core/pom.xml b/zhilian-common/zhilian-common-core/pom.xml similarity index 95% rename from muyu-common/muyu-common-core/pom.xml rename to zhilian-common/zhilian-common-core/pom.xml index d7ff491..943ccc1 100644 --- a/muyu-common/muyu-common-core/pom.xml +++ b/zhilian-common/zhilian-common-core/pom.xml @@ -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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-core + zhilian-common-core - muyu-common-core核心模块 + zhilian-common-core核心模块 diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/annotation/Excel.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/annotation/Excel.java index 36180e5..1cf2791 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/annotation/Excel.java @@ -1,6 +1,6 @@ -package com.muyu.common.core.annotation; +package com.zhilian.common.core.annotation; -import com.muyu.common.core.utils.poi.ExcelHandlerAdapter; +import com.zhilian.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 zhilian */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excels.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/annotation/Excels.java similarity index 82% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excels.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/annotation/Excels.java index f8fc165..e087fdc 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excels.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.annotation; +package com.zhilian.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 zhilian */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/CacheConstants.java similarity index 95% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/CacheConstants.java index 532c9f2..6c3c69e 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/CacheConstants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 缓存常量信息 * - * @author muyu + * @author zhilian */ public class CacheConstants { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/Constants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/Constants.java similarity index 91% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/Constants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/Constants.java index a3540fc..9153d59 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/Constants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/Constants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 通用常量信息 * - * @author muyu + * @author zhilian */ 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.zhilian"}; /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = {"com.muyu"}; + public static final String[] JOB_WHITELIST_STR = {"com.zhilian"}; /** * 定时任务违规的字符 */ 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.zhilian.common.core.utils.file"}; } diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/GenConstants.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/GenConstants.java index fde9967..2d92f4b 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 代码生成通用常量 * - * @author muyu + * @author zhilian */ public class GenConstants { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/HttpStatus.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/HttpStatus.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/HttpStatus.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/HttpStatus.java index 36e0783..490f622 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/HttpStatus.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/HttpStatus.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 返回状态码 * - * @author muyu + * @author zhilian */ public class HttpStatus { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ScheduleConstants.java similarity index 94% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ScheduleConstants.java index b5bceb0..6dacc5d 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ScheduleConstants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 任务调度通用常量 * - * @author muyu + * @author zhilian */ public class ScheduleConstants { public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/SecurityConstants.java similarity index 93% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/SecurityConstants.java index c862929..ad00432 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/SecurityConstants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 权限相关通用常量 * - * @author muyu + * @author zhilian */ public class SecurityConstants { /** diff --git a/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java new file mode 100644 index 0000000..953610f --- /dev/null +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/ServiceNameConstants.java @@ -0,0 +1,23 @@ +package com.zhilian.common.core.constant; + +/** + * 服务名称 + * + * @author zhilian + */ +public class ServiceNameConstants { + /** + * 认证服务的serviceid + */ + public static final String AUTH_SERVICE = "zhilian-auth"; + + /** + * 系统模块的serviceid + */ + public static final String SYSTEM_SERVICE = "zhilian-system"; + + /** + * 文件服务的serviceid + */ + public static final String FILE_SERVICE = "zhilian-file"; +} diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/TokenConstants.java similarity index 85% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/TokenConstants.java index 0884e32..f8e03ea 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/TokenConstants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * Token的Key常量 * - * @author muyu + * @author zhilian */ public class TokenConstants { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/UserConstants.java similarity index 97% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/UserConstants.java index 0df401c..5f65454 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.constant; +package com.zhilian.common.core.constant; /** * 用户常量信息 * - * @author muyu + * @author zhilian */ public class UserConstants { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/context/SecurityContextHolder.java similarity index 91% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/context/SecurityContextHolder.java index 80ea42b..9b380a6 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/context/SecurityContextHolder.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.context; +package com.zhilian.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.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.text.Convert; +import com.zhilian.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 zhilian */ public class SecurityContextHolder { private static final TransmittableThreadLocal> THREAD_LOCAL = new TransmittableThreadLocal<>(); diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java similarity index 93% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java index 70faa40..84155de 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/domain/Result.java @@ -1,7 +1,7 @@ -package com.muyu.common.core.domain; +package com.zhilian.common.core.domain; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.constant.HttpStatus; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.constant.HttpStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,7 +12,7 @@ import java.io.Serializable; /** * 响应信息主体 * - * @author muyu + * @author zhilian */ @Data @Builder diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/enums/UserStatus.java similarity index 87% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/enums/UserStatus.java index 32ff39a..bff58fe 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.enums; +package com.zhilian.common.core.enums; /** * 用户状态 * - * @author muyu + * @author zhilian */ public enum UserStatus { OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/CaptchaException.java similarity index 78% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/CaptchaException.java index eb32d0b..54b1b37 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/CaptchaException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 验证码错误异常类 * - * @author muyu + * @author zhilian */ public class CaptchaException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/CheckedException.java similarity index 90% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/CheckedException.java index 4f12893..c371342 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/CheckedException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 检查异常 * - * @author muyu + * @author zhilian */ public class CheckedException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/DemoModeException.java similarity index 75% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/DemoModeException.java index 82249cf..3665507 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 演示模式异常 * - * @author muyu + * @author zhilian */ public class DemoModeException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/GlobalException.java similarity index 94% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/GlobalException.java index b14e03c..98a4077 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/GlobalException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 全局异常 * - * @author muyu + * @author zhilian */ public class GlobalException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/InnerAuthException.java similarity index 78% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/InnerAuthException.java index f211c7f..13b9aba 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/InnerAuthException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 内部认证异常 * - * @author muyu + * @author zhilian */ public class InnerAuthException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/PreAuthorizeException.java similarity index 75% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/PreAuthorizeException.java index 6cb8636..d2e5681 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/PreAuthorizeException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 权限异常 * - * @author muyu + * @author zhilian */ public class PreAuthorizeException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/ServiceException.java similarity index 95% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/ServiceException.java index 5039bc0..6e32c9e 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/ServiceException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 业务异常 * - * @author muyu + * @author zhilian */ public final class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/UtilException.java similarity index 87% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/UtilException.java index 8de4bbf..f282d99 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception; +package com.zhilian.common.core.exception; /** * 工具类异常 * - * @author muyu + * @author zhilian */ public class UtilException extends RuntimeException { private static final long serialVersionUID = 8247610319171014183L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotLoginException.java similarity index 78% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotLoginException.java index 40293bf..47d984a 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotLoginException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.auth; +package com.zhilian.common.core.exception.auth; /** * 未能通过的登录认证异常 * - * @author muyu + * @author zhilian */ public class NotLoginException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotPermissionException.java similarity index 86% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotPermissionException.java index e464840..c5e4402 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotPermissionException.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.exception.auth; +package com.zhilian.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; /** * 未能通过的权限认证异常 * - * @author muyu + * @author zhilian */ public class NotPermissionException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotRoleException.java similarity index 84% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotRoleException.java index 53a1522..987b1dd 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/auth/NotRoleException.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.exception.auth; +package com.zhilian.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; /** * 未能通过的角色认证异常 * - * @author muyu + * @author zhilian */ public class NotRoleException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/base/BaseException.java similarity index 95% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/base/BaseException.java index 9bb1356..3e6dd00 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/base/BaseException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.base; +package com.zhilian.common.core.exception.base; /** * 基础异常 * - * @author muyu + * @author zhilian */ public class BaseException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileException.java similarity index 67% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileException.java index ae2e184..f33df3c 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.exception.file; +package com.zhilian.common.core.exception.file; -import com.muyu.common.core.exception.base.BaseException; +import com.zhilian.common.core.exception.base.BaseException; /** * 文件信息异常类 * - * @author muyu + * @author zhilian */ public class FileException extends BaseException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 84% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileNameLengthLimitExceededException.java index 3a85df3..6a3c370 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.file; +package com.zhilian.common.core.exception.file; /** * 文件名称超长限制异常类 * - * @author muyu + * @author zhilian */ public class FileNameLengthLimitExceededException extends FileException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileSizeLimitExceededException.java similarity index 83% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileSizeLimitExceededException.java index 7570be5..61253c8 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.file; +package com.zhilian.common.core.exception.file; /** * 文件名大小限制异常类 * - * @author muyu + * @author zhilian */ public class FileSizeLimitExceededException extends FileException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileUploadException.java similarity index 94% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileUploadException.java index 94341ab..a03519b 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/FileUploadException.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.exception.file; +package com.zhilian.common.core.exception.file; import java.io.PrintStream; import java.io.PrintWriter; @@ -6,7 +6,7 @@ import java.io.PrintWriter; /** * 文件上传异常类 * - * @author muyu + * @author zhilian */ public class FileUploadException extends Exception { diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/InvalidExtensionException.java similarity index 97% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/InvalidExtensionException.java index 3a993c2..cfa247c 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/file/InvalidExtensionException.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.exception.file; +package com.zhilian.common.core.exception.file; import java.util.Arrays; /** * 文件上传 误异常类 * - * @author muyu + * @author zhilian */ public class InvalidExtensionException extends FileUploadException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/job/TaskException.java similarity index 89% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/job/TaskException.java index aee364a..e1eeb9a 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/job/TaskException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.job; +package com.zhilian.common.core.exception.job; /** * 计划策略异常 * - * @author muyu + * @author zhilian */ public class TaskException extends Exception { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/CaptchaExpireException.java similarity index 78% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/CaptchaExpireException.java index a95a57b..985ac35 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.user; +package com.zhilian.common.core.exception.user; /** * 验证码失效异常类 * - * @author muyu + * @author zhilian */ public class CaptchaExpireException extends UserException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/UserException.java similarity index 65% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/UserException.java index f113749..0ccc0da 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.exception.user; +package com.zhilian.common.core.exception.user; -import com.muyu.common.core.exception.base.BaseException; +import com.zhilian.common.core.exception.base.BaseException; /** * 用户信息异常类 * - * @author muyu + * @author zhilian */ public class UserException extends BaseException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/UserPasswordNotMatchException.java similarity index 81% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/UserPasswordNotMatchException.java index 7615cda..fa5b97c 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.exception.user; +package com.zhilian.common.core.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author muyu + * @author zhilian */ public class UserPasswordNotMatchException extends UserException { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/CharsetKit.java similarity index 95% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/CharsetKit.java index fe5e9fa..4552ad1 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/CharsetKit.java @@ -1,6 +1,6 @@ -package com.muyu.common.core.text; +package com.zhilian.common.core.text; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.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 zhilian */ public class CharsetKit { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/Convert.java similarity index 99% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/Convert.java index fb57cb9..68ab36d 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/Convert.java @@ -1,6 +1,6 @@ -package com.muyu.common.core.text; +package com.zhilian.common.core.text; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; import java.math.BigDecimal; import java.math.BigInteger; @@ -13,7 +13,7 @@ import java.util.Set; /** * 类型转换器 * - * @author muyu + * @author zhilian */ public class Convert { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/StrFormatter.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/StrFormatter.java index 0c07cf5..cb89878 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/text/StrFormatter.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.text; +package com.zhilian.common.core.text; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; /** * 字符串格式化 * - * @author muyu + * @author zhilian */ public class StrFormatter { public static final String EMPTY_JSON = "{}"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/DateUtils.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/DateUtils.java index fb15c59..560c96e 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils; +package com.zhilian.common.core.utils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -11,7 +11,7 @@ import java.util.Date; /** * 时间工具类 * - * @author muyu + * @author zhilian */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static String YYYY = "yyyy"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ExceptionUtil.java similarity index 93% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ExceptionUtil.java index e6abdf9..482f04b 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils; +package com.zhilian.common.core.utils; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -8,7 +8,7 @@ import java.io.StringWriter; /** * 错误信息处理类。 * - * @author muyu + * @author zhilian */ public class ExceptionUtil { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/JwtUtils.java similarity index 92% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/JwtUtils.java index a12b839..ce89ded 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/JwtUtils.java @@ -1,8 +1,8 @@ -package com.muyu.common.core.utils; +package com.zhilian.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.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.constant.TokenConstants; +import com.zhilian.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 zhilian */ public class JwtUtils { public static String secret = TokenConstants.SECRET; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/PageUtils.java similarity index 77% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/PageUtils.java index d4b0554..fa99821 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/PageUtils.java @@ -1,14 +1,14 @@ -package com.muyu.common.core.utils; +package com.zhilian.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.zhilian.common.core.utils.sql.SqlUtil; +import com.zhilian.common.core.web.page.PageDomain; +import com.zhilian.common.core.web.page.TableSupport; /** * 分页工具类 * - * @author muyu + * @author zhilian */ public class PageUtils extends PageHelper { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ServletUtils.java similarity index 97% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ServletUtils.java index c9a8998..2d46490 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ServletUtils.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.utils; +package com.zhilian.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.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.domain.Result; +import com.zhilian.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 zhilian */ public class ServletUtils { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/SpringUtils.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/SpringUtils.java index c37a65c..0b92cb2 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils; +package com.zhilian.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 zhilian */ @Component public final class SpringUtils implements BeanFactoryPostProcessor { diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/StringUtils.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/StringUtils.java index ec8f557..fa4b8b3 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/StringUtils.java @@ -1,7 +1,7 @@ -package com.muyu.common.core.utils; +package com.zhilian.common.core.utils; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.text.StrFormatter; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.text.StrFormatter; import org.springframework.util.AntPathMatcher; import java.util.Collection; @@ -11,7 +11,7 @@ import java.util.Map; /** * 字符串工具类 * - * @author muyu + * @author zhilian */ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/bean/BeanUtils.java similarity index 97% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/bean/BeanUtils.java index d44b351..b85e848 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils.bean; +package com.zhilian.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 zhilian */ public class BeanUtils extends org.springframework.beans.BeanUtils { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/bean/BeanValidators.java similarity index 90% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/bean/BeanValidators.java index abbb157..b061dc5 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils.bean; +package com.zhilian.common.core.utils.bean; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; @@ -8,7 +8,7 @@ import java.util.Set; /** * bean对象属性验证 * - * @author muyu + * @author zhilian */ public class BeanValidators { public static void validateWithException (Validator validator, Object object, Class... groups) diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/FileTypeUtils.java similarity index 94% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/FileTypeUtils.java index dde7e85..d658296 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils.file; +package com.zhilian.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 zhilian */ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: muyu.txt, 返回: txt + * 例如: zhilian.txt, 返回: txt * * @param file 文件名 * @@ -32,7 +32,7 @@ public class FileTypeUtils { /** * 获取文件类型 *

- * 例如: muyu.txt, 返回: txt + * 例如: zhilian.txt, 返回: txt * * @param fileName 文件名 * diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/FileUtils.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/FileUtils.java index 30f01b8..4f9afe6 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/FileUtils.java @@ -1,6 +1,6 @@ -package com.muyu.common.core.utils.file; +package com.zhilian.common.core.utils.file; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.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 zhilian */ public class FileUtils { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/ImageUtils.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/ImageUtils.java index 7e23345..5d959f0 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils.file; +package com.zhilian.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 zhilian */ public class ImageUtils { private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/MimeTypeUtils.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/MimeTypeUtils.java index 9eb1d84..afe22e4 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.utils.file; +package com.zhilian.common.core.utils.file; /** * 媒体类型工具类 * - * @author muyu + * @author zhilian */ public class MimeTypeUtils { public static final String IMAGE_PNG = "image/png"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/html/EscapeUtil.java similarity index 97% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/html/EscapeUtil.java index 7dba9be..0b8a30c 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/html/EscapeUtil.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.utils.html; +package com.zhilian.common.core.utils.html; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; /** * 转义和反转义工具类 * - * @author muyu + * @author zhilian */ public class EscapeUtil { public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/html/HTMLFilter.java similarity index 99% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/html/HTMLFilter.java index 68221f3..e65a1d0 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils.html; +package com.zhilian.common.core.utils.html; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * HTML过滤器，用于去除XSS漏洞隐患。 * - * @author muyu + * @author zhilian */ public final class HTMLFilter { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ip/IpUtils.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ip/IpUtils.java index f7ad9bf..446fb00 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/ip/IpUtils.java @@ -1,7 +1,7 @@ -package com.muyu.common.core.utils.ip; +package com.zhilian.common.core.utils.ip; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; @@ -10,7 +10,7 @@ import java.net.UnknownHostException; /** * 获取IP方法 * - * @author muyu + * @author zhilian */ public class IpUtils { public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/poi/ExcelHandlerAdapter.java similarity index 88% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/poi/ExcelHandlerAdapter.java index e2041fc..5ecac4d 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/poi/ExcelHandlerAdapter.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.utils.poi; +package com.zhilian.common.core.utils.poi; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Workbook; @@ -6,7 +6,7 @@ import org.apache.poi.ss.usermodel.Workbook; /** * Excel数据格式处理适配器 * - * @author muyu + * @author zhilian */ public interface ExcelHandlerAdapter { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/poi/ExcelUtil.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/poi/ExcelUtil.java index 69795db..a93cd69 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/poi/ExcelUtil.java @@ -1,16 +1,16 @@ -package com.muyu.common.core.utils.poi; +package com.zhilian.common.core.utils.poi; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.annotation.Excel.Type; -import com.muyu.common.core.annotation.Excels; -import com.muyu.common.core.exception.UtilException; -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.utils.DateUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.file.FileTypeUtils; -import com.muyu.common.core.utils.file.ImageUtils; -import com.muyu.common.core.utils.reflect.ReflectUtils; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.annotation.Excel.Type; +import com.zhilian.common.core.annotation.Excels; +import com.zhilian.common.core.exception.UtilException; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.utils.DateUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.file.FileTypeUtils; +import com.zhilian.common.core.utils.file.ImageUtils; +import com.zhilian.common.core.utils.reflect.ReflectUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -40,7 +40,7 @@ import java.util.stream.Collectors; /** * Excel相关处理 * - * @author muyu + * @author zhilian */ public class ExcelUtil { public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/reflect/ReflectUtils.java similarity index 98% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/reflect/ReflectUtils.java index 2ec7e4f..e11bf03 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package com.muyu.common.core.utils.reflect; +package com.zhilian.common.core.utils.reflect; -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.utils.DateUtils; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; @@ -14,7 +14,7 @@ import java.util.Date; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * - * @author muyu + * @author zhilian */ @SuppressWarnings("rawtypes") public class ReflectUtils { diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/sign/Base64.java similarity index 99% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/sign/Base64.java index 038933f..b35ea11 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sign/Base64.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/sign/Base64.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.utils.sign; +package com.zhilian.common.core.utils.sign; /** * Base64工具类 * - * @author muyu + * @author zhilian */ public final class Base64 { static private final int BASELENGTH = 128; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sql/SqlUtil.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/sql/SqlUtil.java similarity index 90% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sql/SqlUtil.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/sql/SqlUtil.java index 3f418e7..5d8c525 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/sql/SqlUtil.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.muyu.common.core.utils.sql; +package com.zhilian.common.core.utils.sql; -import com.muyu.common.core.exception.UtilException; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.exception.UtilException; +import com.zhilian.common.core.utils.StringUtils; /** * sql操作工具类 * - * @author muyu + * @author zhilian */ public class SqlUtil { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/IdUtils.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/IdUtils.java similarity index 93% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/IdUtils.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/IdUtils.java index 375b034..1ddede1 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/IdUtils.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/IdUtils.java @@ -1,9 +1,9 @@ -package com.muyu.common.core.utils.uuid; +package com.zhilian.common.core.utils.uuid; /** * ID生成器工具类 * - * @author muyu + * @author zhilian */ public class IdUtils { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/Seq.java similarity index 92% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/Seq.java index b72e3dd..edd6645 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/Seq.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/Seq.java @@ -1,12 +1,12 @@ -package com.muyu.common.core.utils.uuid; +package com.zhilian.common.core.utils.uuid; -import com.muyu.common.core.utils.DateUtils; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.DateUtils; +import com.zhilian.common.core.utils.StringUtils; import java.util.concurrent.atomic.AtomicInteger; /** - * @author muyu 序列生成类 + * @author zhilian 序列生成类 */ public class Seq { // 通用序列类型 diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/UUID.java similarity index 99% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/UUID.java index 37c3c9e..38d4328 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/utils/uuid/UUID.java @@ -1,6 +1,6 @@ -package com.muyu.common.core.utils.uuid; +package com.zhilian.common.core.utils.uuid; -import com.muyu.common.core.exception.UtilException; +import com.zhilian.common.core.exception.UtilException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -11,7 +11,7 @@ import java.util.concurrent.ThreadLocalRandom; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * - * @author muyu + * @author zhilian */ public final class UUID implements java.io.Serializable, Comparable { private static final long serialVersionUID = -1185015143654744140L; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/controller/BaseController.java similarity index 91% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/controller/BaseController.java index 3789a82..4c38a51 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/controller/BaseController.java @@ -1,10 +1,10 @@ -package com.muyu.common.core.web.controller; +package com.zhilian.common.core.web.controller; import com.github.pagehelper.PageInfo; -import com.muyu.common.core.utils.DateUtils; -import com.muyu.common.core.utils.PageUtils; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.zhilian.common.core.utils.DateUtils; +import com.zhilian.common.core.utils.PageUtils; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -17,7 +17,7 @@ import java.util.List; /** * web层通用数据处理 * - * @author muyu + * @author zhilian */ public class BaseController { protected final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/domain/BaseEntity.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/domain/BaseEntity.java index add8e3e..cf06ba5 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.web.domain; +package com.zhilian.common.core.web.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -17,7 +17,7 @@ import java.util.Map; /** * Entity基类 * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/domain/TreeEntity.java similarity index 96% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/domain/TreeEntity.java index 427fcc7..7ba5774 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.web.domain; +package com.zhilian.common.core.web.domain; import lombok.AllArgsConstructor; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; /** * Tree基类 * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/PageDomain.java similarity index 94% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/PageDomain.java index b9c5e45..b3ba70c 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/PageDomain.java @@ -1,11 +1,11 @@ -package com.muyu.common.core.web.page; +package com.zhilian.common.core.web.page; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; /** * 分页数据 * - * @author muyu + * @author zhilian */ public class PageDomain { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/TableDataInfo.java similarity index 91% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/TableDataInfo.java index d677cce..9377e03 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.web.page; +package com.zhilian.common.core.web.page; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,7 +12,7 @@ import java.util.List; /** * 表格分页数据对象 * - * @author muyu + * @author zhilian */ @Data diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/TableSupport.java similarity index 88% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/TableSupport.java index ce0328d..142e4cf 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/web/page/TableSupport.java @@ -1,12 +1,12 @@ -package com.muyu.common.core.web.page; +package com.zhilian.common.core.web.page; -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.utils.ServletUtils; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.utils.ServletUtils; /** * 表格数据处理 * - * @author muyu + * @author zhilian */ public class TableSupport { /** diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/Xss.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/xss/Xss.java similarity index 92% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/Xss.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/xss/Xss.java index 7eb649b..def4823 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/Xss.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package com.muyu.common.core.xss; +package com.zhilian.common.core.xss; import javax.validation.Constraint; import javax.validation.Payload; @@ -10,7 +10,7 @@ import java.lang.annotation.Target; /** * 自定义xss校验注解 * - * @author muyu + * @author zhilian */ @Retention(RetentionPolicy.RUNTIME) @Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/xss/XssValidator.java similarity index 88% rename from muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java rename to zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/xss/XssValidator.java index 5a59932..a5cae58 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java +++ b/zhilian-common/zhilian-common-core/src/main/java/com/zhilian/common/core/xss/XssValidator.java @@ -1,6 +1,6 @@ -package com.muyu.common.core.xss; +package com.zhilian.common.core.xss; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -10,7 +10,7 @@ import java.util.regex.Pattern; /** * 自定义xss校验注解实现 * - * @author muyu + * @author zhilian */ public class XssValidator implements ConstraintValidator { private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />"; diff --git a/zhilian-common/zhilian-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..b415881 --- /dev/null +++ b/zhilian-common/zhilian-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.zhilian.common.core.utils.SpringUtils diff --git a/muyu-common/muyu-common-datascope/pom.xml b/zhilian-common/zhilian-common-datascope/pom.xml similarity index 59% rename from muyu-common/muyu-common-datascope/pom.xml rename to zhilian-common/zhilian-common-datascope/pom.xml index 079f752..9bd0026 100644 --- a/muyu-common/muyu-common-datascope/pom.xml +++ b/zhilian-common/zhilian-common-datascope/pom.xml @@ -3,24 +3,24 @@ 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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-datascope + zhilian-common-datascope - muyu-common-datascope权限范围 + zhilian-common-datascope权限范围 - + - com.muyu - muyu-common-security + com.zhilian + zhilian-common-security diff --git a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java b/zhilian-common/zhilian-common-datascope/src/main/java/com/zhilian/common/datascope/annotation/DataScope.java similarity index 89% rename from muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java rename to zhilian-common/zhilian-common-datascope/src/main/java/com/zhilian/common/datascope/annotation/DataScope.java index 498f06b..0781b07 100644 --- a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/annotation/DataScope.java +++ b/zhilian-common/zhilian-common-datascope/src/main/java/com/zhilian/common/datascope/annotation/DataScope.java @@ -1,11 +1,11 @@ -package com.muyu.common.datascope.annotation; +package com.zhilian.common.datascope.annotation; import java.lang.annotation.*; /** * 数据权限过滤注解 * - * @author muyu + * @author zhilian */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java b/zhilian-common/zhilian-common-datascope/src/main/java/com/zhilian/common/datascope/aspect/DataScopeAspect.java similarity index 90% rename from muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java rename to zhilian-common/zhilian-common-datascope/src/main/java/com/zhilian/common/datascope/aspect/DataScopeAspect.java index 3d66b0d..2c05e38 100644 --- a/muyu-common/muyu-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java +++ b/zhilian-common/zhilian-common-datascope/src/main/java/com/zhilian/common/datascope/aspect/DataScopeAspect.java @@ -1,14 +1,14 @@ -package com.muyu.common.datascope.aspect; +package com.zhilian.common.datascope.aspect; -import com.muyu.common.core.context.SecurityContextHolder; -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.datascope.annotation.DataScope; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.context.SecurityContextHolder; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.domain.BaseEntity; +import com.zhilian.common.datascope.annotation.DataScope; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.common.system.domain.LoginUser; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; @@ -20,7 +20,7 @@ import java.util.List; /** * 数据过滤处理 * - * @author muyu + * @author zhilian */ @Aspect @Component diff --git a/zhilian-common/zhilian-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..88b6efa --- /dev/null +++ b/zhilian-common/zhilian-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.zhilian.common.datascope.aspect.DataScopeAspect diff --git a/muyu-common/muyu-common-datasource/pom.xml b/zhilian-common/zhilian-common-datasource/pom.xml similarity index 83% rename from muyu-common/muyu-common-datasource/pom.xml rename to zhilian-common/zhilian-common-datasource/pom.xml index 994cf84..fb8a9bd 100644 --- a/muyu-common/muyu-common-datasource/pom.xml +++ b/zhilian-common/zhilian-common-datasource/pom.xml @@ -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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-datasource + zhilian-common-datasource - muyu-common-datasource多数据源 + zhilian-common-datasource多数据源 diff --git a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Master.java b/zhilian-common/zhilian-common-datasource/src/main/java/com/zhilian/common/datasource/annotation/Master.java similarity index 78% rename from muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Master.java rename to zhilian-common/zhilian-common-datasource/src/main/java/com/zhilian/common/datasource/annotation/Master.java index d9aae00..463375c 100644 --- a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Master.java +++ b/zhilian-common/zhilian-common-datasource/src/main/java/com/zhilian/common/datasource/annotation/Master.java @@ -1,4 +1,4 @@ -package com.muyu.common.datasource.annotation; +package com.zhilian.common.datasource.annotation; import com.baomidou.dynamic.datasource.annotation.DS; @@ -7,7 +7,7 @@ import java.lang.annotation.*; /** * 主库数据源 * - * @author muyu + * @author zhilian */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java b/zhilian-common/zhilian-common-datasource/src/main/java/com/zhilian/common/datasource/annotation/Slave.java similarity index 78% rename from muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java rename to zhilian-common/zhilian-common-datasource/src/main/java/com/zhilian/common/datasource/annotation/Slave.java index 9663cd4..fcd8fe0 100644 --- a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java +++ b/zhilian-common/zhilian-common-datasource/src/main/java/com/zhilian/common/datasource/annotation/Slave.java @@ -1,4 +1,4 @@ -package com.muyu.common.datasource.annotation; +package com.zhilian.common.datasource.annotation; import com.baomidou.dynamic.datasource.annotation.DS; @@ -7,7 +7,7 @@ import java.lang.annotation.*; /** * 从库数据源 * - * @author muyu + * @author zhilian */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/muyu-common/muyu-common-log/pom.xml b/zhilian-common/zhilian-common-log/pom.xml similarity index 60% rename from muyu-common/muyu-common-log/pom.xml rename to zhilian-common/zhilian-common-log/pom.xml index 3bf544e..671557e 100644 --- a/muyu-common/muyu-common-log/pom.xml +++ b/zhilian-common/zhilian-common-log/pom.xml @@ -3,24 +3,24 @@ 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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-log + zhilian-common-log - muyu-common-log日志记录 + zhilian-common-log日志记录 - + - com.muyu - muyu-common-security + com.zhilian + zhilian-common-security diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/annotation/Log.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/annotation/Log.java similarity index 83% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/annotation/Log.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/annotation/Log.java index ac6394e..275d6b6 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/annotation/Log.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/annotation/Log.java @@ -1,14 +1,14 @@ -package com.muyu.common.log.annotation; +package com.zhilian.common.log.annotation; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.log.enums.OperatorType; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.log.enums.OperatorType; import java.lang.annotation.*; /** * 自定义操作日志记录注解 * - * @author muyu + * @author zhilian */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/aspect/LogAspect.java similarity index 93% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/aspect/LogAspect.java index 4ecefc5..af527cd 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/aspect/LogAspect.java @@ -1,15 +1,15 @@ -package com.muyu.common.log.aspect; +package com.zhilian.common.log.aspect; import com.alibaba.fastjson2.JSON; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.ip.IpUtils; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessStatus; -import com.muyu.common.log.filter.PropertyPreExcludeFilter; -import com.muyu.common.log.service.AsyncLogService; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysOperLog; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.ip.IpUtils; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessStatus; +import com.zhilian.common.log.filter.PropertyPreExcludeFilter; +import com.zhilian.common.log.service.AsyncLogService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysOperLog; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -33,7 +33,7 @@ import java.util.Map; /** * 操作日志记录处理 * - * @author muyu + * @author zhilian */ @Aspect @Component diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessStatus.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/BusinessStatus.java similarity index 71% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessStatus.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/BusinessStatus.java index 45e9713..f5941a8 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessStatus.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.muyu.common.log.enums; +package com.zhilian.common.log.enums; /** * 操作状态 * - * @author muyu + * @author zhilian */ public enum BusinessStatus { /** diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/BusinessType.java similarity index 89% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/BusinessType.java index 2e928c7..c24a641 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.muyu.common.log.enums; +package com.zhilian.common.log.enums; /** * 业务操作类型 * - * @author muyu + * @author zhilian */ public enum BusinessType { /** diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/OperatorType.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/OperatorType.java similarity index 77% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/OperatorType.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/OperatorType.java index 645777f..b8004b0 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/OperatorType.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.muyu.common.log.enums; +package com.zhilian.common.log.enums; /** * 操作人类别 * - * @author muyu + * @author zhilian */ public enum OperatorType { /** diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/filter/PropertyPreExcludeFilter.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/filter/PropertyPreExcludeFilter.java similarity index 88% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/filter/PropertyPreExcludeFilter.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/filter/PropertyPreExcludeFilter.java index 2245256..5211be4 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/filter/PropertyPreExcludeFilter.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/filter/PropertyPreExcludeFilter.java @@ -1,11 +1,11 @@ -package com.muyu.common.log.filter; +package com.zhilian.common.log.filter; import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; /** * 排除JSON敏感属性 * - * @author muyu + * @author zhilian */ public class PropertyPreExcludeFilter extends SimplePropertyPreFilter { public PropertyPreExcludeFilter () { diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/service/AsyncLogService.java similarity index 69% rename from muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java rename to zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/service/AsyncLogService.java index 46e1cdf..3743808 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java +++ b/zhilian-common/zhilian-common-log/src/main/java/com/zhilian/common/log/service/AsyncLogService.java @@ -1,8 +1,8 @@ -package com.muyu.common.log.service; +package com.zhilian.common.log.service; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.system.remote.RemoteLogService; -import com.muyu.common.system.domain.SysOperLog; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.system.remote.RemoteLogService; +import com.zhilian.common.system.domain.SysOperLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; /** * 异步调用日志服务 * - * @author muyu + * @author zhilian */ @Service public class AsyncLogService { diff --git a/zhilian-common/zhilian-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..0c32e86 --- /dev/null +++ b/zhilian-common/zhilian-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.zhilian.common.log.service.AsyncLogService +com.zhilian.common.log.aspect.LogAspect diff --git a/muyu-common/muyu-common-redis/pom.xml b/zhilian-common/zhilian-common-redis/pom.xml similarity index 69% rename from muyu-common/muyu-common-redis/pom.xml rename to zhilian-common/zhilian-common-redis/pom.xml index 912bc01..2609f02 100644 --- a/muyu-common/muyu-common-redis/pom.xml +++ b/zhilian-common/zhilian-common-redis/pom.xml @@ -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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-redis + zhilian-common-redis - muyu-common-redis缓存服务 + zhilian-common-redis缓存服务 @@ -23,10 +23,10 @@ spring-boot-starter-data-redis - + - com.muyu - muyu-common-core + com.zhilian + zhilian-common-core diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/configure/FastJson2JsonRedisSerializer.java similarity index 92% rename from muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java rename to zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/configure/FastJson2JsonRedisSerializer.java index 5959aad..5103e63 100644 --- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/FastJson2JsonRedisSerializer.java +++ b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -1,10 +1,10 @@ -package com.muyu.common.redis.configure; +package com.zhilian.common.redis.configure; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.filter.Filter; -import com.muyu.common.core.constant.Constants; +import com.zhilian.common.core.constant.Constants; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.SerializationException; @@ -13,7 +13,7 @@ import java.nio.charset.Charset; /** * Redis使用FastJson序列化 * - * @author muyu + * @author zhilian */ public class FastJson2JsonRedisSerializer implements RedisSerializer { public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/RedisConfig.java b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/configure/RedisConfig.java similarity index 96% rename from muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/RedisConfig.java rename to zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/configure/RedisConfig.java index ba8760e..8316403 100644 --- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/configure/RedisConfig.java +++ b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/configure/RedisConfig.java @@ -1,4 +1,4 @@ -package com.muyu.common.redis.configure; +package com.zhilian.common.redis.configure; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; @@ -13,7 +13,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; /** * redis配置 * - * @author muyu + * @author zhilian */ @Configuration @EnableCaching diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java similarity index 99% rename from muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java rename to zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java index db90c1e..cb12263 100644 --- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java @@ -1,4 +1,4 @@ -package com.muyu.common.redis.service; +package com.zhilian.common.redis.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; /** * spring redis 工具类 * - * @author muyu + * @author zhilian **/ @SuppressWarnings(value = {"unchecked", "rawtypes"}) @Component diff --git a/zhilian-common/zhilian-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..06ced63 --- /dev/null +++ b/zhilian-common/zhilian-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.zhilian.common.redis.configure.RedisConfig +com.zhilian.common.redis.service.RedisService diff --git a/muyu-common/muyu-common-seata/pom.xml b/zhilian-common/zhilian-common-seata/pom.xml similarity index 78% rename from muyu-common/muyu-common-seata/pom.xml rename to zhilian-common/zhilian-common-seata/pom.xml index a8cab12..6c74108 100644 --- a/muyu-common/muyu-common-seata/pom.xml +++ b/zhilian-common/zhilian-common-seata/pom.xml @@ -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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-seata + zhilian-common-seata - muyu-common-seata分布式事务 + zhilian-common-seata分布式事务 diff --git a/muyu-common/muyu-common-security/pom.xml b/zhilian-common/zhilian-common-security/pom.xml similarity index 60% rename from muyu-common/muyu-common-security/pom.xml rename to zhilian-common/zhilian-common-security/pom.xml index 6bb80d3..218df2f 100644 --- a/muyu-common/muyu-common-security/pom.xml +++ b/zhilian-common/zhilian-common-security/pom.xml @@ -2,16 +2,16 @@ - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-security + zhilian-common-security - muyu-common-security安全模块 + zhilian-common-security安全模块 @@ -22,16 +22,16 @@ spring-webmvc - + - com.muyu - muyu-common-redis + com.zhilian + zhilian-common-redis - + - com.muyu - muyu-common-system + com.zhilian + zhilian-common-system diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableCustomConfig.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/EnableCustomConfig.java similarity index 76% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableCustomConfig.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/EnableCustomConfig.java index ca7a07a..39d6c8d 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableCustomConfig.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/EnableCustomConfig.java @@ -1,7 +1,7 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; -import com.muyu.common.security.config.ApplicationConfig; -import com.muyu.common.security.feign.FeignAutoConfiguration; +import com.zhilian.common.security.config.ApplicationConfig; +import com.zhilian.common.security.feign.FeignAutoConfiguration; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; @@ -16,7 +16,7 @@ import java.lang.annotation.*; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.muyu.**.mapper") +@MapperScan("com.zhilian.**.mapper") // 开启线程异步执行 @EnableAsync // 自动加载类 diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableMyFeignClients.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/EnableMyFeignClients.java similarity index 79% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableMyFeignClients.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/EnableMyFeignClients.java index 7a59fa4..1b882d8 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/EnableMyFeignClients.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/EnableMyFeignClients.java @@ -1,4 +1,4 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -8,7 +8,7 @@ import java.lang.annotation.*; * 自定义feign注解 * 添加basePackages路径 * - * @author muyu + * @author zhilian */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -17,7 +17,7 @@ import java.lang.annotation.*; public @interface EnableMyFeignClients { String[] value () default {}; - String[] basePackages () default {"com.muyu"}; + String[] basePackages () default {"com.zhilian"}; Class[] basePackageClasses () default {}; diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/InnerAuth.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/InnerAuth.java similarity index 79% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/InnerAuth.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/InnerAuth.java index 092a573..8d2ad6f 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/InnerAuth.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/InnerAuth.java @@ -1,11 +1,11 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; import java.lang.annotation.*; /** * 内部认证注解 * - * @author muyu + * @author zhilian */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/Logical.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/Logical.java similarity index 73% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/Logical.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/Logical.java index 0be306a..bee8eeb 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/Logical.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/Logical.java @@ -1,9 +1,9 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; /** * 权限注解的验证模式 * - * @author muyu + * @author zhilian */ public enum Logical { /** diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresLogin.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresLogin.java similarity index 84% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresLogin.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresLogin.java index 4eff911..84b60c4 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresLogin.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresLogin.java @@ -1,4 +1,4 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 登录认证：只有登录之后才能进入该方法 * - * @author muyu + * @author zhilian */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresPermissions.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresPermissions.java similarity index 89% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresPermissions.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresPermissions.java index 8d95bb4..c0b9909 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresPermissions.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresPermissions.java @@ -1,4 +1,4 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 权限认证：必须具有指定权限才能进入该方法 * - * @author muyu + * @author zhilian */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresRoles.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresRoles.java similarity index 89% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresRoles.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresRoles.java index 78911cc..9e0ab7a 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/annotation/RequiresRoles.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/annotation/RequiresRoles.java @@ -1,4 +1,4 @@ -package com.muyu.common.security.annotation; +package com.zhilian.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * 角色认证：必须具有指定角色标识才能进入该方法 * - * @author muyu + * @author zhilian */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/InnerAuthAspect.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/aspect/InnerAuthAspect.java similarity index 80% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/InnerAuthAspect.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/aspect/InnerAuthAspect.java index 1707742..fcacac7 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/InnerAuthAspect.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/aspect/InnerAuthAspect.java @@ -1,10 +1,10 @@ -package com.muyu.common.security.aspect; +package com.zhilian.common.security.aspect; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.exception.InnerAuthException; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.security.annotation.InnerAuth; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.exception.InnerAuthException; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.annotation.InnerAuth; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; /** * 内部服务调用验证处理 * - * @author muyu + * @author zhilian */ @Aspect @Component diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/PreAuthorizeAspect.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/aspect/PreAuthorizeAspect.java similarity index 81% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/PreAuthorizeAspect.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/aspect/PreAuthorizeAspect.java index 4cdd933..44070fb 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/aspect/PreAuthorizeAspect.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/aspect/PreAuthorizeAspect.java @@ -1,9 +1,9 @@ -package com.muyu.common.security.aspect; +package com.zhilian.common.security.aspect; -import com.muyu.common.security.annotation.RequiresLogin; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.annotation.RequiresRoles; -import com.muyu.common.security.auth.AuthUtil; +import com.zhilian.common.security.annotation.RequiresLogin; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.annotation.RequiresRoles; +import com.zhilian.common.security.auth.AuthUtil; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -24,9 +24,9 @@ public class PreAuthorizeAspect { /** * 定义AOP签名 (切入所有使用鉴权注解的方法) */ - public static final String POINTCUT_SIGN = " @annotation(com.muyu.common.security.annotation.RequiresLogin) || " - + "@annotation(com.muyu.common.security.annotation.RequiresPermissions) || " - + "@annotation(com.muyu.common.security.annotation.RequiresRoles)"; + public static final String POINTCUT_SIGN = " @annotation(com.zhilian.common.security.annotation.RequiresLogin) || " + + "@annotation(com.zhilian.common.security.annotation.RequiresPermissions) || " + + "@annotation(com.zhilian.common.security.annotation.RequiresRoles)"; /** * 构建 diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/auth/AuthLogic.java similarity index 90% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/auth/AuthLogic.java index beb3426..371683d 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthLogic.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/auth/AuthLogic.java @@ -1,18 +1,18 @@ -package com.muyu.common.security.auth; +package com.zhilian.common.security.auth; -import com.muyu.common.core.context.SecurityContextHolder; -import com.muyu.common.core.exception.auth.NotLoginException; -import com.muyu.common.core.exception.auth.NotPermissionException; -import com.muyu.common.core.exception.auth.NotRoleException; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.security.annotation.Logical; -import com.muyu.common.security.annotation.RequiresLogin; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.annotation.RequiresRoles; -import com.muyu.common.security.service.TokenService; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.context.SecurityContextHolder; +import com.zhilian.common.core.exception.auth.NotLoginException; +import com.zhilian.common.core.exception.auth.NotPermissionException; +import com.zhilian.common.core.exception.auth.NotRoleException; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.annotation.Logical; +import com.zhilian.common.security.annotation.RequiresLogin; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.annotation.RequiresRoles; +import com.zhilian.common.security.service.TokenService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.LoginUser; import org.springframework.util.PatternMatchUtils; import java.util.Collection; @@ -22,7 +22,7 @@ import java.util.Set; /** * Token 权限验证，逻辑实现类 * - * @author muyu + * @author zhilian */ public class AuthLogic { /** diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthUtil.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/auth/AuthUtil.java similarity index 94% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthUtil.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/auth/AuthUtil.java index 131d150..834c6ab 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/auth/AuthUtil.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/auth/AuthUtil.java @@ -1,13 +1,13 @@ -package com.muyu.common.security.auth; +package com.zhilian.common.security.auth; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.annotation.RequiresRoles; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.annotation.RequiresRoles; +import com.zhilian.common.system.domain.LoginUser; /** * Token 权限验证工具类 * - * @author muyu + * @author zhilian */ public class AuthUtil { /** diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/ApplicationConfig.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/config/ApplicationConfig.java similarity index 88% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/ApplicationConfig.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/config/ApplicationConfig.java index b78abbf..e6707d7 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/ApplicationConfig.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.muyu.common.security.config; +package com.zhilian.common.security.config; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; @@ -8,7 +8,7 @@ import java.util.TimeZone; /** * 系统配置 * - * @author muyu + * @author zhilian */ public class ApplicationConfig { /** diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/WebMvcConfig.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/config/WebMvcConfig.java similarity index 85% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/WebMvcConfig.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/config/WebMvcConfig.java index 8acde35..bbb0fee 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/config/WebMvcConfig.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/config/WebMvcConfig.java @@ -1,13 +1,13 @@ -package com.muyu.common.security.config; +package com.zhilian.common.security.config; -import com.muyu.common.security.interceptor.HeaderInterceptor; +import com.zhilian.common.security.interceptor.HeaderInterceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * 拦截器配置 * - * @author muyu + * @author zhilian */ public class WebMvcConfig implements WebMvcConfigurer { /** diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignAutoConfiguration.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/feign/FeignAutoConfiguration.java similarity index 85% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignAutoConfiguration.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/feign/FeignAutoConfiguration.java index 4bfda6d..b673a03 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignAutoConfiguration.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/feign/FeignAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.muyu.common.security.feign; +package com.zhilian.common.security.feign; import feign.RequestInterceptor; import org.springframework.context.annotation.Bean; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * Feign 配置注册 * - * @author muyu + * @author zhilian **/ @Configuration public class FeignAutoConfiguration { diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/feign/FeignRequestInterceptor.java similarity index 86% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/feign/FeignRequestInterceptor.java index 196765f..a9180e5 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/feign/FeignRequestInterceptor.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/feign/FeignRequestInterceptor.java @@ -1,9 +1,9 @@ -package com.muyu.common.security.feign; +package com.zhilian.common.security.feign; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.ip.IpUtils; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.ip.IpUtils; import feign.RequestInterceptor; import feign.RequestTemplate; import org.springframework.stereotype.Component; @@ -14,7 +14,7 @@ import java.util.Map; /** * feign 请求拦截器 * - * @author muyu + * @author zhilian */ @Component public class FeignRequestInterceptor implements RequestInterceptor { diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/handler/GlobalExceptionHandler.java similarity index 91% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/handler/GlobalExceptionHandler.java index 52b43af..fa2da73 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/handler/GlobalExceptionHandler.java @@ -1,13 +1,13 @@ -package com.muyu.common.security.handler; +package com.zhilian.common.security.handler; -import com.muyu.common.core.constant.HttpStatus; -import com.muyu.common.core.exception.DemoModeException; -import com.muyu.common.core.exception.InnerAuthException; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.exception.auth.NotPermissionException; -import com.muyu.common.core.exception.auth.NotRoleException; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.domain.Result; +import com.zhilian.common.core.constant.HttpStatus; +import com.zhilian.common.core.exception.DemoModeException; +import com.zhilian.common.core.exception.InnerAuthException; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.exception.auth.NotPermissionException; +import com.zhilian.common.core.exception.auth.NotRoleException; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.domain.Result; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.validation.BindException; @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest; /** * 全局异常处理器 * - * @author muyu + * @author zhilian */ @RestControllerAdvice public class GlobalExceptionHandler { diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/interceptor/HeaderInterceptor.java similarity index 78% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/interceptor/HeaderInterceptor.java index fe1774c..bed0483 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/interceptor/HeaderInterceptor.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/interceptor/HeaderInterceptor.java @@ -1,12 +1,12 @@ -package com.muyu.common.security.interceptor; +package com.zhilian.common.security.interceptor; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.context.SecurityContextHolder; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.security.auth.AuthUtil; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.context.SecurityContextHolder; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.auth.AuthUtil; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.LoginUser; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; @@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletResponse; * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取 * 注意：此拦截器会同时验证当前用户有效期自动刷新有效期 * - * @author muyu + * @author zhilian */ public class HeaderInterceptor implements AsyncHandlerInterceptor { @Override diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/service/TokenService.java similarity index 88% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/service/TokenService.java index b19697e..b1f6342 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/service/TokenService.java @@ -1,15 +1,15 @@ -package com.muyu.common.security.service; +package com.zhilian.common.security.service; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.utils.JwtUtils; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.ip.IpUtils; -import com.muyu.common.core.utils.uuid.IdUtils; -import com.muyu.common.redis.service.RedisService; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.utils.JwtUtils; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.ip.IpUtils; +import com.zhilian.common.core.utils.uuid.IdUtils; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; /** * token验证处理 * - * @author muyu + * @author zhilian */ @Component public class TokenService { diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/DictUtils.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/utils/DictUtils.java similarity index 83% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/DictUtils.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/utils/DictUtils.java index 04ee068..3a78d66 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/DictUtils.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/utils/DictUtils.java @@ -1,11 +1,11 @@ -package com.muyu.common.security.utils; +package com.zhilian.common.security.utils; import com.alibaba.fastjson2.JSONArray; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.redis.service.RedisService; -import com.muyu.common.system.domain.SysDictData; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.system.domain.SysDictData; import java.util.Collection; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; /** * 字典工具类 * - * @author muyu + * @author zhilian */ public class DictUtils { /** diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/utils/SecurityUtils.java similarity index 86% rename from muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java rename to zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/utils/SecurityUtils.java index e7f2a2c..976df2b 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/utils/SecurityUtils.java +++ b/zhilian-common/zhilian-common-security/src/main/java/com/zhilian/common/security/utils/SecurityUtils.java @@ -1,11 +1,11 @@ -package com.muyu.common.security.utils; +package com.zhilian.common.security.utils; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.constant.TokenConstants; -import com.muyu.common.core.context.SecurityContextHolder; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.constant.TokenConstants; +import com.zhilian.common.core.context.SecurityContextHolder; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.system.domain.LoginUser; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import javax.servlet.http.HttpServletRequest; @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; /** * 权限获取工具类 * - * @author muyu + * @author zhilian */ public class SecurityUtils { /** diff --git a/zhilian-common/zhilian-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6173ee4 --- /dev/null +++ b/zhilian-common/zhilian-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.zhilian.common.security.config.WebMvcConfig +com.zhilian.common.security.service.TokenService +com.zhilian.common.security.aspect.PreAuthorizeAspect +com.zhilian.common.security.aspect.InnerAuthAspect +com.zhilian.common.security.handler.GlobalExceptionHandler diff --git a/muyu-common/muyu-common-swagger/pom.xml b/zhilian-common/zhilian-common-swagger/pom.xml similarity index 82% rename from muyu-common/muyu-common-swagger/pom.xml rename to zhilian-common/zhilian-common-swagger/pom.xml index 750bd3a..22fe523 100644 --- a/muyu-common/muyu-common-swagger/pom.xml +++ b/zhilian-common/zhilian-common-swagger/pom.xml @@ -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"> - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 4.0.0 - muyu-common-swagger + zhilian-common-swagger - muyu-common-swagger系统接口 + zhilian-common-swagger系统接口 diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/annotation/EnableCustomSwagger2.java similarity index 69% rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java rename to zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/annotation/EnableCustomSwagger2.java index 8b56946..636d9f4 100644 --- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/annotation/EnableCustomSwagger2.java +++ b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/annotation/EnableCustomSwagger2.java @@ -1,6 +1,6 @@ -package com.muyu.common.swagger.annotation; +package com.zhilian.common.swagger.annotation; -import com.muyu.common.swagger.config.SwaggerAutoConfiguration; +import com.zhilian.common.swagger.config.SwaggerAutoConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerAutoConfiguration.java similarity index 99% rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java rename to zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerAutoConfiguration.java index a58a108..3e42899 100644 --- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerAutoConfiguration.java +++ b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.muyu.common.swagger.config; +package com.zhilian.common.swagger.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerBeanPostProcessor.java similarity index 96% rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java rename to zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerBeanPostProcessor.java index 13d252f..4064063 100644 --- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerBeanPostProcessor.java +++ b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerBeanPostProcessor.java @@ -1,4 +1,4 @@ -package com.muyu.common.swagger.config; +package com.zhilian.common.swagger.config; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; @@ -14,7 +14,7 @@ import java.util.stream.Collectors; /** * swagger 在 springboot 2.6.x 不兼容问题的处理 * - * @author muyu + * @author zhilian */ public class SwaggerBeanPostProcessor implements BeanPostProcessor { @Override diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerProperties.java similarity index 99% rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java rename to zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerProperties.java index a0dac64..f49fc67 100644 --- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerProperties.java +++ b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerProperties.java @@ -1,4 +1,4 @@ -package com.muyu.common.swagger.config; +package com.zhilian.common.swagger.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerWebConfiguration.java similarity index 89% rename from muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java rename to zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerWebConfiguration.java index 48d66f6..a643b1e 100644 --- a/muyu-common/muyu-common-swagger/src/main/java/com/muyu/common/swagger/config/SwaggerWebConfiguration.java +++ b/zhilian-common/zhilian-common-swagger/src/main/java/com/zhilian/common/swagger/config/SwaggerWebConfiguration.java @@ -1,4 +1,4 @@ -package com.muyu.common.swagger.config; +package com.zhilian.common.swagger.config; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * swagger 资源映射路径 * - * @author muyu + * @author zhilian */ public class SwaggerWebConfiguration implements WebMvcConfigurer { @Override diff --git a/zhilian-common/zhilian-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..aefa82a --- /dev/null +++ b/zhilian-common/zhilian-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +# com.zhilian.common.swagger.config.SwaggerAutoConfiguration +# com.zhilian.common.swagger.config.SwaggerWebConfiguration +# com.zhilian.common.swagger.config.SwaggerBeanPostProcessor diff --git a/muyu-common/muyu-common-system/pom.xml b/zhilian-common/zhilian-common-system/pom.xml similarity index 71% rename from muyu-common/muyu-common-system/pom.xml rename to zhilian-common/zhilian-common-system/pom.xml index 62fdc74..d47b737 100644 --- a/muyu-common/muyu-common-system/pom.xml +++ b/zhilian-common/zhilian-common-system/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.muyu - muyu-common + com.zhilian + zhilian-common 3.6.3 - muyu-common-system + zhilian-common-system 17 @@ -18,10 +18,10 @@ - + - com.muyu - muyu-common-core + com.zhilian + zhilian-common-core diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/LoginUser.java similarity index 97% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/LoginUser.java index ce39e96..583aee3 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/LoginUser.java @@ -1,4 +1,4 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; import java.io.Serializable; @@ -7,7 +7,7 @@ import java.util.Set; /** * 用户信息 * - * @author muyu + * @author zhilian */ public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDept.java similarity index 97% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDept.java index 9569d64..4517515 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDept.java @@ -1,6 +1,6 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,7 +19,7 @@ import java.util.List; /** * 部门表 sys_dept * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDictData.java similarity index 94% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDictData.java index 43d28eb..a7cf4f7 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDictData.java @@ -1,9 +1,9 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import javax.validation.constraints.Size; /** * 字典数据表 sys_dict_data * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDictType.java similarity index 92% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDictType.java index e87832d..1d93ec9 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysDictType.java @@ -1,8 +1,8 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import javax.validation.constraints.Size; /** * 字典类型表 sys_dict_type * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysFile.java similarity index 92% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysFile.java index 38918d7..7771c34 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysFile.java @@ -1,4 +1,4 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 文件信息 * - * @author muyu + * @author zhilian */ public class SysFile { /** diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysLogininfor.java similarity index 90% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysLogininfor.java index 9ad179f..ff37dc3 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysLogininfor.java @@ -1,9 +1,9 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import java.util.Date; /** * 系统访问记录表 sys_logininfor * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysOperLog.java similarity index 95% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysOperLog.java index c82fbb6..bf815a0 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysOperLog.java @@ -1,9 +1,9 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import java.util.Date; /** * 操作日志记录表 oper_log * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysRole.java similarity index 96% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysRole.java index 09fda22..fca212c 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysRole.java @@ -1,8 +1,8 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,7 +19,7 @@ import java.util.Set; /** * 角色表 sys_role * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysUser.java similarity index 95% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysUser.java index 6be7436..494fdd7 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/domain/SysUser.java @@ -1,11 +1,11 @@ -package com.muyu.common.system.domain; +package com.zhilian.common.system.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.annotation.Excel.Type; -import com.muyu.common.core.annotation.Excels; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.core.xss.Xss; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.annotation.Excel.Type; +import com.zhilian.common.core.annotation.Excels; +import com.zhilian.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.xss.Xss; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,7 +23,7 @@ import java.util.List; /** * 用户对象 sys_user * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteFileService.java similarity index 72% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteFileService.java index 96dd181..889aa28 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteFileService.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteFileService.java @@ -1,9 +1,9 @@ -package com.muyu.common.system.remote; +package com.zhilian.common.system.remote; -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysFile; -import com.muyu.common.system.remote.factory.RemoteFileFallbackFactory; +import com.zhilian.common.core.constant.ServiceNameConstants; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.system.domain.SysFile; +import com.zhilian.common.system.remote.factory.RemoteFileFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; @@ -13,7 +13,7 @@ import org.springframework.web.multipart.MultipartFile; /** * 文件服务 * - * @author muyu + * @author zhilian */ @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) public interface RemoteFileService { diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteLogService.java similarity index 73% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteLogService.java index 7e767c4..6fcf9af 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteLogService.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteLogService.java @@ -1,11 +1,11 @@ -package com.muyu.common.system.remote; +package com.zhilian.common.system.remote; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.common.system.domain.SysOperLog; -import com.muyu.common.system.remote.factory.RemoteLogFallbackFactory; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.constant.ServiceNameConstants; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.system.domain.SysLogininfor; +import com.zhilian.common.system.domain.SysOperLog; +import com.zhilian.common.system.remote.factory.RemoteLogFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestHeader; /** * 日志服务 * - * @author muyu + * @author zhilian */ @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) public interface RemoteLogService { diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteUserService.java similarity index 71% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteUserService.java index cb968e0..2473b35 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/RemoteUserService.java @@ -1,18 +1,18 @@ -package com.muyu.common.system.remote; +package com.zhilian.common.system.remote; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.constant.ServiceNameConstants; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.common.system.remote.factory.RemoteUserFallbackFactory; +import com.zhilian.common.system.domain.LoginUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; /** * 用户服务 * - * @author muyu + * @author zhilian */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService { diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteFileFallbackFactory.java similarity index 79% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteFileFallbackFactory.java index 395f74f..912be03 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteFileFallbackFactory.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteFileFallbackFactory.java @@ -1,8 +1,8 @@ -package com.muyu.common.system.remote.factory; +package com.zhilian.common.system.remote.factory; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.remote.RemoteFileService; -import com.muyu.common.system.domain.SysFile; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.system.remote.RemoteFileService; +import com.zhilian.common.system.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -12,7 +12,7 @@ import org.springframework.web.multipart.MultipartFile; /** * 文件服务降级处理 * - * @author muyu + * @author zhilian */ @Component public class RemoteFileFallbackFactory implements FallbackFactory { diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteLogFallbackFactory.java similarity index 78% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteLogFallbackFactory.java index 5998c17..9f434f6 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteLogFallbackFactory.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteLogFallbackFactory.java @@ -1,9 +1,9 @@ -package com.muyu.common.system.remote.factory; +package com.zhilian.common.system.remote.factory; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.remote.RemoteLogService; -import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.common.system.domain.SysOperLog; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.system.remote.RemoteLogService; +import com.zhilian.common.system.domain.SysLogininfor; +import com.zhilian.common.system.domain.SysOperLog; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** * 日志服务降级处理 * - * @author muyu + * @author zhilian */ @Component public class RemoteLogFallbackFactory implements FallbackFactory { diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteUserFallbackFactory.java similarity index 78% rename from muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java rename to zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteUserFallbackFactory.java index b7f4d60..b8e4b08 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/zhilian-common/zhilian-common-system/src/main/java/com/zhilian/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,9 +1,9 @@ -package com.muyu.common.system.remote.factory; +package com.zhilian.common.system.remote.factory; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.system.remote.RemoteUserService; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.common.system.domain.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; /** * 用户服务降级处理 * - * @author muyu + * @author zhilian */ @Component public class RemoteUserFallbackFactory implements FallbackFactory { diff --git a/zhilian-common/zhilian-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/zhilian-common/zhilian-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6538aa9 --- /dev/null +++ b/zhilian-common/zhilian-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.zhilian.common.system.remote.factory.RemoteUserFallbackFactory +com.zhilian.common.system.remote.factory.RemoteLogFallbackFactory +com.zhilian.common.system.remote.factory.RemoteFileFallbackFactory diff --git a/muyu-gateway/pom.xml b/zhilian-gateway/pom.xml similarity index 93% rename from muyu-gateway/pom.xml rename to zhilian-gateway/pom.xml index 7683a66..053ecd1 100644 --- a/muyu-gateway/pom.xml +++ b/zhilian-gateway/pom.xml @@ -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"> - com.muyu + com.zhilian smart-cloud-server 3.6.3 4.0.0 - muyu-gateway + zhilian-gateway - muyu-gateway网关模块 + zhilian-gateway网关模块 @@ -70,10 +70,10 @@ kaptcha - + - com.muyu - muyu-common-redis + com.zhilian + zhilian-common-redis diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/ZhiLianGatewayApplication.java similarity index 69% rename from muyu-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/ZhiLianGatewayApplication.java index a3e851e..3b59115 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/MuYuGatewayApplication.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/ZhiLianGatewayApplication.java @@ -1,4 +1,4 @@ -package com.muyu.gateway; +package com.zhilian.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,11 +7,11 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 网关启动程序 * - * @author muyu + * @author zhilian */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class MuYuGatewayApplication { +public class ZhiLianGatewayApplication { public static void main (String[] args) { - SpringApplication.run(MuYuGatewayApplication.class, args); + SpringApplication.run(ZhiLianGatewayApplication.class, args); } } diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/CaptchaConfig.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/CaptchaConfig.java similarity index 96% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/CaptchaConfig.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/CaptchaConfig.java index 557af8a..dd71ef6 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/CaptchaConfig.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.config; +package com.zhilian.gateway.config; import com.google.code.kaptcha.impl.DefaultKaptcha; import com.google.code.kaptcha.util.Config; @@ -12,7 +12,7 @@ import static com.google.code.kaptcha.Constants.*; /** * 验证码配置 * - * @author muyu + * @author zhilian */ @Configuration public class CaptchaConfig { @@ -62,7 +62,7 @@ public class CaptchaConfig { // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.muyu.gateway.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.zhilian.gateway.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/GatewayConfig.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/GatewayConfig.java similarity index 79% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/GatewayConfig.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/GatewayConfig.java index bf004bf..223a27b 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/GatewayConfig.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/GatewayConfig.java @@ -1,6 +1,6 @@ -package com.muyu.gateway.config; +package com.zhilian.gateway.config; -import com.muyu.gateway.handler.SentinelFallbackHandler; +import com.zhilian.gateway.handler.SentinelFallbackHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -9,7 +9,7 @@ import org.springframework.core.annotation.Order; /** * 网关限流配置 * - * @author muyu + * @author zhilian */ @Configuration public class GatewayConfig { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/KaptchaTextCreator.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/KaptchaTextCreator.java similarity index 97% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/KaptchaTextCreator.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/KaptchaTextCreator.java index 7b0636d..2a70280 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/KaptchaTextCreator.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.config; +package com.zhilian.gateway.config; import com.google.code.kaptcha.text.impl.DefaultTextCreator; @@ -7,7 +7,7 @@ import java.util.Random; /** * 验证码文本生成器 * - * @author muyu + * @author zhilian */ public class KaptchaTextCreator extends DefaultTextCreator { private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(","); diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/RouterFunctionConfiguration.java similarity index 88% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/RouterFunctionConfiguration.java index 41b8e47..56331a0 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/RouterFunctionConfiguration.java @@ -1,6 +1,6 @@ -package com.muyu.gateway.config; +package com.zhilian.gateway.config; -import com.muyu.gateway.handler.ValidateCodeHandler; +import com.zhilian.gateway.handler.ValidateCodeHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,7 +12,7 @@ import org.springframework.web.reactive.function.server.RouterFunctions; /** * 路由配置信息 * - * @author muyu + * @author zhilian */ @Configuration public class RouterFunctionConfiguration { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/SwaggerProvider.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/SwaggerProvider.java similarity index 94% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/SwaggerProvider.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/SwaggerProvider.java index 3af24d2..001691b 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/SwaggerProvider.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/SwaggerProvider.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.config; +package com.zhilian.gateway.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.config.GatewayProperties; @@ -17,7 +17,7 @@ import java.util.List; /** * 聚合系统接口 * - * @author muyu + * @author zhilian */ @Component public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer { @@ -52,7 +52,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu .contains(routeDefinition.getId())) .forEach(routeDefinition -> routeDefinition.getPredicates().stream() .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) - .filter(predicateDefinition -> !"muyu-auth".equalsIgnoreCase(routeDefinition.getId())) + .filter(predicateDefinition -> !"zhilian-auth".equalsIgnoreCase(routeDefinition.getId())) .forEach(predicateDefinition -> resourceList .add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs() .get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", SWAGGER2URL))))); diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/properties/CaptchaProperties.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/CaptchaProperties.java similarity index 92% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/properties/CaptchaProperties.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/CaptchaProperties.java index 60b1814..3a2128b 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/properties/CaptchaProperties.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/CaptchaProperties.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.config.properties; +package com.zhilian.gateway.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; /** * 验证码配置 * - * @author muyu + * @author zhilian */ @Configuration @RefreshScope diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/properties/IgnoreWhiteProperties.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/IgnoreWhiteProperties.java similarity index 91% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/properties/IgnoreWhiteProperties.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/IgnoreWhiteProperties.java index d5ea46c..b5ff42f 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/properties/IgnoreWhiteProperties.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/IgnoreWhiteProperties.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.config.properties; +package com.zhilian.gateway.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; @@ -10,7 +10,7 @@ import java.util.List; /** * 放行白名单配置 * - * @author muyu + * @author zhilian */ @Configuration @RefreshScope diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/config/properties/XssProperties.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/XssProperties.java similarity index 93% rename from muyu-gateway/src/main/java/com/muyu/gateway/config/properties/XssProperties.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/XssProperties.java index 31dcc6a..edfed8e 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/config/properties/XssProperties.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.config.properties; +package com.zhilian.gateway.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; @@ -10,7 +10,7 @@ import java.util.List; /** * XSS跨站脚本配置 * - * @author muyu + * @author zhilian */ @Configuration @RefreshScope diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/AuthFilter.java similarity index 88% rename from muyu-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/filter/AuthFilter.java index 47e073f..dfc5893 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/AuthFilter.java @@ -1,14 +1,14 @@ -package com.muyu.gateway.filter; +package com.zhilian.gateway.filter; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.constant.HttpStatus; -import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.constant.TokenConstants; -import com.muyu.common.core.utils.JwtUtils; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.redis.service.RedisService; -import com.muyu.gateway.config.properties.IgnoreWhiteProperties; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.constant.HttpStatus; +import com.zhilian.common.core.constant.SecurityConstants; +import com.zhilian.common.core.constant.TokenConstants; +import com.zhilian.common.core.utils.JwtUtils; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.gateway.config.properties.IgnoreWhiteProperties; import io.jsonwebtoken.Claims; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +24,7 @@ import reactor.core.publisher.Mono; /** * 网关鉴权 * - * @author muyu + * @author zhilian */ @Component public class AuthFilter implements GlobalFilter, Ordered { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/filter/BlackListUrlFilter.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/BlackListUrlFilter.java similarity index 94% rename from muyu-gateway/src/main/java/com/muyu/gateway/filter/BlackListUrlFilter.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/filter/BlackListUrlFilter.java index 0096d4c..ccb6af3 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/filter/BlackListUrlFilter.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/BlackListUrlFilter.java @@ -1,6 +1,6 @@ -package com.muyu.gateway.filter; +package com.zhilian.gateway.filter; -import com.muyu.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.ServletUtils; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.stereotype.Component; @@ -12,7 +12,7 @@ import java.util.regex.Pattern; /** * 黑名单过滤器 * - * @author muyu + * @author zhilian */ @Component public class BlackListUrlFilter extends AbstractGatewayFilterFactory { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/filter/CacheRequestFilter.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/CacheRequestFilter.java similarity index 97% rename from muyu-gateway/src/main/java/com/muyu/gateway/filter/CacheRequestFilter.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/filter/CacheRequestFilter.java index 3a09564..1113eb3 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/filter/CacheRequestFilter.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/CacheRequestFilter.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.filter; +package com.zhilian.gateway.filter; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.GatewayFilterChain; @@ -16,7 +16,7 @@ import java.util.List; /** * 获取body请求数据（解决流不能重复读取问题） * - * @author muyu + * @author zhilian */ @Component public class CacheRequestFilter extends AbstractGatewayFilterFactory { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/ValidateCodeFilter.java similarity index 90% rename from muyu-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/filter/ValidateCodeFilter.java index c19c944..26d2bf6 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/ValidateCodeFilter.java @@ -1,11 +1,11 @@ -package com.muyu.gateway.filter; +package com.zhilian.gateway.filter; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.core.utils.ServletUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.gateway.config.properties.CaptchaProperties; -import com.muyu.gateway.service.ValidateCodeService; +import com.zhilian.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.gateway.config.properties.CaptchaProperties; +import com.zhilian.gateway.service.ValidateCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicReference; /** * 验证码过滤器 * - * @author muyu + * @author zhilian */ @Component public class ValidateCodeFilter extends AbstractGatewayFilterFactory { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/XssFilter.java similarity index 95% rename from muyu-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/filter/XssFilter.java index 4316d84..3792ceb 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/filter/XssFilter.java @@ -1,8 +1,8 @@ -package com.muyu.gateway.filter; +package com.zhilian.gateway.filter; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.html.EscapeUtil; -import com.muyu.gateway.config.properties.XssProperties; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.html.EscapeUtil; +import com.zhilian.gateway.config.properties.XssProperties; import io.netty.buffer.ByteBufAllocator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets; /** * 跨站脚本过滤器 * - * @author muyu + * @author zhilian */ @Component @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/handler/GatewayExceptionHandler.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/GatewayExceptionHandler.java similarity index 93% rename from muyu-gateway/src/main/java/com/muyu/gateway/handler/GatewayExceptionHandler.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/handler/GatewayExceptionHandler.java index ed5198e..1fff083 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/handler/GatewayExceptionHandler.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/GatewayExceptionHandler.java @@ -1,6 +1,6 @@ -package com.muyu.gateway.handler; +package com.zhilian.gateway.handler; -import com.muyu.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.ServletUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler; @@ -15,7 +15,7 @@ import reactor.core.publisher.Mono; /** * 网关统一异常处理 * - * @author muyu + * @author zhilian */ @Order(-1) @Configuration diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/handler/SentinelFallbackHandler.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/SentinelFallbackHandler.java similarity index 92% rename from muyu-gateway/src/main/java/com/muyu/gateway/handler/SentinelFallbackHandler.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/handler/SentinelFallbackHandler.java index d93866f..2055219 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/handler/SentinelFallbackHandler.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/SentinelFallbackHandler.java @@ -1,8 +1,8 @@ -package com.muyu.gateway.handler; +package com.zhilian.gateway.handler; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; import com.alibaba.csp.sentinel.slots.block.BlockException; -import com.muyu.common.core.utils.ServletUtils; +import com.zhilian.common.core.utils.ServletUtils; import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebExceptionHandler; @@ -11,7 +11,7 @@ import reactor.core.publisher.Mono; /** * 自定义限流异常处理 * - * @author muyu + * @author zhilian */ public class SentinelFallbackHandler implements WebExceptionHandler { private Mono writeResponse (ServerResponse response, ServerWebExchange exchange) { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/handler/SwaggerHandler.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/SwaggerHandler.java similarity index 97% rename from muyu-gateway/src/main/java/com/muyu/gateway/handler/SwaggerHandler.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/handler/SwaggerHandler.java index c2a7b67..1e71707 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/handler/SwaggerHandler.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/SwaggerHandler.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.handler; +package com.zhilian.gateway.handler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/ValidateCodeHandler.java similarity index 83% rename from muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/handler/ValidateCodeHandler.java index f3b3206..32bcefd 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/handler/ValidateCodeHandler.java @@ -1,8 +1,8 @@ -package com.muyu.gateway.handler; +package com.zhilian.gateway.handler; -import com.muyu.common.core.exception.CaptchaException; -import com.muyu.common.core.domain.Result; -import com.muyu.gateway.service.ValidateCodeService; +import com.zhilian.common.core.exception.CaptchaException; +import com.zhilian.common.core.domain.Result; +import com.zhilian.gateway.service.ValidateCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import java.io.IOException; /** * 验证码获取 * - * @author muyu + * @author zhilian */ @Component public class ValidateCodeHandler implements HandlerFunction { diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/model/resp/CaptchaCodeResp.java similarity index 90% rename from muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/model/resp/CaptchaCodeResp.java index bd12aad..fc8ea08 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/model/resp/CaptchaCodeResp.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/model/resp/CaptchaCodeResp.java @@ -1,4 +1,4 @@ -package com.muyu.gateway.model.resp; +package com.zhilian.gateway.model.resp; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/service/ValidateCodeService.java similarity index 67% rename from muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/service/ValidateCodeService.java index 25ed94e..f2049f1 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/service/ValidateCodeService.java @@ -1,14 +1,14 @@ -package com.muyu.gateway.service; +package com.zhilian.gateway.service; -import com.muyu.common.core.exception.CaptchaException; -import com.muyu.common.core.domain.Result; +import com.zhilian.common.core.exception.CaptchaException; +import com.zhilian.common.core.domain.Result; import java.io.IOException; /** * 验证码处理 * - * @author muyu + * @author zhilian */ public interface ValidateCodeService { /** diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/zhilian-gateway/src/main/java/com/zhilian/gateway/service/impl/ValidateCodeServiceImpl.java similarity index 83% rename from muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java rename to zhilian-gateway/src/main/java/com/zhilian/gateway/service/impl/ValidateCodeServiceImpl.java index 879d887..748449e 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/zhilian-gateway/src/main/java/com/zhilian/gateway/service/impl/ValidateCodeServiceImpl.java @@ -1,17 +1,17 @@ -package com.muyu.gateway.service.impl; +package com.zhilian.gateway.service.impl; import com.google.code.kaptcha.Producer; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.exception.CaptchaException; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.sign.Base64; -import com.muyu.common.core.utils.uuid.IdUtils; -import com.muyu.common.core.domain.Result; -import com.muyu.common.redis.service.RedisService; -import com.muyu.gateway.config.properties.CaptchaProperties; -import com.muyu.gateway.model.resp.CaptchaCodeResp; -import com.muyu.gateway.service.ValidateCodeService; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.exception.CaptchaException; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.sign.Base64; +import com.zhilian.common.core.utils.uuid.IdUtils; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.gateway.config.properties.CaptchaProperties; +import com.zhilian.gateway.model.resp.CaptchaCodeResp; +import com.zhilian.gateway.service.ValidateCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; /** * 验证码实现处理 * - * @author muyu + * @author zhilian */ @Service public class ValidateCodeServiceImpl implements ValidateCodeService { diff --git a/muyu-gateway/src/main/resources/banner.txt b/zhilian-gateway/src/main/resources/banner.txt similarity index 100% rename from muyu-gateway/src/main/resources/banner.txt rename to zhilian-gateway/src/main/resources/banner.txt diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/zhilian-gateway/src/main/resources/bootstrap.yml similarity index 80% rename from muyu-gateway/src/main/resources/bootstrap.yml rename to zhilian-gateway/src/main/resources/bootstrap.yml index d7367b4..b426d9a 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/zhilian-gateway/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-gateway + name: zhilian-gateway profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,8 +33,8 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 - dataId: sentinel-muyu-gateway + server-addr: 10.10.25.2:8848 + dataId: sentinel-zhilian-gateway groupId: DEFAULT_GROUP data-type: json rule-type: gw-flow diff --git a/zhilian-gateway/src/main/resources/logback.xml b/zhilian-gateway/src/main/resources/logback.xml new file mode 100644 index 0000000..4dbcaf8 --- /dev/null +++ b/zhilian-gateway/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/pom.xml b/zhilian-modules/pom.xml similarity index 65% rename from muyu-modules/pom.xml rename to zhilian-modules/pom.xml index b72413f..57f793c 100644 --- a/muyu-modules/pom.xml +++ b/zhilian-modules/pom.xml @@ -2,24 +2,24 @@ - com.muyu + com.zhilian smart-cloud-server 3.6.3 4.0.0 - muyu-system - muyu-gen - muyu-job - muyu-file + zhilian-system + zhilian-gen + zhilian-job + zhilian-file - muyu-modules + zhilian-modules pom - muyu-modules业务模块 + zhilian-modules业务模块 diff --git a/muyu-modules/muyu-file/pom.xml b/zhilian-modules/zhilian-file/pom.xml similarity index 85% rename from muyu-modules/muyu-file/pom.xml rename to zhilian-modules/zhilian-file/pom.xml index e1de9af..2f00346 100644 --- a/muyu-modules/muyu-file/pom.xml +++ b/zhilian-modules/zhilian-file/pom.xml @@ -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"> - com.muyu - muyu-modules + com.zhilian + zhilian-modules 3.6.3 4.0.0 - muyu-modules-file + zhilian-modules-file - muyu-modules-file文件服务 + zhilian-modules-file文件服务 @@ -55,16 +55,16 @@ - + - com.muyu - muyu-common-swagger + com.zhilian + zhilian-common-swagger - + - com.muyu - muyu-common-system + com.zhilian + zhilian-common-system diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/ZhiLianFileApplication.java similarity index 63% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/ZhiLianFileApplication.java index b2e172f..09e0e46 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/ZhiLianFileApplication.java @@ -1,6 +1,6 @@ -package com.muyu.file; +package com.zhilian.file; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; 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 zhilian */ @EnableCustomSwagger2 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class MuYuFileApplication { +public class ZhiLianFileApplication { public static void main (String[] args) { - SpringApplication.run(MuYuFileApplication.class, args); + SpringApplication.run(ZhiLianFileApplication.class, args); } } diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/config/MinioConfig.java similarity index 96% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/config/MinioConfig.java index af8c1bb..4ac4596 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/config/MinioConfig.java @@ -1,4 +1,4 @@ -package com.muyu.file.config; +package com.zhilian.file.config; import io.minio.MinioClient; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration; /** * Minio 配置信息 * - * @author muyu + * @author zhilian */ @Configuration @ConfigurationProperties(prefix = "minio") diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/config/ResourcesConfig.java similarity index 96% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/config/ResourcesConfig.java index 78a8be0..6fcdbe1 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.muyu.file.config; +package com.zhilian.file.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -11,7 +11,7 @@ import java.io.File; /** * 通用映射配置 * - * @author muyu + * @author zhilian */ @Configuration public class ResourcesConfig implements WebMvcConfigurer { diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/controller/SysFileController.java similarity index 81% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/controller/SysFileController.java index 5f5ce31..9bc9603 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/controller/SysFileController.java @@ -1,9 +1,9 @@ -package com.muyu.file.controller; +package com.zhilian.file.controller; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.file.FileUtils; -import com.muyu.file.service.ISysFileService; -import com.muyu.common.system.domain.SysFile; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.file.FileUtils; +import com.zhilian.file.service.ISysFileService; +import com.zhilian.common.system.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ import org.springframework.web.multipart.MultipartFile; /** * 文件请求处理 * - * @author muyu + * @author zhilian */ @RestController public class SysFileController { diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/FastDfsSysFileServiceImpl.java similarity index 91% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/FastDfsSysFileServiceImpl.java index 3cc2ee3..7594e0f 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/FastDfsSysFileServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.file.service; +package com.zhilian.file.service; import com.alibaba.nacos.common.utils.IoUtils; import com.github.tobato.fastdfs.domain.fdfs.StorePath; import com.github.tobato.fastdfs.service.FastFileStorageClient; -import com.muyu.common.core.utils.file.FileTypeUtils; +import com.zhilian.common.core.utils.file.FileTypeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import java.io.InputStream; /** * FastDFS 文件存储 * - * @author muyu + * @author zhilian */ @Service public class FastDfsSysFileServiceImpl implements ISysFileService { diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/ISysFileService.java similarity index 86% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/ISysFileService.java index 416c26c..3618bbc 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/ISysFileService.java @@ -1,11 +1,11 @@ -package com.muyu.file.service; +package com.zhilian.file.service; import org.springframework.web.multipart.MultipartFile; /** * 文件上传接口 * - * @author muyu + * @author zhilian */ public interface ISysFileService { /** diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/LocalSysFileServiceImpl.java similarity index 80% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/LocalSysFileServiceImpl.java index f3ce089..cc6afbd 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/LocalSysFileServiceImpl.java @@ -1,6 +1,6 @@ -package com.muyu.file.service; +package com.zhilian.file.service; -import com.muyu.file.utils.FileUploadUtils; +import com.zhilian.file.utils.FileUploadUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; @@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile; /** * 本地文件存储 * - * @author muyu + * @author zhilian */ @Primary @Service @@ -17,19 +17,19 @@ public class LocalSysFileServiceImpl implements ISysFileService { /** * 资源映射路径 前缀 */ - @Value("${file.prefix}") + @Value("${file.prefix:/statics}") public String localFilePrefix; /** * 域名或本机访问地址 */ - @Value("${file.domain}") + @Value("${file.domain:http://127.0.0.1:9300}") public String domain; /** * 上传文件存储在本地的根路径 */ - @Value("${file.path}") + @Value("${file.path:D:/zhilian/uploadPath}") private String localFilePath; /** diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/MinioSysFileServiceImpl.java similarity index 90% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/MinioSysFileServiceImpl.java index 9a50de4..d442433 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/service/MinioSysFileServiceImpl.java @@ -1,8 +1,8 @@ -package com.muyu.file.service; +package com.zhilian.file.service; import com.alibaba.nacos.common.utils.IoUtils; -import com.muyu.file.config.MinioConfig; -import com.muyu.file.utils.FileUploadUtils; +import com.zhilian.file.config.MinioConfig; +import com.zhilian.file.utils.FileUploadUtils; import io.minio.MinioClient; import io.minio.PutObjectArgs; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +14,7 @@ import java.io.InputStream; /** * Minio 文件存储 * - * @author muyu + * @author zhilian */ @Service public class MinioSysFileServiceImpl implements ISysFileService { diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/utils/FileUploadUtils.java similarity index 90% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java rename to zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/utils/FileUploadUtils.java index 0a48cbf..b9e96ec 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java +++ b/zhilian-modules/zhilian-file/src/main/java/com/zhilian/file/utils/FileUploadUtils.java @@ -1,14 +1,14 @@ -package com.muyu.file.utils; +package com.zhilian.file.utils; -import com.muyu.common.core.exception.file.FileException; -import com.muyu.common.core.exception.file.FileNameLengthLimitExceededException; -import com.muyu.common.core.exception.file.FileSizeLimitExceededException; -import com.muyu.common.core.exception.file.InvalidExtensionException; -import com.muyu.common.core.utils.DateUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.file.FileTypeUtils; -import com.muyu.common.core.utils.file.MimeTypeUtils; -import com.muyu.common.core.utils.uuid.Seq; +import com.zhilian.common.core.exception.file.FileException; +import com.zhilian.common.core.exception.file.FileNameLengthLimitExceededException; +import com.zhilian.common.core.exception.file.FileSizeLimitExceededException; +import com.zhilian.common.core.exception.file.InvalidExtensionException; +import com.zhilian.common.core.utils.DateUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.file.FileTypeUtils; +import com.zhilian.common.core.utils.file.MimeTypeUtils; +import com.zhilian.common.core.utils.uuid.Seq; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; @@ -20,7 +20,7 @@ import java.util.Objects; /** * 文件上传工具类 * - * @author muyu + * @author zhilian */ public class FileUploadUtils { /** diff --git a/muyu-modules/muyu-file/src/main/resources/banner.txt b/zhilian-modules/zhilian-file/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/banner.txt rename to zhilian-modules/zhilian-file/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml similarity index 81% rename from muyu-modules/muyu-file/src/main/resources/bootstrap.yml rename to zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml index 0cb85bd..415c871 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-file + name: zhilian-file profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-file/src/main/resources/logback.xml b/zhilian-modules/zhilian-file/src/main/resources/logback.xml similarity index 96% rename from muyu-modules/muyu-file/src/main/resources/logback.xml rename to zhilian-modules/zhilian-file/src/main/resources/logback.xml index de3e2ce..644c83e 100644 --- a/muyu-modules/muyu-file/src/main/resources/logback.xml +++ b/zhilian-modules/zhilian-file/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/muyu-modules/muyu-gen/pom.xml b/zhilian-modules/zhilian-gen/pom.xml similarity index 86% rename from muyu-modules/muyu-gen/pom.xml rename to zhilian-modules/zhilian-gen/pom.xml index bd2a910..0a714ae 100644 --- a/muyu-modules/muyu-gen/pom.xml +++ b/zhilian-modules/zhilian-gen/pom.xml @@ -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"> - com.muyu - muyu-modules + com.zhilian + zhilian-modules 3.6.3 4.0.0 - muyu-modules-gen + zhilian-modules-gen - muyu-modules-gen代码生成 + zhilian-modules-gen代码生成 @@ -60,16 +60,16 @@ mysql-connector-j - + - com.muyu - muyu-common-log + com.zhilian + zhilian-common-log - + - com.muyu - muyu-common-swagger + com.zhilian + zhilian-common-swagger diff --git a/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/ZhiLianGenApplication.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/ZhiLianGenApplication.java new file mode 100644 index 0000000..dcd190d --- /dev/null +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/ZhiLianGenApplication.java @@ -0,0 +1,22 @@ +package com.zhilian.gen; + +import com.zhilian.common.security.annotation.EnableCustomConfig; +import com.zhilian.common.security.annotation.EnableMyFeignClients; +import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 代码生成 + * + * @author zhilian + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class ZhiLianGenApplication { + public static void main (String[] args) { + SpringApplication.run(ZhiLianGenApplication.class, args); + } +} diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/config/GenConfig.java similarity index 96% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/config/GenConfig.java index 65d9824..dc91d86 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.muyu.gen.config; +package com.zhilian.gen.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * 代码生成相关配置 * - * @author muyu + * @author zhilian */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/controller/GenController.java similarity index 90% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/controller/GenController.java index 7fe822a..0bcb1b2 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/controller/GenController.java @@ -1,16 +1,16 @@ -package com.muyu.gen.controller; +package com.zhilian.gen.controller; -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.gen.domain.GenTable; -import com.muyu.gen.domain.GenTableColumn; -import com.muyu.gen.service.IGenTableColumnService; -import com.muyu.gen.service.IGenTableService; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.gen.domain.GenTable; +import com.zhilian.gen.domain.GenTableColumn; +import com.zhilian.gen.service.IGenTableColumnService; +import com.zhilian.gen.service.IGenTableService; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -25,7 +25,7 @@ import java.util.Map; /** * 代码生成 操作处理 * - * @author muyu + * @author zhilian */ @RequestMapping("/gen") @RestController @@ -185,7 +185,7 @@ public class GenController extends BaseController { */ private void genCode (HttpServletResponse response, byte[] data) throws IOException { response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"muyu.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"zhilian.zip\""); response.addHeader("Content-Length", String.valueOf(data.length)); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/domain/GenTable.java similarity index 97% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/domain/GenTable.java index 690d8d0..fdeee79 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/domain/GenTable.java @@ -1,8 +1,8 @@ -package com.muyu.gen.domain; +package com.zhilian.gen.domain; -import com.muyu.common.core.constant.GenConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.constant.GenConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,7 +20,7 @@ import java.util.List; /** * 业务表 gen_table * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/domain/GenTableColumn.java similarity index 98% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/domain/GenTableColumn.java index 638b0ab..ac7e75b 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/domain/GenTableColumn.java @@ -1,7 +1,7 @@ -package com.muyu.gen.domain; +package com.zhilian.gen.domain; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank; /** * 代码生成业务字段表 gen_table_column * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/mapper/GenTableColumnMapper.java similarity index 93% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/mapper/GenTableColumnMapper.java index 5825d59..4535b00 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/mapper/GenTableColumnMapper.java @@ -1,14 +1,14 @@ -package com.muyu.gen.mapper; +package com.zhilian.gen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.gen.domain.GenTableColumn; +import com.zhilian.gen.domain.GenTableColumn; import java.util.List; /** * 业务字段 数据层 * - * @author muyu + * @author zhilian */ public interface GenTableColumnMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/mapper/GenTableMapper.java similarity index 94% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/mapper/GenTableMapper.java index 66858cb..ea27b91 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/mapper/GenTableMapper.java @@ -1,14 +1,14 @@ -package com.muyu.gen.mapper; +package com.zhilian.gen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.gen.domain.GenTable; +import com.zhilian.gen.domain.GenTable; import java.util.List; /** * 业务 数据层 * - * @author muyu + * @author zhilian */ public interface GenTableMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/GenTableColumnServiceImpl.java similarity index 88% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/GenTableColumnServiceImpl.java index 895b1ed..ed485e1 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/GenTableColumnServiceImpl.java @@ -1,8 +1,8 @@ -package com.muyu.gen.service; +package com.zhilian.gen.service; -import com.muyu.common.core.text.Convert; -import com.muyu.gen.domain.GenTableColumn; -import com.muyu.gen.mapper.GenTableColumnMapper; +import com.zhilian.common.core.text.Convert; +import com.zhilian.gen.domain.GenTableColumn; +import com.zhilian.gen.mapper.GenTableColumnMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,7 +11,7 @@ import java.util.List; /** * 业务字段 服务层实现 * - * @author muyu + * @author zhilian */ @Service public class GenTableColumnServiceImpl implements IGenTableColumnService { diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/GenTableServiceImpl.java similarity index 95% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/GenTableServiceImpl.java index 6273779..b800b91 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/GenTableServiceImpl.java @@ -1,20 +1,20 @@ -package com.muyu.gen.service; +package com.zhilian.gen.service; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.constant.GenConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.text.CharsetKit; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.gen.domain.GenTable; -import com.muyu.gen.domain.GenTableColumn; -import com.muyu.gen.mapper.GenTableColumnMapper; -import com.muyu.gen.mapper.GenTableMapper; -import com.muyu.gen.util.GenUtils; -import com.muyu.gen.util.VelocityInitializer; -import com.muyu.gen.util.VelocityUtils; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.constant.GenConstants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.text.CharsetKit; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.gen.domain.GenTable; +import com.zhilian.gen.domain.GenTableColumn; +import com.zhilian.gen.mapper.GenTableColumnMapper; +import com.zhilian.gen.mapper.GenTableMapper; +import com.zhilian.gen.util.GenUtils; +import com.zhilian.gen.util.VelocityInitializer; +import com.zhilian.gen.util.VelocityUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.velocity.Template; @@ -41,7 +41,7 @@ import java.util.zip.ZipOutputStream; /** * 业务 服务层实现 * - * @author muyu + * @author zhilian */ @Service public class GenTableServiceImpl implements IGenTableService { diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/IGenTableColumnService.java similarity index 89% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/IGenTableColumnService.java index b60ea57..601846e 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/IGenTableColumnService.java @@ -1,13 +1,13 @@ -package com.muyu.gen.service; +package com.zhilian.gen.service; -import com.muyu.gen.domain.GenTableColumn; +import com.zhilian.gen.domain.GenTableColumn; import java.util.List; /** * 业务字段 服务层 * - * @author muyu + * @author zhilian */ public interface IGenTableColumnService { /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/IGenTableService.java similarity index 96% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/IGenTableService.java index f34dc37..c4a3607 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/service/IGenTableService.java @@ -1,6 +1,6 @@ -package com.muyu.gen.service; +package com.zhilian.gen.service; -import com.muyu.gen.domain.GenTable; +import com.zhilian.gen.domain.GenTable; import java.util.List; import java.util.Map; @@ -8,7 +8,7 @@ import java.util.Map; /** * 业务 服务层 * - * @author muyu + * @author zhilian */ public interface IGenTableService { /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/GenUtils.java similarity index 96% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/GenUtils.java index 5aea1f2..524283c 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/GenUtils.java @@ -1,10 +1,10 @@ -package com.muyu.gen.util; +package com.zhilian.gen.util; -import com.muyu.common.core.constant.GenConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.gen.config.GenConfig; -import com.muyu.gen.domain.GenTable; -import com.muyu.gen.domain.GenTableColumn; +import com.zhilian.common.core.constant.GenConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.gen.config.GenConfig; +import com.zhilian.gen.domain.GenTable; +import com.zhilian.gen.domain.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; @@ -12,7 +12,7 @@ import java.util.Arrays; /** * 代码生成器 工具类 * - * @author muyu + * @author zhilian */ public class GenUtils { /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/VelocityInitializer.java similarity index 88% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/VelocityInitializer.java index cc171b4..c3d7893 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package com.muyu.gen.util; +package com.zhilian.gen.util; -import com.muyu.common.core.constant.Constants; +import com.zhilian.common.core.constant.Constants; import org.apache.velocity.app.Velocity; import java.util.Properties; @@ -8,7 +8,7 @@ import java.util.Properties; /** * VelocityEngine工厂 * - * @author muyu + * @author zhilian */ public class VelocityInitializer { /** diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/VelocityUtils.java similarity index 97% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java rename to zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/VelocityUtils.java index 9305ff7..97991e1 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java +++ b/zhilian-modules/zhilian-gen/src/main/java/com/zhilian/gen/util/VelocityUtils.java @@ -1,12 +1,12 @@ -package com.muyu.gen.util; +package com.zhilian.gen.util; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.core.constant.GenConstants; -import com.muyu.common.core.utils.DateUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.gen.domain.GenTable; -import com.muyu.gen.domain.GenTableColumn; +import com.zhilian.common.core.constant.GenConstants; +import com.zhilian.common.core.utils.DateUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.gen.domain.GenTable; +import com.zhilian.gen.domain.GenTableColumn; import org.apache.velocity.VelocityContext; import java.util.ArrayList; @@ -17,7 +17,7 @@ import java.util.Set; /** * 模板工具类 * - * @author muyu + * @author zhilian */ public class VelocityUtils { /** diff --git a/muyu-modules/muyu-gen/src/main/resources/banner.txt b/zhilian-modules/zhilian-gen/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/banner.txt rename to zhilian-modules/zhilian-gen/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml similarity index 81% rename from muyu-modules/muyu-gen/src/main/resources/bootstrap.yml rename to zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml index b628931..e6ae61a 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-gen + name: zhilian-gen profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/logback.xml b/zhilian-modules/zhilian-gen/src/main/resources/logback.xml similarity index 96% rename from muyu-modules/muyu-gen/src/main/resources/logback.xml rename to zhilian-modules/zhilian-gen/src/main/resources/logback.xml index 9ce06ea..eb731d4 100644 --- a/muyu-modules/muyu-gen/src/main/resources/logback.xml +++ b/zhilian-modules/zhilian-gen/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/zhilian-modules/zhilian-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 94% rename from muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to zhilian-modules/zhilian-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index fb9800e..a93041f 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/zhilian-modules/zhilian-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -55,7 +55,7 @@ from gen_table_column - where table_id = #{tableId} order by sort @@ -75,7 +75,7 @@ order by ordinal_position - + insert into gen_table_column ( table_id, column_name, @@ -119,7 +119,7 @@ ) - + update gen_table_column column_comment = #{columnComment}, diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/zhilian-modules/zhilian-gen/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 95% rename from muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml rename to zhilian-modules/zhilian-gen/src/main/resources/mapper/generator/GenTableMapper.xml index 42ab2cf..296a3e3 100644 --- a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/zhilian-modules/zhilian-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -28,7 +28,7 @@ - + @@ -77,7 +77,7 @@ from gen_table - @@ -95,7 +95,7 @@ - select table_name, table_comment, create_time, update_time from information_schema.tables where table_schema = (select database()) AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%' @@ -249,7 +249,7 @@ order by c.sort - + insert into gen_table ( table_name, table_comment, @@ -283,7 +283,7 @@ ) - + update gen_table table_name = #{tableName}, diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/controller.java.vm similarity index 90% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/java/controller.java.vm index ed7a33a..a616ca2 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm +++ b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/controller.java.vm @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.muyu.common.core.web.page.TableDataInfo; +import com.zhilian.common.core.web.page.TableDataInfo; #elseif($table.tree) #end diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/domain.java.vm similarity index 94% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/java/domain.java.vm index 4d0d9a6..d21198f 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm +++ b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/domain.java.vm @@ -5,11 +5,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.muyu.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel; #if($table.crud || $table.sub) -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.web.domain.BaseEntity; #elseif($table.tree) -import com.muyu.common.core.web.domain.TreeEntity; +import com.zhilian.common.core.web.domain.TreeEntity; #end /** diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/java/service.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 97% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/java/serviceImpl.java.vm index 3904af5..66ad0b1 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.muyu.common.core.utils.DateUtils; +import com.zhilian.common.core.utils.DateUtils; #break #end #end @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/sub-domain.java.vm similarity index 95% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/java/sub-domain.java.vm index df72461..85cd11c 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm +++ b/zhilian-modules/zhilian-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -5,8 +5,8 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/js/api.js.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/js/api.js.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/sql/sql.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/sql/sql.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index.vue.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index.vue.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/readme.txt b/zhilian-modules/zhilian-gen/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/readme.txt rename to zhilian-modules/zhilian-gen/src/main/resources/vm/vue/v3/readme.txt diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm b/zhilian-modules/zhilian-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm rename to zhilian-modules/zhilian-gen/src/main/resources/vm/xml/mapper.xml.vm diff --git a/muyu-modules/muyu-job/pom.xml b/zhilian-modules/zhilian-job/pom.xml similarity index 86% rename from muyu-modules/muyu-job/pom.xml rename to zhilian-modules/zhilian-job/pom.xml index 7ebe99d..19e7982 100644 --- a/muyu-modules/muyu-job/pom.xml +++ b/zhilian-modules/zhilian-job/pom.xml @@ -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"> - com.muyu - muyu-modules + com.zhilian + zhilian-modules 3.6.3 4.0.0 - muyu-modules-job + zhilian-modules-job - muyu-modules-job定时任务 + zhilian-modules-job定时任务 @@ -66,16 +66,16 @@ mysql-connector-j - + - com.muyu - muyu-common-log + com.zhilian + zhilian-common-log - + - com.muyu - muyu-common-swagger + com.zhilian + zhilian-common-swagger diff --git a/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/ZhiLianJobApplication.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/ZhiLianJobApplication.java new file mode 100644 index 0000000..6a0e95e --- /dev/null +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/ZhiLianJobApplication.java @@ -0,0 +1,22 @@ +package com.zhilian.job; + +import com.zhilian.common.security.annotation.EnableCustomConfig; +import com.zhilian.common.security.annotation.EnableMyFeignClients; +import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 定时任务 + * + * @author zhilian + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class ZhiLianJobApplication { + public static void main (String[] args) { + SpringApplication.run(ZhiLianJobApplication.class, args); + } +} diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/config/ScheduleConfig.java similarity index 97% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/config/ScheduleConfig.java index e2edda4..4760765 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.muyu.job.config; +//package com.zhilian.job.config; // //import java.util.Properties; //import javax.sql.DataSource; @@ -9,7 +9,7 @@ ///** // * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效） // * -// * @author muyu +// * @author zhilian // */ //@Configuration //public class ScheduleConfig diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/controller/SysJobController.java similarity index 88% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/controller/SysJobController.java index 692dee7..5d8ea6a 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/controller/SysJobController.java @@ -1,20 +1,20 @@ -package com.muyu.job.controller; +package com.zhilian.job.controller; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.exception.job.TaskException; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.job.domain.SysJob; -import com.muyu.job.service.ISysJobService; -import com.muyu.job.util.CronUtils; -import com.muyu.job.util.ScheduleUtils; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.exception.job.TaskException; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.job.domain.SysJob; +import com.zhilian.job.service.ISysJobService; +import com.zhilian.job.util.CronUtils; +import com.zhilian.job.util.ScheduleUtils; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; /** * 调度任务信息操作处理 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/job") diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/controller/SysJobLogController.java similarity index 80% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/controller/SysJobLogController.java index a15bdfd..2608674 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/controller/SysJobLogController.java @@ -1,14 +1,14 @@ -package com.muyu.job.controller; +package com.zhilian.job.controller; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.job.domain.SysJobLog; -import com.muyu.job.service.ISysJobLogService; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.job.domain.SysJobLog; +import com.zhilian.job.service.ISysJobLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,7 +18,7 @@ import java.util.List; /** * 调度日志操作处理 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/job/log") diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/domain/SysJob.java similarity index 92% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/domain/SysJob.java index ec31e58..0808ae7 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/domain/SysJob.java @@ -1,12 +1,12 @@ -package com.muyu.job.domain; +package com.zhilian.job.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.constant.ScheduleConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.job.util.CronUtils; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.constant.ScheduleConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.domain.BaseEntity; +import com.zhilian.job.util.CronUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,7 +22,7 @@ import java.util.Date; /** * 定时任务调度表 sys_job * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/domain/SysJobLog.java similarity index 95% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/domain/SysJobLog.java index cb24816..b40e552 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/domain/SysJobLog.java @@ -1,7 +1,7 @@ -package com.muyu.job.domain; +package com.zhilian.job.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import java.util.Date; /** * 定时任务调度日志表 sys_job_log * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/mapper/SysJobLogMapper.java similarity index 93% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/mapper/SysJobLogMapper.java index 675b15d..6271da8 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/mapper/SysJobLogMapper.java @@ -1,14 +1,14 @@ -package com.muyu.job.mapper; +package com.zhilian.job.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.job.domain.SysJobLog; +import com.zhilian.job.domain.SysJobLog; import java.util.List; /** * 调度任务日志信息 数据层 * - * @author muyu + * @author zhilian */ public interface SysJobLogMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/mapper/SysJobMapper.java similarity index 93% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/mapper/SysJobMapper.java index 84e9fa4..b123b6f 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/mapper/SysJobMapper.java @@ -1,14 +1,14 @@ -package com.muyu.job.mapper; +package com.zhilian.job.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.job.domain.SysJob; +import com.zhilian.job.domain.SysJob; import java.util.List; /** * 调度任务信息 数据层 * - * @author muyu + * @author zhilian */ public interface SysJobMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/ISysJobLogService.java similarity index 92% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/ISysJobLogService.java index 349f901..b7b1f1e 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/ISysJobLogService.java @@ -1,13 +1,13 @@ -package com.muyu.job.service; +package com.zhilian.job.service; -import com.muyu.job.domain.SysJobLog; +import com.zhilian.job.domain.SysJobLog; import java.util.List; /** * 定时任务调度日志信息信息 服务层 * - * @author muyu + * @author zhilian */ public interface ISysJobLogService { /** diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/ISysJobService.java similarity index 93% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/ISysJobService.java index 49a8cd3..41e08c2 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/ISysJobService.java @@ -1,7 +1,7 @@ -package com.muyu.job.service; +package com.zhilian.job.service; -import com.muyu.common.core.exception.job.TaskException; -import com.muyu.job.domain.SysJob; +import com.zhilian.common.core.exception.job.TaskException; +import com.zhilian.job.domain.SysJob; import org.quartz.SchedulerException; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * 定时任务调度信息信息 服务层 * - * @author muyu + * @author zhilian */ public interface ISysJobService { /** diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/SysJobLogServiceImpl.java similarity index 92% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/SysJobLogServiceImpl.java index 074463e..eed0467 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/SysJobLogServiceImpl.java @@ -1,7 +1,7 @@ -package com.muyu.job.service; +package com.zhilian.job.service; -import com.muyu.job.domain.SysJobLog; -import com.muyu.job.mapper.SysJobLogMapper; +import com.zhilian.job.domain.SysJobLog; +import com.zhilian.job.mapper.SysJobLogMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,7 +10,7 @@ import java.util.List; /** * 定时任务调度日志信息 服务层 * - * @author muyu + * @author zhilian */ @Service public class SysJobLogServiceImpl implements ISysJobLogService { diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/SysJobServiceImpl.java similarity index 95% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/SysJobServiceImpl.java index 40d339f..19408c0 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/service/SysJobServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.job.service; +package com.zhilian.job.service; -import com.muyu.common.core.constant.ScheduleConstants; -import com.muyu.common.core.exception.job.TaskException; -import com.muyu.job.domain.SysJob; -import com.muyu.job.mapper.SysJobMapper; -import com.muyu.job.util.CronUtils; -import com.muyu.job.util.ScheduleUtils; +import com.zhilian.common.core.constant.ScheduleConstants; +import com.zhilian.common.core.exception.job.TaskException; +import com.zhilian.job.domain.SysJob; +import com.zhilian.job.mapper.SysJobMapper; +import com.zhilian.job.util.CronUtils; +import com.zhilian.job.util.ScheduleUtils; import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; @@ -20,7 +20,7 @@ import java.util.List; /** * 定时任务调度信息 服务层 * - * @author muyu + * @author zhilian */ @Service public class SysJobServiceImpl implements ISysJobService { diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/task/MyTask.java similarity index 85% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/task/MyTask.java index 8a4c7d8..d2a2c59 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/task/MyTask.java @@ -1,12 +1,12 @@ -package com.muyu.job.task; +package com.zhilian.job.task; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; import org.springframework.stereotype.Component; /** * 定时任务调度测试 * - * @author muyu + * @author zhilian */ @Component("myTask") public class MyTask { diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/AbstractQuartzJob.java similarity index 86% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/AbstractQuartzJob.java index 772b248..acbaff0 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/AbstractQuartzJob.java @@ -1,13 +1,13 @@ -package com.muyu.job.util; +package com.zhilian.job.util; -import com.muyu.common.core.constant.ScheduleConstants; -import com.muyu.common.core.utils.ExceptionUtil; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.bean.BeanUtils; -import com.muyu.job.domain.SysJob; -import com.muyu.job.domain.SysJobLog; -import com.muyu.job.service.ISysJobLogService; +import com.zhilian.common.core.constant.ScheduleConstants; +import com.zhilian.common.core.utils.ExceptionUtil; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.bean.BeanUtils; +import com.zhilian.job.domain.SysJob; +import com.zhilian.job.domain.SysJobLog; +import com.zhilian.job.service.ISysJobLogService; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -19,7 +19,7 @@ import java.util.Date; /** * 抽象quartz调用 * - * @author muyu + * @author zhilian */ public abstract class AbstractQuartzJob implements Job { private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/CronUtils.java similarity index 96% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/CronUtils.java index 2d3f719..8683d4b 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.muyu.job.util; +package com.zhilian.job.util; import org.quartz.CronExpression; @@ -8,7 +8,7 @@ import java.util.Date; /** * cron表达式工具类 * - * @author muyu + * @author zhilian */ public class CronUtils { /** diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/JobInvokeUtil.java similarity index 96% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/JobInvokeUtil.java index b942b26..4db95e2 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/JobInvokeUtil.java @@ -1,8 +1,8 @@ -package com.muyu.job.util; +package com.zhilian.job.util; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.job.domain.SysJob; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.job.domain.SysJob; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -12,7 +12,7 @@ import java.util.List; /** * 任务执行工具 * - * @author muyu + * @author zhilian */ public class JobInvokeUtil { /** diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/QuartzDisallowConcurrentExecution.java similarity index 82% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/QuartzDisallowConcurrentExecution.java index 0fb58eb..721f382 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/QuartzDisallowConcurrentExecution.java @@ -1,13 +1,13 @@ -package com.muyu.job.util; +package com.zhilian.job.util; -import com.muyu.job.domain.SysJob; +import com.zhilian.job.domain.SysJob; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; /** * 定时任务处理（禁止并发执行） * - * @author muyu + * @author zhilian */ @DisallowConcurrentExecution public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob { diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/QuartzJobExecution.java similarity index 78% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/QuartzJobExecution.java index 51dede7..9a77a6d 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/QuartzJobExecution.java @@ -1,12 +1,12 @@ -package com.muyu.job.util; +package com.zhilian.job.util; -import com.muyu.job.domain.SysJob; +import com.zhilian.job.domain.SysJob; import org.quartz.JobExecutionContext; /** * 定时任务处理（允许并发执行） * - * @author muyu + * @author zhilian */ public class QuartzJobExecution extends AbstractQuartzJob { @Override diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/ScheduleUtils.java similarity index 91% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java rename to zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/ScheduleUtils.java index ab2e7f9..2af3b72 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java +++ b/zhilian-modules/zhilian-job/src/main/java/com/zhilian/job/util/ScheduleUtils.java @@ -1,18 +1,18 @@ -package com.muyu.job.util; +package com.zhilian.job.util; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.constant.ScheduleConstants; -import com.muyu.common.core.exception.job.TaskException; -import com.muyu.common.core.exception.job.TaskException.Code; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.job.domain.SysJob; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.constant.ScheduleConstants; +import com.zhilian.common.core.exception.job.TaskException; +import com.zhilian.common.core.exception.job.TaskException.Code; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.job.domain.SysJob; import org.quartz.*; /** * 定时任务工具类 * - * @author muyu + * @author zhilian */ public class ScheduleUtils { /** diff --git a/muyu-modules/muyu-job/src/main/resources/banner.txt b/zhilian-modules/zhilian-job/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/banner.txt rename to zhilian-modules/zhilian-job/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml similarity index 81% rename from muyu-modules/muyu-job/src/main/resources/bootstrap.yml rename to zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml index 618f3e8..1833882 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-job + name: zhilian-job profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/logback.xml b/zhilian-modules/zhilian-job/src/main/resources/logback.xml similarity index 96% rename from muyu-modules/muyu-job/src/main/resources/logback.xml rename to zhilian-modules/zhilian-job/src/main/resources/logback.xml index 0eebcc4..6e789f8 100644 --- a/muyu-modules/muyu-job/src/main/resources/logback.xml +++ b/zhilian-modules/zhilian-job/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobLogMapper.xml similarity index 92% rename from muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml rename to zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobLogMapper.xml index 314808f..eaadbda 100644 --- a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -27,7 +27,7 @@ from sys_job_log - @@ -77,7 +77,7 @@ truncate table sys_job_log - + insert into sys_job_log( job_log_id, job_name, diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml b/zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobMapper.xml similarity index 92% rename from muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml rename to zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobMapper.xml index 82550dd..aee3b55 100644 --- a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/zhilian-modules/zhilian-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -35,7 +35,7 @@ from sys_job - @@ -75,7 +75,7 @@ - + update sys_job job_name = #{jobName}, @@ -92,7 +92,7 @@ where job_id = #{jobId} - + insert into sys_job( job_id, job_name, diff --git a/muyu-modules/muyu-system/pom.xml b/zhilian-modules/zhilian-system/pom.xml similarity index 78% rename from muyu-modules/muyu-system/pom.xml rename to zhilian-modules/zhilian-system/pom.xml index be58498..f368787 100644 --- a/muyu-modules/muyu-system/pom.xml +++ b/zhilian-modules/zhilian-system/pom.xml @@ -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"> - com.muyu - muyu-modules + com.zhilian + zhilian-modules 3.6.3 4.0.0 - muyu-modules-system + zhilian-modules-system - muyu-modules-system系统模块 + zhilian-modules-system系统模块 @@ -54,28 +54,28 @@ mysql-connector-j - + - com.muyu - muyu-common-datasource + com.zhilian + zhilian-common-datasource - + - com.muyu - muyu-common-datascope + com.zhilian + zhilian-common-datascope - + - com.muyu - muyu-common-log + com.zhilian + zhilian-common-log - + - com.muyu - muyu-common-swagger + com.zhilian + zhilian-common-swagger diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/ZhiLianSystemApplication.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/ZhiLianSystemApplication.java new file mode 100644 index 0000000..167c444 --- /dev/null +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/ZhiLianSystemApplication.java @@ -0,0 +1,22 @@ +package com.zhilian.system; + +import com.zhilian.common.security.annotation.EnableCustomConfig; +import com.zhilian.common.security.annotation.EnableMyFeignClients; +import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author zhilian + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class ZhiLianSystemApplication { + public static void main (String[] args) { + SpringApplication.run(ZhiLianSystemApplication.class, args); + } +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysConfigController.java similarity index 85% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysConfigController.java index fdabe7a..734c011 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysConfigController.java @@ -1,15 +1,15 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysConfig; -import com.muyu.system.service.SysConfigService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.system.domain.SysConfig; +import com.zhilian.system.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -21,7 +21,7 @@ import java.util.List; /** * 参数配置 信息操作处理 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/config") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDeptController.java similarity index 85% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDeptController.java index f1ed572..4421abe 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDeptController.java @@ -1,15 +1,15 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDept; -import com.muyu.system.service.SysDeptService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysDept; +import com.zhilian.system.service.SysDeptService; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -20,7 +20,7 @@ import java.util.List; /** * 部门信息 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/dept") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDictDataController.java similarity index 81% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDictDataController.java index 418ce2a..1eb7a65 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDictDataController.java @@ -1,17 +1,17 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDictData; -import com.muyu.system.service.SysDictDataService; -import com.muyu.system.service.SysDictTypeService; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysDictData; +import com.zhilian.system.service.SysDictDataService; +import com.zhilian.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -23,7 +23,7 @@ import java.util.List; /** * 数据字典信息 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/dict/data") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDictTypeController.java similarity index 84% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDictTypeController.java index 4d1325c..1e53124 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysDictTypeController.java @@ -1,15 +1,15 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDictType; -import com.muyu.system.service.SysDictTypeService; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysDictType; +import com.zhilian.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,7 +20,7 @@ import java.util.List; /** * 数据字典信息 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/dict/type") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysLogininforController.java similarity index 76% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysLogininforController.java index 7a4e5ac..d9a752e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysLogininforController.java @@ -1,17 +1,17 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.redis.service.RedisService; -import com.muyu.common.security.annotation.InnerAuth; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.system.service.SysLogininforService; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.security.annotation.InnerAuth; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.system.domain.SysLogininfor; +import com.zhilian.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,7 +21,7 @@ import java.util.List; /** * 系统访问记录 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/logininfor") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysMenuController.java similarity index 87% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysMenuController.java index c22f798..c463d01 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysMenuController.java @@ -1,16 +1,16 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.resp.RoleMenuTreeResp; -import com.muyu.system.service.SysMenuService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.system.domain.SysMenu; +import com.zhilian.system.domain.resp.RoleMenuTreeResp; +import com.zhilian.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,7 +20,7 @@ import java.util.List; /** * 菜单信息 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/menu") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysNoticeController.java similarity index 79% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysNoticeController.java index 9706350..53f984a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysNoticeController.java @@ -1,14 +1,14 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysNotice; -import com.muyu.system.service.SysNoticeService; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.system.domain.SysNotice; +import com.zhilian.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -18,7 +18,7 @@ import java.util.List; /** * 公告 信息操作处理 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/notice") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysOperlogController.java similarity index 75% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysOperlogController.java index add3ba5..67ae3af 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysOperlogController.java @@ -1,15 +1,15 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.InnerAuth; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.system.domain.SysOperLog; -import com.muyu.system.service.SysOperLogService; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.InnerAuth; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.system.domain.SysOperLog; +import com.zhilian.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,7 +19,7 @@ import java.util.List; /** * 操作日志记录 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/operlog") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysPostController.java similarity index 84% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysPostController.java index f9da917..dc2b0a7 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysPostController.java @@ -1,15 +1,15 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.domain.SysPost; -import com.muyu.system.service.SysPostService; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.system.domain.SysPost; +import com.zhilian.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -20,7 +20,7 @@ import java.util.List; /** * 岗位信息操作处理 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/post") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysProfileController.java similarity index 84% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysProfileController.java index ae49255..d2195f7 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysProfileController.java @@ -1,20 +1,20 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.file.FileTypeUtils; -import com.muyu.common.core.utils.file.MimeTypeUtils; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.service.TokenService; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.remote.RemoteFileService; -import com.muyu.common.system.domain.SysFile; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.resp.ProfileResp; -import com.muyu.system.service.SysUserService; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.file.FileTypeUtils; +import com.zhilian.common.core.utils.file.MimeTypeUtils; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.service.TokenService; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.remote.RemoteFileService; +import com.zhilian.common.system.domain.SysFile; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.common.system.domain.LoginUser; +import com.zhilian.system.domain.resp.ProfileResp; +import com.zhilian.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -24,7 +24,7 @@ import java.util.Arrays; /** * 个人信息 业务处理 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/user/profile") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysRoleController.java similarity index 88% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysRoleController.java index 63df7a9..55779df 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysRoleController.java @@ -1,21 +1,21 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.SysUserRole; -import com.muyu.system.domain.resp.DeptTreeResp; -import com.muyu.system.service.SysDeptService; -import com.muyu.system.service.SysRoleService; -import com.muyu.system.service.SysUserService; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysDept; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.system.domain.SysUserRole; +import com.zhilian.system.domain.resp.DeptTreeResp; +import com.zhilian.system.service.SysDeptService; +import com.zhilian.system.service.SysRoleService; +import com.zhilian.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +26,7 @@ import java.util.List; /** * 角色信息 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/role") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysUserController.java similarity index 91% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysUserController.java index 9811a0e..1957db5 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysUserController.java @@ -1,23 +1,23 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.InnerAuth; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.resp.AuthRoleResp; -import com.muyu.system.domain.resp.UserDetailInfoResp; -import com.muyu.system.domain.resp.UserInfoResp; -import com.muyu.system.service.*; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.poi.ExcelUtil; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.security.annotation.InnerAuth; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysDept; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.common.system.domain.LoginUser; +import com.zhilian.system.domain.resp.AuthRoleResp; +import com.zhilian.system.domain.resp.UserDetailInfoResp; +import com.zhilian.system.domain.resp.UserInfoResp; +import com.zhilian.system.service.*; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; /** * 用户信息 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/user") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysUserOnlineController.java similarity index 74% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysUserOnlineController.java index 26f7883..11f0c99 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/controller/SysUserOnlineController.java @@ -1,17 +1,17 @@ -package com.muyu.system.controller; +package com.zhilian.system.controller; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.redis.service.RedisService; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.SysUserOnline; -import com.muyu.system.service.SysUserOnlineService; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.page.TableDataInfo; +import com.zhilian.common.log.annotation.Log; +import com.zhilian.common.log.enums.BusinessType; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.security.annotation.RequiresPermissions; +import com.zhilian.common.system.domain.LoginUser; +import com.zhilian.system.domain.SysUserOnline; +import com.zhilian.system.service.SysUserOnlineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,7 +23,7 @@ import java.util.List; /** * 在线用户监控 * - * @author muyu + * @author zhilian */ @RestController @RequestMapping("/online") diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java index e2a10b5..d7aebfa 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java @@ -1,11 +1,11 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,7 +20,7 @@ import javax.validation.constraints.Size; /** * 参数配置表 sys_config * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysMenu.java similarity index 98% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysMenu.java index b7f4558..cd92f07 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysMenu.java @@ -1,6 +1,6 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import java.util.List; /** * 菜单权限表 sys_menu * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysNotice.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysNotice.java index 69675c1..f836026 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysNotice.java @@ -1,7 +1,7 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.core.xss.Xss; +import com.zhilian.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.xss.Xss; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +16,7 @@ import javax.validation.constraints.Size; /** * 通知公告表 sys_notice * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysPost.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysPost.java index d67f36a..5bccd89 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysPost.java @@ -1,8 +1,8 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; -import com.muyu.common.core.web.domain.BaseEntity; +import com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.annotation.Excel.ColumnType; +import com.zhilian.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,7 +18,7 @@ import javax.validation.constraints.Size; /** * 岗位表 sys_post * - * @author muyu + * @author zhilian */ @Data @SuperBuilder diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysRoleDept.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysRoleDept.java index 2a06ea8..a8dcc0c 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept * - * @author muyu + * @author zhilian */ public class SysRoleDept { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysRoleMenu.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysRoleMenu.java index 42148c7..a7a1ddb 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu * - * @author muyu + * @author zhilian */ public class SysRoleMenu { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserOnline.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserOnline.java index c89bd42..e378072 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserOnline.java @@ -1,9 +1,9 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; /** * 当前在线会话 * - * @author muyu + * @author zhilian */ public class SysUserOnline { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserPost.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserPost.java index 8f29380..e8ad899 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post * - * @author muyu + * @author zhilian */ public class SysUserPost { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserRole.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserRole.java index 8430826..7606801 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain; +package com.zhilian.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role * - * @author muyu + * @author zhilian */ public class SysUserRole { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/AuthRoleResp.java similarity index 77% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/AuthRoleResp.java index 69294b6..715cf59 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/AuthRoleResp.java @@ -1,8 +1,8 @@ -package com.muyu.system.domain.resp; +package com.zhilian.system.domain.resp; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/DeptTreeResp.java similarity index 84% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/DeptTreeResp.java index cd72807..21974e3 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/DeptTreeResp.java @@ -1,7 +1,7 @@ -package com.muyu.system.domain.resp; +package com.zhilian.system.domain.resp; -import com.muyu.system.domain.vo.TreeSelect; +import com.zhilian.system.domain.vo.TreeSelect; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/ProfileResp.java similarity index 85% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/ProfileResp.java index 21d9808..2412605 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/ProfileResp.java @@ -1,6 +1,6 @@ -package com.muyu.system.domain.resp; +package com.zhilian.system.domain.resp; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysUser; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/RoleMenuTreeResp.java similarity index 85% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/RoleMenuTreeResp.java index 696763e..a0c804c 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/RoleMenuTreeResp.java @@ -1,6 +1,6 @@ -package com.muyu.system.domain.resp; +package com.zhilian.system.domain.resp; -import com.muyu.system.domain.vo.TreeSelect; +import com.zhilian.system.domain.vo.TreeSelect; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/UserDetailInfoResp.java similarity index 83% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/UserDetailInfoResp.java index 4c61832..67142b0 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/UserDetailInfoResp.java @@ -1,7 +1,7 @@ -package com.muyu.system.domain.resp; +package com.zhilian.system.domain.resp; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/UserInfoResp.java similarity index 85% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/UserInfoResp.java index d15a760..81a9192 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/resp/UserInfoResp.java @@ -1,6 +1,6 @@ -package com.muyu.system.domain.resp; +package com.zhilian.system.domain.resp; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysUser; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/MetaVo.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/MetaVo.java index 9da75c4..9ffd0c8 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/MetaVo.java @@ -1,11 +1,11 @@ -package com.muyu.system.domain.vo; +package com.zhilian.system.domain.vo; -import com.muyu.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.StringUtils; /** * 路由显示信息 * - * @author muyu + * @author zhilian */ public class MetaVo { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/RouterVo.java similarity index 97% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/RouterVo.java index df51982..650f66a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.muyu.system.domain.vo; +package com.zhilian.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; @@ -7,7 +7,7 @@ import java.util.List; /** * 路由配置信息 * - * @author muyu + * @author zhilian */ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/TreeSelect.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/TreeSelect.java index 4f593ff..0e5e0e2 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/vo/TreeSelect.java @@ -1,8 +1,8 @@ -package com.muyu.system.domain.vo; +package com.zhilian.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import com.muyu.common.system.domain.SysDept; -import com.muyu.system.domain.SysMenu; +import com.zhilian.common.system.domain.SysDept; +import com.zhilian.system.domain.SysMenu; import java.io.Serializable; import java.util.List; @@ -11,7 +11,7 @@ import java.util.stream.Collectors; /** * Treeselect树结构实体类 * - * @author muyu + * @author zhilian */ public class TreeSelect implements Serializable { private static final long serialVersionUID = 1L; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysConfigMapper.java similarity index 73% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysConfigMapper.java index ced239a..6a1ae7f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysConfig; +import com.zhilian.system.domain.SysConfig; /** * @author DongZl diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDeptMapper.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDeptMapper.java index 5ef9ab4..5c0857f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDeptMapper.java @@ -1,7 +1,7 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysDept; +import com.zhilian.common.system.domain.SysDept; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * 部门管理 数据层 * - * @author muyu + * @author zhilian */ public interface SysDeptMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDictDataMapper.java similarity index 95% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDictDataMapper.java index 1e87a7e..6d6e8dd 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDictDataMapper.java @@ -1,7 +1,7 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysDictData; +import com.zhilian.common.system.domain.SysDictData; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * 字典表 数据层 * - * @author muyu + * @author zhilian */ public interface SysDictDataMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDictTypeMapper.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDictTypeMapper.java index 0a4ffe6..a0cd6ab 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysDictTypeMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysDictType; +import com.zhilian.common.system.domain.SysDictType; import java.util.List; /** * 字典表 数据层 * - * @author muyu + * @author zhilian */ public interface SysDictTypeMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysLogininforMapper.java similarity index 89% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysLogininforMapper.java index 0f1f86a..c58740d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysLogininforMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysLogininfor; +import com.zhilian.common.system.domain.SysLogininfor; import java.util.List; /** * 系统访问日志情况信息 数据层 * - * @author muyu + * @author zhilian */ public interface SysLogininforMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysMenuMapper.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysMenuMapper.java index 8ceaaa0..93a8e18 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysMenuMapper.java @@ -1,7 +1,7 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysMenu; +import com.zhilian.system.domain.SysMenu; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * 菜单表 数据层 * - * @author muyu + * @author zhilian */ public interface SysMenuMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysNoticeMapper.java similarity index 92% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysNoticeMapper.java index fee9930..e5db7d3 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysNoticeMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysNotice; +import com.zhilian.system.domain.SysNotice; import java.util.List; /** * 通知公告表 数据层 * - * @author muyu + * @author zhilian */ public interface SysNoticeMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysOperLogMapper.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysOperLogMapper.java index 6ea1bcd..2e11829 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysOperLogMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysOperLog; +import com.zhilian.common.system.domain.SysOperLog; import java.util.List; /** * 操作日志 数据层 * - * @author muyu + * @author zhilian */ public interface SysOperLogMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysPostMapper.java similarity index 95% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysPostMapper.java index 4bfd66d..8c93d86 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysPostMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysPost; +import com.zhilian.system.domain.SysPost; import java.util.List; /** * 岗位信息 数据层 * - * @author muyu + * @author zhilian */ public interface SysPostMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleDeptMapper.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleDeptMapper.java index 0e6dd4d..12d43b4 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleDeptMapper.java @@ -1,15 +1,15 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysRoleDept; +import com.zhilian.system.domain.SysRoleDept; import java.util.List; /** * 角色与部门关联表 数据层 * - * @author muyu + * @author zhilian */ public interface SysRoleDeptMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleMapper.java similarity index 95% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleMapper.java index 2b01dc3..b99bd7d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysRole; import java.util.List; /** * 角色表 数据层 * - * @author muyu + * @author zhilian */ public interface SysRoleMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleMenuMapper.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleMenuMapper.java index 664ce26..70826cf 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysRoleMenuMapper.java @@ -1,15 +1,15 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysRoleMenu; +import com.zhilian.system.domain.SysRoleMenu; import java.util.List; /** * 角色与菜单关联表 数据层 * - * @author muyu + * @author zhilian */ public interface SysRoleMenuMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserMapper.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserMapper.java index e037b34..d3b8f48 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserMapper.java @@ -1,7 +1,7 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysUser; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * 用户表 数据层 * - * @author muyu + * @author zhilian */ public interface SysUserMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserPostMapper.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserPostMapper.java index 8d09a47..8aef566 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserPostMapper.java @@ -1,14 +1,14 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysUserPost; +import com.zhilian.system.domain.SysUserPost; import java.util.List; /** * 用户与岗位关联表 数据层 * - * @author muyu + * @author zhilian */ public interface SysUserPostMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserRoleMapper.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserRoleMapper.java index 512adb8..79c67f9 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.muyu.system.mapper; +package com.zhilian.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.domain.SysUserRole; +import com.zhilian.system.domain.SysUserRole; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; /** * 用户与角色关联表 数据层 * - * @author muyu + * @author zhilian */ public interface SysUserRoleMapper extends BaseMapper { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysConfigService.java similarity index 91% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysConfigService.java index f23d67e..78faf7a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysConfigService.java @@ -1,7 +1,7 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.domain.SysConfig; +import com.zhilian.system.domain.SysConfig; import java.util.List; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDeptService.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDeptService.java index 140cf91..297a2bf 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDeptService.java @@ -1,15 +1,15 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysDept; -import com.muyu.system.domain.vo.TreeSelect; +import com.zhilian.common.system.domain.SysDept; +import com.zhilian.system.domain.vo.TreeSelect; import java.util.List; /** * 部门管理 服务层 * - * @author muyu + * @author zhilian */ public interface SysDeptService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDictDataService.java similarity index 92% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDictDataService.java index 47aae4b..3948ec6 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDictDataService.java @@ -1,14 +1,14 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysDictData; +import com.zhilian.common.system.domain.SysDictData; import java.util.List; /** * 字典 业务层 * - * @author muyu + * @author zhilian */ public interface SysDictDataService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDictTypeService.java similarity index 93% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDictTypeService.java index 1b3212d..8be9cd7 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysDictTypeService.java @@ -1,15 +1,15 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysDictData; -import com.muyu.common.system.domain.SysDictType; +import com.zhilian.common.system.domain.SysDictData; +import com.zhilian.common.system.domain.SysDictType; import java.util.List; /** * 字典 业务层 * - * @author muyu + * @author zhilian */ public interface SysDictTypeService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysLogininforService.java similarity index 88% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysLogininforService.java index bb3031e..4219703 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysLogininforService.java @@ -1,14 +1,14 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysLogininfor; +import com.zhilian.common.system.domain.SysLogininfor; import java.util.List; /** * 系统访问日志情况信息 服务层 * - * @author muyu + * @author zhilian */ public interface SysLogininforService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysMenuService.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysMenuService.java index 29bfb07..d6a046f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysMenuService.java @@ -1,9 +1,9 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.vo.RouterVo; -import com.muyu.system.domain.vo.TreeSelect; +import com.zhilian.system.domain.SysMenu; +import com.zhilian.system.domain.vo.RouterVo; +import com.zhilian.system.domain.vo.TreeSelect; import java.util.List; import java.util.Set; @@ -11,7 +11,7 @@ import java.util.Set; /** * 菜单 业务层 * - * @author muyu + * @author zhilian */ public interface SysMenuService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysNoticeService.java similarity index 92% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysNoticeService.java index a1afe02..31a0f6a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysNoticeService.java @@ -1,14 +1,14 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.domain.SysNotice; +import com.zhilian.system.domain.SysNotice; import java.util.List; /** * 公告 服务层 * - * @author muyu + * @author zhilian */ public interface SysNoticeService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysOperLogService.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysOperLogService.java index 70b63ee..53810b2 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysOperLogService.java @@ -1,14 +1,14 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysOperLog; +import com.zhilian.common.system.domain.SysOperLog; import java.util.List; /** * 操作日志 服务层 * - * @author muyu + * @author zhilian */ public interface SysOperLogService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysPermissionService.java similarity index 81% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysPermissionService.java index 02e9d14..3ad10ba 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysPermissionService.java @@ -1,13 +1,13 @@ -package com.muyu.system.service; +package com.zhilian.system.service; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysUser; import java.util.Set; /** * 权限信息 服务层 * - * @author muyu + * @author zhilian */ public interface SysPermissionService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysPostService.java similarity index 95% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysPostService.java index fbd8677..1fdac10 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysPostService.java @@ -1,14 +1,14 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.domain.SysPost; +import com.zhilian.system.domain.SysPost; import java.util.List; /** * 岗位信息 服务层 * - * @author muyu + * @author zhilian */ public interface SysPostService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysRoleService.java similarity index 96% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysRoleService.java index 47009f8..b3ba653 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysRoleService.java @@ -1,8 +1,8 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysRole; -import com.muyu.system.domain.SysUserRole; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.system.domain.SysUserRole; import java.util.List; import java.util.Set; @@ -10,7 +10,7 @@ import java.util.Set; /** * 角色业务层 * - * @author muyu + * @author zhilian */ public interface SysRoleService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysUserOnlineService.java similarity index 88% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysUserOnlineService.java index 531735b..792a129 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysUserOnlineService.java @@ -1,13 +1,13 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.SysUserOnline; +import com.zhilian.common.system.domain.LoginUser; +import com.zhilian.system.domain.SysUserOnline; /** * 在线用户 服务层 * - * @author muyu + * @author zhilian */ public interface SysUserOnlineService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysUserService.java similarity index 97% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysUserService.java index f4c6167..b789c13 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/SysUserService.java @@ -1,14 +1,14 @@ -package com.muyu.system.service; +package com.zhilian.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.SysUser; +import com.zhilian.common.system.domain.SysUser; import java.util.List; /** * 用户 业务层 * - * @author muyu + * @author zhilian */ public interface SysUserService extends IService { /** diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysConfigServiceImpl.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysConfigServiceImpl.java index bc07cc8..3276f47 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysConfigServiceImpl.java @@ -1,13 +1,13 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.CacheConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.redis.service.RedisService; -import com.muyu.system.domain.SysConfig; -import com.muyu.system.mapper.SysConfigMapper; -import com.muyu.system.service.SysConfigService; +import com.zhilian.common.core.constant.CacheConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.redis.service.RedisService; +import com.zhilian.system.domain.SysConfig; +import com.zhilian.system.mapper.SysConfigMapper; +import com.zhilian.system.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDeptServiceImpl.java similarity index 91% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDeptServiceImpl.java index a55301b..fa53234 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDeptServiceImpl.java @@ -1,20 +1,20 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.datascope.annotation.DataScope; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.vo.TreeSelect; -import com.muyu.system.mapper.SysDeptMapper; -import com.muyu.system.mapper.SysRoleMapper; -import com.muyu.system.service.SysDeptService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.text.Convert; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.datascope.annotation.DataScope; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysDept; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.system.domain.vo.TreeSelect; +import com.zhilian.system.mapper.SysDeptMapper; +import com.zhilian.system.mapper.SysRoleMapper; +import com.zhilian.system.service.SysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +26,7 @@ import java.util.stream.Collectors; /** * 部门管理 服务实现 * - * @author muyu + * @author zhilian */ @Service public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDictDataServiceImpl.java similarity index 91% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDictDataServiceImpl.java index 777ffbd..581869c 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDictDataServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.security.utils.DictUtils; -import com.muyu.common.system.domain.SysDictData; -import com.muyu.system.mapper.SysDictDataMapper; -import com.muyu.system.service.SysDictDataService; +import com.zhilian.common.security.utils.DictUtils; +import com.zhilian.common.system.domain.SysDictData; +import com.zhilian.system.mapper.SysDictDataMapper; +import com.zhilian.system.service.SysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.List; /** * 字典 业务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysDictDataServiceImpl extends ServiceImpl implements SysDictDataService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDictTypeServiceImpl.java similarity index 91% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDictTypeServiceImpl.java index 4117411..7e12f2a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysDictTypeServiceImpl.java @@ -1,15 +1,15 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.security.utils.DictUtils; -import com.muyu.common.system.domain.SysDictData; -import com.muyu.common.system.domain.SysDictType; -import com.muyu.system.mapper.SysDictDataMapper; -import com.muyu.system.mapper.SysDictTypeMapper; -import com.muyu.system.service.SysDictTypeService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.utils.DictUtils; +import com.zhilian.common.system.domain.SysDictData; +import com.zhilian.common.system.domain.SysDictType; +import com.zhilian.system.mapper.SysDictDataMapper; +import com.zhilian.system.mapper.SysDictTypeMapper; +import com.zhilian.system.service.SysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * 字典 业务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysDictTypeServiceImpl extends ServiceImpl implements SysDictTypeService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysLogininforServiceImpl.java similarity index 86% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysLogininforServiceImpl.java index 1a7c7a0..6097bb7 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysLogininforServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.system.domain.SysLogininfor; -import com.muyu.system.mapper.SysLogininforMapper; -import com.muyu.system.service.SysLogininforService; +import com.zhilian.common.system.domain.SysLogininfor; +import com.zhilian.system.mapper.SysLogininforMapper; +import com.zhilian.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.List; /** * 系统访问日志情况信息 服务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysLogininforServiceImpl extends ServiceImpl implements SysLogininforService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysMenuServiceImpl.java index e4e2ec8..f6394d6 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysMenuServiceImpl.java @@ -1,20 +1,20 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.Constants; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.SysMenu; -import com.muyu.system.domain.vo.MetaVo; -import com.muyu.system.domain.vo.RouterVo; -import com.muyu.system.domain.vo.TreeSelect; -import com.muyu.system.mapper.SysMenuMapper; -import com.muyu.system.mapper.SysRoleMapper; -import com.muyu.system.mapper.SysRoleMenuMapper; -import com.muyu.system.service.SysMenuService; +import com.zhilian.common.core.constant.Constants; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.system.domain.SysMenu; +import com.zhilian.system.domain.vo.MetaVo; +import com.zhilian.system.domain.vo.RouterVo; +import com.zhilian.system.domain.vo.TreeSelect; +import com.zhilian.system.mapper.SysMenuMapper; +import com.zhilian.system.mapper.SysRoleMapper; +import com.zhilian.system.mapper.SysRoleMenuMapper; +import com.zhilian.system.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import java.util.stream.Collectors; /** * 菜单 业务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysNoticeServiceImpl.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysNoticeServiceImpl.java index 8c0c8d5..3fbe3b4 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysNoticeServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.system.domain.SysNotice; -import com.muyu.system.mapper.SysNoticeMapper; -import com.muyu.system.service.SysNoticeService; +import com.zhilian.system.domain.SysNotice; +import com.zhilian.system.mapper.SysNoticeMapper; +import com.zhilian.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.List; /** * 公告 服务层实现 * - * @author muyu + * @author zhilian */ @Service public class SysNoticeServiceImpl extends ServiceImpl implements SysNoticeService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysOperLogServiceImpl.java similarity index 88% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysOperLogServiceImpl.java index 24e7d39..a094edf 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysOperLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.system.domain.SysOperLog; -import com.muyu.system.mapper.SysOperLogMapper; -import com.muyu.system.service.SysOperLogService; +import com.zhilian.common.system.domain.SysOperLog; +import com.zhilian.system.mapper.SysOperLogMapper; +import com.zhilian.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,7 +12,7 @@ import java.util.List; /** * 操作日志 服务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysOperLogServiceImpl extends ServiceImpl implements SysOperLogService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysPermissionServiceImpl.java similarity index 86% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysPermissionServiceImpl.java index a8641a1..de6336b 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysPermissionServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.system.service.SysMenuService; -import com.muyu.system.service.SysPermissionService; -import com.muyu.system.service.SysRoleService; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.system.service.SysMenuService; +import com.zhilian.system.service.SysPermissionService; +import com.zhilian.system.service.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -17,7 +17,7 @@ import java.util.Set; /** * 用户权限处理 * - * @author muyu + * @author zhilian */ @Service public class SysPermissionServiceImpl implements SysPermissionService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysPostServiceImpl.java index 457ac5a..68418dd 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysPostServiceImpl.java @@ -1,13 +1,13 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.system.domain.SysPost; -import com.muyu.system.mapper.SysPostMapper; -import com.muyu.system.mapper.SysUserPostMapper; -import com.muyu.system.service.SysPostService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.system.domain.SysPost; +import com.zhilian.system.mapper.SysPostMapper; +import com.zhilian.system.mapper.SysUserPostMapper; +import com.zhilian.system.service.SysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; /** * 岗位信息 服务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysPostServiceImpl extends ServiceImpl implements SysPostService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysRoleServiceImpl.java similarity index 92% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysRoleServiceImpl.java index fa832da..bac4482 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysRoleServiceImpl.java @@ -1,22 +1,22 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.datascope.annotation.DataScope; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.SysRoleDept; -import com.muyu.system.domain.SysRoleMenu; -import com.muyu.system.domain.SysUserRole; -import com.muyu.system.mapper.SysRoleDeptMapper; -import com.muyu.system.mapper.SysRoleMapper; -import com.muyu.system.mapper.SysRoleMenuMapper; -import com.muyu.system.mapper.SysUserRoleMapper; -import com.muyu.system.service.SysRoleService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.datascope.annotation.DataScope; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.system.domain.SysRoleDept; +import com.zhilian.system.domain.SysRoleMenu; +import com.zhilian.system.domain.SysUserRole; +import com.zhilian.system.mapper.SysRoleDeptMapper; +import com.zhilian.system.mapper.SysRoleMapper; +import com.zhilian.system.mapper.SysRoleMenuMapper; +import com.zhilian.system.mapper.SysUserRoleMapper; +import com.zhilian.system.service.SysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +26,7 @@ import java.util.*; /** * 角色 业务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysUserOnlineServiceImpl.java similarity index 89% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysUserOnlineServiceImpl.java index 8ede754..ddab2ff 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,16 +1,16 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.system.domain.SysUserOnline; -import com.muyu.system.service.SysUserOnlineService; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.system.domain.LoginUser; +import com.zhilian.system.domain.SysUserOnline; +import com.zhilian.system.service.SysUserOnlineService; import org.springframework.stereotype.Service; /** * 在线用户 服务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysUserOnlineServiceImpl implements SysUserOnlineService { diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysUserServiceImpl.java similarity index 94% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java rename to zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysUserServiceImpl.java index ab88e1c..78719cf 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/service/impl/SysUserServiceImpl.java @@ -1,21 +1,21 @@ -package com.muyu.system.service.impl; +package com.zhilian.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.exception.ServiceException; -import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.common.core.utils.bean.BeanValidators; -import com.muyu.common.datascope.annotation.DataScope; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.system.domain.SysPost; -import com.muyu.system.domain.SysUserPost; -import com.muyu.system.domain.SysUserRole; -import com.muyu.system.mapper.*; -import com.muyu.system.service.SysUserService; -import com.muyu.system.service.SysConfigService; +import com.zhilian.common.core.constant.UserConstants; +import com.zhilian.common.core.exception.ServiceException; +import com.zhilian.common.core.utils.SpringUtils; +import com.zhilian.common.core.utils.StringUtils; +import com.zhilian.common.core.utils.bean.BeanValidators; +import com.zhilian.common.datascope.annotation.DataScope; +import com.zhilian.common.security.utils.SecurityUtils; +import com.zhilian.common.system.domain.SysRole; +import com.zhilian.common.system.domain.SysUser; +import com.zhilian.system.domain.SysPost; +import com.zhilian.system.domain.SysUserPost; +import com.zhilian.system.domain.SysUserRole; +import com.zhilian.system.mapper.*; +import com.zhilian.system.service.SysUserService; +import com.zhilian.system.service.SysConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; /** * 用户 业务层处理 * - * @author muyu + * @author zhilian */ @Service public class SysUserServiceImpl extends ServiceImpl implements SysUserService { diff --git a/muyu-modules/muyu-system/src/main/resources/banner.txt b/zhilian-modules/zhilian-system/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/banner.txt rename to zhilian-modules/zhilian-system/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml similarity index 76% rename from muyu-modules/muyu-system/src/main/resources/bootstrap.yml rename to zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml index a66fd4c..2eeab13 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-system/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-system + name: zhilian-system profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 10.10.25.2:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -25,4 +25,4 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: - com.muyu.system.mapper: DEBUG + com.zhilian.system.mapper: DEBUG diff --git a/muyu-gateway/src/main/resources/logback.xml b/zhilian-modules/zhilian-system/src/main/resources/logback.xml similarity index 96% rename from muyu-gateway/src/main/resources/logback.xml rename to zhilian-modules/zhilian-system/src/main/resources/logback.xml index 9084cd2..d953225 100644 --- a/muyu-gateway/src/main/resources/logback.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 90% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysConfigMapper.xml index 2c35243..37ebaf6 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -42,12 +42,12 @@ - - @@ -78,7 +78,7 @@ where config_key = #{configKey} limit 1 - + insert into sys_config ( config_name, config_key, @@ -98,7 +98,7 @@ ) - + update sys_config config_name = #{configName}, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 94% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDeptMapper.xml index a571d8b..ded3e33 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -38,7 +38,7 @@ from sys_dept d - where d.del_flag = '0' @@ -109,7 +109,7 @@ where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 - + insert into sys_dept( dept_id, parent_id, @@ -137,7 +137,7 @@ ) - + update sys_dept parent_id = #{parentId}, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 90% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 5128c99..d6a6c17 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -36,7 +36,7 @@ from sys_dict_data - @@ -52,7 +52,7 @@ order by dict_sort asc - where status = '0' and dict_type = #{dictType} order by dict_sort asc @@ -88,7 +88,7 @@ - + update sys_dict_data dict_sort = #{dictSort}, @@ -112,7 +112,7 @@ where dict_type = #{oldDictType} - + insert into sys_dict_data( dict_sort, dict_label, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 89% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 7c0ebd1..7afd12c 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ from sys_dict_type - @@ -73,7 +73,7 @@ - + update sys_dict_type dict_name = #{dictName}, @@ -86,7 +86,7 @@ where dict_id = #{dictId} - + insert into sys_dict_type( dict_name, dict_type, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 83% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 114599c..ca2eaa7 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -13,12 +13,12 @@ - + insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) - select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 94% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1dac5c4..595da92 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -46,7 +46,7 @@ from sys_menu - @@ -84,7 +84,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m @@ -181,12 +181,12 @@ where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -209,7 +209,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 90% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 0687403..457952f 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -36,7 +36,7 @@ where notice_id = #{noticeId} - @@ -51,7 +51,7 @@ - + insert into sys_notice ( notice_title, notice_type, @@ -71,7 +71,7 @@ ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 91% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 1834ea1..48f8ce6 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -43,14 +43,14 @@ from sys_oper_log - + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, cost_time, oper_time) values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) - diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 91% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysPostMapper.xml index 63142c3..1d19167 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -29,7 +29,7 @@ from sys_post - @@ -79,7 +79,7 @@ where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -93,7 +93,7 @@ where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 88% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 1a9ab92..da558df 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 93% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleMapper.xml index f6b56b3..2bbf771 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -39,7 +39,7 @@ left join sys_dept d on u.dept_id = d.dept_id - where r.del_flag = '0' @@ -102,7 +102,7 @@ where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - + insert into sys_role( role_id, role_name, @@ -130,7 +130,7 @@ ) - + update sys_role role_name = #{roleName}, diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 88% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 22d2609..f7c62c4 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 89% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserMapper.xml index 6f633b7..0fdaa77 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -23,11 +23,11 @@ - + - + @@ -37,7 +37,7 @@ - + @@ -82,7 +82,7 @@ left join sys_role r on r.role_id = ur.role_id - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u @@ -114,7 +114,7 @@ ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -131,7 +131,7 @@ ${params.dataScope} - select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id @@ -184,7 +184,7 @@ limit 1 - + insert into sys_user( user_id, dept_id, @@ -216,7 +216,7 @@ ) - + update sys_user dept_id = #{deptId}, @@ -237,19 +237,19 @@ where user_id = #{userId} - + update sys_user set status = #{status} where user_id = #{userId} - + update sys_user set avatar = #{avatar} where user_name = #{userName} - + update sys_user set password = #{password} where user_name = #{userName} diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 88% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 30e4f06..6aeaa23 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 86% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index b93bc72..dbe2fbe 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/zhilian-modules/zhilian-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -35,7 +35,7 @@ - + delete from sys_user_role where user_id = #{userId} diff --git a/muyu-visual/pom.xml b/zhilian-visual/pom.xml similarity index 75% rename from muyu-visual/pom.xml rename to zhilian-visual/pom.xml index b4a6ce3..4f29633 100644 --- a/muyu-visual/pom.xml +++ b/zhilian-visual/pom.xml @@ -2,21 +2,21 @@ - com.muyu + com.zhilian smart-cloud-server 3.6.3 4.0.0 - muyu-monitor + zhilian-monitor - muyu-visual + zhilian-visual pom - muyu-visual图形化管理模块 + zhilian-visual图形化管理模块 diff --git a/muyu-visual/muyu-monitor/pom.xml b/zhilian-visual/zhilian-monitor/pom.xml similarity index 93% rename from muyu-visual/muyu-monitor/pom.xml rename to zhilian-visual/zhilian-monitor/pom.xml index 9caa211..c95c224 100644 --- a/muyu-visual/muyu-monitor/pom.xml +++ b/zhilian-visual/zhilian-monitor/pom.xml @@ -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"> - com.muyu - muyu-visual + com.zhilian + zhilian-visual 3.6.3 4.0.0 - muyu-visual-monitor + zhilian-visual-monitor - muyu-visual-monitor监控中心 + zhilian-visual-monitor监控中心 diff --git a/muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java b/zhilian-visual/zhilian-monitor/src/main/java/com/zhilian/modules/monitor/ZhiLianMonitorApplication.java similarity index 65% rename from muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java rename to zhilian-visual/zhilian-monitor/src/main/java/com/zhilian/modules/monitor/ZhiLianMonitorApplication.java index d54ce03..0d36174 100644 --- a/muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/MuYuMonitorApplication.java +++ b/zhilian-visual/zhilian-monitor/src/main/java/com/zhilian/modules/monitor/ZhiLianMonitorApplication.java @@ -1,4 +1,4 @@ -package com.muyu.modules.monitor; +package com.zhilian.modules.monitor; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication; @@ -7,12 +7,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 监控中心 * - * @author muyu + * @author zhilian */ @EnableAdminServer @SpringBootApplication -public class MuYuMonitorApplication { +public class ZhiLianMonitorApplication { public static void main (String[] args) { - SpringApplication.run(MuYuMonitorApplication.class, args); + SpringApplication.run(ZhiLianMonitorApplication.class, args); } } diff --git a/muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java b/zhilian-visual/zhilian-monitor/src/main/java/com/zhilian/modules/monitor/config/WebSecurityConfigurer.java similarity index 96% rename from muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java rename to zhilian-visual/zhilian-monitor/src/main/java/com/zhilian/modules/monitor/config/WebSecurityConfigurer.java index 0b70196..443e88b 100644 --- a/muyu-visual/muyu-monitor/src/main/java/com/muyu/modules/monitor/config/WebSecurityConfigurer.java +++ b/zhilian-visual/zhilian-monitor/src/main/java/com/zhilian/modules/monitor/config/WebSecurityConfigurer.java @@ -1,4 +1,4 @@ -package com.muyu.modules.monitor.config; +package com.zhilian.modules.monitor.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti /** * 监控权限配置 * - * @author muyu + * @author zhilian */ @EnableWebSecurity public class WebSecurityConfigurer { diff --git a/muyu-visual/muyu-monitor/src/main/resources/banner.txt b/zhilian-visual/zhilian-monitor/src/main/resources/banner.txt similarity index 100% rename from muyu-visual/muyu-monitor/src/main/resources/banner.txt rename to zhilian-visual/zhilian-monitor/src/main/resources/banner.txt diff --git a/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml b/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..14ce9aa --- /dev/null +++ b/zhilian-visual/zhilian-monitor/src/main/resources/bootstrap.yml @@ -0,0 +1,25 @@ +# Tomcat +server: + port: 9101 + +# Spring +spring: + application: + # 应用名称 + name: zhilian-monitor + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 10.10.25.2:8848 + config: + # 配置中心地址 + server-addr: 10.10.25.2:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/zhilian-visual/zhilian-monitor/src/main/resources/logback.xml b/zhilian-visual/zhilian-monitor/src/main/resources/logback.xml new file mode 100644 index 0000000..2450490 --- /dev/null +++ b/zhilian-visual/zhilian-monitor/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + +