新增手动签到
新增百合会签到 优化天使动漫签到 优化大头菜统计最高价日 修复大头菜第二周数据未清空 新增大头菜显示购入价功能
This commit is contained in:
parent
f4711d82fb
commit
5a29f7595b
@ -42,7 +42,6 @@ public class QQMessageListener extends SimpleListenerHost {
|
||||
Model useModel = (Model) model.getDeclaredConstructor().newInstance();
|
||||
if (!useModel.isUserPublic()) {
|
||||
if (!QQNumberManager.getManager().isExistsPower(event.getSource().getFromId(), useModel.getUsePowers())) {
|
||||
Log.i("用户没有权限",event.getSource().getFromId()+" > "+model.getSimpleName());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,10 @@ package com.yutou.qqbot.MessageEvent;
|
||||
import com.yutou.qqbot.QQBotManager;
|
||||
import com.yutou.qqbot.QQNumberManager;
|
||||
import com.yutou.qqbot.models.Model;
|
||||
import com.yutou.qqbot.models.WebSign.BaiHeHui;
|
||||
import com.yutou.qqbot.models.WebSign.Tsdm;
|
||||
import com.yutou.qqbot.utlis.AppTools;
|
||||
import com.yutou.qqbot.utlis.Log;
|
||||
import com.yutou.qqbot.utlis.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
@ -24,6 +27,7 @@ public class AdminMessage extends Message {
|
||||
|
||||
private static final String SHOW="!列表";
|
||||
private static final String HELP="!help";
|
||||
private static final String SIGN="!签到";
|
||||
}
|
||||
|
||||
public AdminMessage(Long qq, String msg) {
|
||||
@ -138,6 +142,27 @@ public class AdminMessage extends Message {
|
||||
System.out.println("结束进程");
|
||||
AppTools.exec("cd /home/yutou/public/servier/tools && ./start.sh",null,true,false);
|
||||
}
|
||||
case QQCommands.SIGN -> {
|
||||
boolean sign=true;
|
||||
Log.i("开始签到");
|
||||
try{
|
||||
new Tsdm().tsdmSign();
|
||||
}catch (Exception e){
|
||||
sign=false;
|
||||
QQBotManager.getInstance().sendMessage(qq,"tsdm签到失败:"+AppTools.getExceptionString(e));
|
||||
e.printStackTrace();
|
||||
}
|
||||
try {
|
||||
new BaiHeHui().sign();
|
||||
}catch (Exception e){
|
||||
sign=false;
|
||||
QQBotManager.getInstance().sendMessage(qq,"百合会签到失败:"+AppTools.getExceptionString(e));
|
||||
e.printStackTrace();
|
||||
}
|
||||
if(sign){
|
||||
QQBotManager.getInstance().sendMessage(qq,"签到任务完成");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
@SpringBootApplication
|
||||
public class QQBotApplication {
|
||||
public static final String version="QQBot v.1.0.1";
|
||||
public static final String version="QQBot v.1.1.1";
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(QQBotApplication.class, args);
|
||||
RedisTools.initRedisPoolSub();
|
||||
|
@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.yutou.qqbot.QQBotManager;
|
||||
import com.yutou.qqbot.models.Model;
|
||||
import com.yutou.qqbot.utlis.Log;
|
||||
import com.yutou.qqbot.utlis.RedisTools;
|
||||
import com.yutou.qqbot.utlis.StringUtils;
|
||||
import com.yutou.qqbot.utlis.WebClient;
|
||||
import com.yutou.qqbot.utlis.*;
|
||||
import net.mamoe.mirai.event.events.MessageEvent;
|
||||
import org.openqa.selenium.By;
|
||||
import org.openqa.selenium.WebDriver;
|
||||
@ -43,7 +40,7 @@ public class TurnipProphet extends Model {
|
||||
|
||||
}
|
||||
|
||||
static int nowTime;
|
||||
static int nowTime=-1;
|
||||
|
||||
@Override
|
||||
public boolean isUserPublic() {
|
||||
@ -156,9 +153,7 @@ public class TurnipProphet extends Model {
|
||||
}
|
||||
} else {
|
||||
if (money >= 9 && money <= 660) {
|
||||
System.out.println("array = " + array);
|
||||
System.out.println("array.size() = " + array.size());
|
||||
if (nowTime < 12) {
|
||||
if (getTime() < 12) {
|
||||
array.set(getDay() * 2 - 1, money);
|
||||
} else {
|
||||
array.set(getDay() * 2, money);
|
||||
@ -189,7 +184,9 @@ public class TurnipProphet extends Model {
|
||||
QQBotManager.getInstance().sendMessage(qq, "已记录,正在预测本周走势...");
|
||||
|
||||
Map<String, String> map = openTurnip(prices, pattern);
|
||||
|
||||
if(map==null){
|
||||
map=openTurnip(prices,pattern);
|
||||
}
|
||||
String tmp_pattern = sendQQ(map, prices, pattern, qq);
|
||||
if (!StringUtils.isEmpty(tmp_pattern)) {
|
||||
json.put("pattern", tmp_pattern);
|
||||
@ -197,21 +194,20 @@ public class TurnipProphet extends Model {
|
||||
RedisTools.set(redisKey, json.toJSONString());
|
||||
|
||||
} catch (Exception e) {
|
||||
setData(money, qq);
|
||||
e.printStackTrace();
|
||||
setData(money, qq);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private String sendQQ(Map<String, String> map, String prices, String pattern, long qq) {
|
||||
|
||||
if (map == null) {
|
||||
String url = String.format("https://turnipprophet.io?prices=%s%s",
|
||||
prices,
|
||||
pattern == null ? "" : "&pattern=" + pattern
|
||||
);
|
||||
QQBotManager.getInstance().sendMessage(qq, "没有结果,请检查数据是否有误。 \n网页预览:" + url);
|
||||
QQBotManager.getInstance().sendMessage(qq, "没有结果,请检查数据是否有误。 \n网页预览:\n" + url);
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -221,7 +217,7 @@ public class TurnipProphet extends Model {
|
||||
out.append("预测结果如下:\n");
|
||||
out.append(TurnipData.MODEL).append(prArray.getJSONObject(0).getString(TurnipData.MODEL)).append("\n");
|
||||
out.append(TurnipData.PR).append(prArray.getJSONObject(0).getString(TurnipData.PR)).append("\n");
|
||||
|
||||
out.append("购入价:").append(prices.split("\\.")[0]).append("\n");
|
||||
out.append(TurnipData.MIX).append(map.get(TurnipData.MIX)).append("\n")
|
||||
.append(TurnipData.MAX).append(map.get(TurnipData.MAX)).append("\n")
|
||||
.append(TurnipData.DAY).append(map.get(TurnipData.DAY)).append("\n")
|
||||
@ -259,6 +255,12 @@ public class TurnipProphet extends Model {
|
||||
super.onTime(time);
|
||||
nowTime = Integer.parseInt(time.split(":")[0]);
|
||||
}
|
||||
public int getTime(){
|
||||
if(nowTime==-1){
|
||||
nowTime=Integer.parseInt(AppTools.getHours());
|
||||
}
|
||||
return nowTime;
|
||||
}
|
||||
|
||||
private int getDay() {
|
||||
return Calendar.getInstance().get(Calendar.DAY_OF_WEEK) - 1;
|
||||
@ -266,7 +268,7 @@ public class TurnipProphet extends Model {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
TurnipProphet prophet = new TurnipProphet();
|
||||
prophet.setData(88, 583819556);
|
||||
prophet.setData(68, 583819556);
|
||||
|
||||
}
|
||||
|
||||
@ -284,10 +286,14 @@ public class TurnipProphet extends Model {
|
||||
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
|
||||
Thread.sleep(500);
|
||||
WebElement element = driver.findElement(By.id("output"));
|
||||
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
|
||||
List<WebElement> list = element.findElements(By.tagName("tr"));
|
||||
driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
|
||||
JSONObject pr = new JSONObject();
|
||||
JSONArray array = new JSONArray();
|
||||
if (list.size() == 0) {
|
||||
driver.close();
|
||||
driver.quit();
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -324,14 +330,24 @@ public class TurnipProphet extends Model {
|
||||
}
|
||||
}
|
||||
}
|
||||
int maxMoney=0;
|
||||
String maxDay=null;
|
||||
for (String key : map.keySet()) {
|
||||
System.err.println("记录最高日:" + map.get(key) + " > " + key);
|
||||
if (!key.equals(TurnipProphet.TurnipData.MAX) &&
|
||||
map.get(key).contains(map.get(TurnipProphet.TurnipData.MAX))) {
|
||||
map.put(TurnipProphet.TurnipData.DAY, key);
|
||||
break;
|
||||
if(map.get(key).contains("~")){
|
||||
for (String s : map.get(key).split("~")) {
|
||||
if(Integer.parseInt(s)>maxMoney){
|
||||
maxMoney=Integer.parseInt(s);
|
||||
maxDay=key;
|
||||
}
|
||||
}
|
||||
}else{
|
||||
if(Integer.parseInt(map.get(key))>maxMoney){
|
||||
maxMoney=Integer.parseInt(map.get(key));
|
||||
maxDay=key;
|
||||
}
|
||||
}
|
||||
}
|
||||
map.put(TurnipProphet.TurnipData.DAY, maxDay);
|
||||
pr.put(TurnipProphet.TurnipData.MODEL, array);
|
||||
map.put(TurnipProphet.TurnipData.MODEL, pr.toJSONString());
|
||||
driver.close();
|
||||
|
@ -1,15 +1,19 @@
|
||||
package com.yutou.qqbot.models.WebSign;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.yutou.qqbot.QQBotManager;
|
||||
import com.yutou.qqbot.models.Model;
|
||||
import com.yutou.qqbot.utlis.AppTools;
|
||||
import com.yutou.qqbot.utlis.ConfigTools;
|
||||
import com.yutou.qqbot.utlis.StringUtils;
|
||||
import com.yutou.qqbot.utlis.WebClient;
|
||||
import org.openqa.selenium.By;
|
||||
import org.openqa.selenium.Cookie;
|
||||
import org.openqa.selenium.WebDriver;
|
||||
import org.openqa.selenium.WebElement;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class BaiHeHui extends Model {
|
||||
@Override
|
||||
@ -26,18 +30,26 @@ public class BaiHeHui extends Model {
|
||||
public void onTime(String time) {
|
||||
super.onTime(time);
|
||||
if ("08:00".equals(time)) {
|
||||
try {
|
||||
sign();
|
||||
QQBotManager.getInstance().sendMessage(QQBotManager.defGroup,"百合会签到成功");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
QQBotManager.getInstance().sendMessage(QQBotManager.defGroup,"百合会签到失败:"+ AppTools.getExceptionString(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void sign(){
|
||||
public void sign() {
|
||||
String cookie = ConfigTools.readFile(new File("baihehui.json"));
|
||||
if (StringUtils.isEmpty(cookie)) {
|
||||
return;
|
||||
}
|
||||
WebDriver driver = WebClient.getInstance().getWebDriver();
|
||||
JSONArray array = JSONArray.parseArray(cookie);
|
||||
driver.get("https://bbs.yamibo.com/plugin.php?id=study_daily_attendance:daily_attendance&fhash=425430f7");
|
||||
driver.manage().timeouts().implicitlyWait(10000, TimeUnit.SECONDS);
|
||||
driver.get("https://bbs.yamibo.com/forum.php");
|
||||
driver.manage().deleteAllCookies();
|
||||
for (Cookie _cookie : WebClient.loadCookie(array)) {
|
||||
driver.manage().addCookie(_cookie);
|
||||
}
|
||||
@ -47,10 +59,17 @@ public class BaiHeHui extends Model {
|
||||
e.printStackTrace();
|
||||
}
|
||||
driver.navigate().refresh();
|
||||
|
||||
for (WebElement element : driver.findElements(By.xpath("//a"))) {
|
||||
if("打卡签到".equals(element.getText())){
|
||||
element.click();
|
||||
return;
|
||||
}
|
||||
}
|
||||
driver.close();
|
||||
driver.quit();
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
new BaiHeHui().sign();
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -3,21 +3,16 @@ package com.yutou.qqbot.models.WebSign;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.yutou.qqbot.QQBotManager;
|
||||
import com.yutou.qqbot.models.Model;
|
||||
import com.yutou.qqbot.utlis.AppTools;
|
||||
import com.yutou.qqbot.utlis.ConfigTools;
|
||||
import com.yutou.qqbot.utlis.StringUtils;
|
||||
import com.yutou.qqbot.utlis.WebClient;
|
||||
import net.mamoe.mirai.event.events.MessageEvent;
|
||||
import org.openqa.selenium.By;
|
||||
import org.openqa.selenium.Cookie;
|
||||
import org.openqa.selenium.JavascriptExecutor;
|
||||
import org.openqa.selenium.WebDriver;
|
||||
import org.openqa.selenium.chrome.ChromeDriver;
|
||||
import org.openqa.selenium.*;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static com.yutou.qqbot.utlis.WebClient.getOptions;
|
||||
|
||||
public class Tsdm extends Model {
|
||||
@Override
|
||||
public boolean isUserPublic() {
|
||||
@ -49,8 +44,13 @@ public class Tsdm extends Model {
|
||||
public void onTime(String time) {
|
||||
super.onTime(time);
|
||||
if ("08:00".equals(time)) {
|
||||
try {
|
||||
tsdmSign();
|
||||
QQBotManager.getInstance().sendMessage(QQBotManager.defGroup, "已完成天使动漫的签到");
|
||||
} catch (Exception e) {
|
||||
QQBotManager.getInstance().sendMessage(QQBotManager.defGroup, "天使动漫签到失败:" + AppTools.getExceptionString(e));
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,6 +63,17 @@ public class Tsdm extends Model {
|
||||
WebDriver driver = WebClient.getInstance().getWebDriver();
|
||||
driver.get("https://www.tsdm39.net/forum.php");
|
||||
getTsdm(array, driver);
|
||||
boolean isSign=false;
|
||||
for (WebElement element : driver.findElements(By.xpath("//a"))) {
|
||||
if(element.getText().contains("签到")){
|
||||
isSign=true;
|
||||
}
|
||||
}
|
||||
if(!isSign){
|
||||
driver.close();
|
||||
driver.quit();
|
||||
return;
|
||||
}
|
||||
try {
|
||||
((JavascriptExecutor) driver).executeScript("showWindow('dsu_paulsign', 'plugin.php?id=dsu_paulsign:sign&9b5e8da2')");
|
||||
} catch (Exception ignored) {
|
||||
@ -72,15 +83,20 @@ public class Tsdm extends Model {
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
try {
|
||||
driver.findElement(By.id("wl")).click();
|
||||
driver.findElement(By.xpath("//input[@value='3']")).click();
|
||||
driver.findElement(By.id("qiandao")).submit();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
driver.close();
|
||||
driver.quit();
|
||||
}
|
||||
|
||||
private void getTsdm(JSONArray array, WebDriver driver) {
|
||||
driver.manage().timeouts().implicitlyWait(10000, TimeUnit.SECONDS);
|
||||
driver.manage().deleteAllCookies();
|
||||
try {
|
||||
Thread.sleep(500);
|
||||
} catch (InterruptedException e) {
|
||||
|
@ -31,6 +31,9 @@ public class AppTools {
|
||||
public static String getToDayTime() {
|
||||
return new SimpleDateFormat("yyyy-MM-dd").format(new Date());
|
||||
}
|
||||
public static String getHours(){
|
||||
return new SimpleDateFormat("HH").format(new Date());
|
||||
}
|
||||
/**
|
||||
* 异常输出
|
||||
*
|
||||
|
@ -21,9 +21,11 @@ public class WebClient {
|
||||
}
|
||||
return client;
|
||||
}
|
||||
|
||||
public WebDriver getWebDriver() {
|
||||
return new ChromeDriver(getOptions());
|
||||
}
|
||||
|
||||
private WebClient() {
|
||||
System.setProperty("webdriver.chrome.driver",
|
||||
ConfigTools.load(ConfigTools.CONFIG, "chrome", String.class));
|
||||
@ -31,11 +33,6 @@ public class WebClient {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static List<Cookie> loadCookie(JSONArray array) {
|
||||
List<Cookie> list = new ArrayList<>();
|
||||
|
||||
@ -51,7 +48,7 @@ public class WebClient {
|
||||
json.getString("value"),
|
||||
json.getString("domain"),
|
||||
json.getString("path"),
|
||||
containsDate? new Date(t):null,
|
||||
containsDate ? new Date(t) : new Date(),
|
||||
json.getBoolean("secure"),
|
||||
json.getBoolean("httpOnly")
|
||||
|
||||
@ -63,8 +60,8 @@ public class WebClient {
|
||||
|
||||
public static ChromeOptions getOptions() {
|
||||
ChromeOptions options = new ChromeOptions();
|
||||
options.addArguments("disable-infobars");
|
||||
options.addArguments("blink-settings=imagesEnabled=false");
|
||||
options.addArguments("--disable-gpu");
|
||||
// options.addArguments("blink-settings=imagesEnabled=false");
|
||||
options.addArguments("--headless");
|
||||
options.addArguments("--no-sandbox");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user