Skip to content

Commit 700cef8

Browse files
LiggMaxLiggMax
committed
Merge remote-tracking branch 'gitee/main'
2 parents 30f2ec2 + 6b49251 commit 700cef8

6 files changed

Lines changed: 43 additions & 40 deletions

File tree

‎FBver/FBmain.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def __init__(self, cookies, data, content0, content1, task_order, rest_times):
8484
self.task_order = task_order or []
8585
self.executed_tasks = [] # 用于跟踪已执行的任务
8686
self.rest_times = rest_times or {} # 存储休息时间配置
87-
self.username = content1
87+
self.account = content1
8888
self.device_number = content0 # 设备号，可以从配置中获取
8989
self.machine_code = self.generate_machine_code() # 获取机器码
9090
self.is_phone = 0 # 是否是手机
@@ -277,13 +277,13 @@ async def execute_task_with_timeout(self, task_func, task_index, position, compl
277277
remaining_time = completion_time - elapsed_time
278278

279279
if remaining_time > 0:
280-
await self.robust_update_status(f"{task_name}提前完成，等待剩余时间: {int(remaining_time)}秒")
280+
await self.robust_update_status(f"{task_name}提前完成，等待剩餘時間: {int(remaining_time)}秒")
281281
# 更新倒计时显示为剩余等待时间
282282
if self.status_window and hasattr(self.status_window, 'update_task_countdown'):
283283
asyncio.create_task(self.update_waiting_countdown(task_id, int(remaining_time)))
284284
await asyncio.sleep(remaining_time)
285285
else:
286-
await self.robust_update_status(f"{task_name}在指定时间内完成")
286+
await self.robust_update_status(f"{task_name}在指定時間內完成")
287287

288288
except asyncio.TimeoutError:
289289
await self.robust_update_status(f"{task_name}執行超時，強制結束並進入下一個任務")
@@ -477,7 +477,7 @@ async def home_post(self):
477477

478478
# 請求數據
479479
tweet = await self.fetch_data(
480-
f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.username}")
480+
f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.account}")
481481
response_url = tweet.split("|+|")
482482
comment_text = response_url[7].split("{}")
483483

@@ -508,7 +508,7 @@ async def sponsor_like(self,selector,like_count,seek_count):
508508

509509
#請求數據
510510
tweet = await self.fetch_data(
511-
f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.username}")
511+
f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.account}")
512512
response_url = tweet.split("|+|")
513513
comment_text = response_url[7].split("{}")
514514

@@ -644,7 +644,7 @@ async def comment_post(self, comment_text, posts):
644644
# """發文、推文"""
645645
async def tweet_comment(self):
646646
await self.robust_update_status("開始執行發文")
647-
tweet = await self.fetch_data(f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.username}&Count1={self.Count1}&Count2={self.Count2}")
647+
tweet = await self.fetch_data(f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.account}&Count1={self.Count1}&Count2={self.Count2}")
648648
response_url = tweet.split("|+|")
649649
post_url = response_url[0].split("{}")
650650
# 發文內容設置
@@ -705,7 +705,7 @@ async def post_comment(self):
705705
await self.robust_update_status(f"開始執行推文")
706706
asyncio.create_task(self.report_task_status(f"開始執行推文"))
707707
post = await self.fetch_data(
708-
f"http://aj.ry188.vip/api/GetPostUrlList.aspx?Account={self.username}&UrlCount={self.Count_num}&Count1={self.Count1}&Count2={self.Count2}")
708+
f"http://aj.ry188.vip/api/GetPostUrlList.aspx?Account={self.account}&UrlCount={self.Count_num}&Count1={self.Count1}&Count2={self.Count2}")
709709
response_url = post.split("|+|")
710710
post_url = response_url[0].split("{}")
711711
print(post_url) # 推文留言網址
@@ -728,7 +728,7 @@ async def post_comment(self):
728728
# 加社團up
729729
async def add_join_groups(self):
730730
groups = await self.fetch_data2(
731-
f"http://aj.ry188.vip/api/GetGroupUrl.aspx?Account={self.username}")
731+
f"http://aj.ry188.vip/api/GetGroupUrl.aspx?Account={self.account}")
732732
is_on_line = parse_bool(groups["IsOnLineGroupData"])#是否在線社團
733733
answer = ["遵守版規", "同意版規", "感謝版主"]
734734
for i in range(len(groups["GroupDataList"])):
@@ -958,7 +958,7 @@ async def add_friend_invitation(self):
958958

