Skip to content

Commit c40333a

Browse files
lunzhiPenxillunzhiPenxil
committed
0.11.56，春分更新
春分，也称“升分”（外文名：Vernal equinox），古时又称“日中”“日夜分”“仲春之月”，是二十四节气之一，春季第四个节气。斗指卯，太阳黄经达0°，于每年公历3月19-22日交节。
1 parent 5656b1d commit c40333a

File tree

4 files changed

+72
-27
lines changed

4 files changed

+72
-27
lines changed

‎OlivOS/core/L10N/L10NDataAPI.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
'libAstralQsignEXEModelAPI_0004': 'OlivOS libAstralQsignEXEModel failed: {0}\n{1}',
118118
'libAstralQsignEXEModelAPI_0005': 'OlivOS libAstralQsignEXEModel server [{0}] is running',
119119
'libAstralQsignEXEModelAPI_0006': 'OlivOS libAstralQsignEXEModel server [{0}] exited',
120-
'libAstralQsignEXEModelAPI_0007': 'OlivOS libAstralQsignEXEModel server [{0}] is running on port [{1}]',
120+
'libAstralQsignEXEModelAPI_0007': 'OlivOS libAstralQsignEXEModel server [{0}] is running',
121121
'bootAPI_0001': 'OlivOS model [{0}] will init',
122122
'bootAPI_0002': 'OlivOS model [{0}] init',
123123
'bootAPI_0003': 'OlivOS model [{0}] will try init',
@@ -222,7 +222,7 @@
222222
'libAstralQsignEXEModelAPI_0004': 'OlivOS libAstralQsignEXEModelAPI进程托管服务组件 错误: {0}\n{1}',
223223
'libAstralQsignEXEModelAPI_0005': 'OlivOS libAstralQsignEXEModelAPI进程托管服务组件 [{0}] 正在运作',
224224
'libAstralQsignEXEModelAPI_0006': 'OlivOS libAstralQsignEXEModelAPI进程托管服务组件 [{0}] 已经存在',
225-
'libAstralQsignEXEModelAPI_0007': 'OlivOS libAstralQsignEXEModelAPI进程托管服务组件 [{0}] 正在运作于端口 [{1}]',
225+
'libAstralQsignEXEModelAPI_0007': 'OlivOS libAstralQsignEXEModelAPI进程托管服务组件 [{0}] 正在运作',
226226
'bootAPI_0001': 'OlivOS 组件 [{0}] 即将初始化',
227227
'bootAPI_0002': 'OlivOS 组件 [{0}] 初始化',
228228
'bootAPI_0003': 'OlivOS 组件 [{0}] 即将尝试初始化',

‎OlivOS/core/info/infoAPI.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import OlivOS
1818

1919

20-
OlivOS_Version = '0.11.54'
21-
OlivOS_SVN = 174
22-
OlivOS_Version_Slogan = '麻辣火腿花卷'
20+
OlivOS_Version = '0.11.56'
21+
OlivOS_SVN = 176
22+
OlivOS_Version_Slogan = '春分'
2323

2424
# Compatible <= Plugin[compatible_svn] : Compatible
2525
# OldCompatible <= Plugin[compatible_svn] < Compatible : OldCompatible Warn

‎OlivOS/libBooter/libAstralQsignEXEModelAPI.py

+16-5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import traceback
2121
import platform
2222
import zipfile
23+
import hashlib
24+
import re
2325

2426
import OlivOS
2527

