diff --git a/build-config/build-java.sh b/build-config/build-java.sh index 4c5a0498..a8ce7df3 100755 --- a/build-config/build-java.sh +++ b/build-config/build-java.sh @@ -10,6 +10,11 @@ do echo -e "\033[32m----------------- $gfile 模块 清理 成功 ---------------------- \033[0m" else gradle -b $gfile clean build -x test -DbuildProduct=true -DreleaseVersion=$1 + + if [ 0 -ne $? ] ; then + echo -e "\033[31m-----------------$gfile 模块编译失败导致产品编译失败! ------------ \033[0m"; + continue; + fi echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m" fi diff --git a/publish.sh b/publish.sh new file mode 100755 index 00000000..0ba3df99 --- /dev/null +++ b/publish.sh @@ -0,0 +1,25 @@ +#! /bin/bash +# 发布之前,必须先提交 !!!! 发布之前,必须先提交 !!!! 发布之前,必须先提交 !!!! +# 使用方法: ./publish.sh 版本号. +# git pull; git add . ;git commit -m " 发布版本 $*" ; git push + +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 + + +### 六个 微服务 依赖 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 diff --git a/ruoyi-auth/build.gradle b/ruoyi-auth/build.gradle index 0d6cee02..229f42a3 100644 --- a/ruoyi-auth/build.gradle +++ b/ruoyi-auth/build.gradle @@ -21,8 +21,9 @@ ext { description = "ruoyi-api-system" apply from: "../build-config/build-all.gradle" apply from: "../build-config/build-base.gradle" -apply from: "../build-config/build-publish.gradle" -if (!buildProduct) { +if (buildProduct) { + apply from: "../build-config/build-publish.gradle" +} else { apply from: "../build-config/build-boot-jar.gradle" } diff --git a/ruoyi-auth/publish.sh b/ruoyi-auth/publish.sh new file mode 100755 index 00000000..8c0a1e07 --- /dev/null +++ b/ruoyi-auth/publish.sh @@ -0,0 +1,6 @@ +#! /bin/bash +# 发布之前,必须先提交 !!!! 发布之前,必须先提交 !!!! 发布之前,必须先提交 !!!! +# 使用方法: ./publish.sh 版本号. +# git pull; git add . ;git commit -m " 发布版本 $*" ; git push + +gradle --daemon --parallel -DbuildProduct=true clean publish -DreleaseVersion=$1 \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/build.gradle b/ruoyi-common/ruoyi-common-core/build.gradle index 4b37ce35..f3e88af5 100644 --- a/ruoyi-common/ruoyi-common-core/build.gradle +++ b/ruoyi-common/ruoyi-common-core/build.gradle @@ -1,17 +1,17 @@ dependencies { - implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${springCloud}" - implementation "com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" implementation "com.alibaba:fastjson:1.2.75" - implementation "com.fasterxml.jackson.core:jackson-databind:2.12.0" implementation "commons-io:commons-io:2.8.0" implementation "org.apache.poi:poi-ooxml:4.1.2" + implementation "javax.servlet:javax.servlet-api:4.0.1" + implementation "io.swagger:swagger-annotations:1.5.24" implementation "org.apache.commons:commons-lang3:3.11" implementation "org.apache.commons:commons-pool2:2.9.0" implementation "commons-fileupload:commons-fileupload:1.4" - implementation "javax.servlet:javax.servlet-api:4.0.1" - implementation "io.swagger:swagger-annotations:1.5.24" + implementation "com.fasterxml.jackson.core:jackson-databind:2.12.0" + implementation "com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" + implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${springCloud}" } diff --git a/ruoyi-common/ruoyi-common-datascope/build.gradle b/ruoyi-common/ruoyi-common-datascope/build.gradle index acd3d5e5..f60b153f 100644 --- a/ruoyi-common/ruoyi-common-datascope/build.gradle +++ b/ruoyi-common/ruoyi-common-datascope/build.gradle @@ -2,9 +2,9 @@ dependencies { implementation project(":ruoyi-common-core") + implementation "com.ruoyi:ruoyi-api-system:${devVersion}" implementation project(":ruoyi-common-security") - implementation "com.ruoyi:ruoyi-api-system:${devVersion}" implementation "org.aspectj:aspectjweaver:1.9.6" implementation "org.apache.commons:commons-lang3:3.11" implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}" diff --git a/ruoyi-common/ruoyi-common-log/build.gradle b/ruoyi-common/ruoyi-common-log/build.gradle index e76ec785..799c04ce 100644 --- a/ruoyi-common/ruoyi-common-log/build.gradle +++ b/ruoyi-common/ruoyi-common-log/build.gradle @@ -1,8 +1,8 @@ dependencies { - implementation project(":ruoyi-common-security") implementation project(":ruoyi-common-core") - implementation "com.ruoyi:ruoyi-api-system:${devVersion}" + implementation project(":ruoyi-common-security") + implementation "com.alibaba:fastjson:1.2.75" implementation "org.apache.commons:commons-lang3:3.11" diff --git a/ruoyi-common/ruoyi-common-security/build.gradle b/ruoyi-common/ruoyi-common-security/build.gradle index 79a4da26..26414e43 100644 --- a/ruoyi-common/ruoyi-common-security/build.gradle +++ b/ruoyi-common/ruoyi-common-security/build.gradle @@ -2,8 +2,8 @@ description = "ruoyi-common-security" dependencies { implementation project(":ruoyi-common-core") - implementation project(":ruoyi-common-redis") implementation "com.ruoyi:ruoyi-api-system:${devVersion}" + implementation project(":ruoyi-common-redis") implementation "javax.servlet:javax.servlet-api:4.0.1" implementation "org.apache.commons:commons-lang3:3.11" diff --git a/ruoyi-common/ruoyi-common-security/publish.sh b/ruoyi-common/ruoyi-common-security/publish.sh new file mode 120000 index 00000000..81b8b74d --- /dev/null +++ b/ruoyi-common/ruoyi-common-security/publish.sh @@ -0,0 +1 @@ +../../build-config/publish.sh \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/build.gradle b/ruoyi-modules/ruoyi-file/build.gradle index aec78625..9070d966 100644 --- a/ruoyi-modules/ruoyi-file/build.gradle +++ b/ruoyi-modules/ruoyi-file/build.gradle @@ -21,8 +21,11 @@ ext { description = "ruoyi-modules-file" apply from: "../../build-config/build-all.gradle" apply from: "../../build-config/build-base.gradle" -apply from: "../../build-config/build-boot-jar.gradle" - +if (buildProduct) { + apply from: "../../build-config/build-publish.gradle" +} else { + apply from: "../../build-config/build-boot-jar.gradle" +} dependencies { diff --git a/ruoyi-modules/ruoyi-gen/build.gradle b/ruoyi-modules/ruoyi-gen/build.gradle index b3507255..abe9d967 100644 --- a/ruoyi-modules/ruoyi-gen/build.gradle +++ b/ruoyi-modules/ruoyi-gen/build.gradle @@ -20,7 +20,10 @@ ext { description = "ruoyi-modules-gen" apply from: "../../build-config/build-all.gradle" apply from: "../../build-config/build-base.gradle" -if (!buildProduct) { + +if (buildProduct) { + apply from: "../../build-config/build-publish.gradle" +} else { apply from: "../../build-config/build-boot-jar.gradle" } @@ -32,8 +35,9 @@ dependencies { implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" implementation "org.apache.velocity:velocity:1.7" - implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1" + implementation "org.apache.commons:commons-lang3:3.11" implementation "io.springfox:springfox-swagger-ui:2.9.2" + implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1" implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:${alibabaCloud}" diff --git a/ruoyi-modules/ruoyi-gen/publish.sh b/ruoyi-modules/ruoyi-gen/publish.sh new file mode 120000 index 00000000..81b8b74d --- /dev/null +++ b/ruoyi-modules/ruoyi-gen/publish.sh @@ -0,0 +1 @@ +../../build-config/publish.sh \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/build.gradle b/ruoyi-modules/ruoyi-job/build.gradle index ad57b96e..d33fdf5c 100644 --- a/ruoyi-modules/ruoyi-job/build.gradle +++ b/ruoyi-modules/ruoyi-job/build.gradle @@ -14,13 +14,18 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } description = "ruoyi-modules-job" apply from: "../../build-config/build-all.gradle" apply from: "../../build-config/build-base.gradle" -apply from: "../../build-config/build-boot-jar.gradle" +if (buildProduct) { + apply from: "../../build-config/build-publish.gradle" +} else { + apply from: "../../build-config/build-boot-jar.gradle" +} dependencies { @@ -31,11 +36,13 @@ dependencies { implementation "com.ruoyi:ruoyi-common-core:${devVersion}" - implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1" implementation "org.quartz-scheduler:quartz:2.3.2" + implementation "org.apache.commons:commons-lang3:3.11" implementation "io.springfox:springfox-swagger-ui:2.9.2" - implementation "com.github.tobato:fastdfs-client:1.27.2" implementation "commons-fileupload:commons-fileupload:1.4" + implementation "com.github.tobato:fastdfs-client:1.27.2" + implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1" + implementation "org.springframework:spring-context-support:5.3.2" implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}" implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}" diff --git a/ruoyi-modules/ruoyi-job/publish.sh b/ruoyi-modules/ruoyi-job/publish.sh new file mode 120000 index 00000000..81b8b74d --- /dev/null +++ b/ruoyi-modules/ruoyi-job/publish.sh @@ -0,0 +1 @@ +../../build-config/publish.sh \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/build.gradle b/ruoyi-modules/ruoyi-system/build.gradle index 15ee0ad9..60278b4c 100644 --- a/ruoyi-modules/ruoyi-system/build.gradle +++ b/ruoyi-modules/ruoyi-system/build.gradle @@ -14,12 +14,18 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } apply from: "../../build-config/build-all.gradle" apply from: "../../build-config/build-base.gradle" -apply from: "../../build-config/build-boot-jar.gradle" + +if (buildProduct) { + apply from: "../../build-config/build-publish.gradle" +} else { + apply from: "../../build-config/build-boot-jar.gradle" +} description = "ruoyi-modules-system" dependencies {