JavaWeb/QQBot
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复百度版本保存失败问题

Browse Source
This commit is contained in:
Yutou
2024-05-10 13:03:23 +08:00
parent 2c37c19cc9
commit 604d186cc2
11 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yutou/qqbot/utlis/AppTools.java
View File

@@ -153,7 +153,7 @@ public class AppTools {
Log.i("title=" + title + " msg=" + msg);
HttpTools.post("https://sctapi.ftqq.com/SCT2619Tpqu93OYtQCrK4LOZYEfr2irm.send",
("title="+ URLEncoder.encode(title, "UTF-8") + "&desp=" + URLEncoder.encode(msg, "UTF-8")).getBytes(StandardCharsets.UTF_8));
if (ConfigTools.load(ConfigTools.CONFIG, "model").equals("nas")) {
if (ConfigTools.load(ConfigTools.CONFIG, ConfigTools.MODEL).equals("nas")) {
String img = null;
msg = msg.replace("<br/>", "\n");
if (msg.contains("![logo]")) {

10
src/main/java/com/yutou/qqbot/utlis/BaiduGPTManager.java
View File

@@ -17,9 +17,9 @@ public class BaiduGPTManager {
//4.0
private static final String url_4_0 = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro";
private static String url = url_3_5;
private static final String AppID = ConfigTools.load(ConfigTools.CONFIG,"baidu.gpt.appid", String.class);
private static final String ApiKey =ConfigTools.load(ConfigTools.CONFIG,"baidu.gpt.apikey", String.class);
private static final String SecretKey =ConfigTools.load(ConfigTools.CONFIG,"baidu.gpt.SecretKey", String.class);
private static final String AppID = ConfigTools.load(ConfigTools.CONFIG,ConfigTools.BAIDU_GPT_APPID, String.class);
private static final String ApiKey =ConfigTools.load(ConfigTools.CONFIG,ConfigTools.BAIDU_GPT_API_KEY, String.class);
private static final String SecretKey =ConfigTools.load(ConfigTools.CONFIG,ConfigTools.BAIDU_GPT_SECRET_KEY, String.class);
private final Map<String, List<Message>> msgMap;
private BaiduGPTManager() {
@@ -40,12 +40,12 @@ public class BaiduGPTManager {
public void setModelFor40() {
url = url_4_0;
ConfigTools.save(ConfigTools.CONFIG,"baidu.gpt.version","4.0");
ConfigTools.save(ConfigTools.CONFIG,ConfigTools.BAIDU_GPT_VERSION,"4.0");
}
public void setModelFor35() {
url = url_3_5;
ConfigTools.save(ConfigTools.CONFIG,"baidu.gpt.version","3.5");
ConfigTools.save(ConfigTools.CONFIG,ConfigTools.BAIDU_GPT_VERSION,"3.5");
}
public void clear() {

21
src/main/java/com/yutou/qqbot/utlis/ConfigTools.java
View File

@@ -13,8 +13,25 @@ public class ConfigTools {
public static final String DATA = "data.json";
public static final String SQLITE = "sqlite.json";
public static final String BiliBili = "bilibili.cookie";
public static final String QQ = "qq_bot";
public static final String QQ_NUMBER = "qq_number";
public static final String QQ_PASSWORD = "qq_password";
public static final String MODEL = "model";
public static final String OS = "os";
public static final String MUSIC_SCAN = "musicScan";
public static final String SERVICE_LOG = "service.log";
public static final String QQ_LOG = "qq.log";
public static final String CHROME = "chrome";
public static final String FIREFOX = "firefox";
public static final String FFMPEG = "ffmpeg";
public static final String SIGN_URL = "sign_url";
public static final String NAPCAT_URL = "napcat.url";
public static final String SERVER_URL = "server.url";
public static final String BAIDU_GPT_VERSION = "baidu.gpt.version";
public static final String BAIDU_GPT_APPID = "baidu.gpt.appid";
public static final String BAIDU_GPT_API_KEY = "baidu.gpt.apikey";
public static final String BAIDU_GPT_SECRET_KEY = "baidu.gpt.SecretKey";
private static final String SERVER_URL = load(CONFIG, "server.url", String.class);
static {
try {
@@ -120,6 +137,6 @@ public class ConfigTools {
}
public static String getServerUrl() {
return SERVER_URL;
return ConfigTools.load(CONFIG, SERVER_URL, String.class);
}
}

2
src/main/java/com/yutou/qqbot/utlis/Log.java
View File

@@ -6,7 +6,7 @@ public class Log {
}
public static void i(Object log) {
if (ConfigTools.load(ConfigTools.CONFIG, "service.log", boolean.class, false)) {
if (ConfigTools.load(ConfigTools.CONFIG, ConfigTools.SERVICE_LOG, boolean.class, false)) {
System.out.printf("[%s]%s%n",
AppTools.getToDayNowTimeToString(),
log

2
src/main/java/com/yutou/qqbot/utlis/WebClient.java
View File

@@ -39,7 +39,7 @@ public class WebClient {
private WebClient() {
//System.setProperty("webdriver.http.factory", "jdk-http-client");
System.setProperty("webdriver.chrome.driver",
ConfigTools.load(ConfigTools.CONFIG, "chrome", String.class));
ConfigTools.load(ConfigTools.CONFIG, ConfigTools.CHROME, String.class));
// System.setProperty("webdriver.chrome.whitelistedIps", "");
// java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF);
}