瀏覽代碼

add LicenseKey

zhangweicheng 7 年之前
父節點
當前提交
4903294606

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


+ 3 - 1
modules/bills_template_lib/controllers/bills_template_controller.js

@@ -9,6 +9,7 @@ import BaseController from "../../common/base/base_controller";
 import billsTemplateFacade from "../facade/bills_template_facade";
 import {default as BillsFixedFlagConst, List as BillsFixedFlagList} from "../../common/const/bills_fixed.js";
 import {default as BillsTypeFlagConst, List as BillsTypeFlagList} from "../../common/const/bills_type.js";
+let config = require("../../../config/config.js");
 
 class BillsTemplateController extends BaseController {
 
@@ -26,7 +27,8 @@ class BillsTemplateController extends BaseController {
             userAccount: request.session.managerData.username,
             userID: request.session.managerData.userID,
             templateLibs:templateLibs,
-            layout: 'maintain/common/html/layout'
+            layout: 'maintain/common/html/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
 
         response.render("maintain/bill_template_lib/html/main", randerData);

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

@@ -21,6 +21,7 @@ import STDCalcProgramModel from "../../common/std/std_calc_program_model";
 const billsGuidanceFc = require('../../std_billsGuidance_lib/facade/facades');
 import mainColFacade from "../../main_col_lib/facade/main_col_facade";
 import billTemplateFacade from "../../bills_template_lib/facade/bills_template_facade";
+let config = require("../../../config/config.js");
 
 class CompilationController extends BaseController {
 
@@ -62,7 +63,8 @@ class CompilationController extends BaseController {
             id: id,
             compilationList: compilationList,
             selectedCompilation: selectedCompilation,
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
 
         response.render('users/views/compilation/index', renderData);
@@ -153,7 +155,8 @@ class CompilationController extends BaseController {
             valuationList: valuationList,
             valuationId: valuationId,
             section: section,
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/compilation/add', renderData);
     }
@@ -246,7 +249,8 @@ class CompilationController extends BaseController {
             gljCol:JSON.stringify(libData.glj_col),
             calculationList: JSON.stringify(calculationList),
             billsGuidanceList: JSON.stringify(billsGuidanceList),
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/compilation/engineering', renderData);
     }
@@ -532,7 +536,8 @@ class CompilationController extends BaseController {
             compilationList: compilationList,
             valuationId: valuationId,
             section: section,
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/compilation/template', renderData);
     }

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

@@ -7,6 +7,7 @@
  */
 import BaseController from "../../common/base/base_controller";
 import MessageModel from "../models/message_model";
+let config = require("../../../config/config.js");
 
 class DashboardController extends BaseController {
 
@@ -41,7 +42,8 @@ class DashboardController extends BaseController {
             parentTitle: DashboardController.parentTitle,
             parentIndex: DashboardController.parentIndex,
             layout: 'users/views/layout/layout',
-            messageList: messageList
+            messageList: messageList,
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/dashboard/index', renderData);
     }

+ 4 - 1
modules/users/controllers/manager_controller.js

@@ -8,6 +8,7 @@
 import BaseController from "../../common/base/base_controller";
 import ManagerModel from "../models/manager_model";
 import Config from "../../../config/config";
+let config = require("../../../config/config.js");
 
 class ManagerController extends BaseController {
 
@@ -66,6 +67,7 @@ class ManagerController extends BaseController {
             managerList: managerList,
             pages: pageData,
             layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/manager/index', renderData);
     }
@@ -144,7 +146,8 @@ class ManagerController extends BaseController {
 
         let renderData = {
             adminData: adminData,
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/manager/save', renderData);
     }

+ 6 - 2
modules/users/controllers/notify_controller.js

@@ -8,6 +8,7 @@
 import BaseController from "../../common/base/base_controller";
 import MessageModel from "../models/message_model";
 import Config from "../../../config/config";
+let config = require("../../../config/config.js");
 
 class NotifyController extends BaseController {
 
@@ -52,7 +53,8 @@ class NotifyController extends BaseController {
             userMessageTotal: userMessageTotal,
             systemMessageTotal: systemMessageTotal,
             type: type,
-            filter: request.query
+            filter: request.query,
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/notify/index', renderData);
     }
@@ -81,6 +83,7 @@ class NotifyController extends BaseController {
             type: type,
             userMessageTotal: userMessageTotal,
             systemMessageTotal: systemMessageTotal,
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/notify/save', renderData);
     }
@@ -141,7 +144,8 @@ class NotifyController extends BaseController {
             messageData: messageData,
             userMessageTotal: userMessageTotal,
             systemMessageTotal: systemMessageTotal,
-            type: type
+            type: type,
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render("users/views/notify/save", renderData);
     }

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

@@ -6,6 +6,7 @@
  * @version
  */
 import BaseController from "../../common/base/base_controller";
+let config = require("../../../config/config.js");
 
 class ToolController extends BaseController {
 
@@ -18,7 +19,8 @@ class ToolController extends BaseController {
      */
     index(request, response) {
         let renderData = {
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/tool/index', renderData);
     }

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

@@ -8,6 +8,7 @@
 import BaseController from "../../common/base/base_controller";
 import UserModel from "../models/user_model";
 import Config from "../../../config/config";
+let config = require("../../../config/config.js");
 
 class UserController extends BaseController {
 
@@ -57,7 +58,8 @@ class UserController extends BaseController {
             total: total,
             filter: filter,
             model: userModel,
-            layout: 'users/views/layout/layout'
+            layout: 'users/views/layout/layout',
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
         response.render('users/views/user/index', renderData);
     }

文件差異過大導致無法顯示
+ 1 - 1
web/maintain/common/html/edit_layout.html


文件差異過大導致無法顯示
+ 1 - 1
web/users/views/layout/layout.html