语言包翻译优化&切换语言时产生的bug处理

.eslintrc.js

@@ -18,12 +18,12 @@ module.exports = {
             "unix"
         ],
         "quotes": [
-            "warin",
+            "error",
             "double"
         ],
         "semi": [
             "error",
             "always"
         ]
     }
-};
+};

.gitignore

@@ -6,3 +6,5 @@ npm-debug.log
 admin.lock
 server/config/secret.js
 logs/
+dist/
+databak/

configs/logConfig.js

@@ -1,10 +1,11 @@
-let path = require('path');
-const settings = require('../configs/settings');
+let path = require("path");
+const settings = require("../configs/settings");
+const env = process.env.NODE_DEV;
 
 //日志根目录
 
-let isDevEnv = (process.env.NODE_ENV == 'development' || process.env.NODE_ENV == 'FAT') ? true : false;
-let baseLogPath = isDevEnv ? path.resolve(__dirname, '../logs') : settings.SYSTEMLOGPATH;
+let isDevEnv = (env == "development" || env == "FAT") ? true : false;
+let baseLogPath = isDevEnv ? path.resolve(__dirname, "../logs") : settings.SYSTEMLOGPATH;
 //错误日志目录
 let errorPath = "/error";
 //错误日志文件名
@@ -21,35 +22,35 @@ let responseFileName = "response";
 let responseLogPath = baseLogPath + responsePath + "/" + responseFileName;
 
 module.exports = {
-    appenders: {
-        //error logs write by hours
-        errorLogger: {
-            "type": "dateFile",        //log type
-            "filename": errorLogPath,  // output location
-            "pattern": "-yyyy-MM-dd.log",  //file extension
-            "path": errorPath,   //root path,
-            "alwaysIncludePattern": true
-        },
-        resLogger: {
-            "type": "dateFile", //log type
-            "filename": responseLogPath, // output location
-            "path": responsePath, //root path,
-            "alwaysIncludePattern": true,
-            "pattern": "-yyyy-MM-dd.log" //file extension
-        }
-    },
-    categories: {
-        errorLogger: {
-            appenders: ["errorLogger"],
-            level: "ERROR"
-        },
-        resLogger: {
-            appenders: ["resLogger"],
-            level: "ALL"
-        },
-        default: {
-            appenders: ["resLogger"],
-            level: "ALL"
-        },
-    }
+	appenders: {
+		//error logs write by hours
+		errorLogger: {
+			"type": "dateFile",        //log type
+			"filename": errorLogPath,  // output location
+			"pattern": "-yyyy-MM-dd.log",  //file extension
+			"path": errorPath,   //root path,
+			"alwaysIncludePattern": true
+		},
+		resLogger: {
+			"type": "dateFile", //log type
+			"filename": responseLogPath, // output location
+			"path": responsePath, //root path,
+			"alwaysIncludePattern": true,
+			"pattern": "-yyyy-MM-dd.log" //file extension
+		}
+	},
+	categories: {
+		errorLogger: {
+			appenders: ["errorLogger"],
+			level: "ERROR"
+		},
+		resLogger: {
+			appenders: ["resLogger"],
+			level: "ALL"
+		},
+		default: {
+			appenders: ["resLogger"],
+			level: "ALL"
+		},
+	}
 };

configs/settings.js

@@ -2,70 +2,65 @@
  * Created by dora on 2017/5/19.
  *
  */
