瀏覽代碼

bug, 业务分离test

zhangweicheng 6 年之前
父節點
當前提交
5eaeb6cb2f

+ 3 - 1
Dockerfile

@@ -14,6 +14,8 @@ EXPOSE 2060
 
 ENV NODE_ENV=prod
 
-ENTRYPOINT babel-node --max-old-space-size=2048  server.js
+ENTRYPOINT ["babel-node", "--max-old-space-size=2048"]
+
+CMD ["server.js"]
 
 

+ 69 - 0
importserver.js

@@ -0,0 +1,69 @@
+/**
+ * Created by zhang on 2019/12/3.
+ */
+let express = require('express');
+
+let config = require("./config/config.js");
+let fileUtils = require("./modules/common/fileUtils");
+let dbm = require("./config/db/db_manager");
+let log = require("./logs/log_helper");
+
+config.setupDb(process.env.NODE_ENV);
+
+let path = require('path');
+let fs = require('fs');
+
+
+dbm.connect(process.env.NODE_ENV);
+//这里现在只引入了定额工料机里的models,当其它模块的models修改后使用:./modules/**/models/*.js引入所有的模块
+fileUtils.getGlobbedFiles('./modules/all_models/*.js').forEach(function(modelPath) {
+    require(path.resolve(modelPath));
+})
+
+
+
+
+let app = express();
+let _rootDir = __dirname;
+app.locals.rootDir = _rootDir;
+log.use(app);
+app.use(express.static(_rootDir));
+
+app.set('views', path.join(__dirname, 'web'));
+app.engine('.html', require('ejs').__express);
+app.set('view engine', 'html');
+
+let bodyParser = require('body-parser');
+app.use(bodyParser.urlencoded({limit: '10mb', extended: false}));
+app.use(bodyParser.json({limit: '10mb'}));
+
+
+
+//加载路由文件
+fileUtils.getGlobbedFiles('./modules/import/routes/*.js').forEach(function(modelPath) {
+    require(path.resolve(modelPath))(app);
+});
+
+//app.use(express.static(_rootDir+"/web"));
+//app.use(express.static(_rootDir+"/lib"));
+//let rations_Router = require("./modules/rationLibEditor/routes/rationLibEditor_route");
+//app.use("/rationLibEditor",rations_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');
+});
+
+//设置外增的Date对象Format函数
+//备注: 经过测试nodejs 8.9.3版本不支持eval的方式修改prototype,为兼容考虑,把方法调整到stringUtil文件里
+require('./public/stringUtil').setupDateFormat();
+
+app.listen(2050, function(){
+    console.log('import server started!');
+});
+

+ 3 - 0
modules/import/controllers/import_controller.js

@@ -0,0 +1,3 @@
+/**
+ * Created by zhang on 2019/12/3.
+ */

+ 20 - 0
modules/import/routes/import_route.js

@@ -0,0 +1,20 @@
+/**
+ * Created by zhang on 2019/12/3.
+ */
+let express = require('express');
+
+module.exports = function (app) {
+    let importRouter = express.Router();
+    let importController = require('../controllers/import_controller');
+
+/*    importRouter.post('/addMultiRation', importController.action);
+    importRouter.post('/getSameSectionRations', importController.action);
+    importRouter.post('/getDefaultProgramID', importController.action);
+    importRouter.post('/applyTemplate', importController.action);
+    importRouter.post('/updateRationAss', importController.action);
+    importRouter.post('/updateCoeAdjust', importController.action);*/
+    importRouter.get('/test',function (req,res) {
+        res.json("hello word");
+    })
+    app.use('/import', importRouter);
+};

+ 2 - 0
web/building_saas/pm/js/pm_newMain.js

@@ -184,6 +184,8 @@ const projTreeObj = {
             this.bindEvent(newWorkBook);
             this.loadContextMenu();
             this.loadStartMenu();
+        }else {
+            workBook.refresh();
         }
         return newWorkBook;
     },