Skip to content

Commit 672a0aa

Browse files
KlopingKloping
committed
docs fix #25; RequestException
部分类包名修改
1 parent 1547f42 commit 672a0aa

40 files changed

+134
-120
lines changed

‎pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.kloping</groupId>
88
<artifactId>bot-qqpd-java</artifactId>
9-
<version>1.5.1-L1</version>
9+
<version>1.5.1-R1</version>
1010

1111
<packaging>jar</packaging>
1212
<name>bot-qqpd-java</name>
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>io.github.Kloping</groupId>
5151
<artifactId>SpringTool</artifactId>
52-
<version>0.6.3-Alpha1</version>
52+
<version>0.6.3-Beta2</version>
5353
<exclusions>
5454
<exclusion>
5555
<groupId>io.github.Kloping</groupId>
@@ -153,6 +153,7 @@
153153
</goals>
154154
</execution>
155155
</executions>
156+
<!--非手动签名配置-->
156157
<configuration>
157158
<gpgArguments>
158159
<arg>--pinentry-mode</arg>

‎src/main/java/io/github/kloping/qqbot/HttpClientConfig.java

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package io.github.kloping.qqbot;
22

3-
import io.github.kloping.MySpringTool.annotations.AutoStand;
4-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
5-
import io.github.kloping.MySpringTool.annotations.Entity;
6-
import io.github.kloping.MySpringTool.h1.impl.LoggerImpl;
7-
import io.github.kloping.MySpringTool.h1.impl.component.HttpStatusReceiver;
8-
import io.github.kloping.MySpringTool.interfaces.Logger;
9-
import io.github.kloping.MySpringTool.interfaces.component.HttpClientManager;
103
import io.github.kloping.common.Public;
114
import io.github.kloping.qqbot.api.BotContent;
125
import io.github.kloping.qqbot.entities.Bot;
136
import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;
147
import io.github.kloping.qqbot.http.data.ActionResult;
8+
import io.github.kloping.qqbot.utils.RequestException;
9+
import io.github.kloping.spt.annotations.AutoStand;
10+
import io.github.kloping.spt.annotations.AutoStandAfter;
11+
import io.github.kloping.spt.annotations.Entity;
12+
import io.github.kloping.spt.impls.HttpStatusReceiver;
13+
import io.github.kloping.spt.impls.LoggerImpl;
14+
import io.github.kloping.spt.interfaces.Logger;
15+
import io.github.kloping.spt.interfaces.component.HttpClientManager;
1516
import org.fusesource.jansi.Ansi;
1617
import org.jsoup.Connection;
1718
import org.jsoup.nodes.Document;
@@ -44,6 +45,7 @@ public void after(HttpClientManager manager) {
4445
public void receive(HttpClientManager manager, String url, Integer code, Class<?> interface0, Method method,
4546
Connection.Method reqMethod, Class<?> cla, Object o, Document metadata) {
4647
if (o == null || code == null || metadata == null) return;
48+
4749
logger.log(String.format("Use the (%s) method through the (%s) interface to request " +
4850
"the data obtained by the response code of the (%s) URL is (%s), " +
4951
"and (%s) may be converted to (%s) type Will be processed and filtered",
@@ -57,7 +59,6 @@ public void receive(HttpClientManager manager, String url, Integer code, Class<?
5759
Ansi.ansi().fgRgb(LoggerImpl.NORMAL_LOW_COLOR.getRGB()).a(o).reset().toString()
5860
));
5961
fillAll(cla, o);
60-
6162
Public.EXECUTOR_SERVICE.submit(() -> {
6263
if (o instanceof ActionResult) {
6364
ActionResult result = (ActionResult) o;
@@ -76,6 +77,9 @@ public void receive(HttpClientManager manager, String url, Integer code, Class<?
7677
}
7778
}
7879
});
80+
if (code >= 400 || code < 200) {
81+
throw new RequestException(code, metadata.body().wholeText(), url, method.getName());
82+
}
7983
}
8084

8185
public void fillAll(Class<?> cla, Object o) {

‎src/main/java/io/github/kloping/qqbot/Resource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kloping.qqbot;
22

33
import com.google.gson.Gson;
4-
import io.github.kloping.MySpringTool.annotations.Entity;
4+
import io.github.kloping.spt.annotations.Entity;
55

66
/**
77
* @author github.kloping

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.kloping.qqbot;
22

3-
import io.github.kloping.MySpringTool.annotations.AutoStand;
4-
import io.github.kloping.MySpringTool.annotations.CommentScan;
5-
import io.github.kloping.MySpringTool.interfaces.component.ContextManager;
3+
import io.github.kloping.spt.annotations.AutoStand;
4+
import io.github.kloping.spt.annotations.CommentScan;
5+
import io.github.kloping.spt.interfaces.component.ContextManager;
66
import io.github.kloping.judge.Judge;
77
import io.github.kloping.qqbot.entities.qqpd.Channel;
88
import io.github.kloping.qqbot.http.AuthV2Base;

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.kloping.qqbot;
22

3-
import io.github.kloping.MySpringTool.StarterObjectApplication;
4-
import io.github.kloping.MySpringTool.annotations.Entity;
5-
import io.github.kloping.MySpringTool.interfaces.component.ContextManager;
6-
import io.github.kloping.MySpringTool.interfaces.component.HttpClientManager;
3+
import io.github.kloping.spt.StarterObjectApplication;
4+
import io.github.kloping.spt.annotations.Entity;
5+
import io.github.kloping.spt.interfaces.component.ContextManager;
6+
import io.github.kloping.spt.interfaces.component.HttpClientManager;
77
import io.github.kloping.common.Public;
88
import io.github.kloping.judge.Judge;
99
import io.github.kloping.qqbot.entities.Bot;
@@ -21,7 +21,7 @@
2121
import java.util.Set;
2222
import java.util.concurrent.Future;
2323

24-
import static io.github.kloping.MySpringTool.PartUtils.getExceptionLine;
24+
import static io.github.kloping.spt.PartUtils.getExceptionLine;
2525

2626
/**
2727
* <h3>一般启动方式</h3>

‎src/main/java/io/github/kloping/qqbot/entities/Bot.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.kloping.qqbot.entities;
22

3-
import io.github.kloping.MySpringTool.annotations.AutoStand;
4-
import io.github.kloping.MySpringTool.annotations.Entity;
5-
import io.github.kloping.MySpringTool.interfaces.Logger;
3+
import io.github.kloping.spt.annotations.AutoStand;
4+
import io.github.kloping.spt.annotations.Entity;
5+
import io.github.kloping.spt.interfaces.Logger;
66
import io.github.kloping.qqbot.Starter;
77
import io.github.kloping.qqbot.entities.qqpd.Guild;
88
import io.github.kloping.qqbot.entities.qqpd.User;

‎src/main/java/io/github/kloping/qqbot/entities/ex/BaseKeyVals.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.entities.ex;
22

3-
import io.github.kloping.MySpringTool.entity.KeyVals;
3+
import io.github.kloping.spt.entity.KeyVals;
44
import org.jsoup.helper.HttpConnection;
55

66
import java.util.Collection;

‎src/main/java/io/github/kloping/qqbot/entities/qqpd/message/RawMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kloping.qqbot.entities.qqpd.message;
22

33
import com.alibaba.fastjson.annotation.JSONField;
4-
import io.github.kloping.MySpringTool.PartUtils;
4+
import io.github.kloping.spt.PartUtils;
55
import io.github.kloping.judge.Judge;
66
import io.github.kloping.qqbot.api.*;
77
import io.github.kloping.qqbot.api.message.Pinsble;

‎src/main/java/io/github/kloping/qqbot/http/AuthV2Base.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.Headers;
4-
import io.github.kloping.MySpringTool.annotations.http.HttpClient;
5-
import io.github.kloping.MySpringTool.annotations.http.PostPath;
6-
import io.github.kloping.MySpringTool.annotations.http.RequestBody;
3+
import io.github.kloping.spt.annotations.http.Headers;
4+
import io.github.kloping.spt.annotations.http.HttpClient;
5+
import io.github.kloping.spt.annotations.http.PostPath;
6+
import io.github.kloping.spt.annotations.http.RequestBody;
77
import io.github.kloping.qqbot.http.data.Token;
88

99
import java.util.Map;

‎src/main/java/io/github/kloping/qqbot/http/BaseV2.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.Headers;
4-
import io.github.kloping.MySpringTool.annotations.http.RequestBody;
3+
import io.github.kloping.spt.annotations.http.Headers;
4+
import io.github.kloping.spt.annotations.http.RequestBody;
55
import io.github.kloping.qqbot.http.data.V2Result;
66

77
import java.util.Map;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.GetPath;
4-
import io.github.kloping.MySpringTool.annotations.http.Headers;
5-
import io.github.kloping.MySpringTool.annotations.http.HttpClient;
3+
import io.github.kloping.spt.annotations.http.GetPath;
4+
import io.github.kloping.spt.annotations.http.Headers;
5+
import io.github.kloping.spt.annotations.http.HttpClient;
66
import io.github.kloping.qqbot.Starter;
77
import io.github.kloping.qqbot.http.data.UrlPack;
88

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
3+
import io.github.kloping.spt.annotations.http.*;
44
import io.github.kloping.qqbot.Starter;
55
import io.github.kloping.qqbot.entities.qqpd.Channel;
66
import io.github.kloping.qqbot.entities.qqpd.PinsMessage;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
4-
import io.github.kloping.MySpringTool.entity.KeyVals;
3+
import io.github.kloping.spt.annotations.http.*;
4+
import io.github.kloping.spt.entity.KeyVals;
55
import io.github.kloping.qqbot.Starter;
66
import io.github.kloping.qqbot.entities.qqpd.Dms;
77
import io.github.kloping.qqbot.entities.qqpd.DmsRequest;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
3+
import io.github.kloping.spt.annotations.http.*;
44
import io.github.kloping.qqbot.Starter;
55
import io.github.kloping.qqbot.http.data.V2Result;
66

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
3+
import io.github.kloping.spt.annotations.http.*;
44
import io.github.kloping.qqbot.Starter;
55
import io.github.kloping.qqbot.entities.ex.ChannelData;
66
import io.github.kloping.qqbot.entities.qqpd.Channel;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
3+
import io.github.kloping.spt.annotations.http.*;
44
import io.github.kloping.qqbot.Starter;
55
import org.jsoup.Connection;
66

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
3+
import io.github.kloping.spt.annotations.http.*;
44
import io.github.kloping.qqbot.Starter;
55
import io.github.kloping.qqbot.http.data.MutePack;
66
import org.jsoup.Connection;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
4-
import io.github.kloping.MySpringTool.entity.KeyVals;
3+
import io.github.kloping.spt.annotations.http.*;
4+
import io.github.kloping.spt.entity.KeyVals;
55
import io.github.kloping.qqbot.Starter;
66
import io.github.kloping.qqbot.entities.qqpd.message.RawPreMessage;
77
import io.github.kloping.qqbot.http.data.ActionResult;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.GetPath;
4-
import io.github.kloping.MySpringTool.annotations.http.Headers;
5-
import io.github.kloping.MySpringTool.annotations.http.HttpClient;
3+
import io.github.kloping.spt.annotations.http.GetPath;
4+
import io.github.kloping.spt.annotations.http.Headers;
5+
import io.github.kloping.spt.annotations.http.HttpClient;
66
import io.github.kloping.qqbot.entities.qqpd.User;
77

88
import static io.github.kloping.qqbot.Starter.NET_MAIN;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kloping.qqbot.http;
22

3-
import io.github.kloping.MySpringTool.annotations.http.*;
3+
import io.github.kloping.spt.annotations.http.*;
44
import io.github.kloping.qqbot.Starter;
55
import io.github.kloping.qqbot.http.data.V2Result;
66

‎src/main/java/io/github/kloping/qqbot/http/data/V2Result.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.alibaba.fastjson.JSON;
44
import com.alibaba.fastjson.JSONObject;
55
import com.alibaba.fastjson.annotation.JSONField;
6-
import io.github.kloping.MySpringTool.interfaces.Logger;
6+
import io.github.kloping.spt.interfaces.Logger;
77
import io.github.kloping.judge.Judge;
88
import io.github.kloping.qqbot.entities.ex.Image;
99
import io.github.kloping.qqbot.entities.exceptions.ImageUploadFailedException;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public String getClassName() {
4141

4242
@Override
4343
public String toString() {
44-
return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-L1", bot.getConfig().getAppid());
44+
return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-R1", bot.getConfig().getAppid());
4545
}
4646
}

‎src/main/java/io/github/kloping/qqbot/impl/ListenerHost.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ public abstract class ListenerHost {
1212
* 错误抛出处理
1313
*
1414
* @param e
15+
* @return true 继续日志打印报错
1516
*/
16-
public void handleException(Throwable e) {
17-
e.printStackTrace();
17+
public boolean handleException(Throwable e) {
18+
return true;
1819
}
1920

2021
@Override

‎src/main/java/io/github/kloping/qqbot/impl/registers/ChannelEventsRegister.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
77
import io.github.kloping.qqbot.api.event.Event;
88
import io.github.kloping.qqbot.entities.Bot;
99
import io.github.kloping.qqbot.entities.qqpd.Common;

‎src/main/java/io/github/kloping/qqbot/impl/registers/GroupEventsRegister.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
7-
import io.github.kloping.MySpringTool.interfaces.Logger;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
7+
import io.github.kloping.spt.interfaces.Logger;
88
import io.github.kloping.qqbot.api.event.Event;
99
import io.github.kloping.qqbot.entities.Bot;
1010
import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;

‎src/main/java/io/github/kloping/qqbot/impl/registers/GroupRobotEventRegister.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
77
import io.github.kloping.qqbot.api.event.Event;
88
import io.github.kloping.qqbot.entities.Bot;
99
import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;

‎src/main/java/io/github/kloping/qqbot/impl/registers/GuildEventsRegister.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
7-
import io.github.kloping.MySpringTool.interfaces.Logger;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
7+
import io.github.kloping.spt.interfaces.Logger;
88
import io.github.kloping.qqbot.api.event.Event;
99
import io.github.kloping.qqbot.entities.Bot;
1010
import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;

‎src/main/java/io/github/kloping/qqbot/impl/registers/InterActionEventRegister.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
7-
import io.github.kloping.MySpringTool.interfaces.Logger;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
7+
import io.github.kloping.spt.interfaces.Logger;
88
import io.github.kloping.qqbot.api.event.Event;
99
import io.github.kloping.qqbot.entities.Bot;
1010
import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;

‎src/main/java/io/github/kloping/qqbot/impl/registers/MemberEventRegisters.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
77
import io.github.kloping.map.MapUtils;
88
import io.github.kloping.qqbot.api.event.Event;
99
import io.github.kloping.qqbot.api.event.MemberUpdateEvent;

‎src/main/java/io/github/kloping/qqbot/impl/registers/MessageDeleteEventRegister.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.kloping.qqbot.impl.registers;
22

33
import com.alibaba.fastjson.JSONObject;
4-
import io.github.kloping.MySpringTool.annotations.AutoStand;
5-
import io.github.kloping.MySpringTool.annotations.AutoStandAfter;
6-
import io.github.kloping.MySpringTool.annotations.Entity;
4+
import io.github.kloping.spt.annotations.AutoStand;
5+
import io.github.kloping.spt.annotations.AutoStandAfter;
6+
import io.github.kloping.spt.annotations.Entity;
77
import io.github.kloping.qqbot.api.event.Event;
88
import io.github.kloping.qqbot.entities.Bot;
99
import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;

0 commit comments

Comments
 (0)