-
 module.exports = {
+	session_secret: "doracms", // 务必修改
+	auth_cookie_name: "doracms",
+	cache_maxAge: Math.floor(Date.now() / 1000) + 24 * 60 * 60, //1 hours
+	serverPort: 8080,
+	lang: "zh", // 设置默认语言
+	languages: ["zh", "ja", "en"], // 可选语言
 
-    session_secret: 'doracms', // 务必修改
-    auth_cookie_name: 'doracms',
-    cache_maxAge: Math.floor(Date.now() / 1000) + 24 * 60 * 60, //1 hours
-    serverPort: 8080,
-    lang: 'zh-CN', // 设置默认语言
-    languages: ['zh-CN', 'ja_jp', 'en'], // 可选语言
-
-    // 密码盐
-    encrypt_key: 'dora',
-    salt_aes_key: "doracms_", // 可以解密，秘钥必须为：8/16/32位
-    salt_md5_key: "dora", // MD5的盐，用于加密密码
+	// 密码盐
+	encrypt_key: "dora",
+	salt_aes_key: "doracms_", // 可以解密，秘钥必须为：8/16/32位
+	salt_md5_key: "dora", // MD5的盐，用于加密密码
 
-    //    数据库配置
-    URL: 'mongodb://127.0.0.1:27017/doracms2',
-    DB: 'doracms2',
-    HOST: '127.0.0.1',
-    PORT: 27017,
-    USERNAME: 'doracms',
-    PASSWORD: 'password',
+	//    数据库配置
+	URL: "mongodb://127.0.0.1:27017/doracms2",
+	DB: "doracms2",
+	HOST: "127.0.0.1",
+	PORT: 27017,
+	USERNAME: "",
+	PASSWORD: "",
 
-    // 七牛配置
-    openqn: false, //是否开启,若为true 则下面的信息必须配置正确完整
-    accessKey: 'your accessKey',
-    secretKey: 'your secretKey',
-    bucket: 'cmsupload', //上传的目标资源空间
-    origin: 'http://cdn.html-js.cn', // cdn域名
-    fsizeLimit: 1024 * 1024 * 5, // 上传文件大小限制默认为5M
-    assetsCdn: true, // 静态资源使用cnd.请在build完成后将 elemt.*.js 上传的七牛的融合cdn
+	// 七牛配置
+	openqn: false, //是否开启,若为true 则下面的信息必须配置正确完整
+	accessKey: "your accessKey",
+	secretKey: "your secretKey",
+	bucket: "cmsupload", //上传的目标资源空间
+	origin: "http://cdn.html-js.cn", // cdn域名
+	fsizeLimit: 1024 * 1024 * 5, // 上传文件大小限制默认为5M
+	assetsCdn: true, // 静态资源使用cnd.请在build完成后将 elemt.*.js 上传的七牛的融合cdn
 
-    // redis配置
-    openRedis: true, // 测试或生产环境必须开启
-    redis_host: '127.0.0.1',
-    redis_port: 6379,
-    redis_psd: 'your redis password',
-    redis_db: 0,
-    redis_ttl: 12, // 12 小时
+	// redis配置
+	openRedis: true, // 测试或生产环境必须开启
+	redis_host: "127.0.0.1",
+	redis_port: 6379,
+	redis_psd: "",
+	redis_db: 0,
+	redis_ttl: 12, // 12 小时
 
-    // 站点基础信息配置
-    DORACMSAPI: 'http://api.html-js.cn', // 系统服务提供商
-    SYSTEMTEMPFORDER: process.cwd() + '/views/', // 系统模板安装目录
-    TEMPSTATICFOLDER: process.cwd() + '/public/themes/', // 模板静态文件路径
-    SYSTEMLOGPATH: '/home/doraData/logsdir/doracms', // 服务器日志保存目录
+	// 站点基础信息配置
+	DORACMSAPI: "http://api.html-js.cn", // 系统服务提供商
+	SYSTEMTEMPFORDER: process.cwd() + "/views/", // 系统模板安装目录
+	TEMPSTATICFOLDER: process.cwd() + "/public/themes/", // 模板静态文件路径
+	SYSTEMLOGPATH: "/var/log/doraData/logsdir/doracms", // 服务器日志保存目录
 
-    // 邮件相关设置
-    email_findPsd: 'findPsd',
-    email_reg_active: 'reg_active',
-    email_notice_contentMsg: 'notice_contentMsg',
-    email_notice_admin_byContactUs: 'notice_site_messages',
-    email_notice_user_byContactUs: 'notice_user_site_messages',
-    email_notice_contentBug: 'notice_contentBug',
-    email_notice_user_contentMsg: 'notice_user_contentMsg',
-    email_notice_user_reg: 'notice_user_reg',
+	// 邮件相关设置
+	email_findPsd: "findPsd",
+	email_reg_active: "reg_active",
+	email_notice_contentMsg: "notice_contentMsg",
+	email_notice_admin_byContactUs: "notice_site_messages",
+	email_notice_user_byContactUs: "notice_user_site_messages",
+	email_notice_contentBug: "notice_contentBug",
+	email_notice_user_contentMsg: "notice_user_contentMsg",
+	email_notice_user_reg: "notice_user_reg",
 
-    // 信息提示相关
-    system_illegal_param: '非法参数',
-    system_noPower: '对不起，您无权执行该操作！',
-    system_atLeast_one: '请选择至少一项后再执行删除操作！',
-    system_batch_delete_not_allowed: '对不起，该模块不允许批量删除！',
-    system_error_imageType: '文件格式不正确，请重新上传',
-    system_error_upload: '上传失败，请稍后重试'
+	// 信息提示相关
+	system_illegal_param: "非法参数",
+	system_noPower: "对不起，您无权执行该操作！",
+	system_atLeast_one: "请选择至少一项后再执行删除操作！",
+	system_batch_delete_not_allowed: "对不起，该模块不允许批量删除！",
+	system_error_imageType: "文件格式不正确，请重新上传",
+	system_error_upload: "上传失败，请稍后重试"
 };
-
-
-

gulpfile.js

@@ -1,76 +1,76 @@
 // 皮肤开发sass监听
-'use strict';
-var gulp = require('gulp');
-var sass = require('gulp-sass');
+"use strict";
+var gulp = require("gulp");
+var sass = require("gulp-sass");
 var jsmin = require("gulp-uglify");
 var cssmin = require("gulp-minify-css");
 var del = require("del");
-var gulpSequence = require('gulp-sequence')
+var gulpSequence = require("gulp-sequence");
 const babel = require("gulp-babel");
 const es2015Preset = require("babel-preset-es2015");
 
 var tempforder = "dorawhite";
