From f36d725e5566e58438400ce559012908565081af Mon Sep 17 00:00:00 2001
From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Tue, 17 Dec 2019 14:14:50 +0800
Subject: [PATCH] =?utf8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83?=
 =?utf8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 oauth/build.gradle                       | 12 +++---------
 payapi-common/build.gradle               | 19 +++++++++++++++----
 payapi-sdk/build.gradle                  | 13 +++++--------
 payapi/build.gradle                      | 13 ++++---------
 ynrcc-agent/build.gradle                 |  2 +-
 6 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7e5d2a84..75accab2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
diff --git a/oauth/build.gradle b/oauth/build.gradle
index 34967034..2ae2546e 100644
--- a/oauth/build.gradle
+++ b/oauth/build.gradle
@@ -10,25 +10,19 @@ plugins {
 apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 
-def details = versionDetails()
-
 sourceCompatibility = jdkVersion
 def startClass = 'com.supwisdom.oauth.OAuthApplication'
 
-println("Build version: $version")
+println("Build version: $gitVersion")
 
 bootJar {
+    enabled = true
     mainClassName = startClass
     manifest {
-        attributes('oauth-Version': version)
+        attributes('oauth-Version': gitVersion)
     }
 }
 
-jar {
-    baseName = 'oauth'
-}
-
-
 dependencies {
     implementation project(":payapi-common")
 
diff --git a/payapi-common/build.gradle b/payapi-common/build.gradle
index 7ae26c0c..28dc87ab 100644
--- a/payapi-common/build.gradle
+++ b/payapi-common/build.gradle
@@ -4,8 +4,18 @@ plugins {
     id "org.springframework.boot"
 }
 
+jar {
+    enabled = true
+    archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
+    manifest {
+        attributes('Implementation-Title': project.name,
+                'Implementation-Version': buildVersion)
+    }
+}
+println("Build Version: $buildVersion")
 bootJar {
     enabled = false
+
 }
 
 apply from: rootProject.file('gradle/swnx-publish.gradle')
@@ -13,10 +23,8 @@ apply from: rootProject.file('gradle/swnx-publish.gradle')
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            groupId = project.group
-            artifactId = project.name
-            version = version
             from components.java
+            version = buildVersion
         }
     }
 }
@@ -28,4 +36,7 @@ dependencies {
 
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
-}
\ No newline at end of file
+}
+
+
+publish.dependsOn(jar)
\ No newline at end of file
diff --git a/payapi-sdk/build.gradle b/payapi-sdk/build.gradle
index f76dc3a8..ecd78699 100644
--- a/payapi-sdk/build.gradle
+++ b/payapi-sdk/build.gradle
@@ -7,22 +7,19 @@ plugins {
 
 apply plugin: 'io.spring.dependency-management'
 
-def sdkVersion = gitVersion()
-
-
 apply from: rootProject.file('gradle/swnx-publish.gradle')
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            groupId = project.group
-            artifactId = 'payapi-sdk'
-            version = sdkVersion
             from components.java
+            version = buildVersion
         }
     }
 }
 
+println("Build Version: $buildVersion")
+
 bootJar {
     enabled = false
 }
@@ -37,9 +34,9 @@ dependencies {
 
 jar {
     enabled = true
-    baseName = "payapi-sdk"
+    archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
     manifest {
-        attributes('Payapi-SDK-Version': sdkVersion)
+        attributes('Payapi-SDK-Version': buildVersion)
     }
 }
 
diff --git a/payapi/build.gradle b/payapi/build.gradle
index 184dbb53..60c843df 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -9,24 +9,19 @@ plugins {
     id "com.palantir.docker"
 }
 
-payapiVersion = version
 
 def payapiStartClass = "com.supwisdom.dlpay.PayApiApplicationKt"
 
-println("Build version: $payapiVersion")
+println("Build version: $buildVersion")
 
 bootJar {
     mainClassName = payapiStartClass
     manifest {
-        attributes("Payapi-Version": payapiVersion,
+        attributes("Payapi-Version": buildVersion,
                 "Payapi-Buildtime": new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date()))
     }
 }
 
-jar {
-    baseName = "payapi"
-}
-
 compileKotlin {
     kotlinOptions {
         freeCompilerArgs = ["-Xjsr305=strict"]
@@ -50,8 +45,8 @@ docker {
     }
     println("Docker image tag : " + imageVersion)
     name "harbor.supwisdom.com/dali/payapi:" + imageVersion
-    println(jar.archivePath)
-    files jar.archivePath
+    println(jar.archiveFile.get().toString())
+    files jar.archiveFile
 }
 
 docker.dependsOn(jar)
diff --git a/ynrcc-agent/build.gradle b/ynrcc-agent/build.gradle
index 2e612c19..54fab873 100644
--- a/ynrcc-agent/build.gradle
+++ b/ynrcc-agent/build.gradle
@@ -8,7 +8,7 @@ plugins {
 apply plugin: 'java'
 apply plugin: 'io.spring.dependency-management'
 
-def ynrccVersion = version
+def ynrccVersion = buildVersion
 def details = versionDetails()
 
 sourceCompatibility = jdkVersion
-- 
2.17.1