diff --git a/build-config/build-base.gradle b/build-config/build-base.gradle index 71eacd2c..cb22099d 100644 --- a/build-config/build-base.gradle +++ b/build-config/build-base.gradle @@ -53,7 +53,9 @@ dependencies { jar { // 排除掉模块调试的资源文件, 启动类. - excludes = ['*.yml','logback.xml'] + excludes = ['*.yml','logback.xml', + 'com/ruoyi/*/RuoYi*Application*' + ] manifest { attributes "releaseVersion": version + "-" + getGitVersion() diff --git a/ruoyi-auth/build.gradle b/ruoyi-auth/build.gradle index 10b28617..0d6cee02 100644 --- a/ruoyi-auth/build.gradle +++ b/ruoyi-auth/build.gradle @@ -14,14 +14,17 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } description = "ruoyi-api-system" apply from: "../build-config/build-all.gradle" apply from: "../build-config/build-base.gradle" -apply from: "../build-config/build-boot-jar.gradle" - +apply from: "../build-config/build-publish.gradle" +if (!buildProduct) { + apply from: "../build-config/build-boot-jar.gradle" +} dependencies { diff --git a/ruoyi-modules/ruoyi-file/build.gradle b/ruoyi-modules/ruoyi-file/build.gradle index 9d229933..aec78625 100644 --- a/ruoyi-modules/ruoyi-file/build.gradle +++ b/ruoyi-modules/ruoyi-file/build.gradle @@ -14,7 +14,8 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } description = "ruoyi-modules-file" diff --git a/ruoyi-modules/ruoyi-gen/build.gradle b/ruoyi-modules/ruoyi-gen/build.gradle index 06e89164..b3507255 100644 --- a/ruoyi-modules/ruoyi-gen/build.gradle +++ b/ruoyi-modules/ruoyi-gen/build.gradle @@ -14,13 +14,15 @@ buildscript { } ext { - devVersion = "dev-9-SNAPSHOT" + devVersion = System.getProperty("devVersion") ? System.getProperty("devVersion") + : "dev-9-SNAPSHOT" } description = "ruoyi-modules-gen" 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-boot-jar.gradle" +} dependencies {