Просмотр исходного кода

技淘百问本地后台版开发

anderx лет назад: 2
Родитель
Сommit
750edbb91a

+ 1 - 4
src/main/java/com/goafanti/baiduAI/BaiduChatErrorEnums.java

@@ -1,7 +1,4 @@
-package com.goafanti.baiduAI;
-
-import com.goafanti.common.enums.AchievementAuditStatus;
-import org.apache.commons.lang3.StringUtils;
+package com.goafanti.ChatAI;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/InputSendChat.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/InputsendGLM.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/Messages.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 public class Messages {
     /**

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/OutChatER.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 public class OutChatER extends OutSendChat{
     private Integer error_code;

+ 4 - 0
src/main/java/com/goafanti/ChatAI/bo/OutSendChat.java

@@ -0,0 +1,4 @@
+package com.goafanti.ChatAI.bo;
+
+public class OutSendChat {
+}

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/OutSendChatOK.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 public class OutSendChatOK extends  OutSendChat {
     private String id;

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/SseEventBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/SseMap.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 
 import java.util.Map;

+ 1 - 1
src/main/java/com/goafanti/baiduAI/bo/SseResult.java

@@ -1,4 +1,4 @@
-package com.goafanti.baiduAI.bo;
+package com.goafanti.ChatAI.bo;
 
 import com.goafanti.common.bo.SseEmitterUTF8;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

+ 7 - 17
src/main/java/com/goafanti/baiduAI/controller/BaiduAiController.java

@@ -1,33 +1,23 @@
-package com.goafanti.baiduAI.controller;
+package com.goafanti.ChatAI.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.goafanti.baiduAI.bo.*;
-import com.goafanti.baiduAI.service.BaiduAiService;
-import com.goafanti.common.bo.Result;
+import com.goafanti.ChatAI.bo.*;
+import com.goafanti.ChatAI.service.ChatAiService;
 import com.goafanti.common.bo.SseEmitterUTF8;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.BaseController;
-import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.AftUser;
-import com.goafanti.common.utils.IpUtils;
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.shiro.token.TokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
 
 @RestController
 @RequestMapping(value = "/chat")
-public class BaiduAiController {
+public class ChatAiController {
 
     @Autowired
-    private BaiduAiService baiduAiService;
+    private ChatAiService chatAiService;
 
     @RequestMapping(value = "/send")
     public Object sendChat(@RequestBody InputSendChat in){
@@ -35,12 +25,12 @@ public class BaiduAiController {
             in.setUserId(UUID.randomUUID().toString());
             in.setStream(true);
         }
-        return baiduAiService.sendChat(in);
+        return chatAiService.sendChat(in);
     }
 
     @RequestMapping(value = "/sendGLM")
     public Object sendGLM(@RequestBody InputsendGLM in){
-        return baiduAiService.sendGLM(in);
+        return chatAiService.sendGLM(in);
     }
 
 

+ 4 - 4
src/main/java/com/goafanti/baiduAI/service/BaiduAiService.java

@@ -1,13 +1,13 @@
-package com.goafanti.baiduAI.service;
+package com.goafanti.ChatAI.service;
 
-import com.goafanti.baiduAI.bo.InputSendChat;
-import com.goafanti.baiduAI.bo.InputsendGLM;
+import com.goafanti.ChatAI.bo.InputSendChat;
+import com.goafanti.ChatAI.bo.InputsendGLM;
 import com.goafanti.common.bo.SseEmitterUTF8;
 import com.goafanti.common.model.ErnieBotCommon;
 
 import java.util.List;
 
-public interface BaiduAiService {
+public interface ChatAiService {
 
 
     SseEmitterUTF8 sendChat(InputSendChat in);

+ 4 - 7
src/main/java/com/goafanti/baiduAI/service/impl/BaiduAiServiceImpl.java

@@ -1,16 +1,13 @@
-package com.goafanti.baiduAI.service.impl;
+package com.goafanti.ChatAI.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.goafanti.baiduAI.BaiduChatErrorEnums;
-import com.goafanti.baiduAI.bo.*;
-import com.goafanti.baiduAI.service.BaiduAiService;
+import com.goafanti.ChatAI.bo.*;
+import com.goafanti.ChatAI.service.ChatAiService;
 import com.goafanti.common.bo.SseEmitterUTF8;
 import com.goafanti.common.dao.ErnieBotCommonDao;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.ErnieBotCommon;
 import com.goafanti.common.utils.*;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
-import com.goafanti.core.shiro.cache.ShiroRedisCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +15,7 @@ import java.io.IOException;
 import java.util.List;
 
 @Service
-public class BaiduAiServiceImpl implements BaiduAiService {
+public class ChatAiServiceImpl implements ChatAiService {
 
 
     @Autowired

+ 0 - 4
src/main/java/com/goafanti/baiduAI/bo/OutSendChat.java

@@ -1,4 +0,0 @@
-package com.goafanti.baiduAI.bo;
-
-public class OutSendChat {
-}

+ 3 - 4
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -11,8 +11,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import com.goafanti.baiduAI.service.BaiduAiService;
-import com.goafanti.common.dao.ErnieBotCommonDao;
+import com.goafanti.ChatAI.service.ChatAiService;
 import com.goafanti.common.model.*;
 import com.goafanti.news.bo.InputJtNews;
 import com.goafanti.news.bo.OutJtNews;
@@ -114,7 +113,7 @@ public class WebpageController extends BaseController {
 	private EventPlanningService eventPlanningService;
 
 	@Resource
-	private BaiduAiService baiduAiService;
+	private ChatAiService chatAiService;
 
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
@@ -1618,7 +1617,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping("/portal/answers")
 	public ModelAndView answers(ModelAndView modelAndView){
 		modelAndView.setViewName("/portal/answers");
-		List<ErnieBotCommon> list = baiduAiService.selectErnieBotCommonAll(6);
+		List<ErnieBotCommon> list = chatAiService.selectErnieBotCommonAll(6);
 		modelAndView.addObject("list",list);
 		return modelAndView;
 	}

+ 0 - 13
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -1,21 +1,8 @@
 package com.goafanti.common.utils;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.goafanti.baiduAI.bo.OutSendChatOK;
-import com.goafanti.baiduAI.bo.SseMap;
-import com.goafanti.baiduAI.bo.SseResult;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-
 @Component
 @Async
 public class AsyncUtils {

+ 2 - 2
src/main/java/com/goafanti/common/utils/BaiduChatUtils.java

@@ -2,8 +2,8 @@ package com.goafanti.common.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.goafanti.baiduAI.BaiduChatErrorEnums;
-import com.goafanti.baiduAI.bo.*;
+import com.goafanti.ChatAI.BaiduChatErrorEnums;
+import com.goafanti.ChatAI.bo.*;
 import com.goafanti.common.error.BusinessException;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 11
src/main/java/com/goafanti/common/utils/HttpUtils.java

@@ -2,11 +2,6 @@ package com.goafanti.common.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.goafanti.baiduAI.bo.InputSendChat;
-import com.goafanti.baiduAI.bo.Messages;
-import com.goafanti.common.error.BusinessException;
-import com.plexpt.chatgpt.listener.SseStreamListener;
-import okhttp3.*;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.ParseException;
@@ -17,17 +12,11 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import javax.crypto.SecretKey;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 @Component
 public class HttpUtils {

+ 5 - 6
src/main/java/com/goafanti/common/utils/SseEmitterUtils.java

@@ -2,12 +2,11 @@ package com.goafanti.common.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.goafanti.baiduAI.BaiduChatErrorEnums;
-import com.goafanti.baiduAI.bo.InputsendGLM;
-import com.goafanti.baiduAI.bo.OutChatER;
-import com.goafanti.baiduAI.bo.SseMap;
-import com.goafanti.baiduAI.bo.SseResult;
-import com.goafanti.common.bo.SseEmitterUTF8;
+import com.goafanti.ChatAI.BaiduChatErrorEnums;
+import com.goafanti.ChatAI.bo.InputsendGLM;
+import com.goafanti.ChatAI.bo.OutChatER;
+import com.goafanti.ChatAI.bo.SseMap;
+import com.goafanti.ChatAI.bo.SseResult;
 
 import java.io.*;
 import java.net.HttpURLConnection;

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -39,7 +39,7 @@ app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.11
-portal.host=//ss.jishutao.com/portal/2.2.22
+#portal.host=//ss.jishutao.com/portal/2.2.22
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
@@ -47,7 +47,7 @@ skjt.host=//ss.jishutao.com/skjt/1.3
 #static.host=//172.16.1.187/client/1.2.8
 #static.host=//172.16.0.255:3000/jitao/client/1.2.9
 #portal.host=//172.16.0.255:3000/jitao/portal/1.2.18
-#portal.host=//172.16.1.187/portal/2.2.22
+portal.host=//172.16.1.187/portal/2.2.22
 
 avatar.host=//ss.jishutao.com
 avatar.upload.host=//ss.jishutao.com/upload