From f29198fb66540b78263927cd3d93426947c10c11 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Sat, 10 Aug 2024 09:07:51 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E8=BF=81=E7=A7=BBkotlin=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=B0=E6=A0=B9=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 667 +++++++++++++++++++++++------------------- ruoyi-gateway/pom.xml | 73 ----- 2 files changed, 366 insertions(+), 374 deletions(-) diff --git a/pom.xml b/pom.xml index 509b51212..710942db4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,302 +1,367 @@ - - - 4.0.0 - - com.ruoyi - ruoyi - 3.6.4 - - ruoyi - http://www.ruoyi.vip - 若依微服务系统 - - - 3.6.4 - UTF-8 - UTF-8 - 1.8 - 2.7.18 - 2021.0.8 - 2021.0.5.0 - 5.3.33 - 2.7.15 - 3.0.0 - 1.6.2 - 1.27.2 - 2.3.3 - 2.0.0 - 1.2.23 - 4.2.0 - 2.13.0 - 2.3 - 2.0.43 - 0.9.1 - 8.2.2 - 4.1.2 - 2.14.4 - - - - - - - - - org.springframework - spring-framework-bom - ${spring-framework.version} - pom - import - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - com.github.tobato - fastdfs-client - ${tobato.version} - - - - - io.swagger - swagger-models - ${swagger.core.version} - - - io.swagger - swagger-annotations - ${swagger.core.version} - - - - - pro.fessional - kaptcha - ${kaptcha.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - - com.alibaba.fastjson2 - fastjson2 - ${fastjson.version} - - - - - io.jsonwebtoken - jjwt - ${jjwt.version} - - - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - - - com.ruoyi - ruoyi-common-core - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-swagger - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-security - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-sensitive - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-datascope - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-datasource - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-seata - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-log - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-common-redis - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-api-system - ${ruoyi.version} - - - - - - - ruoyi-auth - ruoyi-gateway - ruoyi-visual - ruoyi-modules - ruoyi-api - ruoyi-common - - pom - - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - - + + + 4.0.0 + + com.ruoyi + ruoyi + 3.6.4 + + ruoyi + http://www.ruoyi.vip + 若依微服务系统 + + + 3.6.4 + UTF-8 + UTF-8 + 1.8 + 2.7.18 + 2021.0.8 + 2021.0.5.0 + 5.3.33 + 2.7.15 + 3.0.0 + 1.6.2 + 1.27.2 + 2.3.3 + 2.0.0 + 1.2.23 + 4.2.0 + 2.13.0 + 2.3 + 2.0.43 + 0.9.1 + 8.2.2 + 4.1.2 + 2.14.4 + 2.0.0 + + + + + + + + + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + com.github.tobato + fastdfs-client + ${tobato.version} + + + + + io.swagger + swagger-models + ${swagger.core.version} + + + io.swagger + swagger-annotations + ${swagger.core.version} + + + + + pro.fessional + kaptcha + ${kaptcha.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + commons-io + commons-io + ${commons.io.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson.version} + + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + + com.alibaba + transmittable-thread-local + ${transmittable-thread-local.version} + + + + + com.ruoyi + ruoyi-common-core + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-swagger + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-security + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-sensitive + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-datascope + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-datasource + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-seata + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-log + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-common-redis + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-api-system + ${ruoyi.version} + + + + + + + ruoyi-auth + ruoyi-gateway + ruoyi-visual + ruoyi-modules + ruoyi-api + ruoyi-common + + pom + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + add-source + generate-sources + + add-source + + + + src/main/java + src/main/kotlin + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + src/main/java + src/main/kotlin + target/generated-sources/annotations + + + + + test-compile + test-compile + + test-compile + + + + src/test/kotlin + target/generated-test-sources/test-annotations + + + + + + 1.8 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + \ No newline at end of file diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index ec77a29a9..7cbcdbcde 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -14,10 +14,6 @@ ruoyi-gateway网关模块 - - 2.0.0 - - @@ -111,44 +107,12 @@ springfox-swagger2 ${swagger.fox.version} - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - ${project.artifactId} - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - src/main/java - src/main/kotlin - - - - - org.springframework.boot spring-boot-maven-plugin @@ -160,43 +124,6 @@ - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - src/main/java - src/main/kotlin - target/generated-sources/annotations - - - - - test-compile - test-compile - - test-compile - - - - src/test/kotlin - target/generated-test-sources/test-annotations - - - - - - 1.8 - - org.apache.maven.plugins maven-compiler-plugin