Forráskód Böngészése

appId参数优化

S0025136190 1 éve
szülő
commit
b54c5d2fff

+ 3 - 4
takai-admin/src/main/java/com/takai/web/controller/bigmodel/BigModelController.java

@@ -42,13 +42,12 @@ public class BigModelController extends BaseController {
      * 建立sse连接,流式返回,以messageId维度
      * @param response
      * @param request
-     * @param id
      * @return
      * @throws IOException
      */
-    @PostMapping(value = "/model-api/{id}/sse-invoke",produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-    public SseEmitter sseInvoke(HttpServletResponse response, HttpServletRequest request,@PathVariable String id, @RequestBody SseParams sseParams) throws IOException {
-        return bigModelService.sseInvoke(id,sseParams);
+    @PostMapping(value = "/model-api/sse-invoke",produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public SseEmitter sseInvoke(HttpServletResponse response, HttpServletRequest request, @RequestBody SseParams sseParams) throws IOException {
+        return bigModelService.sseInvoke(sseParams);
     }
 
     @GetMapping("/application/list")

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

@@ -54,7 +54,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: prd
   # 文件上传
   servlet:
     multipart:
@@ -86,7 +86,7 @@ spring:
         # 连接池中的最大空闲连接
         max-idle: 8
         # 连接池的最大数据库连接数
-        max-active: 8
+        max-active: 100
         # #连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1ms
 

+ 7 - 0
takai-bigmodel/src/main/java/com/takai/bigmodel/domain/entity/SseParams.java

@@ -29,6 +29,7 @@ public class SseParams {
      */
     private List<PromptObject> prompt;
 
+    private String appId;
     /**
      * ⽤于控制每次返回内容的类型,空或者没有此字段时默认按照json_string
      * 返回
@@ -107,5 +108,11 @@ public class SseParams {
         this.model = model;
     }
 
+    public String getAppId() {
+        return appId;
+    }
 
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
 }

+ 1 - 2
takai-bigmodel/src/main/java/com/takai/bigmodel/service/IBigModelService.java

@@ -42,11 +42,10 @@ public interface IBigModelService
 
     /**
      * sse方式调用智谱接口
-     * @param id
      * @param sseParams
      * @return
      */
-    public SseEmitter sseInvoke(String id, SseParams sseParams);
+    public SseEmitter sseInvoke(SseParams sseParams);
 
     void initZhiPuInfo();
 

+ 2 - 2
takai-bigmodel/src/main/java/com/takai/bigmodel/service/impl/BigModelServiceImpl.java

@@ -84,9 +84,9 @@ public class BigModelServiceImpl implements IBigModelService
     public static final String SYMBOL = "【示意图序号";
 
     @Override
-    public SseEmitter sseInvoke(String id, SseParams sseParams) {
+    public SseEmitter sseInvoke(SseParams sseParams) {
         SseEmitter sseEmitter = new SseEmitter(0L);
-        String url = bigModelConfig.getBaseurl() + bigModelConfig.getSse().replace("{id}",id);
+        String url = bigModelConfig.getBaseurl() + bigModelConfig.getSse().replace("{id}",sseParams.getAppId());
         JSONObject json = new JSONObject();
         json.put("prompt",sseParams.getPrompt());
         json.put("knowledge_ids",sseParams.getKnowledge_ids());

+ 1 - 1
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").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/getToken","/**/sse-invoke","/**/application/list").permitAll()
                 // 静态资源,可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()