Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev

hai-bweb/src/main/java/com/bweb/controller/ApiIpAddressController.java

@@ -69,6 +69,10 @@ public class ApiIpAddressController {
 
             ApiIpAddress apiIpAddressEdit = apiIpAddressService.findByMchId(apiIpAddress.getMchId());
 
+            if (apiIpAddress.getIpAddress().length() > 250) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "超过最大可配置内容");
+            }
+
             // 判断是否存在ip地址内容
             if (apiIpAddressEdit == null ) {
                 apiIpAddress.setCreateTime(new Date());
@@ -81,7 +85,6 @@ public class ApiIpAddressController {
             }
 
 
-
             return ResponseMsgUtil.success("新增成功");
         } catch (Exception e) {
             log.error("ApiMerchantsController -> insertMerchant() error!",e);

hai-service/src/main/java/com/hai/service/impl/ApiIpAddressServiceImpl.java

@@ -55,7 +55,7 @@ public class ApiIpAddressServiceImpl implements ApiIpAddressService {
     public Boolean validationIpAddressLegal(String mchId, String ipAddress) {
 
         ApiIpAddressExample example  = new ApiIpAddressExample();
-        example.createCriteria().andMchIdEqualTo(mchId).andIpAddressEqualTo(ipAddress);
+        example.createCriteria().andMchIdEqualTo(mchId).andIpAddressLike("%" + ipAddress + "%");
 
         List<ApiIpAddress> list = apiIpAddressMapper.selectByExample(example);
 

v1/src/main/java/com/v1/controller/orderController.java

@@ -62,7 +62,7 @@ public class orderController {
 
     @RequestMapping(value = "/createOrder", method = RequestMethod.POST)
     @ResponseBody
-    @ApiOperation(value = "充值预下单")
+    @ApiOperation(value = "创建订单")
     public ResponseData createOrder(@RequestBody JSONObject object , HttpServletRequest request ) {
         try {