From d98e2adb3791f998c883f613683a17039e97c8f7 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 30 Dec 2024 12:09:24 +0800 Subject: [PATCH 01/13] add permission --- .../ruoyi/web/controller/common/CommonController.java | 3 +-- .../web/controller/system/SysConfigController.java | 1 + .../ruoyi/web/controller/system/SysDeptController.java | 6 ++++-- .../web/controller/system/SysDictDataController.java | 1 + .../web/controller/system/SysDictTypeController.java | 4 ++-- .../ruoyi/web/controller/system/SysMenuController.java | 1 + .../web/controller/system/SysNoticeController.java | 1 + .../ruoyi/web/controller/system/SysPostController.java | 10 ++-------- .../ruoyi/web/controller/system/SysRoleController.java | 2 ++ .../ruoyi/web/controller/system/SysUserController.java | 2 ++ .../src/main/resources/vm/java/controller.java.vm | 1 + .../com/ruoyi/quartz/controller/SysJobController.java | 1 + 12 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index c2db93ac9..7f02469d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -139,8 +139,7 @@ public class CommonController * 本地资源通用下载 */ @GetMapping("/download/resource") - public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) - throws Exception + public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) throws Exception { try { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 9c0bdbe22..0a43e3bcc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -68,6 +68,7 @@ public class SysConfigController extends BaseController /** * 新增参数配置 */ + @RequiresPermissions("system:config:add") @GetMapping("/add") public String add() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index fad2736e8..39d4d2138 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -54,6 +54,7 @@ public class SysDeptController extends BaseController /** * 新增部门 */ + @RequiresPermissions("system:dept:add") @GetMapping("/add/{parentId}") public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) { @@ -163,9 +164,9 @@ public class SysDeptController extends BaseController * @param deptId 部门ID * @param excludeId 排除ID */ + @RequiresPermissions("system:dept:list") @GetMapping(value = { "/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}" }) - public String selectDeptTree(@PathVariable("deptId") Long deptId, - @PathVariable(value = "excludeId", required = false) Long excludeId, ModelMap mmap) + public String selectDeptTree(@PathVariable("deptId") Long deptId, @PathVariable(value = "excludeId", required = false) Long excludeId, ModelMap mmap) { mmap.put("dept", deptService.selectDeptById(deptId)); mmap.put("excludeId", excludeId); @@ -175,6 +176,7 @@ public class SysDeptController extends BaseController /** * 加载部门列表树（排除下级） */ + @RequiresPermissions("system:dept:list") @GetMapping("/treeData/{excludeId}") @ResponseBody public List treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index d7fe5ef74..770766fd4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -65,6 +65,7 @@ public class SysDictDataController extends BaseController /** * 新增字典类型 */ + @RequiresPermissions("system:dict:add") @GetMapping("/add/{dictType}") public String add(@PathVariable("dictType") String dictType, ModelMap mmap) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 136b00f37..1a6f230ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -67,6 +67,7 @@ public class SysDictTypeController extends BaseController /** * 新增字典类型 */ + @RequiresPermissions("system:dict:add") @GetMapping("/add") public String add() { @@ -167,8 +168,7 @@ public class SysDictTypeController extends BaseController * 选择字典树 */ @GetMapping("/selectDictTree/{columnId}/{dictType}") - public String selectDeptTree(@PathVariable("columnId") Long columnId, @PathVariable("dictType") String dictType, - ModelMap mmap) + public String selectDeptTree(@PathVariable("columnId") Long columnId, @PathVariable("dictType") String dictType, ModelMap mmap) { mmap.put("columnId", columnId); mmap.put("dict", dictTypeService.selectDictTypeByType(dictType)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 30ab7955f..1dd7b93b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -77,6 +77,7 @@ public class SysMenuController extends BaseController /** * 新增 */ + @RequiresPermissions("system:menu:add") @GetMapping("/add/{parentId}") public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index c83af2824..aff927972 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -56,6 +56,7 @@ public class SysNoticeController extends BaseController /** * 新增公告 */ + @RequiresPermissions("system:notice:add") @GetMapping("/add") public String add() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 22aea2e0f..f4e36a2f6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -68,19 +68,13 @@ public class SysPostController extends BaseController @ResponseBody public AjaxResult remove(String ids) { - try - { - return toAjax(postService.deletePostByIds(ids)); - } - catch (Exception e) - { - return error(e.getMessage()); - } + return toAjax(postService.deletePostByIds(ids)); } /** * 新增岗位 */ + @RequiresPermissions("system:post:add") @GetMapping("/add") public String add() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 2cdf08055..cb6a1194c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -77,6 +77,7 @@ public class SysRoleController extends BaseController /** * 新增角色 */ + @RequiresPermissions("system:role:add") @GetMapping("/add") public String add() { @@ -275,6 +276,7 @@ public class SysRoleController extends BaseController /** * 选择用户 */ + @RequiresPermissions("system:role:list") @GetMapping("/authUser/selectUser/{roleId}") public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index fd894445b..93edc9c5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -113,6 +113,7 @@ public class SysUserController extends BaseController /** * 新增用户 */ + @RequiresPermissions("system:user:add") @GetMapping("/add") public String add(ModelMap mmap) { @@ -242,6 +243,7 @@ public class SysUserController extends BaseController /** * 进入授权角色页 */ + @RequiresPermissions("system:user:edit") @GetMapping("/authRole/{userId}") public String authRole(@PathVariable("userId") Long userId, ModelMap mmap) { diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index 8ce683e50..a2dc8ec92 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -91,6 +91,7 @@ public class ${ClassName}Controller extends BaseController /** * 新增${functionName} */ + @RequiresPermissions("${permissionPrefix}:add") @GetMapping("/add") public String add() { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index 6cbe3114b..e4d5cc369 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -118,6 +118,7 @@ public class SysJobController extends BaseController /** * 新增调度 */ + @RequiresPermissions("monitor:job:add") @GetMapping("/add") public String add() { From a3b8727b94ab3627a7fccbd637cb06ff244f6659 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 7 Jan 2025 10:26:29 +0800 Subject: [PATCH 02/13] copyright 2025 --- .../src/main/resources/application.yml | 2 +- .../src/main/resources/static/img/qr_code.png | Bin 8602 -> 1590 bytes .../src/main/resources/templates/login.html | 2 +- .../src/main/resources/templates/main.html | 7 +------ .../main/resources/templates/register.html | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 990171754..ffb65e8bd 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ ruoyi: # 版本 version: 4.8.0 # 版权年份 - copyrightYear: 2024 + copyrightYear: 2025 # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） diff --git a/ruoyi-admin/src/main/resources/static/img/qr_code.png b/ruoyi-admin/src/main/resources/static/img/qr_code.png index ecba6d6a6de54d434ecc95374da3191248f9235e..f2740865d6e1ebc2112660b551cc8b64765eb1e0 100644 GIT binary patch literal 1590 zcmeAS@N?(olHy`uVBq!ia0y~yVAKI&4kn<;H+e}VAjMhW5n0T@z;^_M8K-LVNi#68 zzVLK$45^s&_O4^z6AJ-`gCCRr|4)5iDJCJyv1-#T;ll0Fx!MPvJFi^-{{6fDg3tc7 zj32fOD;{y-Fcft1X%QgE{QdpS@qPRDy^A}(r2Q~U-~Q`2-|wkYO@FR3C-$NA{?E(r zg`Z!8)tEO05&siT?))|R@Vn>zv*-B6|G!qf?74hxyzOQoY&LKFefSsqb@sX5Y&(vx z%Wv8LFEZa|Z^7N=_rt@SIywcClv-wRD5@ctW>#zN=T|8IbkA?8|F_1!zAtIgR7_Ps z4U*UXKdU@a^LNef&GW5hpLlP1Vc!3Z*qv}O@$dbew}1WGKJSmQT>p>ra)B0~Uw)s8 z-Q2tK*XqCUy?ea)?)02p`~L;=_xUSYe7^Yos_ohG3{W^KR z>fa9eGhSFD!ma<{{(Y){&U|3_wdf3MrW?(N==)!o3TeDk4m=4N&8Z}wuv ze=Zz;BA@bOb?o-%t&-jmoXCL&3%?sLK8mHUlXu>5{HAN%|E$Bx|5T4hze!X@3uB1# zc=?TAfB3h>=WTrcmbIK$-gLu%o5qLrGjRmV{Yd+r(xz=J4EnbLWIB9)H`0HRv}Up8M5*f8pOLKYK0z{nLGW`2P!4cV3%_BFX)0 zS|(u0U2h7~|N7tcsLLr5`FHFj!*%`SPx8NBn)hQ5%-(lv?iXkMJ(wzUyT0t8^z@G} zci&Zy#2Tf*+)?)9$eFLllj=68=BG;3olE=wzv}$`Q`l1&-+k9Yv*~y0uO0X}kyqZf z%>H-l@%YMp@7&8_+U=j-W;!#Bf!cUbPj n9;34F*0ASc4_|yG@^Aix!-`E_49lH?6#;{%tDnm{r-UW|xrC#$ literal 8602 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 diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html index e92b71fc1..abf4108ce 100644 --- a/ruoyi-admin/src/main/resources/templates/login.html +++ b/ruoyi-admin/src/main/resources/templates/login.html @@ -65,7 +65,7 @@ diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index e3daa0beb..82a7e980f 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -15,12 +15,7 @@
- 领取阿里云通用云产品1888优惠券 -
https://www.aliyun.com/minisite/goods?userCode=brki8iof
- 领取腾讯云通用云产品2860优惠券 -
https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console
阿里云服务器折扣区 ☛☛点我进入☚☚     腾讯云服务器秒杀区 ☛☛点我进入☚☚
-

云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)

@@ -59,7 +54,7 @@
  • 安全框架：Apache Shiro。
  • 模板引擎：Thymeleaf。
  • 持久层框架：MyBatis。
    • -
  • 定时任务:Quartz。
    • +
  • 定时任务：Quartz。
  • 数据库连接池：Druid。
  • 工具类：Fastjson。
  • 更多……
    • diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html index 272f866f8..f9dad268a 100644 --- a/ruoyi-admin/src/main/resources/templates/register.html +++ b/ruoyi-admin/src/main/resources/templates/register.html @@ -64,7 +64,7 @@
    From 568787a12a80d6290dba74ff9177ef7f5da1a2ed Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 26 Feb 2025 10:45:58 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E5=80=BC=E5=B8=A6=E6=8B=AC?= =?UTF-8?q?=E5=8F=B7=E6=97=B6=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98(IBEBOX)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/utils/StringUtils.java | 26 +++++++++++++++++++ .../com/ruoyi/quartz/util/JobInvokeUtil.java | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java index b623672a7..2dfa412f1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java @@ -286,6 +286,32 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils return str.substring(start, end); } + /** + * 在字符串中查找第一个出现的 `open` 和最后一个出现的 `close` 之间的子字符串 + * + * @param str 要截取的字符串 + * @param open 起始字符串 + * @param close 结束字符串 + * @return 截取结果 + */ + public static String substringBetweenLast(final String str, final String open, final String close) + { + if (isEmpty(str) || isEmpty(open) || isEmpty(close)) + { + return NULLSTR; + } + final int start = str.indexOf(open); + if (start != INDEX_NOT_FOUND) + { + final int end = str.lastIndexOf(close); + if (end != INDEX_NOT_FOUND) + { + return str.substring(start + open.length(), end); + } + } + return NULLSTR; + } + /** * 格式化文本, {} 表示占位符
    * 此方法只是简单将占位符 {} 按照顺序替换为参数
    diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java index 9a90d7b14..86fdb927f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java @@ -105,7 +105,7 @@ public class JobInvokeUtil */ public static List getMethodParams(String invokeTarget) { - String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); + String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")"); if (StringUtils.isEmpty(methodStr)) { return null; From 2537abd0951e295d702b7a26760bff633b315727 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 26 Feb 2025 12:23:50 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8DsuccessCallback?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AF=B9=E4=BA=8E=E9=9D=9E=E7=89=B9=E5=AE=9A?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=B1=BB=E5=9E=8B=E6=97=A0=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E9=97=AE=E9=A2=98(IBG6ZD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 8dcfc9087..d55bfe387 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1319,16 +1319,17 @@ var table = { if (result.code == web_status.SUCCESS) { var parent = activeWindow(); if ($.common.isEmpty(parent.table)) { - $.modal.msgSuccessReload(result.msg); + $.modal.msgSuccessReload(result.msg); } else if (parent.table.options.type == table_type.bootstrapTable) { - $.modal.close(); parent.$.modal.msgSuccess(result.msg); parent.$.table.refresh(); } else if (parent.table.options.type == table_type.bootstrapTreeTable) { - $.modal.close(); parent.$.modal.msgSuccess(result.msg); parent.$.treeTable.refresh(); + } else { + parent.$.modal.msgSuccess(result.msg); } + $.modal.close(); } else if (result.code == web_status.WARNING) { $.modal.alertWarning(result.msg) } else { From 5bbddedc8057a342e3c27c76df646512c62ec53f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 26 Feb 2025 17:00:26 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E7=A7=BB=E9=99=A4login=5Fname=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 8c035905d..76c29fa8f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -170,7 +170,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_user dept_id = #{deptId}, - login_name = #{loginName}, user_name = #{userName}, user_type = #{userType}, email = #{email}, From 9f1089ff71cc5a61e219c52bb374d08dd01befb7 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 27 Feb 2025 10:56:49 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=BE=A4?= =?UTF-8?q?=E5=8F=B7=EF=BC=9A180208928?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- ruoyi-admin/src/main/resources/templates/main.html | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4548a4a6f..aeefe48fe 100644 --- a/README.md +++ b/README.md @@ -98,4 +98,4 @@ ## 若依交流群 -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN) [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW) [![加入QQ群](https://img.shields.io/badge/已满-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z) [![加入QQ群](https://img.shields.io/badge/已满-1772718-blue.svg)](https://jq.qq.com/?_wv=1027&k=5g75dCU) [![加入QQ群](https://img.shields.io/badge/已满-1366522-blue.svg)](https://jq.qq.com/?_wv=1027&k=58cPoHA) [![加入QQ群](https://img.shields.io/badge/已满-1382251-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Ofd4Pb) [![加入QQ群](https://img.shields.io/badge/已满-1145125-blue.svg)](https://jq.qq.com/?_wv=1027&k=5yugASz) [![加入QQ群](https://img.shields.io/badge/已满-86752435-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Rf3d2P) [![加入QQ群](https://img.shields.io/badge/已满-134072510-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ZIjaeP) [![加入QQ群](https://img.shields.io/badge/已满-210336300-blue.svg)](https://jq.qq.com/?_wv=1027&k=5CJw1jY) [![加入QQ群](https://img.shields.io/badge/已满-339522636-blue.svg)](https://jq.qq.com/?_wv=1027&k=5omzbKc) [![加入QQ群](https://img.shields.io/badge/已满-130035985-blue.svg)](https://jq.qq.com/?_wv=1027&k=qPIKBb7s) [![加入QQ群](https://img.shields.io/badge/已满-143151071-blue.svg)](https://jq.qq.com/?_wv=1027&k=4NsjKbtU) [![加入QQ群](https://img.shields.io/badge/已满-158781320-blue.svg)](https://jq.qq.com/?_wv=1027&k=VD2pkz2G) [![加入QQ群](https://img.shields.io/badge/已满-201531282-blue.svg)](https://jq.qq.com/?_wv=1027&k=HlshFwkJ) [![加入QQ群](https://img.shields.io/badge/已满-101526938-blue.svg)](https://jq.qq.com/?_wv=1027&k=0ARRrO9V) [![加入QQ群](https://img.shields.io/badge/已满-264355400-blue.svg)](https://jq.qq.com/?_wv=1027&k=up9k3ZXJ) [![加入QQ群](https://img.shields.io/badge/已满-298522656-blue.svg)](https://jq.qq.com/?_wv=1027&k=540WfdEr) [![加入QQ群](https://img.shields.io/badge/已满-139845794-blue.svg)](https://jq.qq.com/?_wv=1027&k=ss91fC4t) [![加入QQ群](https://img.shields.io/badge/已满-185760789-blue.svg)](https://jq.qq.com/?_wv=1027&k=Cqd66IKe) [![加入QQ群](https://img.shields.io/badge/已满-175104288-blue.svg)](https://jq.qq.com/?_wv=1027&k=7FplYUnR) [![加入QQ群](https://img.shields.io/badge/已满-174942938-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lqMHu_5Fskm7H2S1vNAQTtzAUokVydwc&authKey=ptw0Fpch5pbNocML3CIJKKqZBaq2DI7cusKuzIgfMNiY3t9Pvd9hP%2BA8WYx3yaY1&noverify=0&group_code=174942938) [![加入QQ群](https://img.shields.io/badge/已满-287843737-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=blYlRDmwZXSXI5pVrPPU7ZJ1stFJ6Q2Q&authKey=ForGBWffHVlPt9NE3d7g4DoOIouBh%2BqvAj2lp1CLReHfZAUaK7SRrdwsChKpRJDJ&noverify=0&group_code=287843737) [![加入QQ群](https://img.shields.io/badge/232896766-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=KTVAIhggR3rR3uZWK9A8kR4yYNREQ4jo&authKey=An4DUV9e7uK8I8VgBbp949z0ypQoDrOoqvVg%2FWOr2vuNNDMZUAMPvqHor6TFMIgz&noverify=0&group_code=232896766) \ No newline at end of file +QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN) [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW) [![加入QQ群](https://img.shields.io/badge/已满-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z) [![加入QQ群](https://img.shields.io/badge/已满-1772718-blue.svg)](https://jq.qq.com/?_wv=1027&k=5g75dCU) [![加入QQ群](https://img.shields.io/badge/已满-1366522-blue.svg)](https://jq.qq.com/?_wv=1027&k=58cPoHA) [![加入QQ群](https://img.shields.io/badge/已满-1382251-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Ofd4Pb) [![加入QQ群](https://img.shields.io/badge/已满-1145125-blue.svg)](https://jq.qq.com/?_wv=1027&k=5yugASz) [![加入QQ群](https://img.shields.io/badge/已满-86752435-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Rf3d2P) [![加入QQ群](https://img.shields.io/badge/已满-134072510-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ZIjaeP) [![加入QQ群](https://img.shields.io/badge/已满-210336300-blue.svg)](https://jq.qq.com/?_wv=1027&k=5CJw1jY) [![加入QQ群](https://img.shields.io/badge/已满-339522636-blue.svg)](https://jq.qq.com/?_wv=1027&k=5omzbKc) [![加入QQ群](https://img.shields.io/badge/已满-130035985-blue.svg)](https://jq.qq.com/?_wv=1027&k=qPIKBb7s) [![加入QQ群](https://img.shields.io/badge/已满-143151071-blue.svg)](https://jq.qq.com/?_wv=1027&k=4NsjKbtU) [![加入QQ群](https://img.shields.io/badge/已满-158781320-blue.svg)](https://jq.qq.com/?_wv=1027&k=VD2pkz2G) [![加入QQ群](https://img.shields.io/badge/已满-201531282-blue.svg)](https://jq.qq.com/?_wv=1027&k=HlshFwkJ) [![加入QQ群](https://img.shields.io/badge/已满-101526938-blue.svg)](https://jq.qq.com/?_wv=1027&k=0ARRrO9V) [![加入QQ群](https://img.shields.io/badge/已满-264355400-blue.svg)](https://jq.qq.com/?_wv=1027&k=up9k3ZXJ) [![加入QQ群](https://img.shields.io/badge/已满-298522656-blue.svg)](https://jq.qq.com/?_wv=1027&k=540WfdEr) [![加入QQ群](https://img.shields.io/badge/已满-139845794-blue.svg)](https://jq.qq.com/?_wv=1027&k=ss91fC4t) [![加入QQ群](https://img.shields.io/badge/已满-185760789-blue.svg)](https://jq.qq.com/?_wv=1027&k=Cqd66IKe) [![加入QQ群](https://img.shields.io/badge/已满-175104288-blue.svg)](https://jq.qq.com/?_wv=1027&k=7FplYUnR) [![加入QQ群](https://img.shields.io/badge/已满-174942938-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lqMHu_5Fskm7H2S1vNAQTtzAUokVydwc&authKey=ptw0Fpch5pbNocML3CIJKKqZBaq2DI7cusKuzIgfMNiY3t9Pvd9hP%2BA8WYx3yaY1&noverify=0&group_code=174942938) [![加入QQ群](https://img.shields.io/badge/已满-287843737-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=blYlRDmwZXSXI5pVrPPU7ZJ1stFJ6Q2Q&authKey=ForGBWffHVlPt9NE3d7g4DoOIouBh%2BqvAj2lp1CLReHfZAUaK7SRrdwsChKpRJDJ&noverify=0&group_code=287843737) [![加入QQ群](https://img.shields.io/badge/已满-232896766-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=KTVAIhggR3rR3uZWK9A8kR4yYNREQ4jo&authKey=An4DUV9e7uK8I8VgBbp949z0ypQoDrOoqvVg%2FWOr2vuNNDMZUAMPvqHor6TFMIgz&noverify=0&group_code=232896766) [![加入QQ群](https://img.shields.io/badge/180208928-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XwhV8deuZXt__yteR1clNanVSXzA-ugq&authKey=ezgwKqEZPdP%2FgC9I03OBkJb%2Biii8yvVfwrcQuu0%2FL6ILXcRdHYDBFKCXeoeBT0E6&noverify=0&group_code=180208928) \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 82a7e980f..b54b71dc4 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -13,13 +13,6 @@
    -
    -
    - 阿里云服务器折扣区 ☛☛点我进入☚☚     腾讯云服务器秒杀区 ☛☛点我进入☚☚
    -
    - -
    -

    Hello,Guest

    移动设备访问请扫描以下二维码： @@ -74,7 +67,7 @@

    官网：http://www.ruoyi.vip

    -

    QQ群：满1389287 满1679294 满1529866 满1772718 满1366522 满1382251 满1145125 满86752435 满134072510 满210336300 满339522636 满130035985 满143151071 满158781320 满201531282 满101526938 满264355400 满298522656 满139845794 满185760789 满175104288 满174942938 满287843737 232896766 +

    QQ群：满1389287 满1679294 满1529866 满1772718 满1366522 满1382251 满1145125 满86752435 满134072510 满210336300 满339522636 满130035985 满143151071 满158781320 满201531282 满101526938 满264355400 满298522656 满139845794 满185760789 满175104288 满174942938 满287843737 满232896766 180208928

    微信：/ *若依

    From 53e20d414bacadc0e6403c20cd6ff97c48adc621 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 27 Feb 2025 20:23:51 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/page/TableDataInfo.java | 2 +- ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java | 3 +-- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 3 +-- .../src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 2 +- .../com/ruoyi/framework/shiro/service/SysLoginService.java | 2 +- .../java/com/ruoyi/quartz/controller/SysJobController.java | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java index 29f60e7fc..766cf0a23 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable * @param list 列表数据 * @param total 总记录数 */ - public TableDataInfo(List list, int total) + public TableDataInfo(List list, long total) { this.rows = list; this.total = total; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java index 5e5391224..f80fb7c93 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java @@ -108,7 +108,6 @@ public class Arith "The scale must be a positive integer or zero"); } BigDecimal b = new BigDecimal(Double.toString(v)); - BigDecimal one = BigDecimal.ONE; - return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue(); + return b.divide(BigDecimal.ONE, scale, RoundingMode.HALF_UP).doubleValue(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 1ac9ed934..271bf5af4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -1448,8 +1448,7 @@ public class ExcelUtil */ public String encodingFilename(String filename) { - filename = UUID.randomUUID() + "_" + filename + ".xlsx"; - return filename; + return UUID.randomUUID() + "_" + filename + ".xlsx"; } /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index d40b0f8ed..2bab53f4d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -49,7 +49,7 @@ public class LogAspect * 处理请求前执行 */ @Before(value = "@annotation(controllerLog)") - public void boBefore(JoinPoint joinPoint, Log controllerLog) + public void doBefore(JoinPoint joinPoint, Log controllerLog) { TIME_THREADLOCAL.set(System.currentTimeMillis()); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java index 22de728ca..779b19127 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java @@ -163,7 +163,7 @@ public class SysLoginService // 设置permissions属性，以便数据权限匹配权限 for (SysRole role : roles) { - if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL)) + if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin()) { Set rolePerms = menuService.selectPermsByRoleId(role.getRoleId()); role.setPermissions(rolePerms); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java index e4d5cc369..7dd35a6ec 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java @@ -229,7 +229,7 @@ public class SysJobController extends BaseController } /** - * 查询cron表达式近5次的执行时间 + * 查询cron表达式近10次的执行时间 */ @GetMapping("/queryCronExpression") @ResponseBody From 21cd7b452a25b95e513c38bd52a4a60bce0a6ab5 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 27 Feb 2025 20:23:59 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=88=E8=87=AA=E5=AE=9A=E4=B9=89radio/che?= =?UTF-8?q?ckbox=E7=9A=84name=E5=80=BC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index d55bfe387..0784ff31d 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -144,6 +144,7 @@ var table = { rowStyle: options.rowStyle, // 通过自定义函数设置行样式 footerStyle: options.footerStyle, // 通过自定义函数设置页脚样式 headerStyle: options.headerStyle, // 通过自定义函数设置标题样式 + selectItemName: options.selectItemName, // 自定义radio/checkbox的name值 columns: options.columns, // 显示列信息（*） data: options.data, // 被加载的数据 responseHandler: $.table.responseHandler, // 在加载服务器发送来的数据之前处理函数 From 6c3e3af07466abc5f577edf571cf6c6906905d1c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 28 Feb 2025 12:24:58 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=8D=87=E7=BA=A7tomcat=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC9.0.100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2b651d83..ab639de04 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 4.1.2 2.3 - 9.0.96 + 9.0.100 1.2.13 5.3.39 From 30f31c63ff91b6a846b618e1062b74e72ba84ae9 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 28 Feb 2025 19:48:59 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=E6=97=B6=E6=97=A5=E5=BF=97=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=AE=B0=E5=BD=95=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 2bab53f4d..f869aa363 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -20,7 +20,9 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.support.spring.PropertyPreFilters; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessStatus; +import com.ruoyi.common.utils.ExceptionUtil; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; @@ -104,7 +106,7 @@ public class LogAspect if (e != null) { operLog.setStatus(BusinessStatus.FAIL.ordinal()); - operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); + operLog.setErrorMsg(StringUtils.substring(Convert.toStr(e.getMessage(), ExceptionUtil.getExceptionMessage(e)), 0, 2000)); } // 设置方法名称 String className = joinPoint.getTarget().getClass().getName(); From 7a787b583036230868f1a60b96dec2262f95d57c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 1 Mar 2025 15:45:06 +0800 Subject: [PATCH 11/13] =?UTF-8?q?HttpUtils=E5=8A=A0=E5=85=A5=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E7=B1=BB=E5=9E=8B=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/utils/http/HttpUtils.java | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java index 46f56ab02..d50578915 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -21,6 +21,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.StringUtils; +import org.springframework.http.MediaType; /** * 通用http发送方法 @@ -125,6 +126,19 @@ public class HttpUtils * @return 所代表远程资源的响应结果 */ public static String sendPost(String url, String param) + { + return sendPost(url, param, MediaType.APPLICATION_FORM_URLENCODED_VALUE); + } + + /** + * 向指定 URL 发送POST方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数 + * @param contentType 内容类型 + * @return 所代表远程资源的响应结果 + */ + public static String sendPost(String url, String param, String contentType) { PrintWriter out = null; BufferedReader in = null; @@ -138,7 +152,7 @@ public class HttpUtils conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"); conn.setRequestProperty("Accept-Charset", "utf-8"); - conn.setRequestProperty("contentType", "utf-8"); + conn.setRequestProperty("Content-Type", contentType); conn.setDoOutput(true); conn.setDoInput(true); out = new PrintWriter(conn.getOutputStream()); @@ -190,6 +204,11 @@ public class HttpUtils } public static String sendSSLPost(String url, String param) + { + return sendSSLPost(url, param, MediaType.APPLICATION_FORM_URLENCODED_VALUE); + } + + public static String sendSSLPost(String url, String param, String contentType) { StringBuilder result = new StringBuilder(); String urlNameString = url + "?" + param; @@ -204,7 +223,7 @@ public class HttpUtils conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"); conn.setRequestProperty("Accept-Charset", "utf-8"); - conn.setRequestProperty("contentType", "utf-8"); + conn.setRequestProperty("Content-Type", contentType); conn.setDoOutput(true); conn.setDoInput(true); @@ -216,7 +235,7 @@ public class HttpUtils String ret = ""; while ((ret = br.readLine()) != null) { - if (ret != null && !ret.trim().equals("")) + if (ret != null && !"".equals(ret.trim())) { result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)); } From 63800dcbd1f697ee92deea1cb967a783ac0a0f0a Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 1 Mar 2025 15:45:54 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BAExcel?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8F=8C=E5=87=BB=E7=A6=BB?= =?UTF-8?q?=E5=BC=80=E5=90=8E=E4=B8=8E=E8=AE=BE=E5=AE=9A=E7=9A=84=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 271bf5af4..00ed75da8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -1148,6 +1148,7 @@ public class ExcelUtil String dictType = attr.dictType(); if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) { + cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat)); cell.setCellValue(parseDateToStr(dateFormat, value)); } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) From 45d8fe0c168b5e255c0c67db77fd4a40ec73f412 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 4 Mar 2025 20:20:04 +0800 Subject: [PATCH 13/13] update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ab639de04..92e31265a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 4.1.2 2.3 - 9.0.100 + 9.0.98 1.2.13 5.3.39