Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/configuration/BigModelInvokeApi.java

@@ -10,8 +10,8 @@ import org.springframework.stereotype.Component;
  */
 @Data
 @Component
-@ConfigurationProperties(prefix = "fdp.url")
-public class BigModelInvokeUrl {
+@ConfigurationProperties(prefix = "gglm.api")
+public class BigModelInvokeApi {
 
     private String assistantAsk;
 

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java

@@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.google.common.collect.Lists;
 import com.hnac.hzims.bigmodel.business.feign.IAuthClient;
-import com.hnac.hzims.bigmodel.business.service.AuthenticationService;
-import com.hnac.hzims.bigmodel.configuration.BigModelInvokeUrl;
+import com.hnac.hzims.bigmodel.configuration.BigModelInvokeApi;
 import com.hnac.hzims.bigmodel.interactive.service.IHznlmInvokeService;
 import com.hnac.hzims.bigmodel.interactive.vo.AnswerVO;
 import com.hnac.hzims.bigmodel.manager.SessionRedisManager;
@@ -15,10 +14,7 @@ import com.hnac.hzims.bigmodel.websocket.sessionManager.InteractiveSessionManage
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.system.dto.DeptStationDTO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -36,12 +32,12 @@ import java.util.Map;
 @Slf4j
 public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
 
-    private final BigModelInvokeUrl bigModelInvokeUrl;
+    private final BigModelInvokeApi bigModelInvokeApi;
     private final SessionRedisManager sessionRedisManager;
     private final IAuthClient authClient;
 
-    @Value("${fdp.host}")
-    private String fdpHost;
+    @Value("${gglm.url}")
+    private String gglmUrl;
 
     @Override
     public void ask(String question, String sessionId, String userId) {
@@ -51,13 +47,13 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         params.put("query",question);
         Map<String, String[]> authDataIds = this.getAuthDataIds(userId);
         params.putAll(authDataIds);
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantAsk(), params);
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantAsk(), params);
         sessionRedisManager.addSessionId(sessionId);
     }
 
     @Override
     public void ask(QuestionDTO question) {
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantAsk(), JSON.toJSONString(question));
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantAsk(), JSON.toJSONString(question));
         sessionRedisManager.addSessionId(question.getChatId());
     }
 
@@ -69,14 +65,14 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         params.put("extra",extra);
         Map<String, String[]> authDataIds = this.getAuthDataIds(userId);
         params.putAll(authDataIds);
-        log.info("调用大模型接口：{},传参为：{}",fdpHost + bigModelInvokeUrl.getAssistantSpecialAsk(),JSON.toJSONString(params));
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantSpecialAsk(), params);
+        log.info("调用大模型接口：{},传参为：{}",gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(),JSON.toJSONString(params));
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(), params);
         sessionRedisManager.addSessionId(sessionId);
     }
 
     @Override
     public void specialAsk(QuestionDTO question) {
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantSpecialAsk(), JSON.toJSONString(question));
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(), JSON.toJSONString(question));
         sessionRedisManager.addSessionId(question.getChatId());
     }
 
@@ -89,13 +85,13 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         params.put("knowledge", knowledge);
         Map<String, String[]> authDataIds = this.getAuthDataIds(userId);
         params.putAll(authDataIds);
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantKnowledgeAsk(), params);
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantKnowledgeAsk(), params);
         sessionRedisManager.addSessionId(sessionId);
     }
 
     @Override
     public void knowledgeAsk(QuestionDTO question) {
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantKnowledgeAsk(), JSON.toJSONString(question));
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantKnowledgeAsk(), JSON.toJSONString(question));
         sessionRedisManager.addSessionId(question.getChatId());
     }
 
@@ -111,14 +107,14 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
     public void askAbort(String sessionId) {
         Map<String,Object> params = new HashMap<>();
         params.put("chat_id",sessionId);
-        RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAskAbort(), params);
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAskAbort(), params);
         sessionRedisManager.removeSessionId(sessionId);
     }
 
     @Override
     public List hotQuestions() {
         try {
-            return RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getHotQuestion(), null, new TypeReference<List<String>>(){});
+            return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getHotQuestion(), null, new TypeReference<List<String>>(){});
         }
         catch (Exception e) {
             log.error("An error occurred",e);
@@ -130,7 +126,7 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
     public List<AnswerVO> getAnswerBySessionIds(String sessionIds) {
         Map<String,Object> params = new HashMap<>();
         params.put("chat_ids",Func.toStrList(",",sessionIds).toArray());
-        return RequestClientUtil.postCall(fdpHost + bigModelInvokeUrl.getAssistantStatus(), params, new TypeReference<List<AnswerVO>>(){});
+        return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantStatus(), params, new TypeReference<List<AnswerVO>>(){});
     }
 
     private Map<String,String[]> getAuthDataIds(String userId) {

hzims-service/hzims-big-model/src/main/resources/template/template.yml

@@ -47,18 +47,18 @@ spring:
           username: root
           password: 123
 
-fdp:
-  host: http://192.168.60.16:9997
-  url:
-    assistantAsk: /qa/assistant_ask
-    assistantStatus: /qa/assistant_status
-    askAbort: /qa/ask_abort
-    updateVideo: /kn/update_video
-    updateCanvas: /kn/update_canvas
-    updateFault: /kn/update_fault
-    assistantSpecialAsk: /qa/assistant_special_ask
-    assistantKnowledgeAsk: /qa/assistant_knowledge_ask
-    hotQuestion: /qa/question_recommand
+gglm:
+  url: "http://${gglm.host}:${gglm.port}"
+  api:
+    assistantAsk: "/qa/assistant_ask"
+    assistantStatus: "/qa/assistant_status"
+    askAbort: "/qa/ask_abort"
+    updateVideo: "/kn/update_video"
+    updateCanvas: "/kn/update_canvas"
+    updateFault: "/kn/update_fault"
+    assistantSpecialAsk: "/qa/assistant_special_ask"
+    assistantKnowledgeAsk: "/qa/assistant_knowledge_ask"
+    hotQuestion: "/qa/question_recommand"
 
 xxl:
   job: