From 412e058425450dd7897d945a2620890483329e3a Mon Sep 17 00:00:00 2001 From: wangwang-code <64469117+wangwang-code@users.noreply.github.com> Date: Fri, 9 Dec 2022 11:25:59 +0800 Subject: [PATCH 1/3] Update Constants.java --- src/main/java/cn/penidea/alice/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/penidea/alice/util/Constants.java b/src/main/java/cn/penidea/alice/util/Constants.java index ad96abe..96cc6ec 100644 --- a/src/main/java/cn/penidea/alice/util/Constants.java +++ b/src/main/java/cn/penidea/alice/util/Constants.java @@ -9,5 +9,5 @@ */ public class Constants { - public static final String WS_URL = "ws://127.0.0.1:9099"; + public static final String WS_URL = "ws://127.0.0.1:8080"; } From d80aa18f924b07f38d1dd0a1372248d9854021e8 Mon Sep 17 00:00:00 2001 From: wangwang-code Date: Fri, 9 Dec 2022 15:23:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=AE=BE=E7=BD=AEws=E5=9C=B0=E5=9D=80=20--cl?= =?UTF-8?q?ientBaseConfig.cqHttpWs=3Dws://127.0.0.1:8080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/penidea/alice/Start.java | 11 +++++++++-- .../cn/penidea/alice/config/ClientBaseConfig.java | 4 +++- .../java/cn/penidea/alice/thread/ReConnectTask.java | 10 ++++++++-- .../java/cn/penidea/alice/util/BaseConfigBean.java | 7 +------ src/main/java/cn/penidea/alice/util/Constants.java | 13 ------------- src/main/resources/application.yml | 2 +- 6 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/cn/penidea/alice/util/Constants.java diff --git a/src/main/java/cn/penidea/alice/Start.java b/src/main/java/cn/penidea/alice/Start.java index 8f8f26b..7433e3a 100644 --- a/src/main/java/cn/penidea/alice/Start.java +++ b/src/main/java/cn/penidea/alice/Start.java @@ -1,7 +1,8 @@ package cn.penidea.alice; -import cn.penidea.alice.util.Constants; +import cn.penidea.alice.util.BaseConfigBean; import cn.penidea.alice.ws.Client; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; @@ -13,9 +14,15 @@ @Component public class Start implements CommandLineRunner { + private static BaseConfigBean baseConfigBean; + @Autowired + public void setBaseConfigBean(BaseConfigBean baseConfigBean) { + Start.baseConfigBean = baseConfigBean; + } @Override public void run(String... args) throws Exception { - if (!Client.connect(Constants.WS_URL)) { + System.out.println("连接CQ-Http的地址: " + baseConfigBean.getCqHttpWs()); + if (!Client.connect(baseConfigBean.getCqHttpWs())) { Client.reConnect(); } } diff --git a/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java b/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java index b6dec47..2a05b70 100644 --- a/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java +++ b/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java @@ -16,6 +16,8 @@ @Configuration public class ClientBaseConfig { + @Value("${clientBaseConfig.cqHttpWs}") + private String cqHttpWs; @Value("${clientBaseConfig.admin}") private String adminQQ; @Value("${clientBaseConfig.robot}") @@ -34,6 +36,6 @@ public BaseConfigBean baseConfig() { HashMap userList = new HashMap<>(); userList.put(adminQQ, ""); userList.put("admin", adminQQ); - return new BaseConfigBean(userList, "[CQ:at,qq=" + robotQQ + "]", wakeUpWord, robotName, standbyWord, promptUpWord); + return new BaseConfigBean(cqHttpWs, userList, "[CQ:at,qq=" + robotQQ + "]", wakeUpWord, robotName, standbyWord, promptUpWord); } } diff --git a/src/main/java/cn/penidea/alice/thread/ReConnectTask.java b/src/main/java/cn/penidea/alice/thread/ReConnectTask.java index 9470596..40554ed 100644 --- a/src/main/java/cn/penidea/alice/thread/ReConnectTask.java +++ b/src/main/java/cn/penidea/alice/thread/ReConnectTask.java @@ -1,7 +1,8 @@ package cn.penidea.alice.thread; -import cn.penidea.alice.util.Constants; +import cn.penidea.alice.util.BaseConfigBean; import cn.penidea.alice.ws.Client; +import org.springframework.beans.factory.annotation.Autowired; /** * 功能:重连任务线程 @@ -10,10 +11,15 @@ */ public class ReConnectTask implements Runnable { + private static BaseConfigBean baseConfigBean; + @Autowired + public void setBaseConfigBean(BaseConfigBean baseConfigBean) { + ReConnectTask.baseConfigBean = baseConfigBean; + } @Override public void run() { while (true) { - if (Client.connect(Constants.WS_URL)) { + if (Client.connect(baseConfigBean.getCqHttpWs())) { System.out.println("重连成功"); break; } else { diff --git a/src/main/java/cn/penidea/alice/util/BaseConfigBean.java b/src/main/java/cn/penidea/alice/util/BaseConfigBean.java index 54e81c8..f6f7f30 100644 --- a/src/main/java/cn/penidea/alice/util/BaseConfigBean.java +++ b/src/main/java/cn/penidea/alice/util/BaseConfigBean.java @@ -7,17 +7,12 @@ import java.util.HashMap; -/** - * 功能:基础配置类 - * 作者:Mr.Fokers - * 日期：2022年12月09日 2:13 - */ - @Data @AllArgsConstructor @NoArgsConstructor @Builder public class BaseConfigBean { + private String cqHttpWs; private HashMap userList; private String atRobotCQ; private String wakeUpWord; diff --git a/src/main/java/cn/penidea/alice/util/Constants.java b/src/main/java/cn/penidea/alice/util/Constants.java deleted file mode 100644 index 96cc6ec..0000000 --- a/src/main/java/cn/penidea/alice/util/Constants.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.penidea.alice.util; - -import java.util.HashMap; - -/** - * 功能:常量 - * 作者:Mr.Fokers - * 日期：2022年09月30日 14:31 - */ - -public class Constants { - public static final String WS_URL = "ws://127.0.0.1:8080"; -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e2c71ec..e1db2f2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ clientBaseConfig: standbyWord: Nothing,thanks promptUpWord: Hi master,what i to do? robotName: Alice - + cqHttpWs: ws://127.0.0.1:9099 # chatGPT配置 chatGPT: email: fokers@penidea.com From 7d60e574571e1a550c25b8f1a1cae55a8b338a70 Mon Sep 17 00:00:00 2001 From: wangwang-code Date: Fri, 9 Dec 2022 15:23:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=AE=BE=E7=BD=AEws=E5=9C=B0=E5=9D=80=20--cl?= =?UTF-8?q?ientBaseConfig.cqHttpWs=3Dws://127.0.0.1:8080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +-- src/main/java/cn/penidea/alice/Start.java | 11 +++++++++-- .../cn/penidea/alice/config/ClientBaseConfig.java | 4 +++- .../java/cn/penidea/alice/thread/ReConnectTask.java | 10 ++++++++-- .../java/cn/penidea/alice/util/BaseConfigBean.java | 7 +------ src/main/java/cn/penidea/alice/util/Constants.java | 13 ------------- src/main/resources/application.yml | 2 +- 7 files changed, 23 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/cn/penidea/alice/util/Constants.java diff --git a/README.md b/README.md index e598c50..8071b5f 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,10 @@ AliceBot 下载到服务器后使用tar -zxvf进行解压
运行其中的的在解压目录下运行screen -S gocq
再运行./go-cqhttp，第一次运行会先让你选连接方式，我们选择2：正向Websocket,gocq在解压目录下生成config.yml，这时我们先Ctrl+C
- 运行nano config.yml，拉到最下面找到address: 0.0.0.0:8080，把8080替换成9099,然后Ctrl+X,然后按Y，再回车一下保存
然后再次运行./go-cqhttp，完成登录后按Ctrl+A+D放到后台运行
2. 执行jar包 先输入screen -S Alice 创建个会话
- 然后使用java -jar -Xmx512m --clientBaseConfig.admin=管理员QQ --clientBaseConfig.robot=机器人QQ --clientBaseConfig.wakeUpWord=唤醒词 --clientBaseConfig.standbyWord=待机词 --clientBaseConfig.promptUpWord=提示词 --clientBaseConfig.robotName=机器人名称 --chatGPT.email=gpt邮箱 --chatGPT.password=gpt密码 --chatGPT.sessionToken=token --server.port=8080
+ 然后使用java -jar -Xmx512m --clientBaseConfig.admin=管理员QQ --clientBaseConfig.robot=机器人QQ --clientBaseConfig.wakeUpWord=唤醒词 --clientBaseConfig.standbyWord=待机词 --clientBaseConfig.promptUpWord=提示词 --clientBaseConfig.robotName=机器人名称 --chatGPT.email=gpt邮箱 --chatGPT.password=gpt密码 --chatGPT.sessionToken=token --server.port=8081 --clientBaseConfig.cqHttpWs=ws://127.0.0.1:8080
运行后再使用Ctrl+A+D放到后台运行即可 ###########V1.0.0 版本内容更新 diff --git a/src/main/java/cn/penidea/alice/Start.java b/src/main/java/cn/penidea/alice/Start.java index 8f8f26b..7433e3a 100644 --- a/src/main/java/cn/penidea/alice/Start.java +++ b/src/main/java/cn/penidea/alice/Start.java @@ -1,7 +1,8 @@ package cn.penidea.alice; -import cn.penidea.alice.util.Constants; +import cn.penidea.alice.util.BaseConfigBean; import cn.penidea.alice.ws.Client; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; @@ -13,9 +14,15 @@ @Component public class Start implements CommandLineRunner { + private static BaseConfigBean baseConfigBean; + @Autowired + public void setBaseConfigBean(BaseConfigBean baseConfigBean) { + Start.baseConfigBean = baseConfigBean; + } @Override public void run(String... args) throws Exception { - if (!Client.connect(Constants.WS_URL)) { + System.out.println("连接CQ-Http的地址: " + baseConfigBean.getCqHttpWs()); + if (!Client.connect(baseConfigBean.getCqHttpWs())) { Client.reConnect(); } } diff --git a/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java b/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java index b6dec47..2a05b70 100644 --- a/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java +++ b/src/main/java/cn/penidea/alice/config/ClientBaseConfig.java @@ -16,6 +16,8 @@ @Configuration public class ClientBaseConfig { + @Value("${clientBaseConfig.cqHttpWs}") + private String cqHttpWs; @Value("${clientBaseConfig.admin}") private String adminQQ; @Value("${clientBaseConfig.robot}") @@ -34,6 +36,6 @@ public BaseConfigBean baseConfig() { HashMap userList = new HashMap<>(); userList.put(adminQQ, ""); userList.put("admin", adminQQ); - return new BaseConfigBean(userList, "[CQ:at,qq=" + robotQQ + "]", wakeUpWord, robotName, standbyWord, promptUpWord); + return new BaseConfigBean(cqHttpWs, userList, "[CQ:at,qq=" + robotQQ + "]", wakeUpWord, robotName, standbyWord, promptUpWord); } } diff --git a/src/main/java/cn/penidea/alice/thread/ReConnectTask.java b/src/main/java/cn/penidea/alice/thread/ReConnectTask.java index 9470596..40554ed 100644 --- a/src/main/java/cn/penidea/alice/thread/ReConnectTask.java +++ b/src/main/java/cn/penidea/alice/thread/ReConnectTask.java @@ -1,7 +1,8 @@ package cn.penidea.alice.thread; -import cn.penidea.alice.util.Constants; +import cn.penidea.alice.util.BaseConfigBean; import cn.penidea.alice.ws.Client; +import org.springframework.beans.factory.annotation.Autowired; /** * 功能:重连任务线程 @@ -10,10 +11,15 @@ */ public class ReConnectTask implements Runnable { + private static BaseConfigBean baseConfigBean; + @Autowired + public void setBaseConfigBean(BaseConfigBean baseConfigBean) { + ReConnectTask.baseConfigBean = baseConfigBean; + } @Override public void run() { while (true) { - if (Client.connect(Constants.WS_URL)) { + if (Client.connect(baseConfigBean.getCqHttpWs())) { System.out.println("重连成功"); break; } else { diff --git a/src/main/java/cn/penidea/alice/util/BaseConfigBean.java b/src/main/java/cn/penidea/alice/util/BaseConfigBean.java index 54e81c8..f6f7f30 100644 --- a/src/main/java/cn/penidea/alice/util/BaseConfigBean.java +++ b/src/main/java/cn/penidea/alice/util/BaseConfigBean.java @@ -7,17 +7,12 @@ import java.util.HashMap; -/** - * 功能:基础配置类 - * 作者:Mr.Fokers - * 日期：2022年12月09日 2:13 - */ - @Data @AllArgsConstructor @NoArgsConstructor @Builder public class BaseConfigBean { + private String cqHttpWs; private HashMap userList; private String atRobotCQ; private String wakeUpWord; diff --git a/src/main/java/cn/penidea/alice/util/Constants.java b/src/main/java/cn/penidea/alice/util/Constants.java deleted file mode 100644 index 96cc6ec..0000000 --- a/src/main/java/cn/penidea/alice/util/Constants.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.penidea.alice.util; - -import java.util.HashMap; - -/** - * 功能:常量 - * 作者:Mr.Fokers - * 日期：2022年09月30日 14:31 - */ - -public class Constants { - public static final String WS_URL = "ws://127.0.0.1:8080"; -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e2c71ec..e1db2f2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ clientBaseConfig: standbyWord: Nothing,thanks promptUpWord: Hi master,what i to do? robotName: Alice - + cqHttpWs: ws://127.0.0.1:9099 # chatGPT配置 chatGPT: email: fokers@penidea.com