浏览代码

router setting

zhangweicheng 8 年之前
父节点
当前提交
ef2567ef54

+ 16 - 11
modules/fee_rates/routes/fee_rates_route.js

@@ -2,18 +2,23 @@
  * Created by CSL on 2017-03-22.
  */
 
-var express = require('express');
-var frRouter = express.Router();
-var frController = require('../controllers/fee_rates_controller');
+let express = require('express');
+let frController = require('../controllers/fee_rates_controller');
+
+module.exports = function (app) {
+
+    var frRouter = express.Router();
+    frRouter.get('/', function(req, res) {
+        res.render('building_saas/fee_rates/fee_rate', {});
+    });
+    frRouter.post('/getLibNames', frController.libNames);
+    frRouter.post('/getLibFeeRates', frController.libFeeRates);
+    frRouter.post('/getProjectFeeRates', frController.projectFeeRates);
+    frRouter.post('/updateProjectFeeRate', frController.projectFeeUpdateRate);
+
+    app.use('/feeRates',frRouter);
+}
 
-frRouter.get('/', function(req, res) {
-    res.render('building_saas/fee_rates/fee_rate', {});
-});
 
-frRouter.post('/getLibNames', frController.libNames);
-frRouter.post('/getLibFeeRates', frController.libFeeRates);
-frRouter.post('/getProjectFeeRates', frController.projectFeeRates);
-frRouter.post('/updateProjectFeeRate', frController.projectFeeUpdateRate);
 
 
-module.exports = frRouter;

+ 10 - 9
modules/glj/routes/glj_router.js

@@ -8,15 +8,16 @@
 import Express from "express";
 import GLJController from "../controllers/glj_controller";
 
-const router = Express.Router();
-let gljController = new GLJController();
+module.exports = function (app) {
+    const router = Express.Router();
+    let gljController = new GLJController();
 
 // action定义区域
-router.get('/', gljController.init, gljController.index);
-router.post('/update', gljController.init, gljController.updateData);
+    router.get('/', gljController.init, gljController.index);
+    router.post('/update', gljController.init, gljController.updateData);
 
-router.get('/test', gljController.init, gljController.test);
-router.get('/testModify', gljController.init, gljController.testModify);
-router.get('/testDelete', gljController.init, gljController.delete);
-
-module.exports = router;
+    router.get('/test', gljController.init, gljController.test);
+    router.get('/testModify', gljController.init, gljController.testModify);
+    router.get('/testDelete', gljController.init, gljController.delete);
+    app.use('/glj',router);
+};

+ 22 - 0
modules/main/routes/main_route.js

@@ -0,0 +1,22 @@
+/**
+ * Created by chen on 2017/7/17.
+ */
+
+
+
+module.exports =function (app) {
+    app.get('/main',  function(req, res) {
+        let pm = require('../../pm/controllers/pm_controller');
+        pm.checkProjectRight(req.session.sessionUser.ssoId, req.query.project, function (hasRight) {
+            if (hasRight) {
+                res.render('building_saas/main/html/main.html',
+                    {
+                        userAccount: req.session.userAccount,
+                        userID: req.session.sessionUser.ssoId
+                    });
+            } else {
+                res.redirect('/pm');
+            }
+        });
+    });
+}

+ 10 - 6
modules/main/routes/project_route.js

@@ -1,11 +1,15 @@
 /**
  * Created by jimiz on 2017/4/16.
  */
-var express = require('express');
-var projectRouter = express.Router();
-var projectController = require('../controllers/project_controller');
+let express = require('express');
+let projectController = require('../controllers/project_controller');
 
-projectRouter.post('/save', projectController.save);
-projectRouter.post('/getData', projectController.getData);
+module.exports = function (app) {
+    let projectRouter = express.Router();
+
+    projectRouter.post('/save', projectController.save);
+    projectRouter.post('/getData', projectController.getData);
+
+    app.use('/project',projectRouter);
+};
 
