From 943932391fc2aaecb2da52a26b788e54bc40fe88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Thu, 22 Aug 2024 19:42:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9C=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=88=90=E5=8A=9F=E6=96=B9=E6=B3=95=E4=B8=94?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=81=9A=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=97=B6,=E8=BF=94=E5=9B=9E=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/muyu/common/core/domain/Result.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/muyu/common/core/domain/Result.java b/src/main/java/com/muyu/common/core/domain/Result.java index 1f63b23..a47a267 100644 --- a/src/main/java/com/muyu/common/core/domain/Result.java +++ b/src/main/java/com/muyu/common/core/domain/Result.java @@ -65,7 +65,7 @@ public class Result implements Serializable { } public static Result success (T data) { - return restResult(null, SUCCESS, "操作成功"); + return restResult(data, SUCCESS, "操作成功"); } public static Result success (T data, String msg) { From f38c95880480104e7b3263f389b5a60f0cf8de86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Thu, 22 Aug 2024 20:29:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86mybait-plus?= =?UTF-8?q?=E5=9C=A8=E4=BF=AE=E6=94=B9=E4=B8=8E=E6=B7=BB=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99:=E5=AD=97=E7=AC=A6=E9=9B=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF,=E5=8E=9F=E5=9B=A0,=E5=9C=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=BB=A5=E4=B8=8A=E6=96=B9=E6=B3=95=E6=97=B6=E4=BC=9A=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BD=86=E5=B9=B6=E4=B8=8D=E4=BC=9A=E4=BD=BF=E7=94=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=AD=97=E7=AC=A6=E9=9B=86,=E8=80=8C=E6=98=AF?= =?UTF-8?q?=E7=BB=99null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/muyu/common/core/text/Convert.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/muyu/common/core/text/Convert.java b/src/main/java/com/muyu/common/core/text/Convert.java index 667534e..4a71d5c 100644 --- a/src/main/java/com/muyu/common/core/text/Convert.java +++ b/src/main/java/com/muyu/common/core/text/Convert.java @@ -1,5 +1,6 @@ package com.muyu.common.core.text; +import com.muyu.common.core.constant.Constants; import com.muyu.common.core.utils.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -689,11 +690,9 @@ public class Convert { * @return 字符串 */ public static String str (Object obj, String charsetName) { - System.out.println(obj); try{ - return str(obj, Charset.forName(charsetName)); + return str(obj, Charset.forName(charsetName.isEmpty()? Constants.UTF8 : charsetName)); }catch (Exception exception){ - System.out.println("字符转换异常: [{"+obj+"}-{"+charsetName+"}] -> {"+exception.getMessage()+"}"); log.error("字符转换异常: [{}-{}] -> {}",obj,charsetName,exception.getMessage(),exception); throw new RuntimeException(exception); } From 19c9225aa08dbb695adb8c918b4ae31f51c8c594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Fri, 23 Aug 2024 18:22:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BA=E6=9E=9A=E4=B8=BE=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=BC=96=E7=A0=81->=E5=90=8D=E7=A7=B0=20?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/core/enums/SysApiState.java | 13 +++++++++++++ .../com/muyu/common/core/enums/SysCheckState.java | 13 +++++++++++++ .../java/com/muyu/common/core/enums/SysDBType.java | 13 +++++++++++++ .../java/com/muyu/common/core/enums/SysPayType.java | 6 +++--- .../java/com/muyu/common/core/enums/SysYesNo.java | 13 +++++++++++++ .../java/com/muyu/common/core/enums/UserStatus.java | 1 + .../java/com/muyu/common/core/text/Convert.java | 1 + 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/muyu/common/core/enums/SysApiState.java b/src/main/java/com/muyu/common/core/enums/SysApiState.java index 57fd160..2071e36 100644 --- a/src/main/java/com/muyu/common/core/enums/SysApiState.java +++ b/src/main/java/com/muyu/common/core/enums/SysApiState.java @@ -35,4 +35,17 @@ public enum SysApiState { .map(SysApiState::getCode) .anyMatch(c -> c.equals(code)); } + + /** + * 参数转换,从编码转换为名称 + * @param code 编码 + * @return 名称 + */ + public static String getInfoByCode(String code){ + return Arrays.stream(values()) + .filter(c -> c.getCode().equals(code)) + .findFirst() + .map(SysApiState::getInfo) + .orElse("-"); + } } diff --git a/src/main/java/com/muyu/common/core/enums/SysCheckState.java b/src/main/java/com/muyu/common/core/enums/SysCheckState.java index 55098d3..c461251 100644 --- a/src/main/java/com/muyu/common/core/enums/SysCheckState.java +++ b/src/main/java/com/muyu/common/core/enums/SysCheckState.java @@ -37,4 +37,17 @@ public enum SysCheckState { .map(SysCheckState::getCode) .anyMatch(c -> c.equals(code)); } + + /** + * 参数转换,从编码转换为名称 + * @param code 编码 + * @return 名称 + */ + public static String getInfoByCode(String code){ + return Arrays.stream(values()) + .filter(c -> c.getCode().equals(code)) + .findFirst() + .map(SysCheckState::getInfo) + .orElse("-"); + } } diff --git a/src/main/java/com/muyu/common/core/enums/SysDBType.java b/src/main/java/com/muyu/common/core/enums/SysDBType.java index 15cb1a3..23d13ac 100644 --- a/src/main/java/com/muyu/common/core/enums/SysDBType.java +++ b/src/main/java/com/muyu/common/core/enums/SysDBType.java @@ -38,4 +38,17 @@ public enum SysDBType { .map(SysDBType::getCode) .anyMatch(c -> c.equals(code)); } + + /** + * 参数转换,从编码转换为名称 + * @param code 编码 + * @return 名称 + */ + public static String getInfoByCode(String code){ + return Arrays.stream(values()) + .filter(c -> c.getCode().equals(code)) + .findFirst() + .map(SysDBType::getInfo) + .orElse("-"); + } } diff --git a/src/main/java/com/muyu/common/core/enums/SysPayType.java b/src/main/java/com/muyu/common/core/enums/SysPayType.java index 03a9e18..2a68985 100644 --- a/src/main/java/com/muyu/common/core/enums/SysPayType.java +++ b/src/main/java/com/muyu/common/core/enums/SysPayType.java @@ -35,9 +35,9 @@ public enum SysPayType { } /** - * 参数转换,从支付方式编码转换为支付方式名称 - * @param code 支付方式编码 - * @return 支付方式名称 + * 参数转换,从编码转换为名称 + * @param code 编码 + * @return 名称 */ public static String getInfoByCode(String code){ return Arrays.stream(values()) diff --git a/src/main/java/com/muyu/common/core/enums/SysYesNo.java b/src/main/java/com/muyu/common/core/enums/SysYesNo.java index 7e0d17c..2c69689 100644 --- a/src/main/java/com/muyu/common/core/enums/SysYesNo.java +++ b/src/main/java/com/muyu/common/core/enums/SysYesNo.java @@ -32,4 +32,17 @@ public enum SysYesNo { .map(SysYesNo::getCode) .anyMatch(c -> c.equals(code)); } + + /** + * 参数转换,从编码转换为名称 + * @param code 编码 + * @return 名称 + */ + public static String getInfoByCode(String code){ + return Arrays.stream(values()) + .filter(c -> c.getCode().equals(code)) + .findFirst() + .map(SysYesNo::getInfo) + .orElse("-"); + } } diff --git a/src/main/java/com/muyu/common/core/enums/UserStatus.java b/src/main/java/com/muyu/common/core/enums/UserStatus.java index 77494d5..59b9ef5 100644 --- a/src/main/java/com/muyu/common/core/enums/UserStatus.java +++ b/src/main/java/com/muyu/common/core/enums/UserStatus.java @@ -19,4 +19,5 @@ public enum UserStatus { this.info = info; } + } diff --git a/src/main/java/com/muyu/common/core/text/Convert.java b/src/main/java/com/muyu/common/core/text/Convert.java index 4a71d5c..118b2e0 100644 --- a/src/main/java/com/muyu/common/core/text/Convert.java +++ b/src/main/java/com/muyu/common/core/text/Convert.java @@ -692,6 +692,7 @@ public class Convert { public static String str (Object obj, String charsetName) { try{ return str(obj, Charset.forName(charsetName.isEmpty()? Constants.UTF8 : charsetName)); +// return str(obj, Charset.forName(charsetName)); }catch (Exception exception){ log.error("字符转换异常: [{}-{}] -> {}",obj,charsetName,exception.getMessage(),exception); throw new RuntimeException(exception);