From 27d2f13fc540190dbb6b9c5a84e1395bad52588a Mon Sep 17 00:00:00 2001 From: lizhicheng Date: Wed, 26 Oct 2022 18:01:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=B7=B2=E4=B8=8B=E6=9E=B6=E3=80=81=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8D=95=E4=BD=8D=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=81=A9=E7=A7=91=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db/V7.0__enke_hostinfo_add_table.sql | 14 ++++++++++++-- .../activiti/service/impl/ActivitiServiceImpl.java | 14 +++++++------- .../modules/security/config/ShiroConfig.java | 1 + .../main/resources/mapper/resource/ResourceDao.xml | 12 ++++++------ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/config/db/V7.0__enke_hostinfo_add_table.sql b/config/db/V7.0__enke_hostinfo_add_table.sql index 9a4b6e86..e966f635 100644 --- a/config/db/V7.0__enke_hostinfo_add_table.sql +++ b/config/db/V7.0__enke_hostinfo_add_table.sql @@ -39,6 +39,16 @@ VALUES (11, '市公安局', '市公安局', '127.0.0.1', '127.0.0.1', '2022-09-1 INSERT INTO `enke_hostinfo` VALUES (12, '市交通运输局', '市交通运输局', '127.0.0.1', '127.0.0.1', '2022-09-11 09:20:07'); INSERT INTO `enke_hostinfo` -VALUES (13, '一网统揽平台组', '一网统揽平台组', '127.0.0.1', '127.0.0.1', '2022-09-10 09:20:07'); +VALUES (13, '一网统揽平台组', '一网统揽平台组', '127.0.0.1', '127.0.0.1', '2022-09-29 09:20:07'); INSERT INTO `enke_hostinfo` -VALUES (14, '青岛市一网统揽项目组', '青岛市一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-09 09:20:07'); +VALUES (14, '青岛市一网统揽项目组', '青岛市一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-30 09:20:07'); +INSERT INTO `enke_hostinfo` +VALUES (15, '市北区一网统揽项目组', '市北区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-28 09:20:07'); +INSERT INTO `enke_hostinfo` +VALUES (16, '李沧区一网统揽项目组', '李沧区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-27 09:20:07'); +INSERT INTO `enke_hostinfo` +VALUES (17, '崂山区一网统揽项目组', '崂山区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-26 09:20:07'); +INSERT INTO `enke_hostinfo` +VALUES (18, ' 西海岸新区一网统揽项目组', ' 西海岸新区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-25 09:20:07'); +INSERT INTO `enke_hostinfo` +VALUES (19, ' 城阳区一网统揽项目组', ' 城阳区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-24 09:20:07'); diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java index 692a59cf..e0db8444 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java @@ -93,16 +93,16 @@ public class ActivitiServiceImpl extends BaseServiceImpl 0) { - builder.append(duration.toDays() + "d "); - builder.append(duration.minus(Duration.ofDays(duration.toDays())).toHours() + "h"); + builder.append(duration.toDays() + "天 "); + builder.append(duration.minus(Duration.ofDays(duration.toDays())).toHours() + "时"); } else if (duration.toHours() > 0) { - builder.append(duration.toHours() + "h "); - builder.append(duration.minus(Duration.ofHours(duration.toHours())).toMinutes() + "m"); + builder.append(duration.toHours() + "时 "); + builder.append(duration.minus(Duration.ofHours(duration.toHours())).toMinutes() + "分"); } else if (duration.toMinutes() > 0) { - builder.append(duration.toMinutes() + "m "); - builder.append(duration.minus(Duration.ofMinutes(duration.toMinutes())).getSeconds() + "s"); + builder.append(duration.toMinutes() + "分 "); + builder.append(duration.minus(Duration.ofMinutes(duration.toMinutes())).getSeconds() + "秒"); } else { - builder.append(second + "s"); + builder.append(second + "秒"); } return builder.toString(); } diff --git a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java index 0eec36a3..7965f2f6 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java +++ b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java @@ -85,6 +85,7 @@ public class ShiroConfig { filterMap.put("/census/center/**", "anon"); // 全局各类统计 包含 /census/center/v2 filterMap.put("/metrics/**", "anon"); filterMap.put("/gateway-monitor/**", "anon"); + filterMap.put("/enke/**", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 710318ac..52404ca8 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1855,16 +1855,16 @@ tdr.type = '业务组件') - AND tdr.del_flag in (0, 5) + AND tdr.del_flag=0 - AND tdr.del_flag not in (0, 1, 5, 6) + AND tdr.del_flag in (2, 3, 4) AND tdr.del_flag=6 - AND tdr.del_flag != 1 + AND tdr.del_flag in (0, 2, 3, 4, 6) @@ -1899,16 +1899,16 @@ WHERE 1=1 AND tdr.dept_id=sd.id - AND tdr.del_flag in (0, 5) + AND tdr.del_flag=0 - AND tdr.del_flag not in (0, 1, 5, 6) + AND tdr.del_flag in (2, 3, 4) AND tdr.del_flag=6 - AND tdr.del_flag != 1 + AND tdr.del_flag in (0, 2, 3, 4, 6)