瀏覽代碼

分离全国公路

zhangweicheng 4 年之前
父節點
當前提交
61d0e69b9c

文件差異過大導致無法顯示
+ 21 - 3
config/config.js


+ 3 - 1
config/db/db_manager.js

@@ -48,7 +48,9 @@ module.exports = {
     },
     connect:function (env="local") {
         var config = require("../config.js");
-        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/yanghu';
+        let dbname = 'yanghu';
+        if(config[env].dbname) dbname = config[env].dbname;
+        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/'+dbname;
         if(config[env].dbURL){
             mg.connect(config[env].dbURL,{connectTimeoutMS: 20000,useMongoClient: true});
         } else if(config[env].options){

+ 0 - 1
modules/common/base/base_controller.js

@@ -17,7 +17,6 @@ class BaseController {
      *
      * @var string
      */
-    title = '';
 
     /**
      * 构造函数

+ 4 - 0
modules/users/controllers/compilation_controller.js

@@ -71,6 +71,7 @@ class CompilationController extends BaseController {
             compilationList: compilationList,
             categoryList: categoryList,
             selectedCompilation: selectedCompilation,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
@@ -164,6 +165,7 @@ class CompilationController extends BaseController {
             valuationId: valuationId,
             section: section,
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/compilation/add', renderData);
@@ -282,6 +284,7 @@ class CompilationController extends BaseController {
             featureList:JSON.stringify(featureList),
             progressiveList:JSON.stringify(progressiveList),
             vvTaxList: JSON.stringify(vvTaxList),
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
@@ -635,6 +638,7 @@ class CompilationController extends BaseController {
             compilationList: compilationList,
             valuationId: valuationId,
             section: section,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };

+ 1 - 0
modules/users/controllers/dashboard_controller.js

@@ -42,6 +42,7 @@ class DashboardController extends BaseController {
             parentTitle: DashboardController.parentTitle,
             parentIndex: DashboardController.parentIndex,
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             messageList: messageList,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };

+ 3 - 1
modules/users/controllers/login_controller.js

@@ -14,9 +14,9 @@ import crypto from "crypto";
 import Test1Model from "../../../test/models/test1_model";
 import Test2Model from "../../../test/models/test2_model";
 import Test3Model from "../../../test/models/test3_model";
+let config = require("../../../config/config.js");
 
 class LoginController extends BaseController {
-
     /**
      * 登录页面
      *
@@ -25,8 +25,10 @@ class LoginController extends BaseController {
      * @return {void|Mixed}
      */
     index(request, response) {
+        let title =  config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版';
         let renderData = {
             layout: false,
+            title:title
         };
         let managerSessionData = request.session.managerData;
         if (managerSessionData !== undefined) {

+ 3 - 0
modules/users/controllers/manager_controller.js

@@ -105,6 +105,7 @@ class ManagerController extends BaseController {
             permissionGroupList: permissionGroupList,
             permissionGroupList2: permissionGroupList2,
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             filter: filter,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
@@ -224,6 +225,7 @@ class ManagerController extends BaseController {
 
         let renderData = {
             adminData: adminData,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
@@ -341,6 +343,7 @@ class ManagerController extends BaseController {
             topPermissionList: topPermissionList,
             permissionList: permissionList,
             pages: pageData,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };

+ 3 - 0
modules/users/controllers/notify_controller.js

@@ -48,6 +48,7 @@ class NotifyController extends BaseController {
 
         let renderData = {
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             messageList: messageList,
             pages: pageData,
             userMessageTotal: userMessageTotal,
@@ -79,6 +80,7 @@ class NotifyController extends BaseController {
 
         let renderData = {
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             messageData: [],
             type: type,
             userMessageTotal: userMessageTotal,
@@ -141,6 +143,7 @@ class NotifyController extends BaseController {
 
         let renderData = {
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             messageData: messageData,
             userMessageTotal: userMessageTotal,
             systemMessageTotal: systemMessageTotal,

+ 1 - 0
modules/users/controllers/system_controller.js

@@ -31,6 +31,7 @@ class SystemController extends BaseController {
         // 渲染数据
         let renderData = {
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             LicenseKey: config.getLicenseKey(process.env.NODE_ENV),
             setting: setting,
             superAdmin: request.session.managerData.superAdmin

+ 1 - 0
modules/users/controllers/tool_controller.js

@@ -22,6 +22,7 @@ class ToolController extends BaseController {
         console.log(toolMenuData);
         let renderData = {
             layout: 'users/views/layout/layout',
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             toolMenu: toolMenuData,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };

+ 2 - 0
modules/users/controllers/user_controller.js

@@ -93,6 +93,7 @@ class UserController extends BaseController {
             filter: filter,
             model: userModel,
             userMenu: userMenu,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
@@ -167,6 +168,7 @@ class UserController extends BaseController {
             filter: filter,
             model: userModel,
             userMenu: userMenu,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };

+ 1 - 0
modules/users/controllers/welcome_controller.js

@@ -52,6 +52,7 @@ class WelcomeController extends BaseController {
             settingID:settingID,
             compilationList: compilationList,
             selectedCompilation: selectedCompilation,
+            title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',
             layout: 'users/views/layout/layout',
             setting:setting,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)

+ 7 - 2
operation.js

@@ -49,8 +49,11 @@ let bodyParser = require('body-parser');
 app.use(bodyParser.urlencoded({limit: '3mb', extended: true}));
 app.use(bodyParser.json({limit: '3mb'}));
 
+let dbname = 'yanghu';
+if(config[process.env.NODE_ENV].dbname) dbname = config[process.env.NODE_ENV].dbname;
+
 app.use(session({
-    name: 'yanghuSession',
+    name: dbname+'Session',
     secret: 'session users secret',
     cookie: {maxAge: 3600 * 6 * 1000},
     resave: false,
@@ -130,7 +133,9 @@ schedule.scheduleJob({hour: 10, minute: 0}, function(){
     })
 });
 
+let startPort = 2080;
+if(config[process.env.NODE_ENV].startPort) startPort = config[process.env.NODE_ENV].startPort;
 
-app.listen(2080, function(){
+app.listen(startPort, function(){
     console.log("server started!");
 });

+ 2 - 1
package.json

@@ -37,6 +37,7 @@
   },
   "scripts": {
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js",
-    "dev_server": "SET NODE_ENV=qa&& babel-node operation.js"
+    "dev_server": "SET NODE_ENV=qa&& babel-node operation.js",
+    "dev_server_sc": "SET NODE_ENV=qa_sc&& babel-node operation.js"
   }
 }

+ 2 - 2
web/users/views/layout/layout.html

@@ -2,7 +2,7 @@
 <html lang=zh-cn>
 <head>
     <meta charset=utf-8>
-    <title>养护云版后台</title>
+    <title><%= title %>后台</title>
     <meta name=description content="纵横变更令审批系统">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="renderer" content="webkit">
@@ -29,7 +29,7 @@
 </head>
 <body>
 <div class="header">
-    <h1 class="logo"><a>养护云版后台</a></h1>
+    <h1 class="logo"><a><%= title %>后台</a></h1>
     <div class="header-box">
         <div class="header-nav"></div>
         <div class="header-user pull-right">

+ 2 - 2
web/users/views/login/index.html

@@ -2,7 +2,7 @@
 <html lang=zh-cn>
 <head>
     <meta charset=utf-8>
-    <title>养护云版后台</title>
+    <title><%= title %>后台</title>
     <meta name=description content=纵横变更令审批系统>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="renderer" content="webkit">
@@ -19,7 +19,7 @@
 <body class="loginbody">
 <div class="wraplogin">
     <div class="loginTop">
-        <a title="返回首页" href="#">养护云版后台</a>
+        <a title="返回首页" href="#"><%= title %>后台</a>
     </div>
     <div class="loginItem  center-block">
         <div class="loginForm">