From e4051cb970180795ff67c46223eb0eeff83f68a5 Mon Sep 17 00:00:00 2001 From: zhaoyuhang <1045078399@qq.com> Date: Sat, 1 Jul 2023 17:43:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96chatAI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallchat-common/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-common/src/main/resources/application.yml index 2df7f5b..5fdfbdd 100644 --- a/mallchat-common/src/main/resources/application.yml +++ b/mallchat-common/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring: # 连接超时时间 timeout: 1800000 # # 设置密码 -# password: ${mallchat.redis.password} + password: ${mallchat.redis.password} lettuce: pool: # 最大阻塞等待时间，负数表示没有限制 From 6dd7b21b39f92d54a4fa4cc1ab522d5b28442788 Mon Sep 17 00:00:00 2001 From: zhaoyuhang <1045078399@qq.com> Date: Sun, 2 Jul 2023 23:34:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallchat-common/src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-common/src/main/resources/application.yml index 6f13a61..270d74f 100644 --- a/mallchat-common/src/main/resources/application.yml +++ b/mallchat-common/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring: # 连接超时时间 timeout: 1800000 # # 设置密码 -# password: ${mallchat.redis.password} + password: ${mallchat.redis.password} lettuce: pool: # 最大阻塞等待时间，负数表示没有限制 @@ -67,9 +67,9 @@ chatai: chatgpt: use: true AIUserId: 10452 - key: xxxxx + key: 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 chatglm2: use: true - url: xxxxx + url: http://vastmiao.natapp1.cc minute: 3 # 每个用户每3分钟可以请求一次 - AIUserId: 10451 + From d8e2168b40f37e6d4f08559227dd7698b97c6bea Mon Sep 17 00:00:00 2001 From: zhaoyuhang <1045078399@qq.com> Date: Sun, 2 Jul 2023 23:43:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-pro.properties | 24 ++++++++++++------- .../resources/application-test.properties | 24 ++++++++++++------- .../src/main/resources/application.yml | 17 ++++++------- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/mallchat-common/src/main/resources/application-pro.properties b/mallchat-common/src/main/resources/application-pro.properties index 3b71009..e847f8c 100644 --- a/mallchat-common/src/main/resources/application-pro.properties +++ b/mallchat-common/src/main/resources/application-pro.properties @@ -1,28 +1,36 @@ -#todo 记得把这些配置信息补充了 -##################mysql配置################## +#todo ???????????? +##################mysql??################## mallchat.mysql.ip=127.0.0.1 mallchat.mysql.port=3306 mallchat.mysql.db=mallchat mallchat.mysql.username=root mallchat.mysql.password=123456 -##################redis配置################## +##################redis??################## mallchat.redis.host=127.0.0.1 mallchat.redis.port=6379 mallchat.redis.password=123456 ##################jwt################## mallchat.jwt.secret=dsfsdfsdfsdfsd -##################微信公众号信息################## +##################???????################## mallchat.wx.callback=http://127.0.0.1:8080 mallchat.wx.appId=appid mallchat.wx.secret=380bfc1c9147fdsf4sf07 -# 接口配置里的Token值 +# ??????Token? mallchat.wx.token=sdfsf -# 接口配置里的EncodingAESKey值 +# ??????EncodingAESKey? mallchat.wx.aesKey=sha1 -##################OSS配置################## +##################OSS??################## oss.enabled=true oss.type=minio oss.endpoint=http://localhost:9000 oss.access-key=BEZ213 oss.secret-key=Ii4vCMIXuFfds1EZ8e7RXI2342342kV -oss.bucketName=default \ No newline at end of file +oss.bucketName=default +##################gpt??################## +mallchat.chatgpt.use=false +mallchat.chatgpt.uid=10001 +mallchat.chatgpt.key=sk-wvWM0xGcxFfsddfsgxixbXK5tHovM +mallchat.chatgpt.proxyUrl=https://123.cc +mallchat.chatglm2.use=false +mallchat.chatglm2.url=http://v32134.cc +mallchat.chatglm2.uid=10002 \ No newline at end of file diff --git a/mallchat-common/src/main/resources/application-test.properties b/mallchat-common/src/main/resources/application-test.properties index 45e7793..fb572d2 100644 --- a/mallchat-common/src/main/resources/application-test.properties +++ b/mallchat-common/src/main/resources/application-test.properties @@ -1,28 +1,36 @@ -#todo 记得把这些配置信息补充了 -##################mysql配置################## +#todo ???????????? +##################mysql??################## mallchat.mysql.ip=127.0.0.1 mallchat.mysql.port=3306 mallchat.mysql.db=mallchat mallchat.mysql.username=root mallchat.mysql.password=123456 -##################redis配置################## +##################redis??################## mallchat.redis.host=127.0.0.1 mallchat.redis.port=6379 mallchat.redis.password=123456 ##################jwt################## mallchat.jwt.secret=dsfsdfsdfsdfsd -##################微信公众号信息################## +##################???????################## mallchat.wx.callback=http://127.0.0.1:8080 mallchat.wx.appId=appid mallchat.wx.secret=380bfc1c9147fdsf4sf07 -# 接口配置里的Token值 +# ??????Token? mallchat.wx.token=sdfsf -# 接口配置里的EncodingAESKey值 +# ??????EncodingAESKey? mallchat.wx.aesKey=sha1 -##################OSS配置################## +##################OSS??################## oss.enabled=true oss.type=minio oss.endpoint=http://localhost:9000 oss.access-key=BEZ213 oss.secret-key=Ii4vCMIXuFe241dsfEZ8e7RXI2342342kV -oss.bucketName=default \ No newline at end of file +oss.bucketName=default +##################gpt??################## +mallchat.chatgpt.use=false +mallchat.chatgpt.uid=10001 +mallchat.chatgpt.key=sk-wvWM0xGcxFfsddfsgxixbXK5tHovM +mallchat.chatgpt.proxyUrl=https://123.cc +mallchat.chatglm2.use=false +mallchat.chatglm2.url=http://v32134.cc +mallchat.chatglm2.uid=10002 \ No newline at end of file diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-common/src/main/resources/application.yml index 270d74f..cb9bc48 100644 --- a/mallchat-common/src/main/resources/application.yml +++ b/mallchat-common/src/main/resources/application.yml @@ -12,7 +12,7 @@ mybatis-plus: spring: profiles: #运行的环境 - active: test + active: my-prod application: name: mallchat datasource: @@ -37,7 +37,7 @@ spring: database: 0 # 连接超时时间 timeout: 1800000 -# # 设置密码 + # 设置密码 password: ${mallchat.redis.password} lettuce: pool: @@ -65,11 +65,12 @@ wx: aesKey: ${mallchat.wx.aesKey} # 接口配置里的EncodingAESKey值 chatai: chatgpt: - use: true - AIUserId: 10452 - key: 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 + use: ${mallchat.chatgpt.use} + AIUserId: ${mallchat.chatgpt.uid} + key: ${mallchat.chatgpt.key} + proxyUrl: ${mallchat.chatgpt.proxyUrl} chatglm2: - use: true - url: http://vastmiao.natapp1.cc + use: ${mallchat.chatglm2.use} + url: ${mallchat.chatglm2.url} minute: 3 # 每个用户每3分钟可以请求一次 - + AIUserId: ${mallchat.chatglm2.uid} \ No newline at end of file From dedf13f7271a231f2682a91716a8451441902b5e Mon Sep 17 00:00:00 2001 From: zhaoyuhang <1045078399@qq.com> Date: Sun, 2 Jul 2023 23:45:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-pro.properties | 16 ++++++++-------- .../main/resources/application-test.properties | 16 ++++++++-------- .../src/main/resources/application.yml | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mallchat-common/src/main/resources/application-pro.properties b/mallchat-common/src/main/resources/application-pro.properties index e847f8c..c6a31b5 100644 --- a/mallchat-common/src/main/resources/application-pro.properties +++ b/mallchat-common/src/main/resources/application-pro.properties @@ -1,32 +1,32 @@ -#todo ???????????? -##################mysql??################## +#todo 记得把这些配置信息补充了 +##################mysql配置################## mallchat.mysql.ip=127.0.0.1 mallchat.mysql.port=3306 mallchat.mysql.db=mallchat mallchat.mysql.username=root mallchat.mysql.password=123456 -##################redis??################## +##################redis配置################## mallchat.redis.host=127.0.0.1 mallchat.redis.port=6379 mallchat.redis.password=123456 ##################jwt################## mallchat.jwt.secret=dsfsdfsdfsdfsd -##################???????################## +##################微信公众号信息################## mallchat.wx.callback=http://127.0.0.1:8080 mallchat.wx.appId=appid mallchat.wx.secret=380bfc1c9147fdsf4sf07 -# ??????Token? +# 接口配置里的Token值 mallchat.wx.token=sdfsf -# ??????EncodingAESKey? +# 接口配置里的EncodingAESKey值 mallchat.wx.aesKey=sha1 -##################OSS??################## +##################OSS配置################## oss.enabled=true oss.type=minio oss.endpoint=http://localhost:9000 oss.access-key=BEZ213 oss.secret-key=Ii4vCMIXuFfds1EZ8e7RXI2342342kV oss.bucketName=default -##################gpt??################## +##################gpt配置################## mallchat.chatgpt.use=false mallchat.chatgpt.uid=10001 mallchat.chatgpt.key=sk-wvWM0xGcxFfsddfsgxixbXK5tHovM diff --git a/mallchat-common/src/main/resources/application-test.properties b/mallchat-common/src/main/resources/application-test.properties index fb572d2..a4967ae 100644 --- a/mallchat-common/src/main/resources/application-test.properties +++ b/mallchat-common/src/main/resources/application-test.properties @@ -1,32 +1,32 @@ -#todo ???????????? -##################mysql??################## +#todo 记得把这些配置信息补充了 +##################mysql配置################## mallchat.mysql.ip=127.0.0.1 mallchat.mysql.port=3306 mallchat.mysql.db=mallchat mallchat.mysql.username=root mallchat.mysql.password=123456 -##################redis??################## +##################redis配置################## mallchat.redis.host=127.0.0.1 mallchat.redis.port=6379 mallchat.redis.password=123456 ##################jwt################## mallchat.jwt.secret=dsfsdfsdfsdfsd -##################???????################## +##################微信公众号信息################## mallchat.wx.callback=http://127.0.0.1:8080 mallchat.wx.appId=appid mallchat.wx.secret=380bfc1c9147fdsf4sf07 -# ??????Token? +# 接口配置里的Token值 mallchat.wx.token=sdfsf -# ??????EncodingAESKey? +# 接口配置里的EncodingAESKey值 mallchat.wx.aesKey=sha1 -##################OSS??################## +##################OSS配置################## oss.enabled=true oss.type=minio oss.endpoint=http://localhost:9000 oss.access-key=BEZ213 oss.secret-key=Ii4vCMIXuFe241dsfEZ8e7RXI2342342kV oss.bucketName=default -##################gpt??################## +##################gpt配置################## mallchat.chatgpt.use=false mallchat.chatgpt.uid=10001 mallchat.chatgpt.key=sk-wvWM0xGcxFfsddfsgxixbXK5tHovM diff --git a/mallchat-common/src/main/resources/application.yml b/mallchat-common/src/main/resources/application.yml index cb9bc48..2f2ab12 100644 --- a/mallchat-common/src/main/resources/application.yml +++ b/mallchat-common/src/main/resources/application.yml @@ -73,4 +73,4 @@ chatai: use: ${mallchat.chatglm2.use} url: ${mallchat.chatglm2.url} minute: 3 # 每个用户每3分钟可以请求一次 - AIUserId: ${mallchat.chatglm2.uid} \ No newline at end of file + AIUserId: ${mallchat.chatglm2.uid} From ec76c2e337309d79e5bd0aafc7c5acc3aebdee9d Mon Sep 17 00:00:00 2001 From: zhaoyuhang <1045078399@qq.com> Date: Mon, 3 Jul 2023 11:31:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:ChatAI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chatai/handler/AbstractChatAIHandler.java | 38 +++++++---- .../chatai/handler/ChatAIHandlerFactory.java | 16 +---- .../chatai/handler/ChatGLM2Handler.java | 42 ++++++++---- .../chatai/handler/GPTChatAIHandler.java | 65 ++++++++++++------- .../chatai/properties/ChatGLM2Properties.java | 5 -- .../chatai/properties/ChatGPTProperties.java | 10 +-- 6 files changed, 102 insertions(+), 74 deletions(-) diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java index e644b4d..598e621 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/AbstractChatAIHandler.java @@ -29,13 +29,21 @@ public abstract class AbstractChatAIHandler { protected UserService userService; @PostConstruct - private void init() { - ChatAIHandlerFactory.register(getChatAIUserId(), getChatAIName(), this); + protected void init() { + if (isUse()) { + ChatAIHandlerFactory.register(getChatAIUserId(), this); + } } + + /** + * 是否启用 + * + * @return boolean + */ + protected abstract boolean isUse(); + // 获取机器人id public abstract Long getChatAIUserId(); - // 获取机器人名称 - public abstract String getChatAIName(); public void chat(Message message) { if (!supports(message)) { @@ -44,7 +52,7 @@ public abstract class AbstractChatAIHandler { threadPoolTaskExecutor.execute(() -> { String text = doChat(message); if (StringUtils.isNotBlank(text)) { - answerMsg(text, message.getRoomId(), message.getFromUid()); + answerMsg(text, message); } }); } @@ -66,30 +74,34 @@ public abstract class AbstractChatAIHandler { protected abstract String doChat(Message message); - protected void answerMsg(String text, Long roomId, Long uid) { - UserInfoResp userInfo = userService.getUserInfo(uid); + protected void answerMsg(String text, Message replyMessage) { + UserInfoResp userInfo = userService.getUserInfo(replyMessage.getFromUid()); text = "@" + userInfo.getName() + " " + text; - if (text.length() < 450) { - save(text, roomId, uid); - }else { - int maxLen = 450; + if (text.length() < 800) { + save(text, replyMessage); + } else { + int maxLen = 800; int len = text.length(); int count = (len + maxLen - 1) / maxLen; for (int i = 0; i < count; i++) { int start = i * maxLen; int end = Math.min(start + maxLen, len); - save(text.substring(start, end), roomId, uid); + save(text.substring(start, end), replyMessage); } } } - private void save(String text, Long roomId, Long uid) { + private void save(String text, Message replyMessage) { + Long roomId = replyMessage.getRoomId(); + Long uid = replyMessage.getFromUid(); + Long id = replyMessage.getId(); ChatMessageReq answerReq = new ChatMessageReq(); answerReq.setRoomId(roomId); answerReq.setMsgType(MessageTypeEnum.TEXT.getType()); TextMsgReq textMsgReq = new TextMsgReq(); textMsgReq.setContent(text); + textMsgReq.setReplyMsgId(replyMessage.getId()); textMsgReq.setAtUidList(Collections.singletonList(uid)); answerReq.setBody(textMsgReq); chatService.sendMsg(answerReq, getChatAIUserId()); diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java index 8d6356d..a719ecb 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatAIHandlerFactory.java @@ -1,7 +1,6 @@ package com.abin.mallchat.custom.chatai.handler; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import java.util.List; import java.util.Map; @@ -9,11 +8,9 @@ import java.util.concurrent.ConcurrentHashMap; public class ChatAIHandlerFactory { private static final Map CHATAI_ID_MAP = new ConcurrentHashMap<>(); - private static final Map CHATAI_NAME_MAP = new ConcurrentHashMap<>(); - public static void register(Long aIUserId, String name, AbstractChatAIHandler chatAIHandler) { + public static void register(Long aIUserId, AbstractChatAIHandler chatAIHandler) { CHATAI_ID_MAP.put(aIUserId, chatAIHandler); - CHATAI_NAME_MAP.put(name, chatAIHandler); } public static AbstractChatAIHandler getChatAIHandlerById(List userIds) { @@ -28,15 +25,4 @@ public class ChatAIHandlerFactory { } return null; } - public static AbstractChatAIHandler getChatAIHandlerByName(String text) { - if (StringUtils.isBlank(text)) { - return null; - } - for (Map.Entry entry : CHATAI_NAME_MAP.entrySet()) { - if (text.contains("@"+entry.getKey())) { - return entry.getValue(); - } - } - return null; - } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java index 11350ca..0f7ff1b 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/ChatGLM2Handler.java @@ -7,6 +7,7 @@ import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.custom.chatai.properties.ChatGLM2Properties; import com.abin.mallchat.custom.chatai.utils.ChatGLM2Utils; +import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,27 +37,42 @@ public class ChatGLM2Handler extends AbstractChatAIHandler { private static final Random RANDOM = new Random(); + private static String AI_NAME; + @Autowired private ChatGLM2Properties glm2Properties; + @Override + protected void init() { + super.init(); + if (isUse()) { + UserInfoResp userInfo = userService.getUserInfo(glm2Properties.getAIUserId()); + if (userInfo == null) { + log.error("根据AIUserId:{} 找不到用户信息", glm2Properties.getAIUserId()); + throw new RuntimeException("根据AIUserId找不到用户信息"); + } + if (StringUtils.isBlank(userInfo.getName())) { + log.warn("根据AIUserId:{} 找到的用户信息没有name", glm2Properties.getAIUserId()); + throw new RuntimeException("根据AIUserId: " + glm2Properties.getAIUserId() + " 找到的用户没有名字"); + } + AI_NAME = userInfo.getName(); + } + } + + @Override + protected boolean isUse() { + return glm2Properties.isUse(); + } + @Override public Long getChatAIUserId() { return glm2Properties.getAIUserId(); } - @Override - public String getChatAIName() { - if (StringUtils.isNotBlank(glm2Properties.getAIUserName())) { - return glm2Properties.getAIUserName(); - } - String name = userService.getUserInfo(glm2Properties.getAIUserId()).getName(); - glm2Properties.setAIUserName(name); - return name; - } @Override protected String doChat(Message message) { - String content = message.getContent().replace("@" +glm2Properties.getAIUserName(), "").trim(); + String content = message.getContent().replace("@" + AI_NAME, "").trim(); Long uid = message.getFromUid(); Long minute; String text; @@ -73,7 +89,7 @@ public class ChatGLM2Handler extends AbstractChatAIHandler { .send(); text = ChatGLM2Utils.parseText(response); } catch (Exception e) { - e.printStackTrace(); + log.warn("glm2 doChat warn:", e); return getErrorText(); } if (StringUtils.isNotBlank(text)) { @@ -132,7 +148,7 @@ public class ChatGLM2Handler extends AbstractChatAIHandler { if (StringUtils.isBlank(message.getContent())) { return false; } - return StringUtils.contains(message.getContent(), "@" + glm2Properties.getAIUserName()) - && StringUtils.isNotBlank(message.getContent().replace(glm2Properties.getAIUserName(), "").trim()); + return StringUtils.contains(message.getContent(), "@" + AI_NAME) + && StringUtils.isNotBlank(message.getContent().replace(AI_NAME, "").trim()); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java index f814713..440c1d9 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/handler/GPTChatAIHandler.java @@ -2,41 +2,59 @@ package com.abin.mallchat.custom.chatai.handler; import cn.hutool.http.HttpResponse; import com.abin.mallchat.common.chat.domain.entity.Message; +import com.abin.mallchat.common.chat.domain.entity.msg.MessageExtra; import com.abin.mallchat.common.common.constant.RedisKey; import com.abin.mallchat.common.common.utils.DateUtils; import com.abin.mallchat.common.common.utils.RedisUtils; import com.abin.mallchat.custom.chatai.properties.ChatGPTProperties; import com.abin.mallchat.custom.chatai.utils.ChatGPTUtils; +import com.abin.mallchat.custom.user.domain.vo.response.user.UserInfoResp; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import java.util.concurrent.TimeUnit; +@Slf4j @Component public class GPTChatAIHandler extends AbstractChatAIHandler { @Autowired private ChatGPTProperties chatGPTProperties; + private static String AI_NAME; + + @Override + protected void init() { + super.init(); + UserInfoResp userInfo = userService.getUserInfo(chatGPTProperties.getAIUserId()); + if (userInfo == null) { + log.error("根据AIUserId:{} 找不到用户信息", chatGPTProperties.getAIUserId()); + throw new RuntimeException("根据AIUserId: " + chatGPTProperties.getAIUserId() + " 找不到用户信息"); + } + if (StringUtils.isBlank(userInfo.getName())) { + log.warn("根据AIUserId:{} 找到的用户信息没有name", chatGPTProperties.getAIUserId()); + throw new RuntimeException("根据AIUserId: " + chatGPTProperties.getAIUserId() + " 找到的用户没有名字"); + } + AI_NAME = userInfo.getName(); + } + + @Override + protected boolean isUse() { + return chatGPTProperties.isUse(); + } + @Override public Long getChatAIUserId() { return chatGPTProperties.getAIUserId(); } - @Override - public String getChatAIName() { - if (StringUtils.isNotBlank(chatGPTProperties.getAIUserName())) { - return chatGPTProperties.getAIUserName(); - } - String name = userService.getUserInfo(chatGPTProperties.getAIUserId()).getName(); - chatGPTProperties.setAIUserName(name); - return name; - } @Override protected String doChat(Message message) { - String content = message.getContent().replace("@" + chatGPTProperties.getAIUserName(), "").trim(); + String content = message.getContent().replace("@" + AI_NAME, "").trim(); Long uid = message.getFromUid(); Long chatNum; String text; @@ -48,12 +66,13 @@ public class GPTChatAIHandler extends AbstractChatAIHandler { response = ChatGPTUtils.create(chatGPTProperties.getKey()) .proxyUrl(chatGPTProperties.getProxyUrl()) .model(chatGPTProperties.getModelName()) + .timeout(chatGPTProperties.getTimeout()) .prompt(content) .send(); text = ChatGPTUtils.parseText(response); userChatNumInrc(uid); } catch (Exception e) { - e.printStackTrace(); + log.warn("gpt doChat warn:", e); text = "我累了，明天再聊吧"; } } @@ -78,21 +97,21 @@ public class GPTChatAIHandler extends AbstractChatAIHandler { } /* 前端传@信息后取消注释 */ -// MessageExtra extra = message.getExtra(); -// if (extra == null) { -// return false; -// } -// if (CollectionUtils.isEmpty(extra.getAtUidList())) { -// return false; -// } -// if (!extra.getAtUidList().contains(chatGPTProperties.getAIUserId())) { -// return false; -// } + MessageExtra extra = message.getExtra(); + if (extra == null) { + return false; + } + if (CollectionUtils.isEmpty(extra.getAtUidList())) { + return false; + } + if (!extra.getAtUidList().contains(chatGPTProperties.getAIUserId())) { + return false; + } if (StringUtils.isBlank(message.getContent())) { return false; } - return StringUtils.contains(message.getContent(), "@" + chatGPTProperties.getAIUserName()) - && StringUtils.isNotBlank(message.getContent().replace(chatGPTProperties.getAIUserName(), "").trim()); + return StringUtils.contains(message.getContent(), "@" + AI_NAME) + && StringUtils.isNotBlank(message.getContent().replace(AI_NAME, "").trim()); } } diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java index 2ccc99b..7c050b4 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGLM2Properties.java @@ -30,11 +30,6 @@ public class ChatGLM2Properties { */ private Long AIUserId; - /** - * 机器人名称 - */ - private String AIUserName; - /** * 每个用户每?分钟可以请求一次 */ diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java index b7a5c56..86fd564 100644 --- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java +++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chatai/properties/ChatGPTProperties.java @@ -18,11 +18,6 @@ public class ChatGPTProperties { * 机器人 id */ private Long AIUserId; - - /** - * 机器人名称 - */ - private String AIUserName; /** * 模型名称 */ @@ -36,6 +31,11 @@ public class ChatGPTProperties { */ private String proxyUrl; + /** + * 超时 + */ + private Integer timeout = 60*1000; + /** * 用户每天条数限制 */