diff --git a/.gitignore b/.gitignore index 773d481a..709791ed 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ __pycache__ /shell/preload/env.* /shell/preload/notify.* /shell/preload/*-notify.json +/shell/preload/__ql_notify__.* diff --git a/back/config/index.ts b/back/config/index.ts index be155ef5..9b39daf4 100644 --- a/back/config/index.ts +++ b/back/config/index.ts @@ -42,8 +42,8 @@ const systemLogPath = path.join(dataPath, 'syslog/'); const envFile = path.join(preloadPath, 'env.sh'); const jsEnvFile = path.join(preloadPath, 'env.js'); const pyEnvFile = path.join(preloadPath, 'env.py'); -const jsNotifyFile = path.join(preloadPath, 'notify.js'); -const pyNotifyFile = path.join(preloadPath, 'notify.py'); +const jsNotifyFile = path.join(preloadPath, '__ql_notify__.js'); +const pyNotifyFile = path.join(preloadPath, '__ql_notify__.py'); const confFile = path.join(configPath, 'config.sh'); const crontabFile = path.join(configPath, 'crontab.list'); const authConfigFile = path.join(configPath, 'auth.json'); diff --git a/back/loaders/initFile.ts b/back/loaders/initFile.ts index b8629bc0..d613085e 100644 --- a/back/loaders/initFile.ts +++ b/back/loaders/initFile.ts @@ -27,8 +27,8 @@ const sampleNotifyJsFile = path.join(samplePath, 'notify.js'); const sampleNotifyPyFile = path.join(samplePath, 'notify.py'); const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js'); const scriptNotifyPyFile = path.join(scriptPath, 'notify.py'); -const jsNotifyFile = path.join(preloadPath, 'notify.js'); -const pyNotifyFile = path.join(preloadPath, 'notify.py'); +const jsNotifyFile = path.join(preloadPath, '__ql_notify__.js'); +const pyNotifyFile = path.join(preloadPath, '__ql_notify__.py'); const TaskBeforeFile = path.join(configPath, 'task_before.sh'); const TaskBeforeJsFile = path.join(configPath, 'task_before.js'); const TaskBeforePyFile = path.join(configPath, 'task_before.py'); diff --git a/shell/preload/sitecustomize.js b/shell/preload/sitecustomize.js index 424674f7..f80c57f8 100644 --- a/shell/preload/sitecustomize.js +++ b/shell/preload/sitecustomize.js @@ -98,7 +98,7 @@ try { run(); - const { sendNotify } = require('./notify.js'); + const { sendNotify } = require('./__ql_notify__.js'); global.QLAPI = { notify: sendNotify, ...client, diff --git a/shell/preload/sitecustomize.py b/shell/preload/sitecustomize.py index 7e796e61..3d3626f7 100644 --- a/shell/preload/sitecustomize.py +++ b/shell/preload/sitecustomize.py @@ -107,7 +107,7 @@ try: run() - from notify import send + from __ql_notify__ import send class BaseApi(Client): def notify(self, *args, **kwargs):