From a80ea00a7851ae76877b79ec58b6d91fc0fb7c17 Mon Sep 17 00:00:00 2001
From: userA <geniusssbg@gmail.com>
Date: Fri, 13 Oct 2023 02:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=2086607f4=20commit=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                                        | 2 +-
 .../org/example/core/account/Impl/AccountOperator.java    | 4 ++--
 .../src/main/java/org/example/core/exchange/Exchange.java | 2 +-
 .../main/java/org/example/core/guard/VideoPushGuard.java  | 6 +++---
 .../src/main/java/org/example/core/platform/Bilibili.java | 8 +-------
 .../src/main/java/org/example/core/platform/Douyin.java   | 2 +-
 .../src/main/java/org/example/core/pojo/AccountVO.java    | 2 +-
 .../src/main/java/org/example/core/pojo/Video.java        | 2 +-
 .../java/org/example/{core => }/mapper/AccountMapper.java | 2 +-
 .../org/example/{core => }/mapper/AccountTypeMapper.java  | 2 +-
 10 files changed, 13 insertions(+), 19 deletions(-)
 rename chopperbot-account/src/main/java/org/example/{core => }/mapper/AccountMapper.java (95%)
 rename chopperbot-account/src/main/java/org/example/{core => }/mapper/AccountTypeMapper.java (87%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d529ac8..93225a1 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="-parameters" />
+      <module name="ChopperBot" options="" />
       <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/core/account/Impl/AccountOperator.java b/chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
index 174feda..4484486 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
@@ -6,8 +6,8 @@ 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.mapper.AccountMapper;
+import org.example.mapper.AccountTypeMapper;
 import org.example.core.pojo.Account;
 import org.example.core.pojo.AccountType;
 import org.example.core.pojo.AccountVO;
diff --git a/chopperbot-account/src/main/java/org/example/core/exchange/Exchange.java b/chopperbot-account/src/main/java/org/example/core/exchange/Exchange.java
index 6b67604..763c215 100644
--- a/chopperbot-account/src/main/java/org/example/core/exchange/Exchange.java
+++ b/chopperbot-account/src/main/java/org/example/core/exchange/Exchange.java
@@ -1,7 +1,7 @@
 package org.example.core.exchange;
 
 import org.example.api.BilibiliPublishApi;
-import org.example.pojo.VideoQueue;
+import org.example.core.pojo.VideoQueue;
 
 import java.util.*;
 import java.util.concurrent.Executors;
diff --git a/chopperbot-account/src/main/java/org/example/core/guard/VideoPushGuard.java b/chopperbot-account/src/main/java/org/example/core/guard/VideoPushGuard.java
index 119f6a9..6bf518d 100644
--- a/chopperbot-account/src/main/java/org/example/core/guard/VideoPushGuard.java
+++ b/chopperbot-account/src/main/java/org/example/core/guard/VideoPushGuard.java
@@ -3,7 +3,7 @@ package org.example.core.guard;
 import org.example.core.exchange.Exchange;
 import org.example.mapper.AccountMapper;
 import org.example.plugin.GuardPlugin;
-import org.example.pojo.*;
+import org.example.core.pojo.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -35,9 +35,9 @@ public class VideoPushGuard extends GuardPlugin {
         exchange = new Exchange();
         List<Account> accountList = accountMapper.selectList(null);
         for (Account account : accountList) {
-            List<AccountType> accountTypes = accountMapper.selectTypeByUid(account.getUid());
+            List<AccountType> accountTypes = accountMapper.selectTypeByUid(account.getId());
             for (AccountType accountType : accountTypes) {
-                exchange.bind(new VideoQueue(PlatformType.getPlatform(account.getPlatformId()) + "-" + account.getUid(), account.isCompleteMatch(),account.getCookie()), accountType.getType());
+                exchange.bind(new VideoQueue(PlatformType.getPlatform(account.getPlatformId()) + "-" + account.getId(), account.isCompleteMatch(),account.getCookies()), accountType.getType());
             }
         }
         receiveVideo = new ArrayBlockingQueue<>(1024);
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 5c25cb3..3f56c3a 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,10 +1,7 @@
 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.core.mapper.AccountMapper;
+import org.example.mapper.AccountMapper;
 
 import org.example.core.pojo.Account;
 import org.openqa.selenium.By;
@@ -14,9 +11,6 @@ import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.*;
 
 
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 4659d72..2e4d1f9 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
@@ -4,7 +4,7 @@ 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.mapper.AccountMapper;
 import org.example.core.pojo.Account;
 import org.openqa.selenium.Cookie;
 
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
index 0c63eb7..df34aa4 100644
--- a/chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java
@@ -3,7 +3,7 @@ package org.example.core.pojo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.example.pojo.AccountType;
+import org.example.core.pojo.AccountType;
 
 import java.util.List;
 
diff --git a/chopperbot-account/src/main/java/org/example/core/pojo/Video.java b/chopperbot-account/src/main/java/org/example/core/pojo/Video.java
index c460612..bce1fb9 100644
--- a/chopperbot-account/src/main/java/org/example/core/pojo/Video.java
+++ b/chopperbot-account/src/main/java/org/example/core/pojo/Video.java
@@ -1,6 +1,6 @@
 package org.example.core.pojo;
 
-import org.example.pojo.VideoType;
+import org.example.core.pojo.VideoType;
 
 import java.util.List;
 
diff --git a/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java b/chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java
similarity index 95%
rename from chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
rename to chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java
index 8123d46..ec99186 100644
--- a/chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java
+++ b/chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java
@@ -1,4 +1,4 @@
-package org.example.core.mapper;
+package org.example.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
diff --git a/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java b/chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java
similarity index 87%
rename from chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
rename to chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java
index 842c67e..47c6310 100644
--- a/chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java
+++ b/chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java
@@ -1,4 +1,4 @@
-package org.example.core.mapper;
+package org.example.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.example.core.pojo.AccountType;