Skip to content

Commit 3c4bd4d

Browse files
committed
0.11.31,修正NapCat自动托管时上报地址锁死问题
1 parent 9be8fb6 commit 3c4bd4d

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

OlivOS/core/boot/bootDataAPI.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
"rx_queue": "OlivOS_napcat_lib_rx_queue",
530530
"tx_queue": "OlivOS_rx_queue",
531531
"logger_proc": "OlivOS_logger",
532-
"target_proc": None,
532+
"target_proc": "OlivOS_flask_post_rx",
533533
"control_queue": "OlivOS_control_queue",
534534
"debug": False
535535
},

OlivOS/core/info/infoAPI.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import OlivOS
1818

1919

20-
OlivOS_Version = '0.11.30'
21-
OlivOS_SVN = 150
20+
OlivOS_Version = '0.11.31'
21+
OlivOS_SVN = 151
2222

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

OlivOS/libBooter/libNapCatEXEModelAPI.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def startNapCatLibExeModel(
8181
control_queue=multiprocessing_dict[basic_conf_models_this['control_queue']],
8282
logger_proc=Proc_dict[basic_conf_models_this['logger_proc']],
8383
bot_info_dict=plugin_bot_info_dict[bot_info_key],
84-
target_proc=None,
84+
target_proc=basic_conf_models[basic_conf_models_this['target_proc']],
8585
debug_mode=False
8686
)
8787
Proc_Proc_dict[tmp_Proc_name] = Proc_dict[tmp_Proc_name].start_unity(tmp_proc_mode)
@@ -127,7 +127,7 @@ def run(self):
127127
releaseDir(f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}")
128128
releaseDir(f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}/config")
129129
unzip('./lib/NapCat.zip', f"./conf/napcat/{self.Proc_data['bot_info_dict'].hash}")
130-
napcatTypeConfig(self.Proc_data['bot_info_dict']).setConfig()
130+
napcatTypeConfig(self.Proc_data['bot_info_dict'], self.Proc_config['target_proc']).setConfig()
131131
if self.Proc_data['bot_info_dict'].platform['model'] in [
132132
'napcat',
133133
'napcat_show'
@@ -317,8 +317,9 @@ def sendControlEventSend(self, action, data):
317317

318318

319319
class napcatTypeConfig(object):
320-
def __init__(self, bot_info_dict:OlivOS.API.bot_info_T):
320+
def __init__(self, bot_info_dict:OlivOS.API.bot_info_T, target_proc):
321321
self.bot_info_dict = bot_info_dict
322+
self.target_proc = target_proc
322323
self.config_file_str = ''
323324
self.config_file_data = ''
324325
self.config_file_format = {}
@@ -327,7 +328,7 @@ def setConfig(self):
327328
self.config_file_format['uin'] = str(self.bot_info_dict.id)
328329
self.config_file_format['token'] = self.bot_info_dict.post_info.access_token
329330
self.config_file_format['port'] = str(self.bot_info_dict.post_info.port)
330-
self.config_file_format['postUrls'] = 'http://127.0.0.1:55001/OlivOSMsgApi/qq/onebot/default'
331+
self.config_file_format['postUrls'] = f"http://127.0.0.1:{self.target_proc['server']['port']}/OlivOSMsgApi/qq/onebot/default"
331332

332333
self.config_file_data = {
333334
"http": {

0 commit comments

Comments
 (0)