From 6b18466988f58643c4f8f779c42876fbbd9692b4 Mon Sep 17 00:00:00 2001 From: vchao Date: Mon, 18 Mar 2024 10:46:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90API=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=88=86=E7=BB=84=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E6=94=B9=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/vip/xiaonuo/gen/core/config/GenConfigure.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/core/config/GenConfigure.java b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/core/config/GenConfigure.java index d1af964f..3fc3523b 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/core/config/GenConfigure.java +++ b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/core/config/GenConfigure.java @@ -47,7 +47,7 @@ public class GenConfigure { * @date 2022/7/7 16:18 **/ @Bean(value = "genDocApi") - public Docket sysDocApi() { + public Docket genDocApi() { return new Docket(DocumentationType.SWAGGER_2) .apiInfo(new ApiInfoBuilder() .title("代码生成GEN") -- Gitee From 3131ffa40928b70b18b69b93006c8aa2c61dd27b Mon Sep 17 00:00:00 2001 From: vchao Date: Tue, 26 Mar 2024 14:11:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9B=91=E6=8E=A7=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=B1=BB2=E4=B8=AA=E5=B1=9E=E6=80=A7=E5=90=8D=E6=94=B9?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/views/dev/monitor/index.vue | 4 ++-- .../dev/modular/monitor/result/DevMonitorServerResult.java | 4 ++-- .../modular/monitor/service/impl/DevMonitorServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/snowy-admin-web/src/views/dev/monitor/index.vue b/snowy-admin-web/src/views/dev/monitor/index.vue index f4791abc..967296aa 100644 --- a/snowy-admin-web/src/views/dev/monitor/index.vue +++ b/snowy-admin-web/src/views/dev/monitor/index.vue @@ -91,8 +91,8 @@ - {{ devMonitorCpuInfo.cupName }} - {{ devMonitorCpuInfo.cupNum }} + {{ devMonitorCpuInfo.cpuName }} + {{ devMonitorCpuInfo.cpuNum }} {{ devMonitorCpuInfo.cpuPhysicalCoreNum }} {{ devMonitorCpuInfo.cpuLogicalCoreNum }} diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java index e6ca8ceb..2fdd107d 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/result/DevMonitorServerResult.java @@ -65,11 +65,11 @@ public class DevMonitorServerResult { /** CPU名称 */ @ApiModelProperty(value = "CPU名称", position = 1) - private String cupName; + private String cpuName; /** CPU数量 */ @ApiModelProperty(value = "CPU数量", position = 2) - private String cupNum; + private String cpuNum; /** CPU物理核心数 */ @ApiModelProperty(value = "CPU物理核心数", position = 3) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java index 942298cf..b60c1648 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/monitor/service/impl/DevMonitorServiceImpl.java @@ -58,8 +58,8 @@ public class DevMonitorServiceImpl implements DevMonitorService { // CPU信息 DevMonitorServerResult.DevMonitorCpuInfo devMonitorCpuInfo = new DevMonitorServerResult.DevMonitorCpuInfo(); - devMonitorCpuInfo.setCupName(StrUtil.trim(cpu.getProcessorIdentifier().getName())); - devMonitorCpuInfo.setCupNum(cpu.getPhysicalPackageCount() + "颗物理CPU"); + devMonitorCpuInfo.setCpuName(StrUtil.trim(cpu.getProcessorIdentifier().getName())); + devMonitorCpuInfo.setCpuNum(cpu.getPhysicalPackageCount() + "颗物理CPU"); devMonitorCpuInfo.setCpuPhysicalCoreNum(cpu.getPhysicalProcessorCount() + "个物理核心"); devMonitorCpuInfo.setCpuLogicalCoreNum(cpu.getLogicalProcessorCount() + "个逻辑核心"); long[] prevTicks = cpu.getSystemCpuLoadTicks(); -- Gitee From 3805aead4154d0405eb2c3f9e3378b344033746a Mon Sep 17 00:00:00 2001 From: suvue Date: Mon, 8 Apr 2024 09:56:29 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=89=BE?= =?UTF-8?q?=E5=9B=9E=E5=AF=86=E7=A0=81=E6=97=B6=EF=BC=8C=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E6=98=AF=E4=BB=A5=E5=9B=BD=E5=AF=86=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E7=9A=84=E5=BD=A2=E5=BC=8F=E5=AD=98=E5=82=A8=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E4=BB=A5=E5=8C=B9=E9=85=8D=E7=9A=84=E6=97=B6=E5=80=99=E4=B9=9F?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8A=A0=E4=B8=8A=E5=9B=BD=E5=AF=86=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: suvue --- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 1a1f46f4..f67971b3 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -507,7 +507,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 执行校验验证码 validValidCode(sysUserFindPwdByPhoneParam.getPhone(), sysUserFindPwdByPhoneParam.getValidCode(), sysUserFindPwdByPhoneParam.getValidCodeReqNo()); this.update(new LambdaUpdateWrapper().eq(SysUser::getPhone, - sysUserFindPwdByPhoneParam.getPhone()).set(SysUser::getPassword, + CommonCryptogramUtil.doSm4CbcEncrypt(sysUserFindPwdByPhoneParam.getPhone())).set(SysUser::getPassword, CommonCryptogramUtil.doHashValue(CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword())))); } -- Gitee