Merge branch 'xgg-admin-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-admin-dev

xgg-admin/app/base/controller/impl/order/orderCtl.js

@@ -221,7 +221,7 @@ class OrderCtl extends CtlBase {
    * @param {*} pobj2 
    * @param {*} pobj2 
    * @param {*} req 
    * @param {*} req 
    */
    */
-  async createOrder(pobj, pobj2, req){
+    async createOrder(pobj, pobj2, req){
     try {
     try {
       return await this.orderSve.createOrder(pobj);
       return await this.orderSve.createOrder(pobj);
     } catch (error) {
     } catch (error) {

xgg-admin/app/config/routes/web.js

@@ -33,10 +33,10 @@ module.exports = function (app) {
 			return next();
 			return next();
 		}
 		}
 
 
-		if (!jsonUser) {
-			res.end(JSON.stringify({ status: -99, msg: "no login" }));
-			return;
-		}
+		// if (!jsonUser) {
+		// 	res.end(JSON.stringify({ status: -99, msg: "no login" }));
+		// 	return;
+		// }
 
 
 		if(xggadminsid) {
 		if(xggadminsid) {
 			redisClient.setWithEx(xggadminsid, JSON.stringify(jsonUser), 60 * 60 * 60);
 			redisClient.setWithEx(xggadminsid, JSON.stringify(jsonUser), 60 * 60 * 60);