From 1d09f2dce1cb1a9895c9172d08da0338ef952f77 Mon Sep 17 00:00:00 2001
From: Genius <77137063+969025903@users.noreply.github.com>
Date: Fri, 13 Oct 2023 01:09:03 +0800
Subject: [PATCH 1/4] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index fbecf62..ac837ae 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,8 @@
 ![9f9a0e3127245ae70e5375c1bf90509](https://github.com/969025903/ChopperBot/assets/77137063/6d8c0f1e-a02f-4d04-a047-f03888358790)
 ## Heat Recommend
 ![431e8b1880825e528b07f9c11360577](https://github.com/969025903/ChopperBot/assets/77137063/adeab4ae-25fe-4752-a6ce-2a79a6f5703e)
+## Hot Live
+![T4)XK652SFQ1FH7BF53~1 J](https://github.com/969025903/ChopperBot/assets/77137063/6fe79608-6724-4768-8b39-3f4b9b2483c2)
 
 **More pages in development....**
 # 🕹 ChopperBot Module

From 99dde3e038bea6eddc26af5a1507fd3c08c6dd33 Mon Sep 17 00:00:00 2001
From: Genius <77137063+969025903@users.noreply.github.com>
Date: Fri, 13 Oct 2023 01:09:31 +0800
Subject: [PATCH 2/4] Update README.zh-CN.md

---
 README.zh-CN.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.zh-CN.md b/README.zh-CN.md
index 2bd239c..4e2b688 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -67,7 +67,8 @@
 ![9f9a0e3127245ae70e5375c1bf90509](https://github.com/969025903/ChopperBot/assets/77137063/6d8c0f1e-a02f-4d04-a047-f03888358790)
 ## 热门直播推荐
 ![431e8b1880825e528b07f9c11360577](https://github.com/969025903/ChopperBot/assets/77137063/adeab4ae-25fe-4752-a6ce-2a79a6f5703e)
-
+## 多平台热门直播
+![T4)XK652SFQ1FH7BF53~1 J](https://github.com/969025903/ChopperBot/assets/77137063/6fe79608-6724-4768-8b39-3f4b9b2483c2)
 **更多页面正在开发中....**
 
 # 🕹 ChopperBot模块介绍

From 9927cfa40eb004d13daf5db00d645275ff818d7e Mon Sep 17 00:00:00 2001
From: welsir <1824379011@qq.com>
Date: Fri, 13 Oct 2023 01:30:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=9D=97b?=
 =?UTF-8?q?=E7=AB=99=E7=99=BB=E5=BD=95=E3=80=81=E6=8A=96=E9=9F=B3=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=8A=96=E9=9F=B3=E8=A7=86=E9=A2=91=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |   2 +-
 .../main/java/org/example/api/AccountApi.java |  39 +++++--
 .../example/core/account/AccountCenter.java   |  19 ----
 .../core/account/AccountOperateCenter.java    |  24 +++++
 .../core/account/Impl/AccountOperator.java    |  66 ++++++++++--
 .../org/example/core/constpool/ConstPool.java |  35 ++++++
 .../{ => core}/mapper/AccountMapper.java      |   5 +-
 .../{ => core}/mapper/AccountTypeMapper.java  |   2 +-
 .../org/example/core/platform/Bilibili.java   | 101 ++++++++++++++----
 .../org/example/core/platform/Douyin.java     |  17 +++
 .../org/example/{ => core}/pojo/Account.java  |  15 +--
 .../example/{ => core}/pojo/AccountType.java  |   4 +-
 .../java/org/example/core/pojo/AccountVO.java |  24 +++++
 .../example/{ => core}/pojo/PlatformType.java |   2 +-
 .../org/example/{ => core}/pojo/Video.java    |   4 +-
 .../example/{ => core}/pojo/VideoQueue.java   |   9 +-
 .../example/{ => core}/pojo/VideoType.java    |   2 +-
 chopperbot-test/database.db                   | Bin 61440 -> 81920 bytes
 18 files changed, 287 insertions(+), 83 deletions(-)
 delete mode 100644 chopperbot-account/src/main/java/org/example/core/account/AccountCenter.java
 create mode 100644 chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java
 create mode 100644 chopperbot-account/src/main/java/org/example/core/constpool/ConstPool.java
 rename chopperbot-account/src/main/java/org/example/{ => core}/mapper/AccountMapper.java (86%)
 rename chopperbot-account/src/main/java/org/example/{ => core}/mapper/AccountTypeMapper.java (87%)
 create mode 100644 chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
 rename chopperbot-account/src/main/java/org/example/{ => core}/pojo/Account.java (62%)
 rename chopperbot-account/src/main/java/org/example/{ => core}/pojo/AccountType.java (88%)
 create mode 100644 chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java
 rename chopperbot-account/src/main/java/org/example/{ => core}/pojo/PlatformType.java (94%)
 rename chopperbot-account/src/main/java/org/example/{ => core}/pojo/Video.java (89%)
 rename chopperbot-account/src/main/java/org/example/{ => core}/pojo/VideoQueue.java (78%)
 rename chopperbot-account/src/main/java/org/example/{ => core}/pojo/VideoType.java (82%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 93225a1..d529ac8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -38,7 +38,7 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="ChopperBot" options="" />
+      <module name="ChopperBot" options="-parameters" />
       <module name="chopperbot-account" options="-parameters" />
       <module name="chopperbot-barrage" options="-parameters" />
       <module name="chopperbot-common" options="-parameters" />
diff --git a/chopperbot-account/src/main/java/org/example/api/AccountApi.java b/chopperbot-account/src/main/java/org/example/api/AccountApi.java
index 547c36a..6f7bea2 100644
--- a/chopperbot-account/src/main/java/org/example/api/AccountApi.java
+++ b/chopperbot-account/src/main/java/org/example/api/AccountApi.java
@@ -2,7 +2,9 @@ package org.example.api;
 
 import org.example.core.account.Impl.AccountOperator;
 import org.example.pojo.Account;
-import org.springframework.web.bind.annotation.*;
+import org.example.pojo.AccountVO;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -12,25 +14,42 @@ import java.util.List;
  * @Author welsir
  * @Date 2023/9/22 14:11
  */
-@RestController
-@RequestMapping("account")
+@Component
 public class AccountApi {
 
     @Resource
     private AccountOperator accountOperator;
 
-    @PostMapping("/addUser/{uid}")
-    public void addAccount(@PathVariable int uid){
-        accountOperator.insertAccount(uid);
+    /*
+     * 第一次登陆调用此方法将账号对应cookie存入数据库中
+     * 目前仅支持两个平台的账号保管(抖音、b站)
+     * 目前只支持以下方式登录
+     * 抖音登录默认为验证码登录
+     * b站登录默认为账号密码登录
+     */
+    public void addAccountSaveCookie(int platformId, @RequestBody String username, @RequestBody String password){
+        accountOperator.insertAccount(platformId,username,password);
     }
 
-    @GetMapping("/getUser/{platformId}")
-    public List<Account> getAllUsers(@PathVariable int platformId){
+    /*
+     * 根据平台id获取用户集合
+     */
+    public List<AccountVO> getAllUsers(int platformId){
         return accountOperator.getAllUsers(platformId);
     }
 
-    @PostMapping("/editUser")
-    public void editUser(@RequestBody Account account){
+    public List<AccountVO> getAllUsers(){
+        return accountOperator.getAllUsers();
+    }
+
+    /*
+     * 修改用户属性
+     */
+    public void editUser(Account account){
         accountOperator.editUser(account);
     }
+
+    public void deleteUser(int uid){
+        accountOperator.deleteAccount(uid);
+    }
 }
diff --git a/chopperbot-account/src/main/java/org/example/core/account/AccountCenter.java b/chopperbot-account/src/main/java/org/example/core/account/AccountCenter.java
deleted file mode 100644
index 866eb83..0000000
--- a/chopperbot-account/src/main/java/org/example/core/account/AccountCenter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.example.core.account;
-
-import org.example.pojo.Account;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author welsir
- * @Date 2023/9/23 14:02
- */
-public interface AccountCenter {
-
-    void insertAccount(int platformId);
-
-    List<Account> getAllUsers(int id);
-
-    void editUser(Account account);
-}
diff --git a/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java b/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java
new file mode 100644
index 0000000..2c166a6
--- /dev/null
+++ b/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java
@@ -0,0 +1,24 @@
+package org.example.core.account;
+
+import org.example.pojo.Account;
+import org.example.pojo.AccountVO;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/9/23 14:02
+ */
+public interface AccountOperateCenter {
+
+    void insertAccount(int platformId,String username,String password);
+
+    List<AccountVO> getAllUsers();
+
+    List<AccountVO> getAllUsers(int id);
+
+    void deleteAccount(int uid);
+
+    void editUser(Account account);
+}
diff --git a/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java b/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
index 03fc6d3..0e32ee3 100644
--- a/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
+++ b/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
@@ -1,33 +1,54 @@
 package org.example.core.account.Impl;
 
-import org.example.core.account.AccountCenter;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.example.core.account.AccountOperateCenter;
+import org.example.core.constpool.ConstPool;
 import org.example.core.factory.PlatformFactory;
-import org.example.mapper.AccountMapper;
+import org.example.core.factory.PlatformOperation;
+import org.example.core.mapper.AccountMapper;
+import org.example.core.mapper.AccountTypeMapper;
 import org.example.pojo.Account;
-import org.springframework.stereotype.Component;
+import org.example.pojo.AccountType;
+import org.example.pojo.AccountVO;
+import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description
  * @Author welsir
  * @Date 2023/9/23 14:04
  */
-@Component
-public class AccountOperator implements AccountCenter {
+@Service
+public class AccountOperator implements AccountOperateCenter {
 
     @Resource
     private AccountMapper accountMapper;
+    @Resource
+    AccountTypeMapper accountTypeMapper;
     @Override
-    public void insertAccount(int platformId) {
-        PlatformFactory.createPlatformOperation(platformId);
+    public void insertAccount(int platformId,String username,String password) {
+        PlatformOperation platformOperation = PlatformFactory.createPlatformOperation(platformId);
+        platformOperation.login(platformId,username,password);
     }
 
     @Override
-    public List<Account> getAllUsers(int id) {
-        return accountMapper.selectUserByPlatform(id);
+    public List<AccountVO> getAllUsers() {
+        List<Account> accountList = accountMapper.selectList(null);
+        List<AccountType> accountTypes = accountTypeMapper.selectList(null);
+        return addTypeToAccount(accountTypes,accountList);
+    }
+
+    @Override
+    public List<AccountVO> getAllUsers(int id) {
+        List<Account> accountList = accountMapper.selectUserByPlatform(id);
+        List<AccountType> accountTypes = accountTypeMapper.selectList(null);
+        return addTypeToAccount(accountTypes,accountList);
     }
 
     @Override
@@ -35,4 +56,31 @@ public class AccountOperator implements AccountCenter {
         int i = accountMapper.updateById(account);
         Assert.isTrue(i==1,"Update user fail!Please try again or check the wrong!");
     }
+
+    public List<AccountVO> addTypeToAccount(List<AccountType> accountTypes,List<Account> accountList){
+        Map<Long, List<AccountType>> typeMap = accountTypes.stream()
+                .collect(Collectors.groupingBy(AccountType::getUid));
+        List<AccountVO> accountVOList = new ArrayList<>();
+        for (Account account : accountList) {
+            AccountVO accountVO = new AccountVO();
+            List<AccountType> types = typeMap.get(account.getId());
+            if (types != null) {
+                accountVO.setTypeList(types);
+                accountVO.setUid(account.getId());
+                accountVO.setUsername(account.getUsername());
+                accountVO.setPassword(account.getPassword());
+                accountVO.setPlatform(ConstPool.AccountPlatForm.fromId(account.getPlatformId()));
+                accountVOList.add(accountVO);
+            }
+        }
+        return accountVOList;
+    }
+
+    @Override
+    public void deleteAccount(int uid){
+        accountMapper.deleteById(uid);
+        QueryWrapper<AccountType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("uid",uid);
+        accountTypeMapper.delete(queryWrapper);
+    }
 }
diff --git a/chopperbot-account/src/main/java/org/example/core/constpool/ConstPool.java b/chopperbot-account/src/main/java/org/example/core/constpool/ConstPool.java
new file mode 100644
index 0000000..57a7f6f
--- /dev/null
+++ b/chopperbot-account/src/main/java/org/example/core/constpool/ConstPool.java
@@ -0,0 +1,35 @@
+package org.example.core.constpool;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/10/12 20:47
+ */
+public class ConstPool {
+
+    //账号平台
+    public enum AccountPlatForm{
+
+        BILIBILI(1),
+        DOUYIN(2);
+
+        private int id;
+
+        AccountPlatForm(int id){
+            this.id = id;
+        }
+
+        public static int getPlatFormId (int id){
+            return id;
+        }
+        public static String fromId(int id) {
+            for (AccountPlatForm platform : values()) {
+                if (platform.id == id) {
+                    return platform.toString();
+                }
+            }
+            throw new IllegalArgumentException("Invalid id: " + id);
+        }
+    }
+
+}
diff --git a/chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java b/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
similarity index 86%
rename from chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java
rename to chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
index 1bb7b7d..09e518c 100644
--- a/chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java
+++ b/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
@@ -1,9 +1,10 @@
-package org.example.mapper;
+package org.example.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
 import org.example.pojo.Account;
 import org.example.pojo.AccountType;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @Author welsir
  * @Date 2023/9/23 14:15
  */
+@Component
 public interface AccountMapper extends BaseMapper<Account> {
 
     @Select("select * from account a join platform pf on a.platformId=pf.id where pf.id = #{id}")
@@ -20,4 +22,5 @@ public interface AccountMapper extends BaseMapper<Account> {
     @Select("select * from account_type where uid=#{id}")
     List<AccountType> selectTypeByUid(Long id);
 
+
 }
diff --git a/chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java b/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
similarity index 87%
rename from chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java
rename to chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
index af3f7f6..0530c60 100644
--- a/chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java
+++ b/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
@@ -1,4 +1,4 @@
-package org.example.mapper;
+package org.example.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.example.pojo.AccountType;
diff --git a/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java b/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
index e91c623..e070f07 100644
--- a/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
+++ b/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
@@ -1,16 +1,23 @@
 package org.example.core.platform;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.example.core.factory.PlatformOperation;
-import org.example.mapper.AccountMapper;
+import org.example.core.mapper.AccountMapper;
 import org.example.pojo.Account;
+import org.openqa.selenium.By;
 import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 
 import javax.annotation.Resource;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
+
 
 /**
  * @Description
@@ -18,36 +25,84 @@ import java.util.concurrent.TimeUnit;
  * @Date 2023/9/24 21:18
  */
 public class Bilibili implements PlatformOperation {
+
+    //cookie本地读取路径
+    private static final String FILE_PATH = "D:\\Douyincookies.txt";
+    private static final String URL = "https://www.bilibili.com/";
     @Resource
     private AccountMapper accountMapper;
 
-    Set<Cookie> cookies;
     @Override
-    public void operation(int id) {
+    public void login(int id,String account,String password) {
         try {
-            //设置driver驱动，<-记得更改为自己的本地路径!!->
+            // 读取Python脚本的输出
+            List<String> command = new ArrayList<>();
+            command.add("python"); // Python 解释器
+            command.add("D:\\code\\gitHubProject\\Text_select_captcha\\bilbil.py"); // 要运行的 Python 脚本文件名
+            //第一次登录需要提供账号密码
+            command.add(account); // 第一个参数
+            command.add(password); // 第二个参数 账号
+            ProcessBuilder processBuilder = new ProcessBuilder(command);
+            Process process = processBuilder.start();
+            // 等待Python脚本执行完成
+            int exitCode = process.waitFor();
+            if (exitCode == 0) {
+                System.out.println("Python脚本执行成功！");
+            } else {
+                System.err.println("Python脚本执行失败！");
+            }
+
             System.setProperty("webdriver.chrome.driver", "D:\\downLoad\\chromedriver_win32\\chromedriver.exe");
             ChromeOptions options = new ChromeOptions();
-            //同理
+            options.addArguments("--headless");
             options.setBinary("C:\\Program Files (x86)\\Chromebrowser\\Chrome.exe");
             ChromeDriver webDriver = new ChromeDriver(options);
-            //b站网址
-            String url = "https://www.bilibili.com/";
-            webDriver.get(url);
-            //与浏览器同步非常重要，必须等待浏览器加载完毕
-            webDriver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-            //中间完成登录操作
-            Scanner scanner = new Scanner(System.in);
-            scanner.next();
-            //获取cookie
-            cookies = webDriver.manage().getCookies();
-            Account account = new Account();
-            account.setCookie(cookies);
-            account.setPlatformId(id);
-            accountMapper.insert(account);
-        } catch (Exception e) {
+            Set<Cookie> read = readCookiesByLocal();
+
+            webDriver.get(URL); //
+            webDriver.manage().deleteAllCookies();
+            for (Cookie cookie : read) {
+                webDriver.manage().addCookie(cookie);
+            }
+            webDriver.navigate().refresh();
+            Thread.sleep(3000L);
+            WebElement avator = webDriver.findElement(By.xpath("/html/body/div[2]/div[2]/div[1]/div[1]/ul[2]/li[1]"));
+            if(avator!=null){
+                Account user = new Account();
+                user.setCookies(read.toString());
+                user.setPlatformId(1);
+                user.setUsername("13078050925");
+                user.setPassword("wjy20020225");
+                accountMapper.insert(user);
+            }
+        } catch (IOException | InterruptedException e) {
             throw new RuntimeException(e);
         }
     }
+    private Set<Cookie> readCookiesByLocal() throws IOException {
+        Set<Cookie> cookies = new HashSet<>();
+        String jsonContent = new String(Files.readAllBytes(Paths.get(FILE_PATH)));
+        JSONArray jsonArray = JSON.parseArray(jsonContent);
+        // 遍历 JSONArray 并解析为 Cookie 对象
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = jsonArray.getJSONObject(i);
+            String path = jsonObject.getString("path");
+            String domain = jsonObject.getString("domain");
+            String sameSite = jsonObject.getString("sameSite");
+            String name = jsonObject.getString("name");
+            String expiry = jsonObject.getString("expiry");
+            String httpOnly = jsonObject.getString("httpOnly");
+            String secure = jsonObject.getString("secure");
+            String value = jsonObject.getString("value");
 
+            // 其他 Cookie 属性的解析
+            long timestamp = Long.parseLong(expiry);
+
+            // 将 Unix 时间戳转换为 Date 对象
+            Date date = new Date(timestamp * 1000);
+            Cookie cookie = new Cookie.Builder(name,value).domain(domain).path(path).expiresOn(date).sameSite(sameSite).isHttpOnly(Boolean.parseBoolean(httpOnly)).isSecure(Boolean.parseBoolean(secure)).build();
+            cookies.add(cookie);
+        }
+        return cookies;
+    }
 }
diff --git a/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java b/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
new file mode 100644
index 0000000..36107a7
--- /dev/null
+++ b/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
@@ -0,0 +1,17 @@
+package org.example.core.platform;
+
+import org.example.core.factory.PlatformOperation;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/10/9 17:09
+ */
+public class Douyin implements PlatformOperation {
+
+
+    @Override
+    public void login(int id,String account,String password) {
+
+    }
+}
diff --git a/chopperbot-account/src/main/java/org/example/pojo/Account.java b/chopperbot-account/src/main/java/org/example/core/pojo/Account.java
similarity index 62%
rename from chopperbot-account/src/main/java/org/example/pojo/Account.java
rename to chopperbot-account/src/main/java/org/example/core/pojo/Account.java
index 40d3247..2d509b1 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/Account.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/Account.java
@@ -1,4 +1,4 @@
-package org.example.pojo;
+package org.example.core.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,9 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.openqa.selenium.Cookie;
 
-import java.util.Set;
+import java.io.Serializable;
 
 /**
  * @Description
@@ -19,11 +18,13 @@ import java.util.Set;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class Account {
+public class Account implements Serializable {
 
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long uid;
-    private Set<Cookie> cookie;
+    @TableId(value = "uid", type = IdType.ASSIGN_UUID)
+    private Long id;
+    private String username;
+    private String password;
+    private String cookies;
     private boolean isCompleteMatch;
     private int platformId;
 
diff --git a/chopperbot-account/src/main/java/org/example/pojo/AccountType.java b/chopperbot-account/src/main/java/org/example/core/pojo/AccountType.java
similarity index 88%
rename from chopperbot-account/src/main/java/org/example/pojo/AccountType.java
rename to chopperbot-account/src/main/java/org/example/core/pojo/AccountType.java
index 3d68ef8..53dd2e8 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/AccountType.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/AccountType.java
@@ -1,12 +1,10 @@
-package org.example.pojo;
+package org.example.core.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * @Description
  * @Author welsir
diff --git a/chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java b/chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java
new file mode 100644
index 0000000..0c63eb7
--- /dev/null
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java
@@ -0,0 +1,24 @@
+package org.example.core.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.example.pojo.AccountType;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/10/12 21:03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AccountVO {
+    private Long uid;
+    private String username;
+    private String password;
+    private String platform;
+    List<AccountType> typeList;
+}
diff --git a/chopperbot-account/src/main/java/org/example/pojo/PlatformType.java b/chopperbot-account/src/main/java/org/example/core/pojo/PlatformType.java
similarity index 94%
rename from chopperbot-account/src/main/java/org/example/pojo/PlatformType.java
rename to chopperbot-account/src/main/java/org/example/core/pojo/PlatformType.java
index de39097..2ed97ce 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/PlatformType.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/PlatformType.java
@@ -1,4 +1,4 @@
-package org.example.pojo;
+package org.example.core.pojo;
 
 /**
  * @Description
diff --git a/chopperbot-account/src/main/java/org/example/pojo/Video.java b/chopperbot-account/src/main/java/org/example/core/pojo/Video.java
similarity index 89%
rename from chopperbot-account/src/main/java/org/example/pojo/Video.java
rename to chopperbot-account/src/main/java/org/example/core/pojo/Video.java
index f1fc1ad..c460612 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/Video.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/Video.java
@@ -1,4 +1,6 @@
-package org.example.pojo;
+package org.example.core.pojo;
+
+import org.example.pojo.VideoType;
 
 import java.util.List;
 
diff --git a/chopperbot-account/src/main/java/org/example/pojo/VideoQueue.java b/chopperbot-account/src/main/java/org/example/core/pojo/VideoQueue.java
similarity index 78%
rename from chopperbot-account/src/main/java/org/example/pojo/VideoQueue.java
rename to chopperbot-account/src/main/java/org/example/core/pojo/VideoQueue.java
index 19294dc..cafe59b 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/VideoQueue.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/VideoQueue.java
@@ -1,12 +1,9 @@
-package org.example.pojo;
+package org.example.core.pojo;
 
 import lombok.Data;
-import org.openqa.selenium.Cookie;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @Description
@@ -18,9 +15,9 @@ public class VideoQueue {
     private String name;
     private List<Object> messages;
     private boolean isStrongMatch;
-    private Set<Cookie> cookies;
+    private String cookies;
 
-    public VideoQueue(String name, boolean isStrongMatch,Set<Cookie> cookies) {
+    public VideoQueue(String name, boolean isStrongMatch,String cookies) {
         this.name = name;
         this.messages = new ArrayList<>();
         this.isStrongMatch = isStrongMatch;
diff --git a/chopperbot-account/src/main/java/org/example/pojo/VideoType.java b/chopperbot-account/src/main/java/org/example/core/pojo/VideoType.java
similarity index 82%
rename from chopperbot-account/src/main/java/org/example/pojo/VideoType.java
rename to chopperbot-account/src/main/java/org/example/core/pojo/VideoType.java
index 0698e6f..740ca7f 100644
--- a/chopperbot-account/src/main/java/org/example/pojo/VideoType.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/VideoType.java
@@ -1,4 +1,4 @@
-package org.example.pojo;
+package org.example.core.pojo;
 
 /**
  * @Description
diff --git a/chopperbot-test/database.db b/chopperbot-test/database.db
index 055dd2c7f5f670fb7f5fd83c40ce2b798de4996b..076f85923a861120d730e7cf4b9ec69af5ca9a88 100644
GIT binary patch
literal 81920
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
J_<u#<{{V7FVu1hv

delta 552
zcmZXQKWI}y9LIn6?)|&h*ZdM}^O96)o~5lrZCW}zbabkV=pY=4NlST8pKTgT2O-cw
z!KLA*lEFU+P9?)pkZewNap>S4#MpvR(xIXt(aY=5f^gp-$9=xvyDwL-8}$y|8B65=
z0F?|SO=+|-v*6}n_VI^d)(6)*X#`o_-E;S(pIkB>*4M6kg#y{WC#uFYNr<K~DLxt_
zVu=lj`}VHQ`sB*MAWtk$BcsxE7Bs)@`99e$Y!pjjWjPANXp@(tm5ZG&uCZI9?WE1c
zwCUX~h$3btt7~D2Z&V&V;c<@7^ZEadQ1;vuWvaJ{0pPK8lDDz(IwOMdXPGo%;1R}b
zotC58R!uXe9)K=7Z}a)a9m^mprAs&e3tb)e0eg6W9o(0G{tbGAFG-nnnuM!QE9*R{
zY;8vCWhxH%ja)*b6KpwpSgZ1w4l6IgL%>6sn)`(MO=5xg63s}``HPMd(^J4xMUOC>
zP~pXDF<9-sd;hK7KF4Q(XA1v7-JxSl{(dzy=TK|`9^q$f#g+I~YQe-f0sB(AE1q}7
z3$@A_P0_3km+$`GY92RVda6!#kXs3(QZYRDs~I<=*aQ57Ke4Bt|B6Y25<=-<Y8s`C
F{R1`&p?m-U


From 86607f4806c12bc93c97ba20f0426685b4cec2ea Mon Sep 17 00:00:00 2001
From: welsir <1824379011@qq.com>
Date: Fri, 13 Oct 2023 01:47:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=9D=97b?=
 =?UTF-8?q?=E7=AB=99=E7=99=BB=E5=BD=95=E3=80=81=E6=8A=96=E9=9F=B3=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=8A=96=E9=9F=B3=E8=A7=86=E9=A2=91=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chopperbot-account/pom.xml                    | 11 +++
 .../main/java/org/example/api/AccountApi.java |  4 +-
 .../core/account/AccountOperateCenter.java    |  5 +-
 .../core/account/Impl/AccountOperator.java    |  7 +-
 .../example/core/factory/PlatformFactory.java | 11 +--
 .../core/factory/PlatformOperation.java       |  2 +-
 .../example/core/mapper/AccountMapper.java    |  4 +-
 .../core/mapper/AccountTypeMapper.java        |  3 +-
 .../org/example/core/platform/Bilibili.java   | 78 +++++--------------
 .../org/example/core/platform/Douyin.java     | 74 +++++++++++++++++-
 .../example/controller/AccountController.java | 47 +++++++++++
 .../org/example/service/AccountService.java   | 25 ++++++
 .../service/impl/AccountServiceImpl.java      | 42 ++++++++++
 13 files changed, 238 insertions(+), 75 deletions(-)
 create mode 100644 chopperbot-console/src/main/java/org/example/controller/AccountController.java
 create mode 100644 chopperbot-console/src/main/java/org/example/service/AccountService.java
 create mode 100644 chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java

diff --git a/chopperbot-account/pom.xml b/chopperbot-account/pom.xml
index 6fef77a..07c1b85 100644
--- a/chopperbot-account/pom.xml
+++ b/chopperbot-account/pom.xml
@@ -67,6 +67,17 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-chrome-driver</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-api</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
diff --git a/chopperbot-account/src/main/java/org/example/api/AccountApi.java b/chopperbot-account/src/main/java/org/example/api/AccountApi.java
index 6f7bea2..c23ebbb 100644
--- a/chopperbot-account/src/main/java/org/example/api/AccountApi.java
+++ b/chopperbot-account/src/main/java/org/example/api/AccountApi.java
@@ -1,8 +1,8 @@
 package org.example.api;
 
 import org.example.core.account.Impl.AccountOperator;
-import org.example.pojo.Account;
-import org.example.pojo.AccountVO;
+import org.example.core.pojo.Account;
+import org.example.core.pojo.AccountVO;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
diff --git a/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java b/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java
index 2c166a6..8c16f74 100644
--- a/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java
+++ b/chopperbot-account/src/main/java/org/example/core/account/AccountOperateCenter.java
@@ -1,7 +1,8 @@
 package org.example.core.account;
 
-import org.example.pojo.Account;
-import org.example.pojo.AccountVO;
+
+import org.example.core.pojo.Account;
+import org.example.core.pojo.AccountVO;
 
 import java.util.List;
 
diff --git a/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java b/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
index 0e32ee3..174feda 100644
--- a/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
+++ b/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
@@ -5,11 +5,12 @@ import org.example.core.account.AccountOperateCenter;
 import org.example.core.constpool.ConstPool;
 import org.example.core.factory.PlatformFactory;
 import org.example.core.factory.PlatformOperation;
+
 import org.example.core.mapper.AccountMapper;
 import org.example.core.mapper.AccountTypeMapper;
-import org.example.pojo.Account;
-import org.example.pojo.AccountType;
-import org.example.pojo.AccountVO;
+import org.example.core.pojo.Account;
+import org.example.core.pojo.AccountType;
+import org.example.core.pojo.AccountVO;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
diff --git a/chopperbot-account/src/main/java/org/example/core/factory/PlatformFactory.java b/chopperbot-account/src/main/java/org/example/core/factory/PlatformFactory.java
index 4af3e5e..f7c4f18 100644
--- a/chopperbot-account/src/main/java/org/example/core/factory/PlatformFactory.java
+++ b/chopperbot-account/src/main/java/org/example/core/factory/PlatformFactory.java
@@ -1,7 +1,9 @@
 package org.example.core.factory;
 
 import org.example.core.platform.Bilibili;
-import org.example.pojo.PlatformType;
+import org.example.core.platform.Douyin;
+import org.example.core.pojo.PlatformType;
+
 
 /**
  * @Description
@@ -10,14 +12,13 @@ import org.example.pojo.PlatformType;
  */
 public class PlatformFactory {
 
-    public static void createPlatformOperation(int platformId) {
+    public static PlatformOperation createPlatformOperation(int platformId) {
         switch (PlatformType.getPlatform(platformId)){
             case BILIBILI:
-                new Bilibili();
-                return;
+                return new Bilibili();
             case DOUYU:
             case DOUYIN:
-                return;
+                return new Douyin();
             default:
                 throw new RuntimeException();
         }
diff --git a/chopperbot-account/src/main/java/org/example/core/factory/PlatformOperation.java b/chopperbot-account/src/main/java/org/example/core/factory/PlatformOperation.java
index 04e4a72..8b54f36 100644
--- a/chopperbot-account/src/main/java/org/example/core/factory/PlatformOperation.java
+++ b/chopperbot-account/src/main/java/org/example/core/factory/PlatformOperation.java
@@ -8,6 +8,6 @@ package org.example.core.factory;
 
 public interface PlatformOperation {
 
-    void operation(int id);
+    void login(int id,String account,String password);
 
 }
diff --git a/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java b/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
index 09e518c..8123d46 100644
--- a/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
+++ b/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
@@ -2,8 +2,8 @@ package org.example.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
-import org.example.pojo.Account;
-import org.example.pojo.AccountType;
+import org.example.core.pojo.Account;
+import org.example.core.pojo.AccountType;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
diff --git a/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java b/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
index 0530c60..842c67e 100644
--- a/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
+++ b/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
@@ -1,7 +1,8 @@
 package org.example.core.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.example.pojo.AccountType;
+import org.example.core.pojo.AccountType;
+
 
 /**
  * @Description
diff --git a/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java b/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
index e070f07..5c25cb3 100644
--- a/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
+++ b/chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
@@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.example.core.factory.PlatformOperation;
 import org.example.core.mapper.AccountMapper;
-import org.example.pojo.Account;
+
+import org.example.core.pojo.Account;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.WebElement;
@@ -33,76 +34,37 @@ public class Bilibili implements PlatformOperation {
     private AccountMapper accountMapper;
 
     @Override
-    public void login(int id,String account,String password) {
+    public void login(int id,String username,String password) {
         try {
-            // 读取Python脚本的输出
-            List<String> command = new ArrayList<>();
-            command.add("python"); // Python 解释器
-            command.add("D:\\code\\gitHubProject\\Text_select_captcha\\bilbil.py"); // 要运行的 Python 脚本文件名
-            //第一次登录需要提供账号密码
-            command.add(account); // 第一个参数
-            command.add(password); // 第二个参数 账号
-            ProcessBuilder processBuilder = new ProcessBuilder(command);
-            Process process = processBuilder.start();
-            // 等待Python脚本执行完成
-            int exitCode = process.waitFor();
-            if (exitCode == 0) {
-                System.out.println("Python脚本执行成功！");
-            } else {
-                System.err.println("Python脚本执行失败！");
-            }
-
             System.setProperty("webdriver.chrome.driver", "D:\\downLoad\\chromedriver_win32\\chromedriver.exe");
             ChromeOptions options = new ChromeOptions();
-            options.addArguments("--headless");
             options.setBinary("C:\\Program Files (x86)\\Chromebrowser\\Chrome.exe");
-            ChromeDriver webDriver = new ChromeDriver(options);
-            Set<Cookie> read = readCookiesByLocal();
+            ChromeDriver loginwebDriver = new ChromeDriver(options);
+            loginwebDriver.get(URL); //
+            loginwebDriver.manage().deleteAllCookies();
+            Thread.sleep(30000L);
+            Set<Cookie> cookies = loginwebDriver.manage().getCookies();
+            loginwebDriver.quit();
 
-            webDriver.get(URL); //
-            webDriver.manage().deleteAllCookies();
-            for (Cookie cookie : read) {
-                webDriver.manage().addCookie(cookie);
+            ChromeDriver confirmLogin = new ChromeDriver(options);
+            confirmLogin.get(URL);
+            confirmLogin.manage().deleteAllCookies();
+            for (Cookie cookie : cookies) {
+                loginwebDriver.manage().addCookie(cookie);
             }
-            webDriver.navigate().refresh();
+            confirmLogin.navigate().refresh();
             Thread.sleep(3000L);
-            WebElement avator = webDriver.findElement(By.xpath("/html/body/div[2]/div[2]/div[1]/div[1]/ul[2]/li[1]"));
+            WebElement avator = confirmLogin.findElement(By.xpath("/html/body/div[2]/div[2]/div[1]/div[1]/ul[2]/li[1]"));
             if(avator!=null){
                 Account user = new Account();
-                user.setCookies(read.toString());
+                user.setCookies(cookies.toString());
                 user.setPlatformId(1);
-                user.setUsername("13078050925");
-                user.setPassword("wjy20020225");
+                user.setUsername(username);
+                user.setPassword(password);
                 accountMapper.insert(user);
             }
-        } catch (IOException | InterruptedException e) {
+        } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
     }
-    private Set<Cookie> readCookiesByLocal() throws IOException {
-        Set<Cookie> cookies = new HashSet<>();
-        String jsonContent = new String(Files.readAllBytes(Paths.get(FILE_PATH)));
-        JSONArray jsonArray = JSON.parseArray(jsonContent);
-        // 遍历 JSONArray 并解析为 Cookie 对象
-        for (int i = 0; i < jsonArray.size(); i++) {
-            JSONObject jsonObject = jsonArray.getJSONObject(i);
-            String path = jsonObject.getString("path");
-            String domain = jsonObject.getString("domain");
-            String sameSite = jsonObject.getString("sameSite");
-            String name = jsonObject.getString("name");
-            String expiry = jsonObject.getString("expiry");
-            String httpOnly = jsonObject.getString("httpOnly");
-            String secure = jsonObject.getString("secure");
-            String value = jsonObject.getString("value");
-
-            // 其他 Cookie 属性的解析
-            long timestamp = Long.parseLong(expiry);
-
-            // 将 Unix 时间戳转换为 Date 对象
-            Date date = new Date(timestamp * 1000);
-            Cookie cookie = new Cookie.Builder(name,value).domain(domain).path(path).expiresOn(date).sameSite(sameSite).isHttpOnly(Boolean.parseBoolean(httpOnly)).isSecure(Boolean.parseBoolean(secure)).build();
-            cookies.add(cookie);
-        }
-        return cookies;
-    }
 }
diff --git a/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java b/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
index 36107a7..4659d72 100644
--- a/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
+++ b/chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
@@ -1,6 +1,19 @@
 package org.example.core.platform;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONReader;
 import org.example.core.factory.PlatformOperation;
+import org.example.core.mapper.AccountMapper;
+import org.example.core.pojo.Account;
+import org.openqa.selenium.Cookie;
+
+import javax.annotation.Resource;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * @Description
@@ -9,9 +22,68 @@ import org.example.core.factory.PlatformOperation;
  */
 public class Douyin implements PlatformOperation {
 
+    final String FILE_PATH = "D:\\Douyincookies.txt";
 
+    @Resource
+    AccountMapper accountMapper;
     @Override
-    public void login(int id,String account,String password) {
+    public void login(int id,String username,String password) {
+        try {
+            List<String> command = new ArrayList<>();
+            command.add("python"); // Python 解释器
+            command.add("D:\\code\\gitHubProject\\Text_select_captcha\\DouyinLogin.py"); // 要运行的 Python 脚本文件名
+            ProcessBuilder processBuilder = new ProcessBuilder(command);
+            Process process = processBuilder.start();
+            List<String> command1 = new ArrayList<>();
+            command1.add("python"); // Python 解释器
+            command1.add("D:\\code\\gitHubProject\\Text_select_captcha\\Douyin.py");
+            ProcessBuilder processBuilder1 = new ProcessBuilder(command1);
+            Process process1 = processBuilder1.start();
+            // 获取Python脚本的标准输出流
+            InputStream inputStream1 = process1.getInputStream();
+            BufferedReader reader1 = new BufferedReader(new InputStreamReader(inputStream1));
 
+            String line1;
+            StringBuilder callBack = new StringBuilder();
+
+            // 读取Python脚本的输出
+            while ((line1 = reader1.readLine()) != null) {
+                callBack.append(line1).append("\n");
+            }
+            System.out.println("验证flag:" + callBack);
+            // 等待Python脚本执行完成
+            int exitCode = process1.waitFor();
+            if (exitCode == 0) {
+                System.out.println("抖音登录成功!");
+                Account account = new Account();
+                account.setUsername(username);
+                account.setCookies(loadCookiesFromFile(FILE_PATH).toString());
+                account.setPlatformId(2);
+                accountMapper.insert(account);
+            }
+        } catch (IOException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    public HashSet<Cookie> loadCookiesFromFile (String filePath) throws IOException {
+        HashSet<Cookie> cookies = new HashSet<>();
+        try (FileReader fileReader = new FileReader(filePath)) {
+            JSONReader reader = new JSONReader(fileReader);
+            JSONArray jsonArray = reader.readObject(JSONArray.class);
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                String name = jsonObject.getString("name");
+                String value = jsonObject.getString("value");
+                String domain = jsonObject.getString("domain");
+                String path = jsonObject.getString("path");
+                String sameSite = jsonObject.getString("sameSite");
+                Date expiry = jsonObject.getDate("expiry");
+                boolean secure = jsonObject.getBoolean("secure");
+                boolean httpOnly = jsonObject.getBoolean("httpOnly");
+                Cookie cookie = new Cookie(name, value, domain, path, expiry, secure, httpOnly, sameSite);
+                cookies.add(cookie);
+            }
+        }
+        return cookies;
     }
 }
diff --git a/chopperbot-console/src/main/java/org/example/controller/AccountController.java b/chopperbot-console/src/main/java/org/example/controller/AccountController.java
new file mode 100644
index 0000000..041aaba
--- /dev/null
+++ b/chopperbot-console/src/main/java/org/example/controller/AccountController.java
@@ -0,0 +1,47 @@
+package org.example.controller;
+
+
+import org.example.core.pojo.Account;
+import org.example.core.pojo.AccountVO;
+import org.example.service.AccountService;
+import org.example.util.Result;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/10/12 22:26
+ */
+@RestController
+@RequestMapping("/account")
+public class AccountController {
+
+    @Resource
+    AccountService accountService;
+
+    @GetMapping(value = "/getUser/{platformId}")
+    public Result getAllUser(@PathVariable int platformId){
+        List<AccountVO> list = accountService.getAllUser(platformId);
+        return Result.success(list);
+    }
+
+    @GetMapping(value = "/getUser")
+    public Result getAllUser(){
+        return Result.success(accountService.getAllUser());
+    }
+
+    @PostMapping(value = "/login/{platformId}")
+    public Result login(@RequestBody String username, @RequestBody String password, @PathVariable int platformId){
+        accountService.login(platformId,username,password);
+        return Result.success();
+    }
+
+    @PostMapping(value = "/edit")
+    public Result edit(@RequestBody Account account){
+        accountService.edit(account);
+        return  Result.success();
+    }
+}
diff --git a/chopperbot-console/src/main/java/org/example/service/AccountService.java b/chopperbot-console/src/main/java/org/example/service/AccountService.java
new file mode 100644
index 0000000..859e953
--- /dev/null
+++ b/chopperbot-console/src/main/java/org/example/service/AccountService.java
@@ -0,0 +1,25 @@
+package org.example.service;
+
+
+
+import org.example.core.pojo.Account;
+import org.example.core.pojo.AccountVO;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/10/12 22:26
+ */
+public interface AccountService {
+
+    List<AccountVO> getAllUser(int id);
+
+    List<AccountVO> getAllUser();
+
+    void login(int platformId,String username,String password);
+
+    void edit(Account account);
+
+}
diff --git a/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java b/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java
new file mode 100644
index 0000000..32f1171
--- /dev/null
+++ b/chopperbot-console/src/main/java/org/example/service/impl/AccountServiceImpl.java
@@ -0,0 +1,42 @@
+package org.example.service.impl;
+
+import org.example.api.AccountApi;
+
+import org.example.core.pojo.Account;
+
+import org.example.core.pojo.AccountVO;
+import org.example.service.AccountService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author welsir
+ * @Date 2023/10/12 22:39
+ */
+@Service
+public class AccountServiceImpl implements AccountService {
+    @Resource
+    AccountApi accountApi;
+    @Override
+    public List<AccountVO> getAllUser(int id) {
+        return accountApi.getAllUsers(id);
+    }
+
+    @Override
+    public List<AccountVO> getAllUser() {
+        return accountApi.getAllUsers();
+    }
+
+    @Override
+    public void login(int platformId,String username, String password) {
+        accountApi.addAccountSaveCookie(platformId,username,password);
+    }
+
+    @Override
+    public void edit(Account account) {
+        accountApi.editUser(account);
+    }
+}