-module.exports = projectRouter;

+ 39 - 27
modules/pm/routes/pm_route.js

@@ -4,36 +4,48 @@
  */
 
 let express = require('express');
-let pmRouter = express.Router();
 let pmController = require('./../controllers/pm_controller');
 
-pmRouter.use(function (req, res, next) {
-    if (/\/getNewProjectID/.test(req.originalUrl) || pmController.checkRight(req, res)) {
-        next();
-    } else {
-        res.json({error: 1, message: '对不起,您无权限操作。', data: null});
-    }
-});
+module.exports = function (app) {
 
-/*
-  req.body = {data: '{user_id}'}
- */
-pmRouter.post('/getProjects', pmController.getProjects);
+    app.get('/pm', function(req, res){
+        res.render('building_saas/pm/html/project-management.html',
+            {userAccount: req.session.userAccount,
+                userID: req.session.sessionUser.ssoId});
+    });
 
-/*
- req.body = {data: '{user_id: user_id, updateData: [{updateType, updateData}]}'}
- data.updateData.updateType: 1 of ['new', 'update', 'delete']
- */
-pmRouter.post('/updateProjects', pmController.updateProjects);
+    let pmRouter = express.Router();
+
+    pmRouter.use(function (req, res, next) {
+        if (/\/getNewProjectID/.test(req.originalUrl) || pmController.checkRight(req, res)) {
+            next();
+        } else {
+            res.json({error: 1, message: '对不起,您无权限操作。', data: null});
+        }
+    });
+
+    /*
+     req.body = {data: '{user_id}'}
+     */
+    pmRouter.post('/getProjects', pmController.getProjects);
+
+    /*
+     req.body = {data: '{user_id: user_id, updateData: [{updateType, updateData}]}'}
+     data.updateData.updateType: 1 of ['new', 'update', 'delete']
+     */
+    pmRouter.post('/updateProjects', pmController.updateProjects);
+
+    /*
+     req.body = {data: '{user_id: user_id, updateData: [{updateType, updateData}]}'}
+     data.updateData.updateType: 1 of ['update', 'copy']
+     */
+    pmRouter.post('/copyProjects', pmController.copyProjects);
+    pmRouter.post('/renameProject', pmController.rename);
+    pmRouter.post('/beforeOpenProject', pmController.beforeOpenProject);
+    pmRouter.post('/getProject', pmController.getProject);
+    pmRouter.post('/getNewProjectID', pmController.getNewProjectID);
+
+    app.use('/pm/api', pmRouter);
+};
 
-/*
- req.body = {data: '{user_id: user_id, updateData: [{updateType, updateData}]}'}
- data.updateData.updateType: 1 of ['update', 'copy']
- */
-pmRouter.post('/copyProjects', pmController.copyProjects);
-pmRouter.post('/renameProject', pmController.rename);
-pmRouter.post('/beforeOpenProject', pmController.beforeOpenProject);
-pmRouter.post('/getProject', pmController.getProject);
-pmRouter.post('/getNewProjectID', pmController.getNewProjectID);
 
-module.exports = pmRouter;

+ 41 - 5
modules/templates/routes/bills_template_router.js

@@ -3,11 +3,47 @@
  */
 
 var express = require('express');
-var billsTemplateRouter = express.Router();
+
 var billsTemplateController = require('./../controllers/bills_template_controller');
 
-billsTemplateRouter.post('/getBillsTemplate', billsTemplateController.getBillsTemplate);
-billsTemplateRouter.post('/updateBillsTemplate', billsTemplateController.updateBillsTemplate);
-billsTemplateRouter.post('/getNewBillsTemplateID', billsTemplateController.getNewBillsTemplateID);
 