959959
async def post_personal_updates(self):
960960
tweet = await self.fetch_data(
961-
f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.username}&Count1={self.Count1}&Count2={self.Count2}")
961+
f"http://aj.ry188.vip/api/GetUrlList.aspx?Account={self.account}&Count1={self.Count1}&Count2={self.Count2}")
962962
response_url = tweet.split("|+|")
963963
await self.page.goto(url="https://www.facebook.com/", wait_until='load',timeout=50000)
964964
title = await self.page.title()
@@ -1103,7 +1103,7 @@ async def report_add_join_groups(self, task_name):
11031103
encoded_bytes = base64.b64encode(task_name.encode('utf-8'))
11041104
encoded_task_name = encoded_bytes.decode('utf-8')
11051105

1106-
url = f"http://aj.ry188.vip/api/UpJoinGroupUrl.aspx?Account={self.username}&Urls={encoded_task_name}"
1106+
url = f"http://aj.ry188.vip/api/UpJoinGroupUrl.aspx?Account={self.account}&Urls={encoded_task_name}"
11071107

11081108
timeout = aiohttp.ClientTimeout(total=10)
11091109
async with aiohttp.ClientSession(timeout=timeout) as session:
@@ -1120,7 +1120,7 @@ async def report_up_post_status(self, task_name):
11201120
"""异步上报推文網址"""
11211121
try:
11221122
task_name = await self.extract_posturl_ids(task_name)
1123-
url = f"http://aj.ry188.vip/api/UpPostUrl.aspx?Account={self.username}&PostId={task_name}&UserNumber={self.customer_code}&GroupName="
1123+
url = f"http://aj.ry188.vip/api/UpPostUrl.aspx?Account={self.account}&PostId={task_name}&UserNumber={self.customer_code}&GroupName="
11241124

11251125
timeout = aiohttp.ClientTimeout(total=10)
11261126
async with aiohttp.ClientSession(timeout=timeout) as session:
@@ -1137,7 +1137,7 @@ async def report_up_fans_post_status(self,user_numer, task_name):
11371137
"""异步上报粉丝专页推文網址"""
11381138
try:
11391139
# task_name = await self.extract_posturl_ids(task_name)
1140-
url = f"http://aj.ry188.vip/api/UpPagesPostUrl.aspx?Account={self.username}&UserNumber={user_numer}&Urls={task_name}"
1140+
url = f"http://aj.ry188.vip/api/UpPagesPostUrl.aspx?Account={self.account}&UserNumber={user_numer}&Urls={task_name}"
11411141

11421142
timeout = aiohttp.ClientTimeout(total=10)
11431143
async with aiohttp.ClientSession(timeout=timeout) as session:
@@ -1154,7 +1154,7 @@ async def report_dawn_post_status(self, task_name):
11541154
"""异步上报刪除推文網址"""
11551155
try:
11561156
task_name = await self.extract_posturl_ids(task_name)
1157-
url = f"http://aj.ry188.vip/api/DeleteUrls.aspx?Account={self.username}&PostId={task_name}"
1157+
url = f"http://aj.ry188.vip/api/DeleteUrls.aspx?Account={self.account}&PostId={task_name}"
11581158

11591159
timeout = aiohttp.ClientTimeout(total=10)
11601160
async with aiohttp.ClientSession(timeout=timeout) as session:
@@ -1179,7 +1179,7 @@ async def report_up_tweet_comment(self, task_name,code):
11791179
print("提取的群组ID:", group_id)
11801180
else:
11811181
print("未找到群组ID")
1182-
url = f"http://aj.ry188.vip/api/UpUrls.aspx?Account={self.username}&Urls={task_name}&GroupId={group_id}&GroupName='123'&PostId={task_name2}&UserNumber={code}"
1182+
url = f"http://aj.ry188.vip/api/UpUrls.aspx?Account={self.account}&Urls={task_name}&GroupId={group_id}&GroupName='123'&PostId={task_name2}&UserNumber={code}"
11831183

11841184
timeout = aiohttp.ClientTimeout(total=10)
11851185
async with aiohttp.ClientSession(timeout=timeout) as session:
@@ -1278,7 +1278,7 @@ async def sleep_time(self, rest_time=60):
12781278
async def report_online_status(self):
12791279
"""异步上报在线状态"""
12801280
try:
1281-
url = f"http://aj.ry188.vip/API/UpDataState.aspx?Account={self.username}&DeviceNumber={self.device_number}&DeviceCode={self.machine_code}&IsPhone={self.is_phone}&RemoteId={self.remote_id}&RunText=在线"
1281+
url = f"http://aj.ry188.vip/API/UpDataState.aspx?Account={self.account}&DeviceNumber={self.device_number}&DeviceCode={self.machine_code}&IsPhone={self.is_phone}&RemoteId={self.remote_id}&RunText=在线"
12821282

