@whyour/qinglong 0.21.0 → 0.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/share.sh

@@ -74,7 +74,9 @@ init_env() {
 
 import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
-  [[ -f $file_env ]] && . $file_env
+  if [[ $LOAD_ENV != 'false' ]] && [[ -f $file_env ]]; then
+    . $file_env
+  fi
 
   ql_base_url=${QlBaseUrl:-"/"}
   ql_port=${QlPort:-"5700"}

package/static/build/config/index.js

@@ -35,6 +35,8 @@ const uploadPath = path_1.default.join(dataPath, 'upload/');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d/');
 const systemLogPath = path_1.default.join(dataPath, 'syslog/');
 const envFile = path_1.default.join(configPath, 'env.sh');
+const jsEnvFile = path_1.default.join(configPath, 'env.js');
+const pyEnvFile = path_1.default.join(configPath, 'env.py');
 const confFile = path_1.default.join(configPath, 'config.sh');
 const crontabFile = path_1.default.join(configPath, 'crontab.list');
 const authConfigFile = path_1.default.join(configPath, 'auth.json');
@@ -81,6 +83,8 @@ exports.default = {
     sampleFile,
     confFile,
     envFile,
+    jsEnvFile,
+    pyEnvFile,
     dbPath,
     uploadPath,
     configPath,
@@ -93,6 +97,8 @@ exports.default = {
         'crontab.list',
         'dependence-proxy.sh',
         'env.sh',
+        'env.js',
+        'env.py',
         'token.json',
     ],
     writePathList: [configPath, scriptPath],

package/static/build/services/env.js

@@ -193,6 +193,8 @@ let EnvService = class EnvService {
         });
         const groups = (0, groupBy_1.default)(envs, 'name');
         let env_string = '';
+        let js_env_string = '';
+        let py_env_string = 'import os\n';
         for (const key in groups) {
             if (Object.prototype.hasOwnProperty.call(groups, key)) {
                 const group = groups[key];
@@ -204,10 +206,19 @@ let EnvService = class EnvService {
                         .replace(/'/g, "'\\''")
                         .trim();
                     env_string += `export ${key}='${value}'\n`;
+                    const _env_value = `'${group
+                        .map((x) => x.value)
+                        .join('&')
+                        .replace(/\\/g, '\\\\')
+                        .replace(/'/g, "\\'")}'`;
+                    js_env_string += `process.env.${key}=${_env_value};\n`;
+                    py_env_string += `os.environ['${key}']=${_env_value}\n`;
                 }
             }
         }
         await fs.writeFile(config_1.default.envFile, env_string);
+        await fs.writeFile(config_1.default.jsEnvFile, js_env_string);
+        await fs.writeFile(config_1.default.pyEnvFile, py_env_string);
     }
 };
 EnvService = __decorate([