From 43c374dec03f89c3e3e6512ab614a71708b3e7fe Mon Sep 17 00:00:00 2001 From: Galudisu Date: Sun, 14 Dec 2025 20:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .java-version | 2 +- .mvn/jvm.config | 3 +- .mvn/maven.config | 4 +- {bin => bat}/clean.bat | 0 {bin => bat}/package.bat | 0 {bin => bat}/run-auth.bat | 0 {bin => bat}/run-gateway.bat | 0 {bin => bat}/run-modules-file.bat | 0 {bin => bat}/run-modules-gen.bat | 0 {bin => bat}/run-modules-job.bat | 0 {bin => bat}/run-modules-system.bat | 0 {bin => bat}/run-monitor.bat | 0 bin/clean.sh | 10 + bin/package.sh | 10 + bin/run-auth.sh | 12 + bin/run-gateway.sh | 12 + bin/run-modules-file.sh | 12 + bin/run-modules-gen.sh | 12 + bin/run-modules-job.sh | 12 + bin/run-modules-system.sh | 12 + bin/run-monitor.sh | 12 + docker/copy.sh | 3 +- docker/deploy.sh | 9 +- docker/docker-compose.yml | 22 +- docker/nacos/Dockerfile | 2 +- docker/nacos/conf/application.properties | 5 +- docker/ruoyi/auth/Dockerfile | 4 +- docker/ruoyi/gateway/Dockerfile | 4 +- docker/ruoyi/modules/file/Dockerfile | 4 +- docker/ruoyi/modules/gen/Dockerfile | 4 +- docker/ruoyi/modules/job/Dockerfile | 4 +- docker/ruoyi/modules/system/Dockerfile | 4 +- docker/ruoyi/visual/monitor/Dockerfile | 4 +- pom.xml | 43 ++-- .../com/ruoyi/system/api/domain/SysDept.java | 8 +- .../ruoyi/system/api/domain/SysDictData.java | 4 +- .../ruoyi/system/api/domain/SysDictType.java | 6 +- .../com/ruoyi/system/api/domain/SysRole.java | 6 +- .../com/ruoyi/system/api/domain/SysUser.java | 2 +- .../auth/controller/TokenController.java | 2 +- ruoyi-auth/src/main/resources/bootstrap.yml | 8 +- ruoyi-common/ruoyi-common-core/pom.xml | 211 +++++++++--------- .../ruoyi/common/core/utils/ServletUtils.java | 8 +- .../core/utils/bean/BeanValidators.java | 6 +- .../common/core/utils/file/FileUtils.java | 4 +- .../ruoyi/common/core/utils/ip/IpUtils.java | 2 +- .../common/core/utils/poi/ExcelUtil.java | 2 +- .../java/com/ruoyi/common/core/xss/Xss.java | 4 +- .../ruoyi/common/core/xss/XssValidator.java | 4 +- .../ruoyi/common/log/aspect/LogAspect.java | 4 +- .../feign/FeignRequestInterceptor.java | 2 +- .../handler/GlobalExceptionHandler.java | 2 +- .../interceptor/HeaderInterceptor.java | 4 +- .../common/security/service/TokenService.java | 2 +- .../common/security/utils/SecurityUtils.java | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 6 +- ruoyi-gateway/pom.xml | 6 +- .../ruoyi/gateway/config/SpringDocConfig.java | 4 +- .../service/impl/ValidateCodeServiceImpl.java | 2 +- .../src/main/resources/bootstrap.yml | 8 +- .../com/ruoyi/file/config/FilterConfig.java | 2 +- .../com/ruoyi/file/filter/RefererFilter.java | 16 +- .../src/main/resources/bootstrap.yml | 6 +- .../ruoyi/gen/controller/GenController.java | 2 +- .../java/com/ruoyi/gen/domain/GenTable.java | 4 +- .../com/ruoyi/gen/domain/GenTableColumn.java | 2 +- .../src/main/resources/bootstrap.yml | 6 +- .../main/resources/vm/java/controller.java.vm | 4 +- .../job/controller/SysJobController.java | 2 +- .../job/controller/SysJobLogController.java | 2 +- .../java/com/ruoyi/job/domain/SysJob.java | 4 +- .../ruoyi/job/service/SysJobServiceImpl.java | 2 +- .../src/main/resources/bootstrap.yml | 6 +- .../controller/SysConfigController.java | 2 +- .../controller/SysDictDataController.java | 2 +- .../controller/SysDictTypeController.java | 2 +- .../controller/SysLogininforController.java | 2 +- .../controller/SysOperlogController.java | 2 +- .../system/controller/SysPostController.java | 2 +- .../system/controller/SysRoleController.java | 2 +- .../system/controller/SysUserController.java | 2 +- .../com/ruoyi/system/domain/SysConfig.java | 4 +- .../java/com/ruoyi/system/domain/SysMenu.java | 6 +- .../com/ruoyi/system/domain/SysNotice.java | 4 +- .../java/com/ruoyi/system/domain/SysPost.java | 6 +- .../service/impl/SysConfigServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 2 +- .../src/main/resources/bootstrap.yml | 6 +- .../monitor/config/WebSecurityConfigurer.java | 4 +- .../src/main/resources/bootstrap.yml | 6 +- sql/ry_20250523.sql | 2 +- 92 files changed, 391 insertions(+), 271 deletions(-) rename {bin => bat}/clean.bat (100%) rename {bin => bat}/package.bat (100%) rename {bin => bat}/run-auth.bat (100%) rename {bin => bat}/run-gateway.bat (100%) rename {bin => bat}/run-modules-file.bat (100%) rename {bin => bat}/run-modules-gen.bat (100%) rename {bin => bat}/run-modules-job.bat (100%) rename {bin => bat}/run-modules-system.bat (100%) rename {bin => bat}/run-monitor.bat (100%) create mode 100644 bin/clean.sh create mode 100644 bin/package.sh create mode 100644 bin/run-auth.sh create mode 100644 bin/run-gateway.sh create mode 100644 bin/run-modules-file.sh create mode 100644 bin/run-modules-gen.sh create mode 100644 bin/run-modules-job.sh create mode 100644 bin/run-modules-system.sh create mode 100644 bin/run-monitor.sh mode change 100644 => 100755 docker/copy.sh mode change 100644 => 100755 docker/deploy.sh diff --git a/.java-version b/.java-version index 468437494..7273c0fa8 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 \ No newline at end of file +25 diff --git a/.mvn/jvm.config b/.mvn/jvm.config index b23750845..615114a0c 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -9,4 +9,5 @@ -XX:+TieredCompilation -Xshare:on -Djava.net.preferIPv4Stack=true --Djava.security.egd=file:/dev/./urandom \ No newline at end of file +-Djava.security.egd=file:/dev/./urandom +-Dfile.encoding=UTF-8 diff --git a/.mvn/maven.config b/.mvn/maven.config index 06ceb5e0b..d0c847ce4 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,3 +1,3 @@ --Djava.version=1.8 +-Djava.version=25 -Drevision=1.0.0 --Dchangelist=-SNAPSHOT \ No newline at end of file +-Dchangelist=-SNAPSHOT diff --git a/bin/clean.bat b/bat/clean.bat similarity index 100% rename from bin/clean.bat rename to bat/clean.bat diff --git a/bin/package.bat b/bat/package.bat similarity index 100% rename from bin/package.bat rename to bat/package.bat diff --git a/bin/run-auth.bat b/bat/run-auth.bat similarity index 100% rename from bin/run-auth.bat rename to bat/run-auth.bat diff --git a/bin/run-gateway.bat b/bat/run-gateway.bat similarity index 100% rename from bin/run-gateway.bat rename to bat/run-gateway.bat diff --git a/bin/run-modules-file.bat b/bat/run-modules-file.bat similarity index 100% rename from bin/run-modules-file.bat rename to bat/run-modules-file.bat diff --git a/bin/run-modules-gen.bat b/bat/run-modules-gen.bat similarity index 100% rename from bin/run-modules-gen.bat rename to bat/run-modules-gen.bat diff --git a/bin/run-modules-job.bat b/bat/run-modules-job.bat similarity index 100% rename from bin/run-modules-job.bat rename to bat/run-modules-job.bat diff --git a/bin/run-modules-system.bat b/bat/run-modules-system.bat similarity index 100% rename from bin/run-modules-system.bat rename to bat/run-modules-system.bat diff --git a/bin/run-monitor.bat b/bat/run-monitor.bat similarity index 100% rename from bin/run-monitor.bat rename to bat/run-monitor.bat diff --git a/bin/clean.sh b/bin/clean.sh new file mode 100644 index 000000000..5438aa35d --- /dev/null +++ b/bin/clean.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 清理工程target生成路径。" +echo "" + +cd "$(dirname "$0")" || exit +cd .. + +mvn clean diff --git a/bin/package.sh b/bin/package.sh new file mode 100644 index 000000000..409307c1e --- /dev/null +++ b/bin/package.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 打包Web工程，生成war/jar包文件。" +echo "" + +cd "$(dirname "$0")" || exit +cd .. + +mvn clean package -Dmaven.test.skip=true diff --git a/bin/run-auth.sh b/bin/run-auth.sh new file mode 100644 index 000000000..39324960c --- /dev/null +++ b/bin/run-auth.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Auth工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-auth/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-auth.jar diff --git a/bin/run-gateway.sh b/bin/run-gateway.sh new file mode 100644 index 000000000..19f76c433 --- /dev/null +++ b/bin/run-gateway.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Gateway工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-gateway/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-gateway.jar diff --git a/bin/run-modules-file.sh b/bin/run-modules-file.sh new file mode 100644 index 000000000..8068390ae --- /dev/null +++ b/bin/run-modules-file.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Modules-File工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-modules/ruoyi-file/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-modules-file.jar diff --git a/bin/run-modules-gen.sh b/bin/run-modules-gen.sh new file mode 100644 index 000000000..edde8b4b4 --- /dev/null +++ b/bin/run-modules-gen.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Modules-Gen工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-modules/ruoyi-gen/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-modules-gen.jar diff --git a/bin/run-modules-job.sh b/bin/run-modules-job.sh new file mode 100644 index 000000000..add1ddcb4 --- /dev/null +++ b/bin/run-modules-job.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Modules-Job工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-modules/ruoyi-job/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-modules-job.jar diff --git a/bin/run-modules-system.sh b/bin/run-modules-system.sh new file mode 100644 index 000000000..5380f7157 --- /dev/null +++ b/bin/run-modules-system.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Modules-System工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-modules/ruoyi-system/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-modules-system.jar diff --git a/bin/run-monitor.sh b/bin/run-monitor.sh new file mode 100644 index 000000000..76acb04d6 --- /dev/null +++ b/bin/run-monitor.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +echo "" +echo "[信息] 使用Jar命令运行Monitor工程。" +echo "" + +cd "$(dirname "$0")" || exit +cd ../ruoyi-visual/ruoyi-monitor/target || exit + +JAVA_OPTS="-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m" + +java -Dfile.encoding=utf-8 "$JAVA_OPTS" -jar ruoyi-visual-monitor.jar diff --git a/docker/copy.sh b/docker/copy.sh old mode 100644 new mode 100755 index 956a071d8..743946780 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -10,7 +10,8 @@ usage() { # copy sql echo "begin copy sql " cp ../sql/ry_20250523.sql ./mysql/db -cp ../sql/ry_config_20250224.sql ./mysql/db +cp ../sql/ry_config*.sql ./mysql/db +cp ../sql/ry_seata*.sql ./mysql/db # copy html echo "begin copy html " diff --git a/docker/deploy.sh b/docker/deploy.sh old mode 100644 new mode 100755 index 024890920..40efa531e --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -10,6 +10,7 @@ usage() { port(){ firewall-cmd --add-port=80/tcp --permanent firewall-cmd --add-port=8080/tcp --permanent + firewall-cmd --add-port=8181/tcp --permanent firewall-cmd --add-port=8848/tcp --permanent firewall-cmd --add-port=9848/tcp --permanent firewall-cmd --add-port=9849/tcp --permanent @@ -26,22 +27,22 @@ port(){ # 启动基础环境（必须） base(){ - docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos + docker compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos } # 启动程序模块（必须） modules(){ - docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system + docker compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system } # 关闭所有环境/模块 stop(){ - docker-compose stop + docker compose stop } # 删除所有环境/模块 rm(){ - docker-compose rm + docker compose rm } # 根据输入参数，选择执行对应方法，不输入则执行使用说明 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b792f15bf..be99e0f06 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,3 @@ -version : '3.8' services: ruoyi-nacos: container_name: ruoyi-nacos @@ -7,10 +6,17 @@ services: context: ./nacos environment: - MODE=standalone + - NACOS_AUTH_ENABLE=true + - NACOS_AUTH_TOKEN=U2VjcmV0S2V5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5 + - NACOS_AUTH_ENABLE=true + - NACOS_AUTH_CACHE_ENABLE=true + - NACOS_AUTH_IDENTITY_KEY=serverIdentity + - NACOS_AUTH_IDENTITY_VALUE=security volumes: - ./nacos/logs/:/home/nacos/logs - ./nacos/conf/application.properties:/home/nacos/conf/application.properties ports: + - "8181:8080" - "8848:8848" - "9848:9848" - "9849:9849" @@ -69,7 +75,7 @@ services: container_name: ruoyi-gateway build: context: ./ruoyi/gateway - dockerfile: ruoyi/gateway/Dockerfile + dockerfile: Dockerfile ports: - "8080:8080" depends_on: @@ -80,7 +86,7 @@ services: container_name: ruoyi-auth build: context: ./ruoyi/auth - dockerfile: ruoyi/auth/Dockerfile + dockerfile: Dockerfile ports: - "9200:9200" depends_on: @@ -91,7 +97,7 @@ services: container_name: ruoyi-modules-system build: context: ./ruoyi/modules/system - dockerfile: ruoyi/modules/system/Dockerfile + dockerfile: Dockerfile ports: - "9201:9201" depends_on: @@ -104,7 +110,7 @@ services: container_name: ruoyi-modules-gen build: context: ./ruoyi/modules/gen - dockerfile: ruoyi/modules/gen/Dockerfile + dockerfile: Dockerfile ports: - "9202:9202" depends_on: @@ -115,7 +121,7 @@ services: container_name: ruoyi-modules-job build: context: ./ruoyi/modules/job - dockerfile: ruoyi/modules/job/Dockerfile + dockerfile: Dockerfile ports: - "9203:9203" depends_on: @@ -126,7 +132,7 @@ services: container_name: ruoyi-modules-file build: context: ./ruoyi/modules/file - dockerfile: ruoyi/modules/file/Dockerfile + dockerfile: Dockerfile ports: - "9300:9300" volumes: @@ -135,6 +141,6 @@ services: container_name: ruoyi-visual-monitor build: context: ./ruoyi/visual/monitor - dockerfile: ruoyi/visual/monitor/Dockerfile + dockerfile: Dockerfile ports: - "9100:9100" diff --git a/docker/nacos/Dockerfile b/docker/nacos/Dockerfile index 44b5672a9..ae5876957 100644 --- a/docker/nacos/Dockerfile +++ b/docker/nacos/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM nacos/nacos-server +FROM nacos/nacos-server:v3.1.1 # author LABEL org.opencontainers.image.authors="ruoyi" diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index 7f2a61f2e..ff04c0c7c 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -22,11 +22,12 @@ nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/ nacos.core.auth.system.type=nacos nacos.core.auth.enabled=false -nacos.core.auth.default.token.expire.seconds=18000 -nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789 +nacos.core.auth.plugin.nacos.token.expire.seconds=18000 +nacos.core.auth.plugin.nacos.token.secret.key=U2VjcmV0S2V5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5 nacos.core.auth.caching.enabled=true nacos.core.auth.enable.userAgentAuthWhite=false nacos.core.auth.server.identity.key=serverIdentity nacos.core.auth.server.identity.value=security nacos.istio.mcp.server.enabled=false + diff --git a/docker/ruoyi/auth/Dockerfile b/docker/ruoyi/auth/Dockerfile index 94bd93b8c..ce6801393 100644 --- a/docker/ruoyi/auth/Dockerfile +++ b/docker/ruoyi/auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar # 启动认证服务 -ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] diff --git a/docker/ruoyi/gateway/Dockerfile b/docker/ruoyi/gateway/Dockerfile index 1185c4cee..eebdeeec2 100644 --- a/docker/ruoyi/gateway/Dockerfile +++ b/docker/ruoyi/gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar # 启动网关服务 -ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] diff --git a/docker/ruoyi/modules/file/Dockerfile b/docker/ruoyi/modules/file/Dockerfile index 6c0a3b4d8..eea74f487 100644 --- a/docker/ruoyi/modules/file/Dockerfile +++ b/docker/ruoyi/modules/file/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar # 启动文件服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"] diff --git a/docker/ruoyi/modules/gen/Dockerfile b/docker/ruoyi/modules/gen/Dockerfile index cab31da9f..814cf8f28 100644 --- a/docker/ruoyi/modules/gen/Dockerfile +++ b/docker/ruoyi/modules/gen/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar # 启动代码生成服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"] diff --git a/docker/ruoyi/modules/job/Dockerfile b/docker/ruoyi/modules/job/Dockerfile index b8e28b4a5..2ae353ec9 100644 --- a/docker/ruoyi/modules/job/Dockerfile +++ b/docker/ruoyi/modules/job/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar # 启动定时任务服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] diff --git a/docker/ruoyi/modules/system/Dockerfile b/docker/ruoyi/modules/system/Dockerfile index 45270c0c9..615ea9baa 100644 --- a/docker/ruoyi/modules/system/Dockerfile +++ b/docker/ruoyi/modules/system/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar # 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] diff --git a/docker/ruoyi/visual/monitor/Dockerfile b/docker/ruoyi/visual/monitor/Dockerfile index cc7cfbbaf..9184896de 100644 --- a/docker/ruoyi/visual/monitor/Dockerfile +++ b/docker/ruoyi/visual/monitor/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM openjdk:8-jre +FROM maven:3.9.11-eclipse-temurin-8-alpine # author LABEL org.opencontainers.image.authors="ruoyi" @@ -12,4 +12,4 @@ WORKDIR /home/ruoyi # 复制jar文件到路径 COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar # 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"] diff --git a/pom.xml b/pom.xml index aaa6b01b8..019931583 100644 --- a/pom.xml +++ b/pom.xml @@ -16,29 +16,32 @@ 3.6.6 UTF-8 UTF-8 - 1.8 - 2.7.18 - 2021.0.9 - 2021.0.6.1 - 2.7.16 + 25 + + 3.5.8 + 2025.0.0 + 2025.0.0.0 + 3.5.6 + 1.27.2 2.3.3 - 2.0.0 - 1.2.23 + 2.1.1 + 1.2.27 4.3.1 2.19.0 2.3 - 2.0.57 + 2.0.60 0.9.1 8.2.2 4.1.2 - 1.6.9 + 3.0.0 2.14.4 9.0.112 - 1.2.13 - 5.3.39 + 1.5.22 + 6.2.15 + 3.14.1 5.4 @@ -124,7 +127,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui ${springdoc.version} @@ -278,13 +281,7 @@ - org.apache.maven.plugins maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - com.cosium.code @@ -305,6 +302,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + com.cosium.code git-code-format-maven-plugin diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java index 59527814c..1471117e7 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java @@ -1,12 +1,12 @@ package com.ruoyi.system.api.domain; import com.ruoyi.common.core.web.domain.BaseEntity; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java index 2972796e5..471e515a4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java @@ -4,8 +4,8 @@ import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.web.domain.BaseEntity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java index d432fb837..843963902 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java @@ -3,9 +3,9 @@ package com.ruoyi.system.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java index 4e4d4d814..a78714be8 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java @@ -3,10 +3,10 @@ package com.ruoyi.system.api.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Set; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index d8b34da1a..dd94bd4f3 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -7,9 +7,9 @@ import com.ruoyi.common.core.annotation.Excels; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; +import jakarta.validation.constraints.*; import java.util.Date; import java.util.List; -import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index 2a6f66692..09edd8348 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -10,7 +10,7 @@ import com.ruoyi.common.security.auth.AuthUtil; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c0..5d3cd5220 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -1,9 +1,9 @@ # Tomcat -server: +server: port: 9200 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-auth @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index cdd603233..5c86613bd 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -2,111 +2,110 @@ - - com.ruoyi - ruoyi-common - 3.6.6 - - 4.0.0 - - ruoyi-common-core - - - ruoyi-common-core核心模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - com.alibaba - transmittable-thread-local - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba.fastjson2 - fastjson2 - - - - - io.jsonwebtoken - jjwt - - - - - javax.xml.bind - jaxb-api - - - - - org.apache.commons - commons-lang3 - - - - - commons-io - commons-io - - - - - org.apache.poi - poi-ooxml - - - - - javax.servlet - javax.servlet-api - - - + + com.ruoyi + ruoyi-common + 3.6.6 + + 4.0.0 + + ruoyi-common-core + + + ruoyi-common-core核心模块 + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + org.springframework + spring-aspects + + + + + com.alibaba + transmittable-thread-local + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba.fastjson2 + fastjson2 + + + + + io.jsonwebtoken + jjwt + + + + + org.apache.commons + commons-lang3 + + + + + commons-io + commons-io + + + + + org.apache.poi + poi-ooxml + + + + + jakarta.servlet + jakarta.servlet-api + + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java index 74946b2fc..6e3502ef5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java @@ -4,6 +4,10 @@ import com.alibaba.fastjson2.JSON; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.text.Convert; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -12,10 +16,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java index f28828f8a..a61eab62e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java @@ -1,9 +1,9 @@ package com.ruoyi.common.core.utils.bean; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; /** * bean对象属性验证 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java index ac459bfe9..f4ee5f798 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java @@ -1,6 +1,8 @@ package com.ruoyi.common.core.utils.file; import com.ruoyi.common.core.utils.StringUtils; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -9,8 +11,6 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index ac113370f..c9d0fae3e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -2,9 +2,9 @@ package com.ruoyi.common.core.utils.ip; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; +import jakarta.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; -import javax.servlet.http.HttpServletRequest; /** * 获取IP方法 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index 3c142a101..129ac6d41 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -11,6 +11,7 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.file.FileTypeUtils; import com.ruoyi.common.core.utils.file.ImageUtils; import com.ruoyi.common.core.utils.reflect.ReflectUtils; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; @@ -30,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java index d82a6d9e2..ae5b60d6b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java @@ -1,11 +1,11 @@ package com.ruoyi.common.core.xss; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; /** * 自定义xss校验注解 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java index 277935ead..e5da215ba 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java @@ -1,10 +1,10 @@ package com.ruoyi.common.core.xss; import com.ruoyi.common.core.utils.StringUtils; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; /** * 自定义xss校验注解实现 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 51913923c..9885e684d 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -12,10 +12,10 @@ import com.ruoyi.common.log.filter.PropertyPreExcludeFilter; import com.ruoyi.common.log.service.AsyncLogService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysOperLog; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Collection; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java index 04796acd6..27de13e52 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java @@ -6,8 +6,8 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.ip.IpUtils; import feign.RequestInterceptor; import feign.RequestTemplate; +import jakarta.servlet.http.HttpServletRequest; import java.util.Map; -import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index f3c32f9da..9fe422b15 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java @@ -10,7 +10,7 @@ import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.html.EscapeUtil; import com.ruoyi.common.core.web.domain.AjaxResult; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.validation.BindException; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java index c2730c37c..09f460116 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java @@ -7,8 +7,8 @@ import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.auth.AuthUtil; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 10601b663..1a815baeb 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -10,10 +10,10 @@ import com.ruoyi.common.core.utils.uuid.IdUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.model.LoginUser; +import jakarta.servlet.http.HttpServletRequest; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java index f14b64a57..c0158a5f2 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java @@ -6,7 +6,7 @@ import com.ruoyi.common.core.context.SecurityContextHolder; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.api.model.LoginUser; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; /** diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index ff0274bf9..d13141822 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -8,9 +8,9 @@ 3.6.6 4.0.0 - + ruoyi-common-swagger - + ruoyi-common-swagger系统接口 @@ -26,7 +26,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 324c4b931..af142e815 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud - spring-cloud-starter-gateway + spring-cloud-starter-gateway-server-webflux @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-starter-actuator - + org.springframework.cloud @@ -79,7 +79,7 @@ org.springdoc - springdoc-openapi-webflux-ui + springdoc-openapi-starter-webflux-ui ${springdoc.version} diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java index e5e15c0e1..37f27f8ed 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java @@ -7,8 +7,8 @@ import com.alibaba.nacos.common.notify.listener.Subscriber; import com.ruoyi.common.core.utils.StringUtils; import java.util.Set; import java.util.stream.Collectors; -import org.springdoc.core.AbstractSwaggerUiConfigProperties; -import org.springdoc.core.SwaggerUiConfigProperties; +import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties; +import org.springdoc.core.properties.SwaggerUiConfigProperties; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java index 7a17a9151..8a7410583 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java @@ -11,10 +11,10 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.gateway.config.properties.CaptchaProperties; import com.ruoyi.gateway.service.ValidateCodeService; +import jakarta.annotation.Resource; import java.awt.image.BufferedImage; import java.io.IOException; import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; import javax.imageio.ImageIO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae6..1e83d9d65 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: port: 8080 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-gateway @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java index dcb3fe227..679d0f005 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java @@ -1,9 +1,9 @@ package com.ruoyi.file.config; import com.ruoyi.file.filter.RefererFilter; +import jakarta.servlet.DispatcherType; import java.util.HashMap; import java.util.Map; -import javax.servlet.DispatcherType; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java index 4d8d3d415..9c895a915 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java @@ -1,16 +1,16 @@ package com.ruoyi.file.filter; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; import java.util.List; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * 防盗链过滤器 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff41125..60c16c5d6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: port: 9300 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-file @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java index 6b7c82863..e3293bc8b 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java @@ -12,11 +12,11 @@ import com.ruoyi.gen.domain.GenTable; import com.ruoyi.gen.domain.GenTableColumn; import com.ruoyi.gen.service.IGenTableColumnService; import com.ruoyi.gen.service.IGenTableService; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java index 14049f85d..f9b584363 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java @@ -3,9 +3,9 @@ package com.ruoyi.gen.domain; import com.ruoyi.common.core.constant.GenConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; /** diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java index 75d5460d0..e56cda372 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java @@ -2,7 +2,7 @@ package com.ruoyi.gen.domain; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 代码生成业务字段表 gen_table_column diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a4575..252fc5dcd 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: port: 9202 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-gen @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm index 363979bdb..0395b2fcc 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm @@ -2,7 +2,7 @@ package ${packageName}.controller; import java.util.List; import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -27,7 +27,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo; /** * ${functionName}Controller - * + * * @author ${author} * @date ${datetime} */ diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java index 9879599e7..e730ba887 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java @@ -15,8 +15,8 @@ import com.ruoyi.job.domain.SysJob; import com.ruoyi.job.service.ISysJobService; import com.ruoyi.job.util.CronUtils; import com.ruoyi.job.util.ScheduleUtils; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java index fd497e7e1..a9b73c09e 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java @@ -9,8 +9,8 @@ import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.job.domain.SysJobLog; import com.ruoyi.job.service.ISysJobLogService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java index 0863e356e..c2becb6d0 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java @@ -7,9 +7,9 @@ import com.ruoyi.common.core.constant.ScheduleConstants; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.job.util.CronUtils; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java index 12b224287..e677e8394 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java @@ -6,8 +6,8 @@ import com.ruoyi.job.domain.SysJob; import com.ruoyi.job.mapper.SysJobMapper; import com.ruoyi.job.util.CronUtils; import com.ruoyi.job.util.ScheduleUtils; +import jakarta.annotation.PostConstruct; import java.util.List; -import javax.annotation.PostConstruct; import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index b86f8c9e1..01b72edd0 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: port: 9203 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-job @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java index febe1fe07..615c2a193 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java @@ -10,8 +10,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java index 06bb898d9..86cdecc6c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java @@ -12,9 +12,9 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java index 2410959e6..a12491660 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java @@ -10,8 +10,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysDictType; import com.ruoyi.system.service.ISysDictTypeService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java index caef1ac8e..83604ab06 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java @@ -12,8 +12,8 @@ import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.system.api.domain.SysLogininfor; import com.ruoyi.system.service.ISysLogininforService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java index 200bba33e..a619daf5f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java @@ -10,8 +10,8 @@ import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.system.api.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java index 01cd4153d..8a88e0f53 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java @@ -10,8 +10,8 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java index b677f3261..872d6d764 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java @@ -15,8 +15,8 @@ import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index 5da3af1c9..a533ff41c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -24,12 +24,12 @@ import com.ruoyi.system.service.ISysPermissionService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Date; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index a2f7b4848..256f722ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -3,8 +3,8 @@ package com.ruoyi.system.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 84278b996..8e16424c6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -1,11 +1,11 @@ package com.ruoyi.system.domain; import com.ruoyi.common.core.web.domain.BaseEntity; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 23e4a8186..4b4034799 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -2,8 +2,8 @@ package com.ruoyi.system.domain; import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.xss.Xss; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 5d82929cf..e9084f819 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -3,9 +3,9 @@ package com.ruoyi.system.domain; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 06425dd4f..2570899d5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -9,9 +9,9 @@ import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.mapper.SysConfigMapper; import com.ruoyi.system.service.ISysConfigService; +import jakarta.annotation.PostConstruct; import java.util.Collection; import java.util.List; -import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 5625c8885..d27379621 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -9,11 +9,11 @@ import com.ruoyi.system.api.domain.SysDictType; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; +import jakarta.annotation.PostConstruct; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 961222c00..cfdd55ab1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -20,10 +20,10 @@ import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; +import jakarta.validation.Validator; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.validation.Validator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab78165..1a8a6c305 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: port: 9201 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-system @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java index aad705333..95546b9e3 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java @@ -32,8 +32,8 @@ public class WebSecurityConfigurer { .frameOptions() .disable() .and() - .authorizeRequests() - .antMatchers( + .authorizeHttpRequests() + .requestMatchers( adminContextPath + "/assets/**", adminContextPath + "/login", adminContextPath + "/actuator/**", diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 13d90cd72..9f31a9e78 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ server: port: 9100 # Spring -spring: +spring: application: # 应用名称 name: ruoyi-monitor @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:8181 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/sql/ry_20250523.sql b/sql/ry_20250523.sql index ae47ac165..7a61b9386 100644 --- a/sql/ry_20250523.sql +++ b/sql/ry_20250523.sql @@ -178,7 +178,7 @@ insert into sys_menu values('108', '日志管理', '1', '9', 'log', insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '在线用户菜单'); insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', '', '', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '定时任务菜单'); insert into sys_menu values('111', 'Sentinel控制台', '2', '3', 'http://localhost:8718', '', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 'admin', sysdate(), '', null, '流量控制菜单'); -insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', sysdate(), '', null, '服务治理菜单'); +insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8181', '', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', sysdate(), '', null, '服务治理菜单'); insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '服务监控菜单'); insert into sys_menu values('114', '表单构建', '3', '1', 'build', 'tool/build/index', '', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '表单构建菜单'); insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '代码生成菜单');