approve

easydo-chengfa/src/main/java/easydo/technology/controller/OaController.java

@@ -56,6 +56,8 @@ public class OaController {
     OAService oaService;
     @Value("${PURCHASE.redirectUrl}")
     String redirectUrl;
+    @Value("${PURCHASE.loginUrl}")
+    String loginUrl;
 
     /**
      * 提供给OA登陆地址
@@ -86,7 +88,7 @@ public class OaController {
         }
         // 登录失败 直接跳转到登录页面
         ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("redirect:" + redirectUrl);
+        modelAndView.setViewName("redirect:" + loginUrl);
         return modelAndView;
     }
 

easydo-chengfa/src/main/resources/config/application-dev.yml

@@ -192,6 +192,7 @@ GLD:
 
 PURCHASE:
   redirectUrl: "http://localhost:7801/#/redirect"
+  loginUrl: "http://localhost:7801/"
   purchasePath: "process-form-infor"
   supplierPath: "supplier-evaluation-detail"
   requestUrl: "http://192.168.101.93:8810/purchase/getDetail?"

easydo-chengfa/src/main/resources/config/application-prod.yml

@@ -156,7 +156,7 @@ tenantId_gld_cost: "5600003"
 tenantId_gld_master: "5600003"
 
 OA:
-  host: "http://172.16.1.71:8180"
+  host: "http://172.16.1.71:8080"
   getTokenPath: "/seeyon/rest/token"
   username: "zcxt"
   password: "f87f6334-585d-42dd-95bc-7e7b97c7cfe8"
@@ -190,6 +190,7 @@ GLD:
 
 PURCHASE:
   redirectUrl: "http://218.201.101.181:8800/#/redirect"
+  loginUrl: "http://218.201.101.181:8800/"
   purchasePath: "process-form-view"
   supplierPath: "supplier-evaluation-detail"
   requestUrl: "http://218.201.101.181:8810/purchase/getDetail?"

easydo-chengfa/src/main/resources/config/application-test.yml

@@ -190,6 +190,7 @@ GLD:
 
 PURCHASE:
   redirectUrl: "http://172.16.1.150:8800/#/redirect"
+  loginUrl: "http://172.16.1.150:8800/"
   purchasePath: "process-form-view"
   supplierPath: "supplier-evaluation-detail"
   requestUrl: "http://172.16.1.150:8810/purchase/getDetail?"