1

src/main/java/com/fdkankan/ucenter/UserCenterApplication.java

@@ -24,8 +24,6 @@ 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;
 
@@ -37,7 +35,6 @@ public class UserCenterApplication implements CommandLineRunner {
     public void run(String... args) throws Exception {
         NacosProperty.bucket = bucket;
         NacosProperty.uploadType = uploadType;
-        NacosProperty.activeType = activeType;
         NacosProperty.setMainUrl(mainUrl);
     }
 }

src/main/java/com/fdkankan/ucenter/common/constants/NacosProperty.java

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

src/main/java/com/fdkankan/ucenter/pay/alipay/AlipayDefaultConfig.java

@@ -29,15 +29,12 @@ public class AlipayDefaultConfig extends AlipayConfig {
     /**
      * PostContruct是spring框架的注解，在方法上加该注解会在项目启动的时候执行该方法，也可以理解为在spring容器初始化的时候执行该方法。
      */
-    @PostConstruct
+    //@PostConstruct
     public void init() {
         log.info(description());
     }
 
     public String description() {
-        if("local-kj".equals(NacosProperty.activeType)){
-            return "local-running";
-        }
         StringBuilder sb = new StringBuilder("\nConfigs{");
         sb.append("支付宝网关: ").append(getGatewayUrl()).append("\n");
         sb.append(", appid: ").append(getAppid()).append("\n");

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

@@ -21,29 +21,20 @@ public abstract class PayPalConfig {
 
     abstract public String getMode();
 
-    @Bean
+    //@Bean
     public Map<String, String> paypalSdkConfig(){
-        if("local-kj".equals(NacosProperty.activeType)){
-            return null;
-        }
         Map<String, String> sdkConfig = new HashMap<>();
         sdkConfig.put("mode", getMode());
         return sdkConfig;
     }
 
-    @Bean
+   // @Bean
     public OAuthTokenCredential authTokenCredential(){
-        if("local-kj".equals(NacosProperty.activeType)){
-            return null;
-        }
         return new OAuthTokenCredential(getClientId(), getSecret(), paypalSdkConfig());
     }
 
-    @Bean
+    //@Bean
     public APIContext apiContext() throws PayPalRESTException {
-        if("local-kj".equals(NacosProperty.activeType)){
-            return null;
-        }
         String accessToken = authTokenCredential().getAccessToken();
         log.info("paypal新的accessToken：" + accessToken);
         APIContext apiContext = new APIContext(accessToken);

src/main/java/com/fdkankan/ucenter/pay/paypal/sdk/PaypalService.java

@@ -25,7 +25,6 @@ import java.util.List;
 @Service
 public class PaypalService {
 
-    @Autowired
     private APIContext apiContext;
     @Autowired
     private PayPalDefaultConfig config;