Merge branch 'dev' into base-modify

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/UserCouponAdminController.java

 package com.xxfc.platform.activity.rest.admin;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -157,6 +157,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         }
 
         String host = request.getRemoteHost();
+        if (StringUtils.isBlank(host)) {
+            return ObjectRestResponse.createDefaultFail();
+        }
         //设置信息
         vm.setCrtName(uorr.getData().getName());
         vm.setCrtUser(uorr.getData().getId());
@@ -208,7 +211,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
         }
         String host = request.getRemoteHost();
-
+        if (StringUtils.isBlank(host)) {
+            return ObjectRestResponse.createDefaultFail();
+        }
 //     插入修改时间
         vm.setUpdName(uorr.getData().getName());
         vm.setUpdUser(uorr.getData().getId());
@@ -289,14 +294,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      * @param limit
      * @return
      */
-    @ApiOperation("优质车型")
+     @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
     @IgnoreUserToken
     public List<GoodDataVO> goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
         return baseBiz.goodList(page, limit);
     }
-
-
     @ApiOperation("上下架")
     @PutMapping(value = "/setStatus/{id}/{status}")
     @Transactional
@@ -311,6 +314,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
         }
         String host = request.getRemoteHost();
+        if (StringUtils.isBlank(host)) {
+            return ObjectRestResponse.createDefaultFail();
+        }
         VehicleModel vehicleModel = new VehicleModel();
         vehicleModel.setId(id);
         vehicleModel.setStatus(status);