config host

secondev-ht-njwebservice/src/main/java/com/weaver/custom/configcenter/htsysjcmtConfig.java

@@ -0,0 +1,18 @@
+package com.weaver.custom.configcenter;
+
+import com.weaver.framework.client.annotation.WeaverConfigCenter;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@WeaverConfigCenter(sources = {
+        @WeaverConfigCenter.ConfigProperty(
+                dataId = "weaver-secondev-htsysjcmt.properties",
+                group = "DEFAULT_GROUP",
+                refresh = "true")
+})
+public class htsysjcmtConfig {
+
+
+}

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/AutoCreateWorkflowService.java

@@ -54,7 +54,6 @@ public class AutoCreateWorkflowService {
     @Autowired
     private ConfigProp configProp;
 
-    private static final String HOST = "http://10.6.24.64:20600/papi/openapi";
 
 
     public String createWorkflow(String loginName, String password, String workflowId, String creator, String requestLevel, String mainTable , String[] detailTables){
@@ -394,8 +393,12 @@ public class AutoCreateWorkflowService {
         }
         log.error("access_token信息："+token);
 
+        String HOST= configProp.getOaapisdkurl();
+
         String url = HOST + "/api/workflow/core/paService/v1/doCreateRequest?access_token=" + token;
 
+        log.error("url  : " +  url);
+
         JSONObject otherParams =new JSONObject();
         otherParams.put("isnextflow",1);
         param.put("otherParams",otherParams);

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/prop/ConfigProp.java

@@ -23,5 +23,8 @@ public class ConfigProp {
     @Value("${htportaloaUrl-pc_url}")
     private String htportaloaUrl_pc_url;
 
+    @Value("${oaapisdkurl}")
+    private String oaapisdkurl;
+
 
 }

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/util/AccessTokenUtil.java

@@ -32,39 +32,39 @@ public class AccessTokenUtil {
     //private static String APP_SECRET = "9aa17e9391d8fdf4be44f78e2a26be30";
     private static String APP_SECRET = "3e86b82ada2b72fdd3d7929d5623b04f";
 
-    private static String HOST = "http://10.6.24.64:20600/papi/openapi";
+//    private static String HOST = "http://10.6.24.64:20600/papi/openapi";
 
     /**
      * 获取AccessToken
      * @return
      * @throws Exception
      */
-    public static String getToken() throws Exception {
+//    public static String getToken() throws Exception {
-
+//
-        // 获取code
+//        // 获取code
-        String codeUrl = HOST + "/oauth2/authorize?corpid=" + CORP_ID + "&response_type=code&state=a21";
+//        String codeUrl = HOST + "/oauth2/authorize?corpid=" + CORP_ID + "&response_type=code&state=a21";
-        String codeResponse = HttpUtil.get(codeUrl);
+//        String codeResponse = HttpUtil.get(codeUrl);
-        System.out.println(codeResponse);
+//        System.out.println(codeResponse);
-
+//
-        JSONObject jsonObject = JSONObject.parseObject(codeResponse);
+//        JSONObject jsonObject = JSONObject.parseObject(codeResponse);
-        Object errcode = jsonObject.get("errcode");
+//        Object errcode = jsonObject.get("errcode");
-        Object code = jsonObject.get("code");
+//        Object code = jsonObject.get("code");
-        log.error("本次获取code值"+code+"==> errcode"+errcode);
+//        log.error("本次获取code值"+code+"==> errcode"+errcode);
-
+//
-        // 根据code 获取token。
+//        // 根据code 获取token。
-        String tokenUrl = HOST + "/oauth2/access_token";
+//        String tokenUrl = HOST + "/oauth2/access_token";
-        Map<String, Object> tokanParam = new HashMap<>(4);
+//        Map<String, Object> tokanParam = new HashMap<>(4);
-        tokanParam.put("app_key", APP_KEY);
+//        tokanParam.put("app_key", APP_KEY);
-        tokanParam.put("app_secret", APP_SECRET);
+//        tokanParam.put("app_secret", APP_SECRET);
-        tokanParam.put("grant_type", "authorization_code");
+//        tokanParam.put("grant_type", "authorization_code");
-        tokanParam.put("code", code);
+//        tokanParam.put("code", code);
-
+//
-        String tokenResponse = HttpUtil.post(tokenUrl, tokanParam);
+//        String tokenResponse = HttpUtil.post(tokenUrl, tokanParam);
-        log.error("tokenResponse" + tokenResponse);
+//        log.error("tokenResponse" + tokenResponse);
-
+//
-        JSONObject tokenResponseObj = JSONObject.parseObject(tokenResponse);
+//        JSONObject tokenResponseObj = JSONObject.parseObject(tokenResponse);
-        return Optional.ofNullable(tokenResponseObj.get("accessToken")).map(Object::toString).orElse(new String());
+//        return Optional.ofNullable(tokenResponseObj.get("accessToken")).map(Object::toString).orElse(new String());
-    }
+//    }
 
 
     public static String getAccessToken(String tenantKey) {