From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Wed, 25 Dec 2019 02:03:05 +0000 (+0800)
Subject: 优化
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=307ec57eb7c43632fe86d41d41ddd0d56059cd19;p=epayment%2Ffood_payapi.git

优化
---

diff --git a/Makefile b/Makefile
index 0793a4ce..23e3cdb4 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,9 @@ endif
 build:
 	$(GRADLE) build -x test
 
+build_single:
+	$(GRADLE) -Pno-multi-tenant build -x test
+
 clean:
 	$(GRADLE) clean
 
diff --git a/payapi/build.gradle b/payapi/build.gradle
index 3e3c2eda..9dcd2e48 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -17,6 +17,11 @@ 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')}"
     manifest {
         attributes("Payapi-Version": buildVersion,
                 "Payapi-Buildtime": buildTime)
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/core/MutliTenantDatasourceProviderAdapter.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/MutliTenantDatasourceProviderAdapter.java
index d4629645..5d0d6018 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/framework/core/MutliTenantDatasourceProviderAdapter.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/core/MutliTenantDatasourceProviderAdapter.java
@@ -1,12 +1,12 @@
 package com.supwisdom.dlpay.framework.core;
 
 import com.supwisdom.multitenant.datasource.MultiTenantDataSourceProvider;
-import com.supwisdom.multitenant.datasource.config.MultiTenantDataSourceAutoConfiguration;
+import com.supwisdom.multitenant.datasource.MultiTenantDatasourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ConditionalOnBean({MultiTenantDataSourceAutoConfiguration.class})
+@ConditionalOnBean({MultiTenantDatasourceAutoConfiguration.class})
 public class MutliTenantDatasourceProviderAdapter implements DatabaseAdapter {
   private final MultiTenantDataSourceProvider multiTenantDataSourceProvider;