diff --git a/build-config/build-java.sh b/build-config/build-java.sh index a8ce7df3..bc4c2eec 100755 --- a/build-config/build-java.sh +++ b/build-config/build-java.sh @@ -9,10 +9,10 @@ do gradle -b $gfile clean & echo -e "\033[32m----------------- $gfile 模块 清理 成功 ---------------------- \033[0m" else - gradle -b $gfile clean build -x test -DbuildProduct=true -DreleaseVersion=$1 + gradle -b $gfile clean build -x test -DbuildProduct=true -DreleaseVersion=$1 & if [ 0 -ne $? ] ; then - echo -e "\033[31m-----------------$gfile 模块编译失败导致产品编译失败! ------------ \033[0m"; + echo -e "\033[31m-----------------$gfile 模块编译失败导致产品编译失败! ------------ \033[0m"; continue; fi echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m" diff --git a/publish.sh b/publish.sh index 91d93df8..eecf9b99 100755 --- a/publish.sh +++ b/publish.sh @@ -7,21 +7,21 @@ gradleArgs="clean publish -DbuildProduct=true -DreleaseVersion=$1" # 发布公共模块,必须按照下列顺序 编译发布。 -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-core/build.gradle -gradle $gradleArgs -b ./ruoyi-api/ruoyi-api-system/build.gradle -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-redis/build.gradle -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-security/build.gradle -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-log/build.gradle -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-datascope/build.gradle -gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-swagger/build.gradle +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-core/build.gradle -s +gradle $gradleArgs -b ./ruoyi-api/ruoyi-api-system/build.gradle -s +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-redis/build.gradle -s +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-security/build.gradle -s +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-log/build.gradle -s +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-datascope/build.gradle -s +gradle $gradleArgs -b ./ruoyi-common/ruoyi-common-swagger/build.gradle -s ### 六个 微服务依赖, monitor 不需要发布。 -gradle $gradleArgs -b ./ruoyi-auth/build.gradle -gradle $gradleArgs -b ./ruoyi-gateway/build.gradle -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-system/build.gradle -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-file/build.gradle -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-gen/build.gradle -gradle $gradleArgs -b ./ruoyi-modules/ruoyi-job/build.gradle +gradle $gradleArgs -b ./ruoyi-auth/build.gradle -s +gradle $gradleArgs -b ./ruoyi-gateway/build.gradle -s +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-system/build.gradle -s +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-file/build.gradle -s +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-gen/build.gradle -s +gradle $gradleArgs -b ./ruoyi-modules/ruoyi-job/build.gradle -s diff --git a/ruoyi-auth/build.gradle b/ruoyi-auth/build.gradle index 229f42a3..804b7a29 100644 --- a/ruoyi-auth/build.gradle +++ b/ruoyi-auth/build.gradle @@ -29,9 +29,9 @@ if (buildProduct) { dependencies { - implementation "com.ruoyi:ruoyi-common-core:${devVersion}" - implementation "com.ruoyi:ruoyi-common-security:${devVersion}" - implementation "com.ruoyi:ruoyi-api-system:${devVersion}" + compile "com.ruoyi:ruoyi-common-core:${devVersion}" + compile "com.ruoyi:ruoyi-common-security:${devVersion}" + compile "com.ruoyi:ruoyi-api-system:${devVersion}" implementation "com.alibaba:fastjson:1.2.75" implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:${alibabaCloud}" diff --git a/ruoyi-gateway/build.gradle b/ruoyi-gateway/build.gradle index 3d0780f6..387b79b4 100644 --- a/ruoyi-gateway/build.gradle +++ b/ruoyi-gateway/build.gradle @@ -28,16 +28,14 @@ if (buildProduct) { dependencies { - implementation "com.ruoyi:ruoyi-common-core:${devVersion}" - implementation "com.ruoyi:ruoyi-common-redis:${devVersion}" + compile "com.ruoyi:ruoyi-common-core:${devVersion}" + compile "com.ruoyi:ruoyi-common-redis:${devVersion}" + - implementation 'com.ruoyi:ruoyi-gateway:dev-9-SNAPSHOT' implementation "com.github.penggle:kaptcha:2.3.2" implementation "io.springfox:springfox-swagger2:2.9.2" implementation "io.springfox:springfox-swagger-ui:2.9.2" - - implementation "com.alibaba.csp:sentinel-datasource-nacos:1.8.0" implementation "com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:${alibabaCloud}" diff --git a/ruoyi-modules/ruoyi-file/build.gradle b/ruoyi-modules/ruoyi-file/build.gradle index 9070d966..3b4519e8 100644 --- a/ruoyi-modules/ruoyi-file/build.gradle +++ b/ruoyi-modules/ruoyi-file/build.gradle @@ -29,9 +29,9 @@ if (buildProduct) { dependencies { - implementation "com.ruoyi:ruoyi-common-core:${devVersion}" - implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" - implementation "com.ruoyi:ruoyi-api-system:${devVersion}" + compile "com.ruoyi:ruoyi-common-core:${devVersion}" + compile "com.ruoyi:ruoyi-common-swagger:${devVersion}" + compile "com.ruoyi:ruoyi-api-system:${devVersion}" implementation "io.minio:minio:8.0.3" implementation "io.springfox:springfox-swagger-ui:2.9.2" diff --git a/ruoyi-modules/ruoyi-gen/build.gradle b/ruoyi-modules/ruoyi-gen/build.gradle index abe9d967..a48a9d1f 100644 --- a/ruoyi-modules/ruoyi-gen/build.gradle +++ b/ruoyi-modules/ruoyi-gen/build.gradle @@ -29,10 +29,10 @@ if (buildProduct) { dependencies { - implementation "com.ruoyi:ruoyi-common-log:${devVersion}" - implementation "com.ruoyi:ruoyi-common-core:${devVersion}" - implementation "com.ruoyi:ruoyi-common-security:${devVersion}" - implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" + compile "com.ruoyi:ruoyi-common-log:${devVersion}" + compile "com.ruoyi:ruoyi-common-core:${devVersion}" + compile "com.ruoyi:ruoyi-common-security:${devVersion}" + compile "com.ruoyi:ruoyi-common-swagger:${devVersion}" implementation "org.apache.velocity:velocity:1.7" implementation "org.apache.commons:commons-lang3:3.11" diff --git a/ruoyi-modules/ruoyi-job/build.gradle b/ruoyi-modules/ruoyi-job/build.gradle index d33fdf5c..b001c8bd 100644 --- a/ruoyi-modules/ruoyi-job/build.gradle +++ b/ruoyi-modules/ruoyi-job/build.gradle @@ -30,10 +30,10 @@ if (buildProduct) { dependencies { - implementation "com.ruoyi:ruoyi-common-log:${devVersion}" - implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" - implementation "com.ruoyi:ruoyi-common-security:${devVersion}" - implementation "com.ruoyi:ruoyi-common-core:${devVersion}" + compile "com.ruoyi:ruoyi-common-log:${devVersion}" + compile "com.ruoyi:ruoyi-common-swagger:${devVersion}" + compile "com.ruoyi:ruoyi-common-security:${devVersion}" + compile "com.ruoyi:ruoyi-common-core:${devVersion}" implementation "org.quartz-scheduler:quartz:2.3.2" diff --git a/ruoyi-modules/ruoyi-system/build.gradle b/ruoyi-modules/ruoyi-system/build.gradle index 60278b4c..e2904c68 100644 --- a/ruoyi-modules/ruoyi-system/build.gradle +++ b/ruoyi-modules/ruoyi-system/build.gradle @@ -29,13 +29,13 @@ if (buildProduct) { description = "ruoyi-modules-system" dependencies { - implementation "com.ruoyi:ruoyi-common-core:${devVersion}" - implementation "com.ruoyi:ruoyi-common-log:${devVersion}" - implementation "com.ruoyi:ruoyi-common-security:${devVersion}" - implementation "com.ruoyi:ruoyi-common-redis:${devVersion}" - implementation "com.ruoyi:ruoyi-common-datascope:${devVersion}" - implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" - implementation "com.ruoyi:ruoyi-api-system:${devVersion}" + compile "com.ruoyi:ruoyi-common-core:${devVersion}" + compile "com.ruoyi:ruoyi-common-log:${devVersion}" + compile "com.ruoyi:ruoyi-common-security:${devVersion}" + compile "com.ruoyi:ruoyi-common-redis:${devVersion}" + compile "com.ruoyi:ruoyi-common-datascope:${devVersion}" + compile "com.ruoyi:ruoyi-common-swagger:${devVersion}" + compile "com.ruoyi:ruoyi-api-system:${devVersion}" implementation "org.apache.poi:poi-ooxml:4.1.2" implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1" diff --git a/ruoyi-visual/ruoyi-monitor/build.gradle b/ruoyi-visual/ruoyi-monitor/build.gradle index df29de3e..9edb76d7 100644 --- a/ruoyi-visual/ruoyi-monitor/build.gradle +++ b/ruoyi-visual/ruoyi-monitor/build.gradle @@ -14,7 +14,8 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } description = "ruoyi-visual-monitor" diff --git a/ruoyi-visual/ruoyi-monitor/settings.gradle b/ruoyi-visual/ruoyi-monitor/settings.gradle index d516ce35..3f70fc26 100644 --- a/ruoyi-visual/ruoyi-monitor/settings.gradle +++ b/ruoyi-visual/ruoyi-monitor/settings.gradle @@ -1 +1 @@ -rootProject.name = 'ruoyi-monitor' +rootProject.name = 'ruoyi-visual-monitor'