From 9b9e75733fe6ea9227563c586da19c0ab560e323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BA=91=E5=BF=97?= <yunzhic@gridnt.com>
Date: Wed, 23 Dec 2020 16:06:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build-config/build-base.gradle        | 4 +++-
 ruoyi-auth/build.gradle               | 9 ++++++---
 ruoyi-modules/ruoyi-file/build.gradle | 3 ++-
 ruoyi-modules/ruoyi-gen/build.gradle  | 8 +++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

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 {