建科统一身份认证平台接入

takai-admin/src/main/resources/application.yml

@@ -204,6 +204,10 @@ jk:
   iamAppid: e971e84b574c40b2
   #Appsecret
   iamAppsecret: 51e7f274f71f4887b25015fc0743e871
+  #clientID
+  iamClientID: e97f94cf93761f4d69e8
+  #clientSecret
+  iamClientSecret: 13845f824b5d9f4f2a58159109aac317263d
   #用户接口url
   iamUserUrl: http://esc.sribs.com.cn:8080/esc-idm/api/v1/account/list
   #部门接口url

takai-common/src/main/java/com/takai/common/config/JkConfig.java

@@ -16,6 +16,10 @@ public class JkConfig {
 
     private String iamAppsecret;
 
+    private String iamClientID;
+
+    private String iamClientSecret;
+
     private String iamUserUrl;
 
     private String iamDeptUrl;

takai-framework/src/main/java/com/takai/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/getToken","/**/sse-invoke","/**/application/list","/bigmodel/api/dialog/**",
+                .antMatchers("/login", "/jk_code_login","/register", "/captchaImage","/getToken","/**/sse-invoke","/**/application/list","/bigmodel/api/dialog/**",
                         "/**/completions", "/**/slice_info/**", "/**/async_result/**", "/**/assistant/**", "/getInfo",
                         "/checkToken", "/**/presets/**", "/**/index/**", "/**/createApplaction/**", "/**/createKnowledge/**",
                         "/**/updateKnowledge/**", "/**/detailKnowledge/**", "/**/delKnowledge/**", "/**/knowledgeList/**",

takai-system/src/main/java/com/takai/system/service/impl/JkApiServiceImpl.java

@@ -205,6 +205,7 @@ public class JkApiServiceImpl implements IJkApiService {
         int page = 1;
         int total = 1;
         while(total >= page){
+
             Request request = buildRequest(url,page);
             // 执行请求并获取响应
             try {
@@ -291,8 +292,8 @@ public class JkApiServiceImpl implements IJkApiService {
                 .addHeader("Authorization", createJkToken())
                 .addHeader("Content-Type", "application/json")
                 .post(body)
-                .url(url).get().build();
-        logger.info("请求head：{}", request.headers().toString());
+                .url(url).build();
+//        logger.info("请求head：{}", request.headers().toString());
 //        logger.info("请求body：{}", request.body().toString());
         return request;
     }
@@ -300,8 +301,8 @@ public class JkApiServiceImpl implements IJkApiService {
     private Request buildTokenRequest(String code) {
         Map<String, Object> requestBodyMap = new HashMap<>();
         requestBodyMap.put(PARAM_GRANT_TYPE, GRANT_TYPE_AC);
-        requestBodyMap.put(PARAM_CLIENT_ID, jkConfig.getIamAppid());
-        requestBodyMap.put(PARAM_CLIENT_SECRET, jkConfig.getIamAppsecret());
+        requestBodyMap.put(PARAM_CLIENT_ID, jkConfig.getIamClientID());
+        requestBodyMap.put(PARAM_CLIENT_SECRET, jkConfig.getIamClientSecret());
         requestBodyMap.put(PARAM_CODE, code);
         // 将 Map 转换为 JSON 字符串
         String requestBodyJson = JSON.toJSONString(requestBodyMap);