Merge branch 'develop' into develop-yx

* develop:
  base64解密方式切换
  no message
  no message
  注册新增小分仓额度
  参数校验返回更新为200状态码

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/GlobalBizExceptionHandler.java

@@ -92,7 +92,7 @@ public class GlobalBizExceptionHandler {
 	 * @return R
 	 */
 	@ExceptionHandler({ MethodArgumentNotValidException.class })
-	@ResponseStatus(HttpStatus.BAD_REQUEST)
+	@ResponseStatus(HttpStatus.OK)
 	public R handleBodyValidException(MethodArgumentNotValidException exception) {
 		List<FieldError> fieldErrors = exception.getBindingResult().getFieldErrors();
 		log.warn("参数绑定异常,ex = {}", fieldErrors.get(0).getDefaultMessage());

kxs-gateway/src/main/java/com/kxs/gateway/api/filter/RequestDecoderFilter.java

@@ -105,7 +105,7 @@ public class RequestDecoderFilter extends AbstractGatewayFilterFactory<Object> {
         try{
             String[] pathSegments = path.split("/");
             String param = pathSegments[pathSegments.length - 1];
-            byte[] decode = Base64.getDecoder().decode(param);
+            byte[] decode = Base64.getMimeDecoder().decode(param);
             String decryptStr = cryptoAes.decryptStr(new String(decode));
 
             Pattern pattern = Pattern.compile("(.+/)[^/]+$");
@@ -141,8 +141,8 @@ public class RequestDecoderFilter extends AbstractGatewayFilterFactory<Object> {
         Flux<DataBuffer> modifiedBody = serverRequest.bodyToFlux(String.class).flatMap(body -> {
             // 解密请求体
             try {
-                byte[] decode = Base64.getDecoder().decode(body);
-//				log.info("待解密请求参数：{}", body);
+//                log.info("待解密请求参数：{}", body);
+                byte[] decode = Base64.getMimeDecoder().decode(body);
                 String decryptStr = cryptoAes.decryptStr(new String(decode));
 //				log.info("解密后参数：{}", decryptStr);
 
@@ -196,7 +196,7 @@ public class RequestDecoderFilter extends AbstractGatewayFilterFactory<Object> {
             if (CharSequenceUtil.isEmpty(decryptedParam)) {
                 return chain.filter(exchange);
             }
-            byte[] decode = Base64.getDecoder().decode(decryptedParam);
+            byte[] decode = Base64.getMimeDecoder().decode(decryptedParam);
 //			log.info("GET:{},请求待解密数据 :{}", exchange.getRequest().getURI(),decryptedParam);
             String decryptStr = cryptoAes.decryptStr(new String(decode));
 //			log.info("GET解密后数据 :{}", decryptStr);

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsWarehouseLimitServiceImpl.java

@@ -162,8 +162,6 @@ public class KxsWarehouseLimitServiceImpl extends ServiceImpl<KxsWarehouseLimitM
         if(warehouseLimit == null){
             kxsWarehouseLimit.setWarehouseType(WarehouseLimitTypeEnum.XFC.getType());
             baseMapper.insert(kxsWarehouseLimit);
-        }else{
-            return Boolean.FALSE;
         }
         return Boolean.TRUE;
     }