-var doraWhiteSassPath = './src/index/' + tempforder + '/css/white.scss';
-var doraWhiteCssPath = './public/themes/' + tempforder + '/css';
+var doraWhiteSassPath = "./src/index/" + tempforder + "/css/white.scss";
+var doraWhiteCssPath = "./public/themes/" + tempforder + "/css";
 
 // layer 皮肤
-var doraLayerSassPath = './src/index/' + tempforder + '/css/layer.scss';
-var doraLayerCssPath = './public/plugins/layer/theme/blue';
+var doraLayerSassPath = "./src/index/" + tempforder + "/css/layer.scss";
+var doraLayerCssPath = "./public/plugins/layer/theme/blue";
 
-var doraWhiteNormalJs = './src/index/' + tempforder + '/js/dora.front.js';
-var doraWhitePagerJs = './src/index/' + tempforder + '/js/avalon-ms-pager.js';
-var doraWhiteMinJs = './public/themes/' + tempforder + '/js/';
+var doraWhiteNormalJs = "./src/index/" + tempforder + "/js/dora.front.js";
+var doraWhitePagerJs = "./src/index/" + tempforder + "/js/avalon-ms-pager.js";
+var doraWhiteMinJs = "./public/themes/" + tempforder + "/js/";
 
 
-gulp.task('sass', function () {
-    return gulp.src(doraWhiteSassPath)
-        .pipe(sass().on('error', sass.logError))
-        .pipe(cssmin())
-        .pipe(gulp.dest(doraWhiteCssPath));
+gulp.task("sass", function () {
+	return gulp.src(doraWhiteSassPath)
+		.pipe(sass().on("error", sass.logError))
+		.pipe(cssmin())
+		.pipe(gulp.dest(doraWhiteCssPath));
 });
 
 gulp.task("cleanjs", function () {
-    return del(doraWhiteMinJs + 'dora.front.js');
+	return del(doraWhiteMinJs + "dora.front.js");
 });
 
-gulp.task('layerSass', function () {
-    return gulp.src(doraLayerSassPath)
-        .pipe(sass().on('error', sass.logError))
-        .pipe(cssmin())
-        .pipe(gulp.dest(doraLayerCssPath));
+gulp.task("layerSass", function () {
+	return gulp.src(doraLayerSassPath)
+		.pipe(sass().on("error", sass.logError))
+		.pipe(cssmin())
+		.pipe(gulp.dest(doraLayerCssPath));
 });
 
 gulp.task("jsmin", ["cleanjs"], function () {
-    return gulp.src(doraWhiteNormalJs)
-        .pipe(babel({ presets: [es2015Preset] }))
-        .pipe(jsmin())
-        .pipe(gulp.dest(doraWhiteMinJs));
+	return gulp.src(doraWhiteNormalJs)
+		.pipe(babel({ presets: [es2015Preset] }))
+		.pipe(jsmin())
+		.pipe(gulp.dest(doraWhiteMinJs));
 });
 
 gulp.task("cleanpagerjs", function () {
-    return del(doraWhiteMinJs + 'avalon-ms-pager.js');
+	return del(doraWhiteMinJs + "avalon-ms-pager.js");
 });
 
 gulp.task("pagerjsmin", ["cleanpagerjs"], function () {
-    return gulp.src(doraWhitePagerJs)
-        .pipe(babel({ presets: [es2015Preset] }))
-        .pipe(jsmin())
-        .pipe(gulp.dest(doraWhiteMinJs));
+	return gulp.src(doraWhitePagerJs)
+		.pipe(babel({ presets: [es2015Preset] }))
+		.pipe(jsmin())
+		.pipe(gulp.dest(doraWhiteMinJs));
 });
 
-gulp.task('uglifyPagerJs', function () {
-    gulp.watch(doraWhitePagerJs, ['pagerjsmin']);
+gulp.task("uglifyPagerJs", function () {
+	gulp.watch(doraWhitePagerJs, ["pagerjsmin"]);
 });
 
-gulp.task('uglifyWhiteJs', function () {
-    gulp.watch(doraWhiteNormalJs, ['jsmin']);
+gulp.task("uglifyWhiteJs", function () {
+	gulp.watch(doraWhiteNormalJs, ["jsmin"]);
 });
 
-gulp.task('uglifyLayerJs', function () {
-    gulp.watch(doraLayerSassPath, ['layerSass']);
+gulp.task("uglifyLayerJs", function () {
+	gulp.watch(doraLayerSassPath, ["layerSass"]);
 });
 
 
-gulp.task('default', ['uglifyWhiteJs', 'uglifyPagerJs', 'uglifyLayerJs'], function () {
-    gulp.watch(doraWhiteSassPath, ['sass']);
-});
+gulp.task("default", ["uglifyWhiteJs", "uglifyPagerJs", "uglifyLayerJs"], function () {
+	gulp.watch(doraWhiteSassPath, ["sass"]);
+});