caipin il y a 4 ans
Parent
commit
c12d947109

+ 8 - 0
app/base/base_controller.js

@@ -1,3 +1,9 @@
+/*
+ * @description: 
+ * @Author: CP
+ * @Date: 2020-08-18 12:28:59
+ * @FilePath: \construction_management_backstage\app\base\base_controller.js
+ */
 'use strict';
 'use strict';
 
 
 /**
 /**
@@ -33,6 +39,7 @@ class BaseController extends Controller {
      * @return {void}
      * @return {void}
      */
      */
     async layout(view, data = {}, modal = '') {
     async layout(view, data = {}, modal = '') {
+        
         data.moment = moment;
         data.moment = moment;
         // 获取消息提示
         // 获取消息提示
         const message = this.ctx.session.message;
         const message = this.ctx.session.message;
@@ -54,6 +61,7 @@ class BaseController extends Controller {
             breadCrumb: data.breadCrumb === undefined ? '' : data.breadCrumb,
             breadCrumb: data.breadCrumb === undefined ? '' : data.breadCrumb,
             cbClass: data.cbClass,
             cbClass: data.cbClass,
         };
         };
+  
         await this.ctx.render('layout/layout.ejs', renderData);
         await this.ctx.render('layout/layout.ejs', renderData);
     }
     }
 
 

+ 7 - 1
app/controller/login_controller.js

