瀏覽代碼

code tuning -> 2 apps

TonyKang 8 年之前
父節點
當前提交
31fef12b26
共有 5 個文件被更改,包括 112 次插入56 次删除
  1. 110 0
      operation.js
  2. 0 46
      server.js
  3. 0 0
      web/maintain/ration_repository/js/main.js
  4. 1 8
      web/maintain/ration_repository/main.html
  5. 1 2
      web/maintain/report/html/RptHome.html

+ 110 - 0
operation.js

@@ -0,0 +1,110 @@
+var express = require('express');
+
+var config = require("./config/config.js");
+config.setToQaDb();
+//config.setupCache();
+var cfgCacheUtil = require("./config/cacheCfg");
+cfgCacheUtil.setupDftCache();
+
+var path = require('path');
+var session = require('express-session');
+var DBStore = require('connect-mongo')(session);
+
+var URL = require('url')
+
+var app = express();
+var _rootDir = __dirname;
+
+app.use(express.static(_rootDir));
+
+app.set('views', path.join(__dirname, 'web'));
+app.engine('.html', require('ejs').__express);
+app.set('view engine', 'html');
+
+var bodyParser = require('body-parser');
+app.use(bodyParser.urlencoded({extended: false}));
+app.use(bodyParser.json());
+
+app.use(session({
+    name: 'usersSession',
+    secret: 'session users secret',
+    cookie: {maxAge: 1000*60*30},
+    resave: false,
+    saveUninitialized: true
+    //*
+    ,store: new DBStore({
+        url: 'mongodb://' + config.current.server + ':' + config.current.port + '/usersManagesOpr'
+    })
+    //*/
+}));
+
+app.use(function (req, res, next) {
+    var url = req.originalUrl, referer;
+    if (!/^\/login/.test(req.originalUrl) && !req.session.userAccount) {
+        if (/\/api/.test(req.originalUrl)) {
+            referer = URL.parse(req.headers.referer);
+            return res.redirect('/login' + '?referer=' + referer.path);
+        } else {
+            return res.redirect("/login" + '?referer=' + req.originalUrl);
+        }
+    }
+    next();
+});
+
+app.use('/', require('./modules/users/routes/users_route'));
+
+var rpt_Router = require("./modules/reports/routes/report_router");
+app.get('/report',  function(req, res) {
+    if (!req.session.userAccount) {
+        res.redirect('/login');
+    }
+    else {
+        res.render('maintain/report/html/rpt_test.html',
+            {userAccount: req.session.userAccount,
+                userID: req.session.userID});
+    }
+});
+app.use("/report_api", rpt_Router);
+
+var rationRepository_Router = require("./modules/ration_repository/routes/ration_rep_routes");
+app.get('/rationRepository/main', function(req, res) {
+    res.render('maintain/ration_repository/main.html',
+        {
+            userAccount: req.session.userAccount,
+            userID: req.session.userID
+        });
+});
+app.get('/rationRepository/ration', function(req, res) {
+    res.render('maintain/ration_repository/dinge.html',
+        {
+            userAccount: req.session.userAccount,
+            userID: req.session.userID
+        });
+});
+app.get('/rationRepository/lmm', function(req, res) {
+    res.render('maintain/ration_repository/gongliao.html',
+        {
+            userAccount: req.session.userAccount,
+            userID: req.session.userID
+        });
+});
+
+app.get('/rationRepository/coeList', function(req, res) {
+    res.render('maintain/ration_repository/fuzhu.html',
+        {
+            userAccount: req.session.userAccount,
+            userID: req.session.userID
+        });
+});
+
+app.use("/rationRepository/api",rationRepository_Router);
+
+
+app.use(function(req, res, next) {
+    res.status(404).send('404 Error');
+});
+app.use(function(err, req, res, next) {
+    console.error(err.stack);
+    res.status(500).send('500 Error');
+});
+app.listen(6080);

+ 0 - 46
server.js

