引入 multi-tenant library 并完成初步测试
diff --git a/payapi/build.gradle b/payapi/build.gradle
index 9dcd2e4..d8f169c 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -14,14 +14,15 @@
println("Build version: $buildVersion")
+
bootJar {
enabled = true
mainClassName = payapiStartClass
- def standalone = ""
- if (rootProject.hasProperty("no-multi-tenant")) {
- standalone = "-stangalone-"
- }
- archiveFileName = "${project.name}${standalone}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
+// def standalone = ""
+// if (rootProject.hasProperty("no-multi-tenant")) {
+// standalone = "-stangalone-"
+//
+ archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
manifest {
attributes("Payapi-Version": buildVersion,
"Payapi-Buildtime": buildTime)
@@ -51,12 +52,11 @@
}
println("Docker image tag : ${imageVersion}")
name "${dockerRegistry}/payapi:${imageVersion}"
- println(jar.archiveFile.get())
- files jar.archiveFile.get()
+ println(bootJar.archiveFile.get())
+ files bootJar.archiveFile.get()
+ buildArgs([BUILD_VERSION: "${buildVersion}"])
}
-docker.dependsOn(jar)
-
configurations {
developmentOnly
runtimeClasspath {
@@ -107,6 +107,7 @@
implementation "com.supwisdom:multi-tenant-core:${multiTenantLibVersion}"
implementation "com.supwisdom:multi-tenant-datasource:${multiTenantLibVersion}"
+ implementation "com.supwisdom:multi-tenant-jwt:${multiTenantLibVersion}"
implementation "org.bitbucket.b_c:jose4j:${jose4jVersion}"
implementation files("libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar")