Merge pull request #30 from TaleLin/env

Handle Env

Author: pedro

README.md

@@ -35,9 +35,9 @@ Lin-CMS 是林间有风团队经过大量项目实践所提炼出的一套**内
 
 ### 当前最新版本
 
-lin-mizar(核心库) ：0.1.0-beta.1
+lin-mizar(核心库) ：0.1.0-beta.4
 
-lin-cms-koa(当前实例工程)：0.1.0-beta.1
+lin-cms-koa(当前示例工程)：0.1.0-beta.3
 
 ### 文档地址
 
@@ -49,9 +49,9 @@ lin-cms-koa(当前实例工程)：0.1.0-beta.1
 
 ### QQ 交流群
 
-QQ 群号：699501172
+QQ 群号：643205479
 
-<img class="QR-img" width="258" height="300" src="http://imglf4.nosdn0.126.net/img/Qk5LWkJVWkF3NmlPcDV2NjJvR2dFYU90R0ZuS2g1STZVa1NhOWN2YVhrUnFXdmJVRk5LQ1FnPT0.jpg?imageView&thumbnail=500x0&quality=96&stripmeta=0&type=jpg">
+<img class="QR-img" width="258" height="300" src="http://imglf3.nosdn0.126.net/img/Qk5LWkJVWkF3Nmdyc2xGcUtScEJLOVV1clErY1dJa0FsQ3E1aDZQWlZHZ2dCbSt4WXA1V3dRPT0.jpg?imageView&thumbnail=1680x0&quality=96&stripmeta=0&type=jpg">
 
 ### 微信公众号
 

app/config/secure.js

@@ -2,7 +2,7 @@
 
 module.exports = {
   db: {
-    database: 'lin-cms5',
+    database: 'lin-cms',
     host: 'localhost',
     dialect: 'mysql',
     port: 3306,

app/config/setting.js

@@ -1,8 +1,17 @@
 'use strict';
 
+let siteDomain;
+switch (process.env.NODE_ENV) {
+  case 'development':
+    siteDomain = 'http://localhost:5000/';
+    break;
+  case 'production':
+    siteDomain = '';
+    break;
+}
 module.exports = {
   port: 5000,
-  siteDomain: 'http://localhost:5000',
+  siteDomain,
   countDefault: 10,
   pageDefault: 0,
   apiDir: 'app/api',

app/extensions/file/local-uploader.js

@@ -26,6 +26,7 @@ class LocalUploader extends Uploader {
         arr.push({
           key: file.fieldname,
           id: exist.id,
+          path: `${exist.path}`,
           url: `${siteDomain}/assets/${exist.path}`
         });
       } else {
@@ -49,6 +50,7 @@ class LocalUploader extends Uploader {
         arr.push({
           key: file.fieldname,
           id: saved.id,
+          path: `${saved.path}`,
           url: `${siteDomain}/assets/${saved.path}`
         });
       }

nodemon.json

@@ -4,8 +4,8 @@
   "description": "simple and practical CMS implememted by koa",
   "main": "app/starter.js",
   "scripts": {
-    "start:dev": "nodemon",
-    "start:prod": "node app/starter.js",
+    "start:dev": "cross-env NODE_ENV=development nodemon",
+    "start:prod": "cross-env NODE_ENV=production node app/starter.js",
     "prettier": "prettier --write app/**/*.js app/*.js app/**/**/*.js app/**/**/**/*.js tests/**/*.js && eslint app tests --fix"
   },
   "keywords": [
@@ -23,6 +23,7 @@
     "@types/koa__cors": "^2.2.3",
     "@types/prettier": "1.16.1",
     "@types/supertest": "^2.0.7",
+    "cross-env": "^5.2.0",
     "eslint": "^5.15.1",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.16.0",
@@ -42,6 +43,6 @@
     "koa-bodyparser": "^4.2.1",
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
-    "lin-mizar": "^0.1.0-beta.4"
+    "lin-mizar": "^0.1.0-beta.5"
   }
 }