二维码

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingAccountController.java

@@ -10,7 +10,8 @@ import java.util.Map;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-import com.gic.enterprise.web.config.Config;
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +60,8 @@ public class BillingAccountController {
     private MarketUserApiService marketUserApiService;
     @Autowired
     private AppTokenApiService appTokenApiService;
-    @Autowired
-    private Config config;
+    //@Autowired
+    //private Config config;
 
 
     //private static final String URL = "https://four.gicdev.com";
@@ -280,7 +281,9 @@ public class BillingAccountController {
         ServiceResponse<String> result = marketUserApiService
                 .BindGicEnterprise(Long.valueOf(enterpriseId), null, null, null);
         if (result.isSuccess()) {
-            return RestResponse.success(config.getHost() + "/market/gic" + "?loginKey=" + result.getResult()
+            Config config = ConfigService.getConfig("COMMON.4.0-gic-properties");
+            String url = config.getProperty("service_host", "").replace("gic", "");
+            return RestResponse.success(url + "/market/gic" + "?loginKey=" + result.getResult()
                     + "&enterpriseId=" + enterpriseId);
         }
         return EnterpriseRestResponse.failure(result);