lyhzzz 2 سال پیش
والد
کامیت
b41eb79cf0

+ 3 - 0
src/main/java/com/fdkankan/ucenter/UserCenterApplication.java

@@ -24,6 +24,8 @@ public class UserCenterApplication implements CommandLineRunner {
     private String bucket;
     @Value("${fyun.type}")
     private String uploadType;
+    @Value("${spring.profiles.active:local}")
+    private String activeType;
     @Value("${main.url}")
     private String mainUrl;
 
@@ -35,6 +37,7 @@ public class UserCenterApplication implements CommandLineRunner {
     public void run(String... args) throws Exception {
         NacosProperty.bucket = bucket;
         NacosProperty.uploadType = uploadType;
+        NacosProperty.activeType = activeType;
         NacosProperty.setMainUrl(mainUrl);
     }
 }

+ 1 - 0
src/main/java/com/fdkankan/ucenter/common/constants/NacosProperty.java

@@ -9,6 +9,7 @@ public class NacosProperty {
 
     public static String bucket;
     public static String uploadType;
+    public static String activeType;
     private static String mainUrl;
 
     public static String getMainUrl() {

+ 1 - 1
src/main/java/com/fdkankan/ucenter/pay/alipay/AlipayDefaultConfig.java

@@ -35,7 +35,7 @@ public class AlipayDefaultConfig extends AlipayConfig {
     }
 
     public String description() {
-        if("local".equals(NacosProperty.uploadType)){
+        if("local-kj".equals(NacosProperty.activeType)){
             return "local-running";
         }
         StringBuilder sb = new StringBuilder("\nConfigs{");

+ 3 - 3
src/main/java/com/fdkankan/ucenter/pay/paypal/sdk/PayPalConfig.java

@@ -23,7 +23,7 @@ public abstract class PayPalConfig {
 
     @Bean
     public Map<String, String> paypalSdkConfig(){
-        if("local".equals(NacosProperty.uploadType)){
+        if("local-kj".equals(NacosProperty.activeType)){
             return null;
         }
         Map<String, String> sdkConfig = new HashMap<>();
@@ -33,7 +33,7 @@ public abstract class PayPalConfig {
 
     @Bean
     public OAuthTokenCredential authTokenCredential(){
-        if("local".equals(NacosProperty.uploadType)){
+        if("local-kj".equals(NacosProperty.activeType)){
             return null;
         }
         return new OAuthTokenCredential(getClientId(), getSecret(), paypalSdkConfig());
@@ -41,7 +41,7 @@ public abstract class PayPalConfig {
 
     @Bean
     public APIContext apiContext() throws PayPalRESTException {
-        if("local".equals(NacosProperty.uploadType)){
+        if("local-kj".equals(NacosProperty.activeType)){
             return null;
         }
         String accessToken = authTokenCredential().getAccessToken();