diff --git a/db/3pigxx_ac.sql b/db/3pigxx_ac.sql index 31aa36dca..6a6222251 100644 --- a/db/3pigxx_ac.sql +++ b/db/3pigxx_ac.sql @@ -673,7 +673,7 @@ CREATE TABLE `oa_leave_bill` ( `leave_time` datetime DEFAULT NULL COMMENT '请假时间', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `del_flag` char(50) DEFAULT '0' COMMENT '删除标识', + `del_flag` char(1) DEFAULT '0' COMMENT '删除标识', `tenant_id` int(11) NOT NULL COMMENT '所属租户', PRIMARY KEY (`leave_id`) ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4; diff --git a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java index d5f7729ed..bddc2d235 100644 --- a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java +++ b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java @@ -17,7 +17,6 @@ package org.springframework.cloud.openfeign; -import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.util.R; @@ -29,6 +28,7 @@ import org.springframework.cglib.proxy.MethodProxy; import org.springframework.lang.Nullable; import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; import java.util.Objects; /** @@ -56,7 +56,7 @@ public class PigxFeignFallback implements MethodInterceptor { byte[] content = exception.content(); - String str = StrUtil.str(content, CharsetUtil.UTF_8); + String str = StrUtil.str(content, StandardCharsets.UTF_8); return R.builder().code(CommonConstants.FAIL) .msg(str).build();