diff --git a/build_java.sh b/build_java.sh index 7a6d0876..78a55138 100755 --- a/build_java.sh +++ b/build_java.sh @@ -4,9 +4,17 @@ for gfile in $(find . -name "build.gradle") do - - gradle -b $gfile clean build -x test -DbuildProduct=true - echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m" + if [[ $1='cl' ]];then + + gradle -b $gfile clean; + echo -e "\033[32m----------------- $gfile 模块 清理 成功 ---------------------- \033[0m" + else + gradle -b $gfile clean build -x test -DbuildProduct=true -DreleaseVersion=$1 + echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m" + fi + + done + diff --git a/ruoyi-api/ruoyi-api-system/build.gradle b/ruoyi-api/ruoyi-api-system/build.gradle index ee70df00..393ea57f 100644 --- a/ruoyi-api/ruoyi-api-system/build.gradle +++ b/ruoyi-api/ruoyi-api-system/build.gradle @@ -20,7 +20,8 @@ buildscript { ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } diff --git a/ruoyi-common/build.gradle b/ruoyi-common/build.gradle index f0e46d90..2175e92b 100644 --- a/ruoyi-common/build.gradle +++ b/ruoyi-common/build.gradle @@ -17,8 +17,8 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" -// devVersion = "2.3.0" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } apply from: "../build-config/build-all.gradle" diff --git a/ruoyi-common/ruoyi-common-core/publish.sh b/ruoyi-common/ruoyi-common-core/publish.sh new file mode 120000 index 00000000..81b8b74d --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/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 3bf7f505..9d229933 100644 --- a/ruoyi-modules/ruoyi-file/build.gradle +++ b/ruoyi-modules/ruoyi-file/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" implementation "com.ruoyi:ruoyi-api-system:${devVersion}" - + implementation "io.minio:minio:8.0.3" 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"