12831283
# 使用 aiohttp 进行异步请求
12841284
timeout = aiohttp.ClientTimeout(total=10) # 设置10秒超时
@@ -1296,7 +1296,7 @@ async def report_online_status(self):
12961296
async def report_task_status(self, task_name):
12971297
"""异步上报任务执行状态"""
12981298
try:
1299-
url = f"http://aj.ry188.vip/API/UpDataRunState.aspx?Account={self.username}&DeviceNumber={self.device_number}&RunText={task_name}&DeviceCode={self.machine_code}&IsPhone={self.is_phone}&RemoteId={self.remote_id}"
1299+
url = f"http://aj.ry188.vip/API/UpDataRunState.aspx?Account={self.account}&DeviceNumber={self.device_number}&RunText={task_name}&DeviceCode={self.machine_code}&IsPhone={self.is_phone}&RemoteId={self.remote_id}"
13001300

13011301
timeout = aiohttp.ClientTimeout(total=10)
13021302
async with aiohttp.ClientSession(timeout=timeout) as session:

‎FBver/FBver.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def download_file_with_progress_http(url, local_path, progress_var, progress_lab
185185

186186

187187
async def check_version():
188-
version = '1.0.0.0'
188+
version = '1.0.0.1'
189189
remote_version_url = 'http://ver.ry188.vip/API/getver.aspx?N=FBver'
190190

191191
async with aiohttp.ClientSession() as session:

‎FBver/file_version_info.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ VSVersionInfo(
66
ffi=FixedFileInfo(
77
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
88
# Set not needed items to zero 0.
9-
filevers=(1, 0, 0, 0),
10-
prodvers=(1, 0, 0, 0),
9+
filevers=(1, 0, 0, 1),
10+
prodvers=(1, 0, 0, 1),
1111
# Contains a bitmask that specifies the valid bits 'flags'r
1212
mask=0x3f,
1313
# Contains a bitmask that specifies the Boolean attributes of the file.
@@ -33,14 +33,14 @@ VSVersionInfo(
3333
[StringStruct('Comments', ''),
3434
StringStruct('CompanyName', ''),
3535
StringStruct('FileDescription', 'FBver'),
36-
StringStruct('FileVersion', '1.0.0.0'),
36+
StringStruct('FileVersion', '1.0.0.1'),
3737
StringStruct('InternalName', 'FBver.exe'),
3838
StringStruct('LegalCopyright', 'Copyright © 2025'),
3939
StringStruct('LegalTrademarks', ''),
4040
StringStruct('OriginalFilename', 'FBver'),
4141
StringStruct('ProductName', 'FBver'),
42-
StringStruct('ProductVersion', '1.0.0.0'),
43-
StringStruct('Assembly Version', '1.0.0.0')])
42+
StringStruct('ProductVersion', '1.0.0.1'),
43+
StringStruct('Assembly Version', '1.0.0.1')])
4444
])
4545
]
4646
)

