refactor(auth): 重构认证逻辑并更新版本号

- 移除 lombok 自动生成的日志类
- 更新认证方式，使用 Start0 类中的 getAccessToken 方法获取访问令牌
- 修改 BaseConnectedEvent 中的版本号为 1.5.2-L1
- 更新 pom.xml 中的版本号为 1.5.2-L1

Author: Kloping

pom.xml

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

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

@@ -1,6 +1,5 @@
 package io.github.kloping.qqbot;
 
-import io.github.kloping.judge.Judge;
 import io.github.kloping.qqbot.entities.qqpd.Channel;
 import io.github.kloping.qqbot.http.AuthV2Base;
 import io.github.kloping.qqbot.http.data.Token;
@@ -24,8 +23,9 @@ public class Start0 {
     ContextManager contextManager;
 
     public Map<String, String> getHeaders() {
+        if (isExpired(token)) headers.clear();
         if (headers.isEmpty()) {
-            headers.put("Authorization", contextManager.getContextEntity(String.class, Starter.AUTH_ID));
+            headers.put("Authorization", String.format("QQBot %s", getV2Token()));
             headers.put("Accept-Encoding", "application/json");
         }
         return headers;
@@ -34,9 +34,7 @@ public Map<String, String> getHeaders() {
     public Map<String, String> getV2Headers() {
         if (isExpired(token)) v2headers.clear();
         if (v2headers.isEmpty()) {
-            String secret = contextManager.getContextEntity(String.class, Starter.SECRET_ID);
-            if (Judge.isEmpty(secret)) return v2headers;
-            v2headers.put("Authorization", String.format("QQBot %s", getV2Token(secret)));
+            v2headers.put("Authorization", String.format("QQBot %s", getV2Token()));
             v2headers.put("X-Union-Appid", contextManager.getContextEntity(String.class, Starter.APPID_ID));
         }
         return v2headers;
@@ -49,14 +47,20 @@ private boolean isExpired(Token token) {
     @AutoStand
     AuthV2Base authV2Base;
 
+
     private Token token;
 
-    private String getV2Token(String secret) {
+    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", contextManager.getContextEntity(String.class, Starter.APPID_ID), secret)
-                , Channel.SEND_MESSAGE_HEADERS
-        );
+                String.format("{\"appId\": \"%s\",\"clientSecret\": \"%s\"}\n", appid, secret)
+                , Channel.SEND_MESSAGE_HEADERS);
         token.setT0(System.currentTimeMillis());
         return token.getAccess_token();
     }
+
+    public String getAccessToken() {
+        return isExpired(token) ? getV2Token() : token.getAccess_token();
+    }
 }

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-R3";
+    public static final String VERSION = "1.5.2-L1";
     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/AuthAndHeartbeat.java

@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import io.github.kloping.common.Public;
 import io.github.kloping.date.FrameUtils;
+import io.github.kloping.qqbot.Start0;
 import io.github.kloping.qqbot.Starter;
 import io.github.kloping.qqbot.api.event.Event;
 import io.github.kloping.qqbot.entities.Bot;
@@ -17,7 +18,6 @@
 import io.github.kloping.spt.annotations.Entity;
 import io.github.kloping.spt.interfaces.Logger;
 import io.github.kloping.spt.interfaces.component.ContextManager;
-import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 
 import java.util.concurrent.Future;
@@ -104,6 +104,9 @@ private void delayIdentifyConnect(int code, WebSocketClient wss) {
     @AutoStand
     Config config;
 
+    @AutoStand
+    Start0 start0;
+
     public void identifyConnect(int code, WebSocketClient wss) {
         if (!config.getReconnect()) return;
         Future future = contextManager.getContextEntity(Future.class, Starter.MAIN_FUTURE_ID);
@@ -144,7 +147,7 @@ public boolean onReceive(Pack pack) {
             authPack = new Pack();
             authPack.setOp(2);
             JSONObject jo = new JSONObject();
-            jo.put(TOKEN_ID, contextManager.getContextEntity(String.class, AUTH_ID));
+            jo.put(TOKEN_ID, "QQBot " + start0.getAccessToken());
             jo.put(INTENTS_ID, contextManager.getContextEntity(Integer.class, INTENTS_ID));
             jo.put(SHARD_ID, contextManager.getContextEntity(Integer[].class, SHARD_ID));
             jo.put(PROPERTIES_ID, new Object());