From 999b5d325f6e4a773cf18440b1ce3a469ebf44e9 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Mon, 18 Jul 2022 14:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/app.ts          | 16 +++++++++++++---
 back/config/index.ts | 11 +----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/back/app.ts b/back/app.ts
index 067d7b19..f7ebb0ef 100644
--- a/back/app.ts
+++ b/back/app.ts
@@ -1,10 +1,8 @@
 import 'reflect-metadata'; // We need this in order to use @Decorators
-
 import config from './config';
-
 import express from 'express';
-
 import Logger from './loaders/logger';
+import path from 'path';
 
 async function startServer() {
   const app = express();
@@ -29,4 +27,16 @@ async function startServer() {
   await require('./loaders/server').default({ server });
 }
 
+function initEnv() {
+  process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+  // 声明QL_DIR环境变量
+  let qlHomePath = path.join(__dirname, '../../');
+  // 生产环境
+  if (qlHomePath.endsWith('/static/')) {
+    qlHomePath = path.join(qlHomePath, '../');
+  }
+  process.env.QL_DIR = qlHomePath;
+}
+
+initEnv();
 startServer();
diff --git a/back/config/index.ts b/back/config/index.ts
index 2534ddda..9f8f8848 100644
--- a/back/config/index.ts
+++ b/back/config/index.ts
@@ -2,19 +2,10 @@ import dotenv from 'dotenv';
 import path from 'path';
 import { createRandomString } from './util';
 
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-// 声明QL_DIR环境变量
-let qlHomePath = path.join(__dirname, '../../');
-// 生产环境
-if (qlHomePath.endsWith('/static/')) {
-  qlHomePath = path.join(qlHomePath, '../');
-}
-process.env.QL_DIR = qlHomePath;
-
 const lastVersionFile = `http://qn.whyour.cn/version.ts?v=${Date.now()}`;
 
 const envFound = dotenv.config();
-const rootPath = qlHomePath;
+const rootPath = process.env.QL_DIR as string;
 const dataPath = path.join(rootPath, 'data/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');