From 40c6e427444ac21e6c4f86e9b8c70cea6008c0fc Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 3 May 2021 13:44:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8C=89=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/web/user/EmpUserController.java | 8 +++++++ .../views/modules/sys/user/empUserList.html | 23 ++++++++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 49980f0e..47728572 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -87,6 +87,10 @@ public class EmpUserController extends BaseController { @RequiresPermissions("sys:empUser:view") @RequestMapping(value = "list") public String list(EmpUser empUser, Model model) { + // 获取角色列表 + Role role = new Role(); + role.setUserType(User.USER_TYPE_EMPLOYEE); + model.addAttribute("roleList", roleService.findList(role)); // 获取岗位列表 Post post = new Post(); model.addAttribute("postList", postService.findList(post)); @@ -427,6 +431,10 @@ public class EmpUserController extends BaseController { if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){ model.addAttribute("selectData", selectDataJson); } + // 获取角色列表 + Role role = new Role(); + role.setUserType(User.USER_TYPE_MEMBER); + model.addAttribute("roleList", roleService.findList(role)); model.addAttribute("empUser", empUser); return "modules/sys/user/empUserSelect"; } diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 24bedeac..7c8d41dd 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -52,7 +52,7 @@
-
+
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
@@ -87,18 +87,25 @@ <#form:input path="email" maxlength="300" class="form-control width-90"/>
-
- -
- <#form:select name="employee.postCode" items="${postList}" - itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/> -
-
<#form:input path="phone" maxlength="100" class="form-control width-90"/>
+
+
+ +
+ <#form:select name="employee.postCode" items="${postList}" + itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/> +
+
+
+ +
+ <#form:select name="roleCode" items="${roleList}" + itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/> +
From 158d3f7044391cda93eb905122cac0d414bb6f40 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 15 May 2021 15:08:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0contentSecurityPolicy?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/src/main/resources/config/jeesite-core.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index a2c211a1..861a0d85 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -370,6 +370,9 @@ shiro: # 是否允许嵌入到外部网站iframe中（true：不限制，false：不允许） isAllowExternalSiteIframe: true + # 设定允许获取的资源列表（v4.2.3） + #contentSecurityPolicy: "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; img-src 'self' 'unsafe-inline' 'unsafe-eval' data:" + # 是否允许跨域访问 CORS，如果允许，设置允许的域名。当设置'*'号全部域名时，accessControlAllowCredentials应该设置为false。 # v4.2.3 开始支持多个域名和模糊匹配，例如：http://*.jeesite.com,http://*.jeesite.net # accessControlAllowOrigin: http://demo.jeesite.com From 6c17e0148b0dd5fa3c506db3dce51dc2143c80ef Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 15 May 2021 18:13:18 +0800 Subject: [PATCH 3/5] logger profile for prod --- .../src/main/resources/config/logger-core.xml | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml index 28ce830b..76c1109a 100644 --- a/modules/core/src/main/resources/config/logger-core.xml +++ b/modules/core/src/main/resources/config/logger-core.xml @@ -35,27 +35,23 @@ + - - - - - - - - - - - - - - - - --> + + + + + + + + + + \ No newline at end of file From 6e4a283763099b096d9efccfa719716cf2eb6c4d Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 2 Jun 2021 21:53:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=B0=E4=BD=8F=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=20Cookie=20=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/common/shiro/filter/FormAuthenticationFilter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java index 4ed0f6b9..4a79c58d 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java @@ -72,6 +72,7 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc. rememberUserCodeCookie.setSecure(Global.getPropertyToBoolean("session.sessionIdCookieSecure", "false")); rememberUserCodeCookie.setHttpOnly(Global.getPropertyToBoolean("session.sessionIdCookieHttpOnly", "true")); rememberUserCodeCookie.setSameSite(SameSiteOptions.valueOf(Global.getProperty("session.sessionIdCookieSameSite", "LAX"))); + rememberUserCodeCookie.setMaxAge(Cookie.ONE_YEAR); instance = this; } From c7d4981d200c89fafd6f2bfcac31a450ba058c10 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 2 Jul 2021 17:52:19 +0800 Subject: [PATCH 5/5] cancel logger profile for prod --- modules/core/src/main/resources/config/logger-core.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml index 76c1109a..b9689c64 100644 --- a/modules/core/src/main/resources/config/logger-core.xml +++ b/modules/core/src/main/resources/config/logger-core.xml @@ -41,7 +41,7 @@ - + \ No newline at end of file