mirror of
https://github.com/whyour/qinglong.git
synced 2025-07-08 04:16:07 +08:00
修改系统内置通知模块名称,避免重复
This commit is contained in:
parent
fa83761d27
commit
f9f78b4e05
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -27,3 +27,4 @@ __pycache__
|
||||||
/shell/preload/env.*
|
/shell/preload/env.*
|
||||||
/shell/preload/notify.*
|
/shell/preload/notify.*
|
||||||
/shell/preload/*-notify.json
|
/shell/preload/*-notify.json
|
||||||
|
/shell/preload/__ql_notify__.*
|
||||||
|
|
|
@ -42,8 +42,8 @@ const systemLogPath = path.join(dataPath, 'syslog/');
|
||||||
const envFile = path.join(preloadPath, 'env.sh');
|
const envFile = path.join(preloadPath, 'env.sh');
|
||||||
const jsEnvFile = path.join(preloadPath, 'env.js');
|
const jsEnvFile = path.join(preloadPath, 'env.js');
|
||||||
const pyEnvFile = path.join(preloadPath, 'env.py');
|
const pyEnvFile = path.join(preloadPath, 'env.py');
|
||||||
const jsNotifyFile = path.join(preloadPath, 'notify.js');
|
const jsNotifyFile = path.join(preloadPath, '__ql_notify__.js');
|
||||||
const pyNotifyFile = path.join(preloadPath, 'notify.py');
|
const pyNotifyFile = path.join(preloadPath, '__ql_notify__.py');
|
||||||
const confFile = path.join(configPath, 'config.sh');
|
const confFile = path.join(configPath, 'config.sh');
|
||||||
const crontabFile = path.join(configPath, 'crontab.list');
|
const crontabFile = path.join(configPath, 'crontab.list');
|
||||||
const authConfigFile = path.join(configPath, 'auth.json');
|
const authConfigFile = path.join(configPath, 'auth.json');
|
||||||
|
|
|
@ -27,8 +27,8 @@ const sampleNotifyJsFile = path.join(samplePath, 'notify.js');
|
||||||
const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
|
const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
|
||||||
const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
|
const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
|
||||||
const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
|
const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
|
||||||
const jsNotifyFile = path.join(preloadPath, 'notify.js');
|
const jsNotifyFile = path.join(preloadPath, '__ql_notify__.js');
|
||||||
const pyNotifyFile = path.join(preloadPath, 'notify.py');
|
const pyNotifyFile = path.join(preloadPath, '__ql_notify__.py');
|
||||||
const TaskBeforeFile = path.join(configPath, 'task_before.sh');
|
const TaskBeforeFile = path.join(configPath, 'task_before.sh');
|
||||||
const TaskBeforeJsFile = path.join(configPath, 'task_before.js');
|
const TaskBeforeJsFile = path.join(configPath, 'task_before.js');
|
||||||
const TaskBeforePyFile = path.join(configPath, 'task_before.py');
|
const TaskBeforePyFile = path.join(configPath, 'task_before.py');
|
||||||
|
|
|
@ -98,7 +98,7 @@ try {
|
||||||
|
|
||||||
run();
|
run();
|
||||||
|
|
||||||
const { sendNotify } = require('./notify.js');
|
const { sendNotify } = require('./__ql_notify__.js');
|
||||||
global.QLAPI = {
|
global.QLAPI = {
|
||||||
notify: sendNotify,
|
notify: sendNotify,
|
||||||
...client,
|
...client,
|
||||||
|
|
|
@ -107,7 +107,7 @@ try:
|
||||||
|
|
||||||
run()
|
run()
|
||||||
|
|
||||||
from notify import send
|
from __ql_notify__ import send
|
||||||
|
|
||||||
class BaseApi(Client):
|
class BaseApi(Client):
|
||||||
def notify(self, *args, **kwargs):
|
def notify(self, *args, **kwargs):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user