Browse Source

金融平台客户端地址增加

hejq 8 years ago
parent
commit
25076c7c9c

+ 2 - 3
src/main/java/com/uas/erp/schedular/financeservice/task/AbstractTask.java

@@ -56,9 +56,8 @@ public class AbstractTask extends AbstractAgent {
      * @return
      */
     private String getApiDomain() {
-//        String key = "test".equals(ContextHolder.getMaster().getMa_env()) ? "api.finance.service.test.url" : "api.finance.service.url";
-//        return settingService.getValue(key);
-        return "http://localhost:8001";
+        String key = "test".equals(ContextHolder.getMaster().getMa_env()) ? "api.finance.service.test.url" : "api.finance.service.url";
+        return settingService.getValue(key);
     }
 
     /**

+ 3 - 3
src/test/java/com/uas/erp/test/ConnectToFinanceTest.java

@@ -23,11 +23,11 @@ import java.util.List;
  *
  * Created by hejq on 2017-12-22.
  */
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = UasSchedulingApplication.class)
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = UasSchedulingApplication.class)
 public class ConnectToFinanceTest extends AbstractTask {
 
-//    @Test
+    @Test
     public void testConnect() {
         Master master = new Master();
         master.setMa_user("UAS");