@@ -1,3 +1,9 @@
+/*
+ * @description: 
+ * @Author: CP
+ * @Date: 2020-08-18 12:29:00
+ * @FilePath: \construction_management_backstage\app\controller\login_controller.js
+ */
 'use strict';
 'use strict';
 
 
 /**
 /**
@@ -65,7 +71,7 @@ module.exports = app => {
                 // 获取校验规则
                 // 获取校验规则
                 const rule = ctx.service.manager.rule('login');
                 const rule = ctx.service.manager.rule('login');
                 ctx.validate(rule);
                 ctx.validate(rule);
-
+              
                 // 如果不是admin则进入cld模式判断
                 // 如果不是admin则进入cld模式判断
                 const result = await ctx.service.manager.validManager(username, password);
                 const result = await ctx.service.manager.validManager(username, password);
                 if (!result) {
                 if (!result) {

+ 7 - 0
app/middleware/permission_filter.js

@@ -1,3 +1,9 @@
+/*
+ * @description: 
+ * @Author: CP
+ * @Date: 2020-08-18 12:29:01
+ * @FilePath: \construction_management_backstage\app\middleware\permission_filter.js
+ */
 'use strict';
 'use strict';
 
 
 module.exports = option => {
 module.exports = option => {
@@ -9,6 +15,7 @@ module.exports = option => {
      */
      */
     return function* permissionFilter(next) {
     return function* permissionFilter(next) {
         // 获取所有权限数据
         // 获取所有权限数据
+       
         const permissionData = yield this.service.permission.getAllData(false, true);
         const permissionData = yield this.service.permission.getAllData(false, true);
         this.currentName = '';
         this.currentName = '';
         let currentPermissionId = 0;
         let currentPermissionId = 0;

+ 6 - 0
app/middleware/session_auth.js

@@ -1,3 +1,9 @@
+/*
+ * @description: 
+ * @Author: CP
+ * @Date: 2020-08-18 12:29:01
+ * @FilePath: \construction_management_backstage\app\middleware\session_auth.js
+ */
 'use strict';
 'use strict';
 
 
 // 加密类
 // 加密类

+ 1 - 1
app/service/manager.js

@@ -152,7 +152,7 @@ module.exports = app => {
             if (manager === null) {
             if (manager === null) {
                 return false;
                 return false;
             }
             }
-
+           
             // 判断是否被禁止登陆
             // 判断是否被禁止登陆
             if (manager.can_login !== 1) {
             if (manager.can_login !== 1) {
                 throw '用户被禁用';
                 throw '用户被禁用';

+ 4 - 2
app/service/permission.js

@@ -54,6 +54,7 @@ module.exports = app => {
             let result = [];
             let result = [];
             // 获取所有数据
             // 获取所有数据
             const dataList = await this.getAllData();
             const dataList = await this.getAllData();
+            
             if (dataList === null || dataList.length <= 0) {
             if (dataList === null || dataList.length <= 0) {
                 return result;
                 return result;
             }
             }
@@ -72,7 +73,7 @@ module.exports = app => {
             do {
             do {
                 this._sort(result, sourceData);
                 this._sort(result, sourceData);
             } while (Object.keys(sourceData).length > 0);
             } while (Object.keys(sourceData).length > 0);
-
+            
             // 加入缓存
             // 加入缓存
             if (result.length > 0) {
             if (result.length > 0) {
                 this.cache.set(cacheKey, JSON.stringify(result), 'EX', app.config.cacheTime);
                 this.cache.set(cacheKey, JSON.stringify(result), 'EX', app.config.cacheTime);
@@ -227,10 +228,11 @@ module.exports = app => {
                 data = JSON.parse(data);
                 data = JSON.parse(data);
                 return data;
                 return data;
             }
             }
-
+            
             // 获取权限数据
             // 获取权限数据
             // let permissionList = managerSession.permission;
             // let permissionList = managerSession.permission;
             let permissionList = await this.ctx.service.manager.getManagerPermission(managerSession.userID);
             let permissionList = await this.ctx.service.manager.getManagerPermission(managerSession.userID);
+
             if (permissionList === '' || permissionList === null) {
             if (permissionList === '' || permissionList === null) {
                 return result;
                 return result;
             }
             }

+ 2 - 2
app/view/layout/layout.ejs

@@ -42,7 +42,7 @@
 <div class="wrapper">
 <div class="wrapper">
     <div class="top-bar">
     <div class="top-bar">
         <div class="logo">
         <div class="logo">
-            <a>计量支付SAAS后台</a>
+            <a>信息化后台</a>
         </div>
         </div>
         <div class="nav d-flex justify-content-between">
         <div class="nav d-flex justify-content-between">
             <h4 class="title">
             <h4 class="title">
@@ -90,7 +90,7 @@
         <div class="menu" id="menu">
         <div class="menu" id="menu">
             <li <% if (ctx.controllerName === 'dashboard') { %>class="active"<% } %>>
             <li <% if (ctx.controllerName === 'dashboard') { %>class="active"<% } %>>
                 <a href="/dashboard">
                 <a href="/dashboard">
-                    <i class="fa fa-dashboard"></i>控制面板
+                    <i class="fa fa-dashboard"></i>控制面板  
                 </a>
                 </a>
             </li>
             </li>
             <% if(menuData.length > 0) { %>
             <% if(menuData.length > 0) { %>

+ 2 - 2
config/config.default.js

@@ -16,7 +16,7 @@ module.exports = appInfo => {
         dialect: 'mysql',
         dialect: 'mysql',
         host: '192.168.1.170',
         host: '192.168.1.170',
         port: 30000,
         port: 30000,
-        database: 'cld2_contact',
+        database: 'construction',
         username: "caipin",
         username: "caipin",
         password: "123456",
         password: "123456",
         define: {
         define: {
@@ -49,7 +49,7 @@ module.exports = appInfo => {
     //     agent: false,
     //     agent: false,
     // };
     // };
     // 表名前缀
     // 表名前缀
-    config.tablePrefix = 'zh_';
+    config.tablePrefix = 'cm_';
 
 
     // redis设置
     // redis设置
     config.redis = {
     config.redis = {

+ 5 - 5
config/config.local.js

@@ -13,15 +13,15 @@ module.exports = appInfo => {
     config.mysql = {
     config.mysql = {
         client: {
         client: {
             // host
             // host
-            host: '192.168.1.76',
+            host: '192.168.1.170',
             // 端口号
             // 端口号
-            port: '3306',
+            port: '30000',
             // 用户名
             // 用户名
-            user: 'zh_dev',
+            user: 'root',
             // 密码
             // 密码
-            password: 'zongheng2019',
+            password: 'root',
             // 数据库名
             // 数据库名
-            database: 'calculation',
+            database: 'construction',
             // database: 'calc_copy_pro',
             // database: 'calc_copy_pro',
         },
         },
         // 是否加载到 app 上,默认开启
         // 是否加载到 app 上,默认开启