Merge 6d5fbeb into b25986d

thinkjs · Nov 30, 2019 · d8c80a7 · d8c80a7
2 parents b25986d + 6d5fbeb
commit d8c80a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/index.d.ts b/index.d.ts
@@ -484,6 +484,7 @@ declare module 'thinkjs' {
     messenger: ThinkCluster.Messenger;
     ROOT_PATH: string;
     APP_PATH: string;
+    RUNTIME_PATH: string;
     logger: Logger;
 
     Controller: TController;

diff --git a/lib/application.js b/lib/application.js
@@ -25,6 +25,9 @@ module.exports = class Application {
       }
       options.APP_PATH = appPath;
     }
+    if (!options.RUNTIME_PATH) {
+      options.RUNTIME_PATH = path.join(options.ROOT_PATH, 'runtime');
+    }
     this.options = options;
   }
   /**

diff --git a/lib/loader.js b/lib/loader.js
@@ -24,6 +24,8 @@ const thinkLoader = class {
   initPath() {
     think.ROOT_PATH = this.options.ROOT_PATH;
     think.APP_PATH = this.options.APP_PATH;
+    think.RUNTIME_PATH = this.options.RUNTIME_PATH;
+
     // set env
     if (this.options.env) {
       think.app.env = this.options.env;
@@ -88,7 +90,7 @@ const thinkLoader = class {
    * @param {Config} config
    */
   writeConfig(config) {
-    const configFilepath = path.join(think.ROOT_PATH, `runtime/config`);
+    const configFilepath = path.join(think.RUNTIME_PATH, 'config');
     helper.mkdir(configFilepath);
     fs.writeFileSync(`${configFilepath}/${think.app.env}.json`, JSON.stringify(config, undefined, 2));
   }