Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/config/routes/api.js

@@ -410,6 +410,13 @@ module.exports = function (app) {
 				res.end(JSON.stringify(result));
 				res.end(JSON.stringify(result));
 				return;
 				return;
 			}
 			}
+			var sign = req.headers["sign"] || "";
+			if (!sign) {
+				result.msg = "req headers sign can not be empty";
+				result.data = null;
+				res.end(JSON.stringify(result));
+				return;
+			}
 			//1.通过appkey 获取appInfo
 			//1.通过appkey 获取appInfo
 			var appRes = await signSve.getAppInfoByAppKey(appkey);
 			var appRes = await signSve.getAppInfoByAppKey(appkey);
 			if(!appRes || appRes.status!=0){
 			if(!appRes || appRes.status!=0){
@@ -420,6 +427,7 @@ module.exports = function (app) {
 			}
 			}
 			var appInfo = appRes.data;
 			var appInfo = appRes.data;
 			//2.通过appsecret 验签
 			//2.通过appsecret 验签
+			req.body.sign = sign;
 			var signParams = req.body;
 			var signParams = req.body;
 			var verifyRes = await signSve.verifySign(req.body,appInfo.uapp_secret);
 			var verifyRes = await signSve.verifySign(req.body,appInfo.uapp_secret);
 			if(verifyRes && verifyRes.status==0){
 			if(verifyRes && verifyRes.status==0){

center-channel/app/config/settings.js

@@ -239,14 +239,14 @@ var settings = {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "https://oauth2.e.360.cn/site/token"// 360测试环境
       return "https://oauth2.e.360.cn/site/token"// 360测试环境
     } else {
     } else {
-      return ""//
+      return "https://oauth2.e.360.cn/site/token"//
     }
     }
   },
   },
   requestUrl360: function () {
   requestUrl360: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://180.163.239.98:38085/"// 360测试环境
       return "http://180.163.239.98:38085/"// 360测试环境
     } else {
     } else {
-      return ""//
+      return "http://180.163.239.98:38085/"//
     }
     }
   },
   },
   aliUappId: function () {
   aliUappId: function () {