@@ -112,57 +112,11 @@ app.use('/bills', bills_Router);
 app.use('/ration', ration_Router);
 app.use('/glj', GLJ_Router);
 
-var rpt_Router = require("./modules/reports/routes/report_router");
-app.get('/report',  function(req, res) {
-    if (!req.session.userAccount) {
-        res.redirect('/login');
-    }
-    else {
-        res.render('maintain/report/html/RptHome.html',
-            {userAccount: req.session.userAccount,
-                userID: req.session.userID});
-    }
-});
-app.use("/report_api", rpt_Router);
-
 //app.use(express.static(_rootDir+"/web"));
 //app.use(express.static(_rootDir+"/lib"));
 //var rations_Router = require("./modules/rationLibEditor/routes/rationLibEditor_route");
 //app.use("/rationLibEditor",rations_Router);
 
-var rationRepository_Router = require("./modules/ration_repository/routes/ration_rep_routes");
-app.get('/rationRepository/main', function(req, res) {
-    res.render('maintain/ration_repository/main.html',
-        {
-            userAccount: req.session.userAccount,
-            userID: req.session.userID
-        });
-});
-app.get('/rationRepository/ration', function(req, res) {
-    res.render('maintain/ration_repository/dinge.html',
-        {
-            userAccount: req.session.userAccount,
-            userID: req.session.userID
-        });
-});
-app.get('/rationRepository/lmm', function(req, res) {
-    res.render('maintain/ration_repository/gongliao.html',
-        {
-            userAccount: req.session.userAccount,
-            userID: req.session.userID
-        });
-});
-
-app.get('/rationRepository/coeList', function(req, res) {
-    res.render('maintain/ration_repository/fuzhu.html',
-        {
-            userAccount: req.session.userAccount,
-            userID: req.session.userID
-        });
-});
-
-app.use("/rationRepository/api",rationRepository_Router);
-
 app.get("/stdBillsmain", function(req, res){
     if(!req.session.userAccount){
         res.redirect('/login');

web/maintain/ration_repository/js/mainJ.js → web/maintain/ration_repository/js/main.js


+ 1 - 8
web/maintain/ration_repository/main.html

@@ -37,11 +37,6 @@
                       <table class="table table-hover table-bordered">
                         <thead><tr><th>定额库名称</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
                         <tbody>
-                        <!--
-                          <tr><td><a href="dinge.html">XX定额库</a></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
-                          <tr><td><a href="dinge.html">XX定额库</a></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
-                          <tr><td><a href="dinge.html">XX定额库</a></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
-                        -->
                         </tbody>
                       </table>
                     </div>
@@ -51,7 +46,6 @@
         </div>
     </div>
     <!--弹出添加-->
-
     <div class="modal fade" id="add" data-backdrop="static" style="display: none;" aria-hidden="true">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
@@ -102,7 +96,6 @@
             </div>
         </div>
     </div>
-
     <!--弹出删除-->
     <div class="modal fade" id="del" data-backdrop="static" style="display: none;" aria-hidden="true">
         <input type="hidden" id="did" value="123">
@@ -133,7 +126,7 @@
     <script type="text/javascript" src="/public/web/date_util.js"></script>
   	<script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
   	<script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
-    <script type="text/javascript" src="/web/maintain/ration_repository/js/mainJ.js"></script>
+    <script type="text/javascript" src="/web/maintain/ration_repository/js/main.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
 </body>
 <script type="text/javascript">

+ 1 - 2
web/maintain/report/html/RptHome.html

@@ -136,8 +136,7 @@
             canvas.style.cursor = "wait";
             $.ajax({
                 type:"POST",
-                url: 'http://localhost:6060/report_api/getReport',
-                //url: 'http://www.smart_cost_tony.cn:3010/api/getReport',
+                url: 'report_api/getReport',
                 data: {"grp_id": rpt_grp, "tpl_id": rpt_id, "pageSize": rpt_size},
                 dataType: 'json',
                 cache: false,