merge

.gitignore

 config/server.json
 
 package-lock.json
-uploads
+uploads/
+tmp/
 dump.rdb
 libs
-uploads
 /node_modules
 npm-debug.*
 .DS_Store

app/blackPearl/view/app/ctrl/url/url-edit-ctrl.js

@@ -231,6 +231,7 @@ function UrlEditCtrl($scope, Project, Url, TemplateUrlRoute) {
 		resizeAce(item);
 	}
 	$(window).resize(resizeAce);
+	$(window).unbind("keydown");
 	$(window).bind("keydown", {
 		fun: function () {
 			//保存数据
@@ -378,6 +379,7 @@ function UrlEditCtrl($scope, Project, Url, TemplateUrlRoute) {
 		$scope.modal.title = title;
 		$scope.modal.value = model;
 		$('#myModal').modal('show');
+		$('#modalInput').unbind("keydown");
 		$('#modalInput').bind("keydown", { do: callback }, modalInputCallBack);
 	}
 	var reg = /^[\u4E00-\u9FA5]+$/;

package.json

@@ -60,7 +60,14 @@
     "request": "^2.75.0",
     "statuses": "^1.3.0",
     "strip-json-comments": "^2.0.1",
-    "swiger": "0.0.2"
+    "swiger": "0.0.2",
+    "bankcardinfo":"",
+    "log4js":"",
+    "redis": "",
+    "concat-files":"",
+    "bluebird":"",
+    "multer":"",
+    "xml2json":""
   },
   "devDependencies": {
     "mm": "^2.0.0",

src/app.js

@@ -235,6 +235,7 @@ Bp_modules.datasource.init();
 
 let require_module = {};
 require_module["bin"] = require('bankcardinfo');
+require_module["xml2json"] = require('xml2json');
 //这个是存在内存里面，可以通过调用接口来更新的。
 
 

src/bp_modules/datasource/index.js

@@ -22,7 +22,11 @@ module.exports = {
     get: function (ctx, key) {
         return   this.client.getAsync(`${ctx.request.ip}${key}`).then(function(records){
             try {
-                return JSON.parse(records).val
+                if (!!!records){
+                    return null
+                }else{
+                    return JSON.parse(records).val   
+                }
             } catch (error) {
                 return error
             }