@@ -51,7 +53,7 @@ def startAstralQsignLibExeModel(
5153
OlivOS.updateAPI.checkResouceFile(
5254
logger_proc=Proc_dict[basic_conf_models_this['logger_proc']],
5355
resouce_api=resourceUrlPath,
54-
resouce_name='astral-qsign-20240816001',
56+
resouce_name='astral-qsign-20250316001',
5557
filePath='./lib/astral-qsign.zip',
5658
filePathUpdate='./lib/astral-qsign.zip.tmp',
5759
filePathFORCESKIP='./lib/FORCESKIP'
@@ -107,15 +109,14 @@ def run(self):
107109
[self.Proc_name]
108110
)
109111
time.sleep(2)
110-
self.setGoCqhttpModelEnableSendAll()
111112
releaseDir("./conf")
112113
releaseDir("./conf/astral-qsign")
113114
unzip('./lib/astral-qsign.zip', "./conf/astral-qsign")
114115
time.sleep(1)
115116
tmp_env = dict(os.environ)
116117
tmp_env['FORCE_TTY'] = ''
117118
model_Proc = subprocess.Popen(
118-
f".\\start.bat \"localhost\" \"{self.server_data['port']}\" \"{self.server_data['token']}\"",
119+
f".\\uninstall.bat \"localhost\" \"{self.server_data['port']}\" \"{getOTPPASSWORD()}\" \"{self.server_data['token']}\"",
119120
cwd='.\\conf\\astral-qsign',
120121
shell=True,
121122
stdin=subprocess.PIPE,
@@ -125,10 +126,11 @@ def run(self):
125126
env=tmp_env
126127
)
127128
self.sendLog(
128-
2, 'OlivOS libAstralQsignEXEModel server [{0}] is running on port [{1}]',
129+
2, 'OlivOS libAstralQsignEXEModel server [{0}] is running',
129130
[self.Proc_name, str(self.server_data['port'])]
130131
)
131132
self.Proc_data['model_Proc'] = model_Proc
133+
self.setGoCqhttpModelEnableSendAll()
132134
self.get_model_stdout(model_Proc)
133135
# model_Proc.communicate(timeout = None)
134136
self.sendLogSim(
@@ -141,7 +143,8 @@ def run(self):
141143
def get_model_stdout(self, model_Proc: subprocess.Popen):
142144
for line in iter(model_Proc.stdout.readline, b''):
143145
try:
144-
log_data = ('%s' % line.decode('gbk', errors='replace')).rstrip('\n').rstrip('\r')
146+
log_data = ('%s' % line.decode('utf-8', errors='replace')).rstrip('\n').rstrip('\r')
147+
log_data = re.sub(r'\033\[[\d;]*m?', '', log_data)
145148
self.log(2, log_data, [('AstralQsign', 'default')])
146149
except Exception as e:
147150
self.log(4, OlivOS.L10NAPI.getTrans('OlivOS libAstralQsignEXEModel failed: %s\n%s' % [
@@ -225,6 +228,14 @@ def isBotActive(plugin_bot_info_dict:dict):
225228
flag_need_enable = True
226229
return flag_need_enable
227230

231+
def getOTPPASSWORD():
232+
ts = str(int(time.time()))
233+
res = f'{ts}OTP_AstralQSign_Private_Package_OlivOS'
234+
hash_tmp = hashlib.new('md5')
235+
hash_tmp.update(str(res).encode(encoding='UTF-8'))
236+
res = f'{ts}{hash_tmp.hexdigest()}'
237+
return res
238+
228239
def releaseDir(dir_path):
229240
if not os.path.exists(dir_path):
230241
os.makedirs(dir_path)

‎OlivOS/libBooter/libEXEModelAPI.py

+51-17
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,36 @@
5555
'android_pad': {
5656
'AstralQsign': '''{
5757
"apk_id": "com.tencent.mobileqq",
58-
"app_id": 537241756,
59-
"sub_app_id": 537241756,
58+
"app_id": 537272373,
59+
"sub_app_id": 537272373,
6060
"app_key": "0S200MNJT807V3GE",
61-
"sort_version_name": "9.0.95.19320",
62-
"build_time": 1713424357,
61+
"sort_version_name": "9.1.55.23840",
62+
"build_time": 1728390173,
6363
"apk_sign": "a6b745bf24a2c277527716f6f36eb68d",
64-
"sdk_version": "6.0.0.2560",
64+
"sdk_version": "6.0.0.2568",
6565
"sso_version": 22,
6666
"misc_bitmap": 150470524,
67-
"main_sig_map": 34869472,
67+
"main_sig_map": 16724722,
6868
"sub_sig_map": 66560,
69-
"dump_time": 1713424357,
70-
"qua": "V1_AND_SQ_9.0.95_7368_YYB_D",
69+
"dump_time": 1728390173,
70+
"qua": "V1_AND_SQ_9.1.55_9176_HDBM_T",
71+
"protocol_type": 6
72+
}''',
73+
'9.1.55': '''{
74+
"apk_id": "com.tencent.mobileqq",
75+
"app_id": 537272373,
76+
"sub_app_id": 537272373,
77+
"app_key": "0S200MNJT807V3GE",
78+
"sort_version_name": "9.1.55.23840",
79+
"build_time": 1728390173,
80+
"apk_sign": "a6b745bf24a2c277527716f6f36eb68d",
81+
"sdk_version": "6.0.0.2568",
82+
"sso_version": 22,
83+
"misc_bitmap": 150470524,
84+
"main_sig_map": 16724722,
85+
"sub_sig_map": 66560,
86+
"dump_time": 1728390173,
87+
"qua": "V1_AND_SQ_9.1.55_9176_HDBM_T",
7188
"protocol_type": 6
7289
}''',
7390
'9.0.95': '''{
@@ -261,19 +278,36 @@
261278
'android_phone': {
262279
'AstralQsign': '''{
263280
"apk_id": "com.tencent.mobileqq",
264-
"app_id": 537242075,
265-
"sub_app_id": 537242075,
281+
"app_id": 537272384,
282+
"sub_app_id": 537272384,
266283
"app_key": "0S200MNJT807V3GE",
267-
"sort_version_name": "9.0.95.19320",
268-
"build_time": 1713424357,
284+
"sort_version_name": "9.1.55.23840",
285+
"build_time": 1728390173,
269286
"apk_sign": "a6b745bf24a2c277527716f6f36eb68d",
270-
"sdk_version": "6.0.0.2560",
287+
"sdk_version": "6.0.0.2568",
271288
"sso_version": 22,
272289
"misc_bitmap": 150470524,
273-
"main_sig_map": 34869472,
290+
"main_sig_map": 16724722,
274291
"sub_sig_map": 66560,
275-
"dump_time": 1713424357,
276-
"qua": "V1_AND_SQ_9.0.95_7368_YYB_D",
292+
"dump_time": 1728390173,
293+
"qua": "V1_AND_SQ_9.1.55_9176_HDBM_T",
294+
"protocol_type": 1
295+
}''',
296+
'9.1.55': '''{
297+
"apk_id": "com.tencent.mobileqq",
298+
"app_id": 537272384,
299+
"sub_app_id": 537272384,
300+
"app_key": "0S200MNJT807V3GE",
301+
"sort_version_name": "9.1.55.23840",
302+
"build_time": 1728390173,
303+
"apk_sign": "a6b745bf24a2c277527716f6f36eb68d",
304+
"sdk_version": "6.0.0.2568",
305+
"sso_version": 22,
306+
"misc_bitmap": 150470524,
307+
"main_sig_map": 16724722,
308+
"sub_sig_map": 66560,
309+
"dump_time": 1728390173,
310+
"qua": "V1_AND_SQ_9.1.55_9176_HDBM_T",
277311
"protocol_type": 1
278312
}''',
279313
'9.0.95': '''{
@@ -485,7 +519,7 @@ def startGoCqhttpLibExeModel(
485519
OlivOS.updateAPI.checkResouceFile(
486520
logger_proc=Proc_dict[basic_conf_models_this['logger_proc']],
487521
resouce_api=resourceUrlPath,
488-
resouce_name='AstralGocq',
522+
resouce_name='AstralGocq-20250316001',
489523
filePath='./lib/go-cqhttp.exe',
490524
filePathUpdate='./lib/go-cqhttp.exe.tmp',
491525
filePathFORCESKIP='./lib/FORCESKIP'

0 commit comments

Comments
 (0)