‎facebook/FBreptilever.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def download_file_with_progress_http(url, local_path, progress_var, progress_lab
185185

186186

187187
async def check_version():
188-
version = '1.0.0.3'
188+
version = '1.0.0.4'
189189
remote_version_url = 'http://ver.ry188.vip/API/getver.aspx?N=FBreptile'
190190

191191
async with aiohttp.ClientSession() as session:

‎facebook/authorization.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import clr
77
import sys
88
import os
9+
10+
import pyperclip
911
from PyQt5.QtWidgets import (QApplication, QDialog, QVBoxLayout, QHBoxLayout,
1012
QLabel, QPushButton, QTextEdit, QMessageBox)
1113
from PyQt5.QtGui import QFont, QPalette, QColor, QIcon
@@ -29,7 +31,7 @@ class AuthorizationDialog(QDialog):
2931
def __init__(self, machine_code, parent=None):
3032
super().__init__(parent)
3133
self.machine_code = machine_code
32-
self.setWindowTitle("授权验证")
34+
self.setWindowTitle("授權驗證")
3335
self.setFixedSize(400, 300)
3436
self.setWindowFlags(Qt.Dialog | Qt.FramelessWindowHint)
3537
self.initUI()
@@ -41,20 +43,20 @@ def initUI(self):
4143
layout.setSpacing(15)
4244

4345
# 标题
44-
title_label = QLabel("授权验证")
46+
title_label = QLabel("授權驗證")
4547
title_label.setFont(QFont("微軟雅黑", 14, QFont.Bold))
4648
title_label.setAlignment(Qt.AlignCenter)
4749
title_label.setStyleSheet("color: #ff6b6b;")
4850
layout.addWidget(title_label)
4951

5052
# 提示信息
51-
info_label = QLabel("当前软件未授权或授权已过期")
53+
info_label = QLabel("當前軟件未授權或授權已經過期")
5254
info_label.setFont(QFont("微軟雅黑", 10))
5355
info_label.setAlignment(Qt.AlignCenter)
5456
layout.addWidget(info_label)
5557

5658
# 机器码显示
57-
machine_label = QLabel("请复制以下机器码联系管理员授权：")
59+
machine_label = QLabel("請複製以下機器碼聯繫管理員授權：")
5860
machine_label.setFont(QFont("微軟雅黑", 9))
5961
layout.addWidget(machine_label)
6062

@@ -74,7 +76,7 @@ def initUI(self):
7476
layout.addWidget(self.code_text)
7577

7678
# 复制按钮
77-
copy_btn = QPushButton("复制机器码")
79+
copy_btn = QPushButton("複製機器碼")
7880
copy_btn.setFixedHeight(35)
7981
copy_btn.clicked.connect(self.copy_code)
8082
copy_btn.setStyleSheet("""
@@ -119,9 +121,10 @@ def center(self):
119121
self.move(frame_gm.topLeft())
120122

121123
def copy_code(self):
122-
clipboard = QApplication.clipboard()
123-
clipboard.setText(self.machine_code)
124-
QMessageBox.information(self, "提示", "机器码已复制到剪贴板")
124+
# clipboard = QApplication.clipboard()
125+
# clipboard.setText(self.machine_code)
126+
pyperclip.copy(self.machine_code)
127+
QMessageBox.information(self, "提示", "機器碼已複製到剪切板")
125128

126129
def close_application(self):
127130
QApplication.quit()
@@ -182,17 +185,17 @@ def check_authorization():
182185
if installDate <= current_date <= ExpiryDate:
183186
days_remaining = (ExpiryDate - current_date).days
184187
print(f"当前日期在有效期内。剩余天数: {days_remaining}")
185-
return True, f"授权有效，剩余{days_remaining}天", machine_code
188+
return True, f"授權有效，剩餘{days_remaining}天", machine_code
186189
else:
187190
print("当前日期不在有效期内。")
188-
return False, "授权已过期", machine_code
191+
return False, "授權已經過期", machine_code
189192
else:
190193
print("没有找到授权信息！")
191-
return False, "未找到授权信息", machine_code
194+
return False, "未找到授權信息", machine_code
192195

193196
except Exception as e:
194197
print(f"授权检查失败: {e}")
195-
return False, f"授权检查失败: {str(e)}", "获取失败"
198+
return False, f"授權檢測失敗: {str(e)}", "獲取失敗"
196199

197200

198201
def show_authorization_dialog(machine_code):

‎facebook/file_version_info.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ VSVersionInfo(
66
ffi=FixedFileInfo(
77
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
88
# Set not needed items to zero 0.
9-
filevers=(1, 0, 0, 3),
10-
prodvers=(1, 0, 0, 3),
9+
filevers=(1, 0, 0, 4),
10+
prodvers=(1, 0, 0, 4),
1111
# Contains a bitmask that specifies the valid bits 'flags'r
1212
mask=0x3f,
1313
# Contains a bitmask that specifies the Boolean attributes of the file.
@@ -33,14 +33,14 @@ VSVersionInfo(
3333
[StringStruct('Comments', ''),
3434
StringStruct('CompanyName', ''),
3535
StringStruct('FileDescription', 'FBreptilever'),
36-
StringStruct('FileVersion', '1.0.0.3'),
36+
StringStruct('FileVersion', '1.0.0.4'),
3737
StringStruct('InternalName', 'FBreptilever.exe'),
3838
StringStruct('LegalCopyright', 'Copyright © 2025'),
3939
StringStruct('LegalTrademarks', ''),
4040
StringStruct('OriginalFilename', 'FBreptilever'),
4141
StringStruct('ProductName', 'FBreptilever'),
42-
StringStruct('ProductVersion', '1.0.0.3'),
43-
StringStruct('Assembly Version', '1.0.0.3')])
42+
StringStruct('ProductVersion', '1.0.0.4'),
43+
StringStruct('Assembly Version', '1.0.0.4')])
4444
])
4545
]
4646
)

0 commit comments

Comments
 (0)