From 02bf9d62c7b93aab5cb800d5bbb9d0d94282495e Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Mon, 28 Apr 2025 11:43:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/pay/PayBackController.java | 2 +- .../web/controller/backstage/BackstageController.java | 5 ++++- .../controller/backstage/SysAppUserController.java | 2 +- .../web/controller/backstage/SysMarketController.java | 2 +- .../controller/backstage/SysWorkReviewController.java | 4 ++-- ruoyi-admin/src/main/resources/application.yml | 11 ++++++++--- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java index 0231108e..e6371a6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java @@ -209,7 +209,7 @@ public class PayBackController { // 如果 key 不存在，自动创建空 List 并添加到 Map List valueList = mapSource.computeIfAbsent(userWork.getWorkName(), k -> new ArrayList<>()); // 添加资源位坐标 - String value = sysSource.getPart()+String.format("%2d", sysSource.getcX())+String.format("%2d", sysSource.getcY()); + String value = sysSource.getPart()+String.format("%02d", sysSource.getcX())+String.format("%02d", sysSource.getcY()); valueList.add(value); // 直接添加到 List // 直接添加Id即可, 每个作品只对应一个Id mapId.put(userWork.getWorkName(),userWork.getWorkId()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/BackstageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/BackstageController.java index 8d8bb8cb..9bf4995c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/BackstageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/BackstageController.java @@ -433,7 +433,9 @@ public class BackstageController { return error("无权限访问"); } - @Log(title = "系统登录--账密登录", businessType = BusinessType.OTHER) + + //------------------------------------------------旧版系统登录------------------------------------------------- +// @Log(title = "系统登录--账密登录", businessType = BusinessType.OTHER) // 后台账密登录 @PostMapping("/loginPassword") public AjaxResult loginPassword(@RequestBody AppLoginBody loginBody) { @@ -444,6 +446,7 @@ public class BackstageController { return ajax; } + @Log(title = "系统登录--验证码登录", businessType = BusinessType.OTHER) // 后台验证码登录 @PostMapping("/loginSms") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java index 829b3b71..0869fa15 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysAppUserController.java @@ -200,7 +200,7 @@ public class SysAppUserController { @GetMapping("/getOnlineTime/{day}") public AjaxResult getOnlineTime(@PathVariable int day){ LocalDate now = LocalDate.now(); - LocalDate startDate = now.minusDays(day+1); + LocalDate startDate = now.minusDays(day); LocalDate endDate = now.minusDays(1); // 实际要返回的方法 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java index 7263af63..ee28b7b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java @@ -93,7 +93,7 @@ public class SysMarketController extends BaseController { //------------------------------------真实接口---------------------------------------------- LocalDate now = LocalDate.now(); - LocalDate startDate = now.minusDays(day+1); + LocalDate startDate = now.minusDays(day); LocalDate endDate = now.minusDays(1); List sysIncomeDtoList = dailySysService.getSysIncome(startDate, endDate); return success(sysIncomeDtoList); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java index f1aa2c1a..3edcda72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java @@ -334,7 +334,7 @@ public class SysWorkReviewController extends BaseController { for(SysSource sysSource:sysSourceList){ List valueList = mapSource.computeIfAbsent(sysSource.getCity()+sysSource.getScenic(), k -> new ArrayList<>()); // 添加资源位坐标 - String value = sysSource.getPart()+String.format("%2d", sysSource.getcX())+String.format("%2d", sysSource.getcY()); + String value = sysSource.getPart()+String.format("%02d", sysSource.getcX())+String.format("%02d", sysSource.getcY()); valueList.add(value); // 直接添加到 List mapTime.put(sysSource.getCity()+sysSource.getScenic(), sysSource.getStartTime()+"至"+sysSource.getEndTime()); } @@ -354,7 +354,7 @@ public class SysWorkReviewController extends BaseController { // 审核不通过 else if(workStatus.equals("4")){ sysUserNotification.setType("4"); - msg = "很遗憾地通知您，您提交的<<" + userWork.getWorkName() + "在审核过程中未能通过，主要原因是内容涉及了不符合平台规定的违法或敏感字样，请重新提交审核。"; + msg = "很遗憾地通知您，您提交的<<" + userWork.getWorkName() + ">>在审核过程中未能通过，主要原因是内容涉及了不符合平台规定的违法或敏感字样，请重新提交审核。"; } else{ return error("请选择审核状态"); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 262f3ff8..e1553e10 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,8 +18,8 @@ ruoyi: # 腾讯云 # domain: http://82.156.153.112:8081 -# 火山云 -# domain: http://14.103.162.172:8081 +# 火山云, 域名解析 +# domain: https://www.lookthere.net # # idCardPath: /home/IdCard # profile: /home/uploadPath @@ -30,6 +30,8 @@ ruoyi: # 开发环境配置 server: + # 仅允许本地访问 +# address: 127.0.0.1 # 仅允许本地访问 # 服务器的HTTP端口，默认为8080 port: 8081 servlet: @@ -90,12 +92,15 @@ spring: # host: 172.17.0.3 # 腾讯云 # host: 172.17.0.2 #火山云 +# host: 172.17.0.6 #火山云 新redis + # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 密码 - password: + password: +# password: dnxxkj0703 # 连接超时时间 timeout: 10s lettuce: