Merge remote-tracking branch 'origin/master'

src/main/java/com/muyu/common/core/enums/SysPayType.java

@@ -3,7 +3,7 @@ package com.muyu.common.core.enums;
 import java.util.Arrays;
 
 /**
- * @Author: zi run
+ * @Author: by 杨旭飞
  * @Date 2024/8/5 19:01
  * @Description 系统支付枚举
  */

src/main/java/com/muyu/common/core/enums/SystemYesNo.java

@@ -3,7 +3,7 @@ package com.muyu.common.core.enums;
 import java.util.Arrays;
 
 /**
- * @Author: zi run
+ * @Author: by 杨旭飞
  * @Date 2024/8/4 14:09
  * @Description 系统是否枚举
  */

src/main/java/com/muyu/common/core/enums/UserStatus.java

@@ -1,9 +1,9 @@
 package com.muyu.common.core.enums;
 
 /**
- * 用户状态
+ * @Description 用户状态
- *
+ * @Author: by 杨旭飞
- * @author muyu
+ * @Date 2024/8/4 14:09
  */
 public enum UserStatus {
     OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");

src/main/java/com/muyu/common/core/text/Convert.java

@@ -1,6 +1,8 @@
 package com.muyu.common.core.text;
 
 import com.muyu.common.core.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -16,6 +18,8 @@ import java.util.Set;
  * @author muyu
  */
 public class Convert {
+    private static final Logger log = LoggerFactory.getLogger(Convert.class);
+
     /**
      * 转换为字符串<br>
      * 如果给定的值为null，或者转换失败，返回默认值<br>
@@ -676,7 +680,6 @@ public class Convert {
     public static String utf8Str (Object obj) {
         return str(obj, CharsetKit.CHARSET_UTF_8);
     }
-
     /**
      * 将对象转为字符串<br>
      * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
@@ -687,7 +690,12 @@ public class Convert {
      * @return 字符串
      */
     public static String str (Object obj, String charsetName) {
-        return str(obj, Charset.forName(charsetName));
+        try {
+            return str(obj, CharsetKit.charset(charsetName));//字符集
+        }catch (Exception exception){
+            log.error("字符集转换异常:[{}--{}]->{}",obj,charsetName,exception.getMessage(),exception);
+            throw new RuntimeException(exception);
+        }
     }
 
     /**

src/main/java/com/muyu/common/core/validation/ValidationConfig.java

@@ -11,4 +11,4 @@ public class ValidationConfig {
     public Validator validator() {
         return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator();
     }
-}
+}

src/main/java/com/muyu/common/core/validation/custom/IsSystemPayType.java

@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * @Author: zi run
+ * @Author: by 杨旭飞
  * @Date 2024/8/5 19:33
  * @Description validation自定义支付渠道校验
  */

src/main/java/com/muyu/common/core/validation/custom/IsSystemYesNo.java

@@ -11,7 +11,7 @@ import java.lang.annotation.Target;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * @Author: zi run
+ * @Author: by 杨旭飞
  * @Date 2024/8/4 14:25
  * @Description validation自定义系统字典校验
  */

src/main/java/com/muyu/common/core/validation/custom/SystemPayTypeValidator.java

@@ -5,7 +5,7 @@ import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
 /**
- * @Author: zi run
+ * @Author: by 杨旭飞
  * @Date 2024/8/5 19:33
  * @Description 支付渠道的校验器
  */

src/main/java/com/muyu/common/core/validation/custom/SystemYsNoValidator.java

@@ -5,7 +5,7 @@ import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
 /**
- * @Author: zi run
+ * @Author: by 杨旭飞
  * @Date 2024/8/4 14:31
  * @Description 是否系统字典的校验器
  */