Merge branch 'master' of https://git.coding.net/tywldx/BlackPearl

app/blackPearl/controller/url/server.js

@@ -63,7 +63,9 @@ exports.sub_relace_env = async function(vappOpt){
     await this.bindDefault();
     await this.mongo("Url").release(this.request.query._id);
     let url = await this.mongo("Url").findUrlTemplatesByUrlId(this.request.query._id);
+    console.log("the url ---------------------",url)
     try {
+        
         vappOpt.bpModules.route_config.setUrlTemplate(url[0]);
         this.body = {code:"0000",data: url[0]}
     } catch (error) {

config/main.development.js

@@ -35,7 +35,7 @@ getIp();
 console.log("配置文件获取IP",ip)
 let vhost = {};
 if(env == "debug"){
-  ip = "172.30.199.2"
+  ip = "127.0.0.1"
 }
 
 vhost[ip] = 'blackPearl';

logs/bp.log

+[2017-11-21T15:20:30.283] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:20:30.288] [ERROR] app - error test================
+[2017-11-21T15:25:30.471] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:25:30.474] [ERROR] app - error test================
+[2017-11-21T15:51:29.158] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:51:29.161] [ERROR] app - error test================

logs/bp.log-2017-11-20.log

+[2017-11-20T19:53:09.510] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-20T19:53:09.512] [ERROR] app - error test================
+[2017-11-20T20:17:40.472] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-20T20:17:40.475] [ERROR] app - error test================

logs/con.log

+[2017-11-20T20:17:40.472] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-20T20:17:40.475] [ERROR] app - error test================
+[2017-11-21T15:17:39.253] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:20:30.283] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:20:30.288] [ERROR] app - error test================
+[2017-11-21T15:25:30.471] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:25:30.474] [ERROR] app - error test================
+[2017-11-21T15:51:29.158] [INFO] app - ----------------------------------------------------------------------------------------------!!!!!!!!!!!!
+[2017-11-21T15:51:29.161] [ERROR] app - error test================

package.json

-
 {
   "name": "gracejs",
   "version": "2.0.9",
@@ -31,11 +30,13 @@
     "node": ">=7.6.0"
   },
   "dependencies": {
-    "bluebird": "3.4.6",
+    "bankcardinfo": "",
+    "bluebird": "",
     "bytes": "^2.4.0",
     "co": "^4.6.0",
     "co-body": "^4.2.0",
     "compressible": "^2.0.8",
+    "concat-files": "",
     "copy-to": "^2.0.1",
     "debug": "^2.6.0",
     "formidable": "^1.0.17",
@@ -47,12 +48,15 @@
     "koa-is-json": "^1.0.0",
     "koa-redis": "^2.1.2",
     "koa-send": "^3.2.0",
+    "log4js": "^2.3.12",
     "methods": "^1.1.2",
     "minimatch": "^3.0.3",
     "mongoose": "^4.6.3",
+    "multer": "",
     "nunjucks": "^3.0.0",
     "path-to-regexp": "^1.6.0",
     "raven": "^0.12.1",
+    "redis": "",
     "request": "^2.75.0",
     "statuses": "^1.3.0",
     "strip-json-comments": "^2.0.1",
@@ -63,7 +67,7 @@
     "concat-files":"",
     "bluebird":"",
     "multer":"",
-		"xml2json":""
+    "xml2json":""
   },
   "devDependencies": {
     "mm": "^2.0.0",

src/app.js

@@ -168,7 +168,10 @@ app.use(Middles.vhost(vhosts));
 // var logger = log4js.getLogger('normal');
 // logger.setLevel('INFO');
 
-
+var logger = Bp_modules.log.Logger("app")
+logger.info("----------------------------------------------------------------------------------------------!!!!!!!!!!!!")
+logger.error("error test================")
+console.log('dkkdkdddddddddddddddddddddd')
 
 //自定义 模块的初始化
 Bp_modules.route_config.init();

src/bp_modules/log/index.js

+var log4js = require('log4js');
+
+//     log4js.configure({
+//         "appenders":[{"type" : "console"     
+//         //控制台log
+//     },{
+//         "type" : "clustered",   //支持多 appender 时添加
+//         "appenders" : [
+//             {
+//                     "type" : "file",
+//                     "filename" : "logs/bp_log.log",
+//                     "maxLogSize" : "2048",
+//                     "backups" : 2,
+//                     "level" : "INFO"              
+//             },
+//             {
+//                 "type": "logLevelFilter", //日志级别过滤
+//                 "level": "ERROR",  //该日志文件只记录级别在error及以上的日志
+//                 "appender": 
+//                 {
+//                     "type": "file",  
+//                     "filename": "logs/errors.log"}              
+//             }
+//         ]
+//         //replaceConsole: true
+//     }]
+//     //让所有console输出到日志中
+//  })
+
+
+log4js.configure({
+    appenders:{
+        console: {type : 'console'},
+        consolelog:{type:'file',filename:'logs/con.log'},
+        app: {
+            type : 'dateFile',filename:'logs/bp.log',pattern:'-yyyy-MM-dd.log',maxLogSize :2048,numBackups :3
+        }
+    },
+    categories: {
+        default: {
+            appenders:['app','console','consolelog'],
+            level: 'debug'
+        }
+    },
+    replaceConsole: true      
+})
+
+
+ module.exports = {
+     Logger : function(name){
+         var logger = log4js.getLogger(name)
+         //logger.setLevel('INFO')
+         //logger.setLevel('INFO');
+         return logger;
+     }
+ }
\ No newline at end of file

src/bp_modules/route_config/index.js

@@ -83,13 +83,19 @@ module.exports = {
             return this.project_routes[ctx.bpRouter.device_route.project_id]
         }
     },
+    removeUrlForProjectRoute:function(project_id,url_obj){
+        delete this.project_routes[project_id][url_obj._id]
+    },
+    addUrlForProjectRoute:function(project_id,url_obj){
+        this.project_routes[project_id][url_obj._id] = JSON.parse(JSON.stringify(url_obj));
+        this.project_routes[project_id][url_obj._id].re = pathToRegExp(url_obj.path);
+    },
     //单个设置项目的route规则,用于更新
     setProjectRoute: function (project) {
         // pathToRegExp
         this.project_routes[project._id] = {};
         project.urls.forEach(function (url) {
-            this.project_routes[project._id][url._id] = JSON.parse(JSON.stringify(url));
-            this.project_routes[project._id][url._id].re = pathToRegExp(url.path)
+            this.addUrlForProjectRoute(project._id,url);
             //这里面的urls应该都是url对象
             //把URL里面的FUN灌入
         }, this);
@@ -151,6 +157,11 @@ module.exports = {
         return this.project_url_exports[url.projects][url._id]
     },
     setUrlTemplate: function (url) {
+        console.log("url project id",url.projects)
+        if(!(!!!this.project_routes[url.projects] && !!!this.project_routes[url.projects][url._id])){
+            this.addUrlForProjectRoute(url.projects,url);
+        }
+
         this.resp_templates[url._id] = {};
         this.device_templates[url._id ] = {};
         if(this.project_url_exports == undefined){
@@ -163,6 +174,7 @@ module.exports = {
         this.project_url_exports[url.projects][url._id] = requireFromString(url.fun);
 
         url.templates.forEach(function (template, index) {
+            console.log(template.key);
             this.resp_templates[url._id][template.key] = requireFromString(template.fun);
             template.devices.forEach(function(device){
                 //再同一URL中，一个设备下面有且只能指定一个Template