Skip to content

Commit edfb6e9

Browse files
MetaLe0MetaLe0
committed
采用新的启动脚本启动新版NapCat
1 parent 9184d8b commit edfb6e9

File tree

4 files changed

+66
-29
lines changed

4 files changed

+66
-29
lines changed

‎OlivOS/adapter/onebotV11/flaskServerAPI.py

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
'napcat',
4141
'napcat_hide',
4242
'napcat_show',
43+
'napcat_show_new',
4344
'napcat_show_old'
4445
]
4546

‎OlivOS/core/core/messageAPI.py

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
'napcat': 'old_string',
5959
'napcat_hide': 'old_string',
6060
'napcat_show': 'old_string',
61+
'napcat_show_new': 'old_string',
6162
'napcat_show_old': 'old_string'
6263
}
6364
},

‎OlivOS/libBooter/libNapCatEXEModelAPI.py

+54-27
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
'napcat',
4040
'napcat_hide',
4141
'napcat_show',
42+
'napcat_show_new',
4243
'napcat_show_old'
4344
]
4445

@@ -62,11 +63,19 @@ def startNapCatLibExeModel(
6263
OlivOS.updateAPI.checkResouceFile(
6364
logger_proc=Proc_dict[basic_conf_models_this['logger_proc']],
6465
resouce_api=resourceUrlPath,
65-
resouce_name='NapCat-QQ-Win-9.9.11-24568', # resouce_name='NapCat-QQ-Win-9.9.12-26000',
66+
resouce_name='NapCat-QQ-Win-9.9.11-24568',
6667
filePath='./lib/NapCat.zip',
6768
filePathUpdate='./lib/NapCat.zip.tmp',
6869
filePathFORCESKIP='./lib/FORCESKIP'
6970
)
71+
OlivOS.updateAPI.checkResouceFile(
72+
logger_proc=Proc_dict[basic_conf_models_this['logger_proc']],
73+
resouce_api=resourceUrlPath,
74+
resouce_name='NapCat-QQ-Win-9.9.12-26000',
75+
filePath='./lib/NapCatNew.zip',
76+
filePathUpdate='./lib/NapCat.zip.tmp',
77+
filePathFORCESKIP='./lib/FORCESKIP'
78+
)
7079
for bot_info_key in plugin_bot_info_dict:
7180
if plugin_bot_info_dict[bot_info_key].platform['model'] in gCheckList:
7281
tmp_Proc_name = basic_conf_models_this['name'] + '=' + bot_info_key
@@ -126,10 +135,16 @@ def run(self):
126135
releaseDir('./conf/napcat')
127136
releaseDir(f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}")
128137
releaseDir(f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}/config")
129-
unzip('./lib/NapCat.zip', f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}")
138+
if self.Proc_data['bot_info_dict'].platform['model'] in [
139+
'napcat_show_new'
140+
]:
141+
unzip('./lib/NapCatNew.zip', f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}")
142+
else:
143+
unzip('./lib/NapCat.zip', f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}")
130144
napcatTypeConfig(self.Proc_data['bot_info_dict'], self.Proc_config['target_proc']).setConfig()
131145
if self.Proc_data['bot_info_dict'].platform['model'] in [
132146
'napcat',
147+
'napcat_show_new',
133148
'napcat_show'
134149
]:
135150
self.log(2, OlivOS.L10NAPI.getTrans(
@@ -147,31 +162,43 @@ def run(self):
147162
args=(),
148163
daemon=self.deamon
149164
).start()
150-
tmp_env = dict(os.environ)
151-
model_Proc = subprocess.Popen(
152-
f".\\napcat-utf8.bat -q {self.Proc_data['bot_info_dict'].id}",
153-
cwd=f".\\conf\\napcat\\{self.Proc_data['bot_info_dict'].hash}",
154-
shell=True,
155-
stdin=subprocess.PIPE,
156-
stdout=subprocess.PIPE,
157-
stderr=subprocess.PIPE,
158-
creationflags=subprocess.CREATE_NEW_CONSOLE,
159-
env=tmp_env
160-
)
161-
self.Proc_data['model_Proc'] = model_Proc
162-
threading.Thread(
163-
target=self.check_stdin,
164-
args=(model_Proc,),
165-
daemon=self.deamon
166-
).start()
167-
self.get_model_stdout(model_Proc)
168-
# model_Proc.communicate(timeout = None)
169-
self.log(3, OlivOS.L10NAPI.getTrans(
170-
'OlivOS libNapCatEXEModel server [{0}] will retry in 10s...',
171-
[self.Proc_name], modelName
172-
))
173-
self.Proc_data['model_Proc'] = None
174-
time.sleep(8)
165+
if self.Proc_data['bot_info_dict'].platform['model'] in [
166+
'napcat_show_new'
167+
]:
168+
tmp_env = dict(os.environ)
169+
subprocess.call(
170+
'start powershell .\\BootWay05.ps1',
171+
shell=True,
172+
cwd='.\\conf\\napcat\\' + self.Proc_data['bot_info_dict'].hash,
173+
env=tmp_env
174+
)
175+
self.flag_run = False
176+
else:
177+
tmp_env = dict(os.environ)
178+
model_Proc = subprocess.Popen(
179+
f".\\napcat-utf8.bat -q {self.Proc_data['bot_info_dict'].id}",
180+
cwd=f".\\conf\\napcat\\{self.Proc_data['bot_info_dict'].hash}",
181+
shell=True,
182+
stdin=subprocess.PIPE,
183+
stdout=subprocess.PIPE,
184+
stderr=subprocess.PIPE,
185+
creationflags=subprocess.CREATE_NEW_CONSOLE,
186+
env=tmp_env
187+
)
188+
self.Proc_data['model_Proc'] = model_Proc
189+
threading.Thread(
190+
target=self.check_stdin,
191+
args=(model_Proc,),
192+
daemon=self.deamon
193+
).start()
194+
self.get_model_stdout(model_Proc)
195+
# model_Proc.communicate(timeout = None)
196+
self.log(3, OlivOS.L10NAPI.getTrans(
197+
'OlivOS libNapCatEXEModel server [{0}] will retry in 10s...',
198+
[self.Proc_name], modelName
199+
))
200+
self.Proc_data['model_Proc'] = None
201+
time.sleep(8)
175202
elif self.Proc_data['bot_info_dict'].platform['model'] in [
176203
'napcat_show_old'
177204
]:

‎OlivOS/nativeGUI/multiLoginUIAPI.py

+10-2
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ def __init__(self, action, Account_data, hash_key=None, edit_commit_callback=Non
365365
'edit_root_Combobox_dict': {
366366
'type_list': [
367367
'QQ/NapCat/默认',
368+
'QQ/NapCat/9.9.11',
368369
'QQ/OPQ/默认',
369370
'QQ/GoCq/安卓平板',
370371
'QQ/GoCq/安卓手机',
@@ -429,7 +430,8 @@ def __init__(self, action, Account_data, hash_key=None, edit_commit_callback=Non
429430
'QQ/OPQ/默认': '简单对接OPQ，使用闭源框架有账号安全风险，OlivOS不对此负责',
430431
'QQ/OPQ/指定端口': '简单对接OPQ，使用闭源框架有账号安全风险，OlivOS不对此负责',
431432
'QQ/OPQ/指定端口/旧': '简单对接OPQ，使用闭源框架有账号安全风险，OlivOS不对此负责',
432-
'QQ/NapCat/默认': '使用本方法需要已经安装较新版本QQ',
433+
'QQ/NapCat/默认': '需要已经安装不低于9.9.12版本QQ',
434+
'QQ/NapCat/9.9.11': '需要已经安装不高于9.9.11版本QQ',
433435
'QQ/NapCat/旧': '使用本方法需要已经安装较新版本QQ'
434436
},
435437
'type_clear_note_list': {
@@ -448,6 +450,7 @@ def __init__(self, action, Account_data, hash_key=None, edit_commit_callback=Non
448450
'QQ/OPQ/指定端口': './conf/OPQBot/{bothash}',
449451
'QQ/OPQ/指定端口/旧': './conf/OPQBot/{bothash}',
450452
'QQ/NapCat/默认': './conf/napcat/{bothash}',
453+
'QQ/NapCat/9.9.11': './conf/napcat/{bothash}',
451454
'QQ/NapCat/旧': './conf/napcat/{bothash}'
452455
},
453456
'type_extend_note_list': {
@@ -542,7 +545,11 @@ def __init__(self, action, Account_data, hash_key=None, edit_commit_callback=Non
542545
'TOKEN': 'edit_root_Entry_Server_access_token',
543546
}
544547
],
545-
'QQ/NapCat/默认': ['qq', 'onebot', 'napcat_show', 'True', 'post', {
548+
'QQ/NapCat/默认': ['qq', 'onebot', 'napcat_show_new', 'True', 'post', {
549+
'QQ号': 'edit_root_Entry_ID',
550+
}
551+
],
552+
'QQ/NapCat/9.9.11': ['qq', 'onebot', 'napcat_show', 'True', 'post', {
546553
'QQ号': 'edit_root_Entry_ID',
547554
}
548555
],
@@ -889,6 +896,7 @@ def __init__(self, action, Account_data, hash_key=None, edit_commit_callback=Non
889896
'napcat',
890897
#'napcat_hide',
891898
'napcat_show',
899+
'napcat_show_new',
892900
'napcat_show_old'
893901
]
894902
},

0 commit comments

Comments
 (0)