Merge remote-tracking branch 'origin/leng_dev' into leng_dev

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;

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;
 
 /**
@@ -47,7 +47,7 @@ public class PigxFeignFallback<T> implements MethodInterceptor {
 	@Override
 	public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
 		String errorMessage = cause.getMessage();
-		log.error("MicaFeignFallback:[{}.{}] serviceId:[{}] message:[{}]", targetType.getName(), method.getName(), targetName, errorMessage);
+		log.error("PigxFeignFallback:[{}.{}] serviceId:[{}] message:[{}]", targetType.getName(), method.getName(), targetName, errorMessage);
 		Class<?> returnType = method.getReturnType();
 		if (R.class != returnType) {
 			return null;
@@ -56,7 +56,7 @@ public class PigxFeignFallback<T> 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();

pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxHystrixFeignTargeterConfiguration.java

@@ -36,7 +36,7 @@ public class PigxHystrixFeignTargeterConfiguration {
 
 	@Bean
 	@Primary
-	public Targeter micaFeignTargeter() {
+	public Targeter pigxFeignTargeter() {
 		return new PigxHystrixTargeter();
 	}
 }

pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxHystrixTargeter.java

@@ -52,8 +52,8 @@ class PigxHystrixTargeter implements Targeter {
 			return targetWithFallbackFactory(factory.getName(), context, target, builder, fallbackFactory);
 		}
 
-		PigxFallbackFactory micaFallbackFactory = new PigxFallbackFactory(target);
-		return (T) builder.target(target, micaFallbackFactory);
+		PigxFallbackFactory pigxFallbackFactory = new PigxFallbackFactory(target);
+		return (T) builder.target(target, pigxFallbackFactory);
 	}
 
 	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,