Merge pull request #77 from ashinnotfound/fix/loginByPassword

feat: 删除qq机器人使用密码登陆的方法

Author: ashinnotfound

pom.xml

@@ -38,19 +38,6 @@
             <artifactId>mirai-core-jvm</artifactId>
             <version>2.16.0</version>
         </dependency>
-<!--        临时修复qq登录组件     https://github.com/cssxsh/fix-protocol-version.git     -->
-        <dependency>
-            <groupId>mirai</groupId>
-            <artifactId>fix-protocol</artifactId>
-            <version>1.12.0</version>
-            <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/fix-protocol-version-1.12.0.mirai2.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>org.asynchttpclient</groupId>
-            <artifactId>async-http-client</artifactId>
-            <version>2.12.3</version>
-        </dependency>
 <!--        微信          -->
         <dependency>
             <groupId>itchat</groupId>

src/main/java/com/ashin/client/QqBotClient.java

@@ -8,7 +8,6 @@
 import net.mamoe.mirai.auth.BotAuthorization;
 import net.mamoe.mirai.utils.BotConfiguration;
 import org.springframework.stereotype.Component;
-import xyz.cssxsh.mirai.tool.FixProtocolVersion;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -29,27 +28,20 @@ public class QqBotClient {
     @PostConstruct
     public void init() {
         if (qqConfig.getEnable()) {
-            //登录 登陆协议有ANDROID_PHONE, ANDROID_PAD, ANDROID_WATCH, IPAD, MACOS
+            //登陆协议有ANDROID_PHONE, ANDROID_PAD, ANDROID_WATCH, IPAD, MACOS
+            //若登陆失败可尝试更换协议
+            BotConfiguration.MiraiProtocol miraiProtocol = BotConfiguration.MiraiProtocol.ANDROID_WATCH;
             try {
                 log.info("正在登录qq,请按提示操作：");
-                if (qqConfig.getLoginByQRCode()) {
-                    //扫码登陆
-                    qqBot = BotFactory.INSTANCE.newBot(qqConfig.getAccount(), BotAuthorization.byQRCode(), configuration -> configuration.setProtocol(BotConfiguration.MiraiProtocol.ANDROID_WATCH));
-                } else {
-                    //密码登录
-                    qqBot = BotFactory.INSTANCE.newBot(qqConfig.getAccount(), qqConfig.getPassword().trim(), new BotConfiguration() {{
-                        setProtocol(BotConfiguration.MiraiProtocol.ANDROID_PAD);
-                    }});
-                    //使用临时修复插件
-                    FixProtocolVersion.update();
-                }
+                //扫码登陆
+                qqBot = BotFactory.INSTANCE.newBot(qqConfig.getAccount(), BotAuthorization.byQRCode(), configuration -> configuration.setProtocol(miraiProtocol));
 
                 qqBot.login();
-                log.info("成功登录账号为 {} 的qq, 登陆方式为 {}", qqConfig.getAccount(), qqConfig.getLoginByQRCode() ? "扫码登陆" : "密码登录");
+                log.info("成功登录账号为 {} 的qq, 登陆协议为 {}", qqConfig.getAccount(), miraiProtocol);
                 //订阅监听事件
                 qqBot.getEventChannel().registerListenerHost(qqMessageHandler);
             } catch (Exception e) {
-                log.error("登陆失败，qq账号为 {}, 登陆方式为 {} ，原因：{}", qqConfig.getAccount(), qqConfig.getLoginByQRCode() ? "扫码登陆" : "密码登录", e.getMessage());
+                log.error("登陆失败, qq账号为 {}, 登陆协议为 {}, 可尝试更换登陆协议, 具体原因: {}", qqConfig.getAccount(), miraiProtocol, e.getMessage());
             }
         }
     }

src/main/java/com/ashin/config/QqConfig.java

@@ -15,9 +15,7 @@
 @ConfigurationProperties("qq")
 public class QqConfig {
     private Boolean enable;
-    private Boolean loginByQRCode;
     private Long account;
-    private String password;
     private Boolean acceptNewFriend;
     private Boolean acceptNewGroup;
     private Boolean returnDrawByURL;

src/main/resources/application.yml

@@ -26,12 +26,8 @@ gpt:
 qq:
   #  是否使用qq true/false
   enable: true
-  #  登陆方法：true扫码登录(推荐) false密码登录
-  loginByQRCode: true
-  #  qq账号密码
+  #  qq账号
   account:
-  #  (扫码登录则无需填写密码)
-  password:
   #  是否自动同意好友申请
   acceptNewFriend: false
   #  是否自动同意被邀请入群