fix #26: support switching sandbox and formal environment

Author: Kloping

docs/readme.md

@@ -32,11 +32,13 @@ _**待完善..**_
 #### 启动方式
 
 ```java
-//启动类新建
+// 启动类新建
 Starter starter = new Starter("appid", "token");
 // 私域推荐Intents.PRIVATE_INTENTS 公域机器人推荐 Intents.PUBLIC_INTENTS
 starter.getConfig().setCode(Intents.PRIVATE_INTENTS.getCode());
-//启动
+// 切换沙箱与正式环境
+starter.getConfig().sandbox();
+// 启动
 starter.run();
 ```
 #### 事件注册

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.1-L2</version>
+    <version>1.5.1-R2</version>
 
     <packaging>jar</packaging>
     <name>bot-qqpd-java</name>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>io.github.Kloping</groupId>
             <artifactId>SpringTool</artifactId>
-            <version>0.6.3-R1</version>
+            <version>0.6.3-L1</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.github.Kloping</groupId>
@@ -154,12 +154,12 @@
                     </execution>
                 </executions>
                 <!--非手动签名配置-->
-<!--                <configuration>-->
-<!--                    <gpgArguments>-->
-<!--                        <arg>&#45;&#45;pinentry-mode</arg>-->
-<!--                        <arg>loopback</arg>-->
-<!--                    </gpgArguments>-->
-<!--                </configuration>-->
+                <configuration>
+                    <gpgArguments>
+                        <arg>--pinentry-mode</arg>
+                        <arg>loopback</arg>
+                    </gpgArguments>
+                </configuration>
             </plugin>
         </plugins>
     </build>

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

@@ -1,9 +1,5 @@
 package io.github.kloping.qqbot;
 
-import io.github.kloping.spt.StarterObjectApplication;
-import io.github.kloping.spt.annotations.Entity;
-import io.github.kloping.spt.interfaces.component.ContextManager;
-import io.github.kloping.spt.interfaces.component.HttpClientManager;
 import io.github.kloping.common.Public;
 import io.github.kloping.judge.Judge;
 import io.github.kloping.qqbot.entities.Bot;
@@ -13,9 +9,12 @@
 import io.github.kloping.qqbot.network.WebSocketListener;
 import io.github.kloping.qqbot.network.WssWorker;
 import io.github.kloping.qqbot.utils.LoggerImpl;
+import io.github.kloping.spt.StarterObjectApplication;
+import io.github.kloping.spt.annotations.Entity;
+import io.github.kloping.spt.interfaces.component.ContextManager;
+import io.github.kloping.spt.interfaces.component.HttpClientManager;
 import lombok.Data;
 import lombok.Getter;
-import org.java_websocket.client.WebSocketClient;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -67,7 +66,10 @@
  * @author github.kloping
  */
 public class Starter implements Runnable {
+    public static final String SANDBOX_NET_MAIN = "https://sandbox.api.sgroup.qq.com/";
     public static final String NET_MAIN = "https://api.sgroup.qq.com/";
+    public String net = NET_MAIN;
+    public static final String NET_POINT = "{io.github.kloping.qqbot.Starter.net}";
     public static final String APPID_ID = "appid";
     public static final String TOKEN_ID = "token";
     public static final String SECRET_ID = "secret";
@@ -130,6 +132,7 @@ protected void after() {
         String appid = getConfig().getAppid();
         String token = getConfig().getToken();
         String secret = getConfig().getSecret();
+        net = getConfig().sandbox ? SANDBOX_NET_MAIN : NET_MAIN;
         contextManager = APPLICATION.INSTANCE.getContextManager();
         contextManager.append(this);
         contextManager.append(appid, APPID_ID);
@@ -176,6 +179,7 @@ public void registerEventsRegister(Class<? extends Events.EventRegister> cla) {
 
     @Data
     public static class Config {
+        public boolean sandbox = false;
         private String appid;
         private String token;
         /**
@@ -190,6 +194,13 @@ public static class Config {
         private Set<ListenerHost> listenerHosts = new HashSet<>();
         private ImageUploadInterceptor interceptor0;
         private WebSocketListener webSocketListener;
+
+        /**
+         * 在沙箱环境与正式环境 之前切换 默认正式环境
+         */
+        public void sandbox() {
+            sandbox = !sandbox;
+        }
     }
 
     public Bot getBot() {

src/main/java/io/github/kloping/qqbot/http/BotBase.java

@@ -9,7 +9,7 @@
 /**
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface BotBase {
     /**

src/main/java/io/github/kloping/qqbot/http/ChannelBase.java

@@ -10,7 +10,7 @@
 /**
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface ChannelBase {
     /**

src/main/java/io/github/kloping/qqbot/http/DmsBase.java

@@ -15,7 +15,7 @@
 /**
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface DmsBase {
     /**

src/main/java/io/github/kloping/qqbot/http/GroupBaseV2.java

@@ -13,7 +13,7 @@
  *
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getV2Headers")
 public interface GroupBaseV2 extends BaseV2{
     /**

src/main/java/io/github/kloping/qqbot/http/GuildBase.java

@@ -7,14 +7,13 @@
 import io.github.kloping.qqbot.entities.qqpd.Guild;
 import io.github.kloping.qqbot.entities.qqpd.Member;
 import io.github.kloping.qqbot.entities.qqpd.Roles;
-import org.jsoup.Connection;
 
 import java.util.Map;
 
 /**
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface GuildBase {
     /**

src/main/java/io/github/kloping/qqbot/http/InterActionBase.java

@@ -7,7 +7,7 @@
 /**
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getV2Headers")
 public interface InterActionBase {
     /**

src/main/java/io/github/kloping/qqbot/http/MemberBase.java

@@ -8,7 +8,7 @@
 /**
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface MemberBase {
 

src/main/java/io/github/kloping/qqbot/http/MessageBase.java

@@ -3,7 +3,6 @@
 import io.github.kloping.spt.annotations.http.*;
 import io.github.kloping.spt.entity.KeyVals;
 import io.github.kloping.qqbot.Starter;
-import io.github.kloping.qqbot.entities.qqpd.message.RawPreMessage;
 import io.github.kloping.qqbot.http.data.ActionResult;
 
 import java.util.Map;
@@ -15,7 +14,7 @@
  *
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface MessageBase {
      /**

src/main/java/io/github/kloping/qqbot/http/UserBase.java

@@ -5,18 +5,17 @@
 import io.github.kloping.spt.annotations.http.HttpClient;
 import io.github.kloping.qqbot.entities.qqpd.User;
 
-import static io.github.kloping.qqbot.Starter.NET_MAIN;
+import static io.github.kloping.qqbot.Starter.NET_POINT;
 
 /**
  * @author github.kloping
  */
-@HttpClient(NET_MAIN)
+@HttpClient(NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getHeaders")
 public interface UserBase {
     /**
      * bot info
      *
-     * @param headers
      * @return
      */
     @GetPath("/users/@me")

src/main/java/io/github/kloping/qqbot/http/UserBaseV2.java

@@ -13,7 +13,7 @@
  *
  * @author github.kloping
  */
-@HttpClient(Starter.NET_MAIN)
+@HttpClient(Starter.NET_POINT)
 @Headers("io.github.kloping.qqbot.Start0.getV2Headers")
 public interface UserBaseV2 extends BaseV2 {
     /**

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

@@ -41,6 +41,6 @@ public String getClassName() {
 
     @Override
     public String toString() {
-        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-R1", bot.getConfig().getAppid());
+        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-R2", bot.getConfig().getAppid());
     }
 }