-module.exports = billsTemplateRouter;
+module.exports = function (app) {
+    app.get('/template/bills', function (req, res) {
+        let checkAdmin = function (userAccount) {
+            return true;
+        }
+        if (checkAdmin(req.session.userAccount)) {
+            res.render('maintain/templates/html/bills.html',
+                {userAccount: req.session.userAccount,
+                    userID: req.session.userID});
+        } else {
+            res.redirect('/pm');
+        }
+    });
+
+    app.use('/template/bills/api', function (req, res, next) {
+        let checkAdmin = function (userAccount) {
+            return true;
+        }
+        if (checkAdmin(req.session.sessionUser)) {
+            next();
+        } else {
+            res.json({error: 1, message: '对不起,您无权限操作清单模板。', data: null});
+        }
+    });
+
+    var billsTemplateRouter = express.Router();
+
+    billsTemplateRouter.post('/getBillsTemplate', billsTemplateController.getBillsTemplate);
+    billsTemplateRouter.post('/updateBillsTemplate', billsTemplateController.updateBillsTemplate);
+    billsTemplateRouter.post('/getNewBillsTemplateID', billsTemplateController.getNewBillsTemplateID);
+    app.use('/template/bills/api', billsTemplateRouter);
+}
+
+
+
+
+
+
+
+

+ 8 - 51
server.js

@@ -80,69 +80,26 @@ require("./modules/users/routes/boot_route")(app);
 require("./modules/users/routes/user_route")(app);
 
 
+// 项目工料机相关
+require("./modules/glj/routes/glj_router")(app);
 
+require('./modules/fee_rates/routes/fee_rates_route')(app);
 
 
+require('./modules/templates/routes/bills_template_router')(app);
 
-// 项目工料机相关
-app.use('/glj', require("./modules/glj/routes/glj_router"));
 
-app.use('/feeRates', require('./modules/fee_rates/routes/fee_rates_route'));
+require('./modules/pm/routes/pm_route')(app);
 
-app.get('/template/bills', function (req, res) {
-    let checkAdmin = function (userAccount) {
-        return true;
-    }
-    if (checkAdmin(req.session.userAccount)) {
-        res.render('maintain/templates/html/bills.html',
-            {userAccount: req.session.userAccount,
-                userID: req.session.userID});
-    } else {
-        res.redirect('/pm');
-    }
-});
+require('./modules/main/routes/main_route')(app);
 
-app.use('/template/bills/api', function (req, res, next) {
-    let checkAdmin = function (userAccount) {
-        return true;
-    }
-    if (checkAdmin(req.session.sessionUser)) {
-        next();
-    } else {
-        res.json({error: 1, message: '对不起,您无权限操作清单模板。', data: null});
-    }
-});
-let billsTemplateRouter = require('./modules/templates/routes/bills_template_router');
-app.use('/template/bills/api', billsTemplateRouter);
+require('./modules/main/routes/project_route')(app);
 
-app.get('/pm', function(req, res){
-    res.render('building_saas/pm/html/project-management.html',
-        {userAccount: req.session.userAccount,
-            userID: req.session.sessionUser.ssoId});
-});
-let pmRouter = require('./modules/pm/routes/pm_route');
-app.use('/pm/api', pmRouter);
-
-app.get('/main',  function(req, res) {
-    let pm = require('./modules/pm/controllers/pm_controller');
-    pm.checkProjectRight(req.session.sessionUser.ssoId, req.query.project, function (hasRight) {
-        if (hasRight) {
-            res.render('building_saas/main/html/main.html',
-                {
-                    userAccount: req.session.userAccount,
-                    userID: req.session.sessionUser.ssoId
-                });
-        } else {
-            res.redirect('/pm');
-        }
-    });
-});
 
-let project_Router = require('./modules/main/routes/project_route');
 let bills_Router = require('./modules/main/routes/bills_route');
 let ration_Router = require('./modules/main/routes/ration_route');
 let GLJ_Router = require('./modules/main/routes/GLJ_route');
-app.use('/project', project_Router);
+
 app.use('/bills', bills_Router);
 app.use('/ration', ration_Router);
 app.use('/glj_bak', GLJ_Router);