lywsvip/ChopperBot
1
0
Fork 0
mirror of https://github.com/Geniusay/ChopperBot.git synced 2026-06-20 16:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复 86607f4 commit出现的问题

Browse Source
This commit is contained in:
userA
2023-10-13 02:01:36 +08:00
parent 0e8272e41e
commit a80ea00a78
10 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml generated
View File

@@ -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" />

4
chopperbot-account/src/main/java/org/example/core/account/Impl/AccountOperator.java
View File

@@ -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;

2
chopperbot-account/src/main/java/org/example/core/exchange/Exchange.java
View File

@@ -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;

6
chopperbot-account/src/main/java/org/example/core/guard/VideoPushGuard.java
View File

@@ -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);

8
chopperbot-account/src/main/java/org/example/core/platform/Bilibili.java
View File

@@ -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.*;

2
chopperbot-account/src/main/java/org/example/core/platform/Douyin.java
View File

@@ -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;

2
chopperbot-account/src/main/java/org/example/core/pojo/AccountVO.java
View File

@@ -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;

2
chopperbot-account/src/main/java/org/example/core/pojo/Video.java
View File

@@ -1,6 +1,6 @@
package org.example.core.pojo;
import org.example.pojo.VideoType;
import org.example.core.pojo.VideoType;
import java.util.List;

2
chopperbot-account/src/main/java/org/example/core/mapper/AccountMapper.java → chopperbot-account/src/main/java/org/example/mapper/AccountMapper.java
View File

@@ -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;

2
chopperbot-account/src/main/java/org/example/core/mapper/AccountTypeMapper.java → chopperbot-account/src/main/java/org/example/mapper/AccountTypeMapper.java
View File

@@ -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;