diff --git a/docs/changelog.md b/docs/changelog.md new file mode 100644 index 0000000..b5a3e5c --- /dev/null +++ b/docs/changelog.md @@ -0,0 +1,7 @@ +# 更新日志 + +### qqrobot-spring-boot-starter 1.0.0 +- 起始版本 + +### qqrobot-framework 1.0.0 +- 起始版本 diff --git a/qqrobot-framework/build.gradle b/qqrobot-framework/build.gradle index 447a913..4f0776a 100644 --- a/qqrobot-framework/build.gradle +++ b/qqrobot-framework/build.gradle @@ -1 +1 @@ -setupVersion '1.0' \ No newline at end of file +setupVersion '1.0.0' diff --git a/qqrobot-spring-boot-starter/build.gradle b/qqrobot-spring-boot-starter/build.gradle index ed7ca82..8a7bde3 100644 --- a/qqrobot-spring-boot-starter/build.gradle +++ b/qqrobot-spring-boot-starter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'io.spring.dependency-management' version '1.0.11.RELEASE' } -setupVersion '1.0' +setupVersion '1.0.0' ext { miraiVersion = '2.8.2' @@ -10,7 +10,7 @@ ext { dependencyManagement { imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:2.5.10' + mavenBom 'org.springframework.boot:spring-boot-dependencies:2.3.5.RELEASE' } } diff --git a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/command/CommandMethodArgs.java b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/command/CommandMethodArgs.java index 2beb6a4..bbe2349 100644 --- a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/command/CommandMethodArgs.java +++ b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/command/CommandMethodArgs.java @@ -7,6 +7,7 @@ /** * 命令方法参数类型,被@Command注解的类必须采用此参数类型 */ +@SuppressWarnings("unused") @Getter public class CommandMethodArgs { diff --git a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/mirai/MiraiFramework.java b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/mirai/MiraiFramework.java index 8f74cc1..c21936d 100644 --- a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/mirai/MiraiFramework.java +++ b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/mirai/MiraiFramework.java @@ -79,7 +79,7 @@ public void addListener(ListenerHost listener) { public void init() { Long qq = basicProperties.getQq(); String password = basicProperties.getPassword(); - if(ObjectUtils.anyNull(qq, password)) { + if(!ObjectUtils.allNotNull(qq, password)) { throw new RuntimeException("QQ号或密码不能为空"); } boolean redirectLogs = miraiProperties.getRedirectLogs(); @@ -87,10 +87,16 @@ public void init() { BotConfiguration conf = BotConfiguration.getDefault(); //转移日志存放目录,设置设备信息 //定义设备信息文件路径,与存放日志的目录路径 - String deviceInfoPath = FileSystems.getDefault().getPath(FileUtils.getClasspath(), - miraiProperties.getWorkDirectory(), "deviceInfo.json").toString(); - String logBase = FileSystems.getDefault().getPath(FileUtils.getClasspath(), - miraiProperties.getWorkDirectory(), "log") + File.separator; + String deviceInfoPath = FileSystems.getDefault().getPath( + FileUtils.getClasspath(), + miraiProperties.getWorkDirectory(), + "deviceInfo.json" + ).toString(); + String logBase = FileSystems.getDefault().getPath( + FileUtils.getClasspath(), + miraiProperties.getWorkDirectory(), + "log" + ) + File.separator; File botLogDir = new File(logBase + "bot"); File networkLogDir = new File(logBase + "network"); //检查文件与目录是否存在,不存在则创建 diff --git a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/tester/server/TesterServerConnection.java b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/tester/server/TesterServerConnection.java index 68c7b02..6552c03 100644 --- a/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/tester/server/TesterServerConnection.java +++ b/qqrobot-spring-boot-starter/src/main/java/de/honoka/qqrobot/starter/framework/tester/server/TesterServerConnection.java @@ -93,7 +93,7 @@ private TesterMessage onLogin(TesterMessage message) { "不能使用Robot作为用户名"); return res; } - if(ObjectUtils.anyNull(qq, username) || username.isEmpty()) { + if(!ObjectUtils.allNotNull(qq, username) || username.isEmpty()) { resData.addProperty("status", false); resData.addProperty("message", "账号和用户名不能为空"); return res;