feat(network): 更新 webhook 路径配置并优化 token 管理

- 将 BaseConnectedEvent 版本号从 1.5.2-L2 升级到 1.5.2-L3
- 修改 HookAuth 中的 webhook 服务器路径配置
-优化 Start0 中的 token 获取和更新逻辑
- 在 Starter 中添加 webhookpath 配置项

Author: Kloping

README.md

@@ -27,13 +27,13 @@ Maven
 <dependency>
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.2-L2</version>
+    <version>1.5.2-L3</version>
 </dependency>
 ```
 
 Gradle
 
-    implementation 'io.github.kloping:bot-qqpd-java:1.5.2-L2'
+    implementation 'io.github.kloping:bot-qqpd-java:1.5.2-L3'
 
 ### 使用前提
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.2-L2</version>
+    <version>1.5.2-L3</version>
 
     <packaging>jar</packaging>
     <name>bot-qqpd-java</name>

src/main/java/io/github/kloping/qqbot/Start0.java

@@ -17,43 +17,43 @@
 public class Start0 {
 
     public Map<String, String> headers = new HashMap();
-    public Map<String, String> v2headers = new HashMap();
 
     @AutoStand
     ContextManager contextManager;
 
     //ALL req token header
     public synchronized Map<String, String> getHeaders() {
-        if (isExpired(token)) headers.clear();
-        if (headers.isEmpty()) {
-            headers.put("Authorization", String.format("QQBot %s", getV2Token()));
-            headers.put("Accept-Encoding", "application/json");
-            headers.put("X-Union-Appid", contextManager.getContextEntity(String.class, Starter.APPID_ID));
-        }
+        if (headers.isEmpty() || isExpired(token)) updateToken();
         return headers;
     }
 
     private boolean isExpired(Token token) {
         return token == null || token.isExpired();
     }
 
-    @AutoStand
-    AuthV2Base authV2Base;
+    private Token token;
 
+    public String getAccessToken() {
+        if (isExpired(token)) updateToken();
+        return token.getAccess_token();
+    }
 
-    private Token token;
+    public void updateToken() {
+        headers.clear();
+        String v2token = getV2Token();
+        headers.put("Authorization", String.format("QQBot %s", v2token));
+        headers.put("Accept-Encoding", "application/json");
+        headers.put("X-Union-Appid", contextManager.getContextEntity(String.class, Starter.APPID_ID));
+    }
+
+    @AutoStand
+    AuthV2Base authV2Base;
 
     private String getV2Token() {
         String appid = contextManager.getContextEntity(String.class, Starter.APPID_ID);
         String secret = contextManager.getContextEntity(String.class, Starter.SECRET_ID);
-        token = authV2Base.auth(
-                String.format("{\"appId\": \"%s\",\"clientSecret\": \"%s\"}\n", appid, secret)
-                , Channel.SEND_MESSAGE_HEADERS);
-        token.setT0(System.currentTimeMillis());
+        token = authV2Base.auth(String.format("{\"appId\": \"%s\",\"clientSecret\": \"%s\"}\n", appid, secret)
+                , Channel.SEND_MESSAGE_HEADERS).setT0(System.currentTimeMillis());
         return token.getAccess_token();
     }
-
-    public String getAccessToken() {
-        return isExpired(token) ? getV2Token() : token.getAccess_token();
-    }
 }

src/main/java/io/github/kloping/qqbot/Starter.java

@@ -199,6 +199,10 @@ public static class Config {
         private Boolean anyCloseReconnect = false;
         private String wslink = null;
         private Integer webhookport = 0;
+        /**
+         * webhook服务路径 默认/webhook0
+         */
+        private String webhookpath = "/webhook0";
         private Set<ListenerHost> listenerHosts = new HashSet<>();
         private ImageUploadInterceptor interceptor0;
         private WebSocketListener webSocketListener;

src/main/java/io/github/kloping/qqbot/impl/BaseConnectedEvent.java

@@ -50,7 +50,7 @@ public String getId() {
         return getMetadata().get("id").toString();
     }
 
-    public static final String VERSION = "1.5.2-L2";
+    public static final String VERSION = "1.5.2-L3";
     public static final String PROJECT_NAME = "qqpd-bot-java";
     public static final String AUTHOR = "kloping";
     public static final String FORMAT = "Bot(%s) connected! By " + AUTHOR + " of " + PROJECT_NAME + " v" + VERSION;

src/main/java/io/github/kloping/qqbot/network/hookauth/HookAuth.java

@@ -56,7 +56,7 @@ public class HookAuth {
     public void webhookServerStart() {
         try {
             HttpServer server = HttpServer.create(new InetSocketAddress(config.getWebhookport()), 0);
-            server.createContext("/webhook0", exchange -> {
+            server.createContext(config.getWebhookpath(), exchange -> {
                 String body = ReadUtils.readAll(exchange.getRequestBody(), "UTF-8");
                 logger.log(String.format("webhook-r: %s", body));
                 Pack pack = GSON.fromJson(body, Pack.class);