From 02702861ae84736037ef006beb8f99a9953b70f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Fri, 30 Mar 2018 10:58:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iBase4J-SYS-Facade/src/main/resources/config/system.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/iBase4J-SYS-Facade/src/main/resources/config/system.properties b/iBase4J-SYS-Facade/src/main/resources/config/system.properties index 3d785817..489790e5 100644 --- a/iBase4J-SYS-Facade/src/main/resources/config/system.properties +++ b/iBase4J-SYS-Facade/src/main/resources/config/system.properties @@ -37,6 +37,7 @@ redis.testOnBorrow=true #\u4e8b\u52a1 redis.expiration=600 redis.enableTransaction=true +redis.cache.ttl=10 redis.cache.enableTransaction=true #rediscluster spring.redis.cluster.nodes= -- Gitee From 0003d85e6175a5d7347d3829c046d9df2dc01df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Wed, 4 Apr 2018 13:06:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=E9=97=B4?= 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 f969edd6..f502b7ec 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ classpath:config/system.properties UTF-8 - 3.0.4 + 3.0.5 5.0.2.RELEASE 2.0.0.RELEASE -- Gitee From 7383c3e0910f3d696f994407d0a9842aaa1d94c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Wed, 4 Apr 2018 13:46:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/ibase4j/service/SysUserService.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/SysUserService.java b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/SysUserService.java index f779cc1a..72f9129e 100644 --- a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/SysUserService.java +++ b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/SysUserService.java @@ -59,6 +59,19 @@ public class SysUserService extends BaseService { return super.update(record); } + public SysUser queryById(Long id) { + SysUser record = super.queryById(id); + if (record.getDeptId() != null) { + SysDept sysDept = sysDeptService.queryById(record.getDeptId()); + if (sysDept != null) { + record.setDeptName(sysDept.getDeptName()); + } else { + record.setDeptId(null); + } + } + return record; + } + public Page query(Map params) { Map userTypeMap = sysDicService.queryDicByType("USERTYPE"); Page pageInfo = super.query(params); -- Gitee From 29e458afb69c9496b23e6bc06a789fd6855274a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Wed, 4 Apr 2018 21:16:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iBase4J-Biz-Service/src/main/resources/Spring-config.xml | 4 ++-- iBase4J-Biz-Web/src/main/resources/Spring-config.xml | 2 +- iBase4J-SYS-Service/src/main/resources/Spring-config.xml | 4 ++-- iBase4J-SYS-Web/src/main/resources/Spring-config.xml | 2 +- pom.xml | 3 --- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/iBase4J-Biz-Service/src/main/resources/Spring-config.xml b/iBase4J-Biz-Service/src/main/resources/Spring-config.xml index e7c2777d..e91b27e8 100644 --- a/iBase4J-Biz-Service/src/main/resources/Spring-config.xml +++ b/iBase4J-Biz-Service/src/main/resources/Spring-config.xml @@ -9,8 +9,8 @@ - ${sys.jdbc.config.path} - ${system.config.path} + classpath:config/jdbc.properties + classpath*:config/system.properties diff --git a/iBase4J-Biz-Web/src/main/resources/Spring-config.xml b/iBase4J-Biz-Web/src/main/resources/Spring-config.xml index adb094ba..044afd74 100644 --- a/iBase4J-Biz-Web/src/main/resources/Spring-config.xml +++ b/iBase4J-Biz-Web/src/main/resources/Spring-config.xml @@ -14,7 +14,7 @@ - ${system.config.path} + classpath*:config/system.properties diff --git a/iBase4J-SYS-Service/src/main/resources/Spring-config.xml b/iBase4J-SYS-Service/src/main/resources/Spring-config.xml index 32f59eca..e51a962a 100644 --- a/iBase4J-SYS-Service/src/main/resources/Spring-config.xml +++ b/iBase4J-SYS-Service/src/main/resources/Spring-config.xml @@ -10,8 +10,8 @@ - ${sys.jdbc.config.path} - ${system.config.path} + classpath:config/jdbc.properties + classpath*:config/system.properties diff --git a/iBase4J-SYS-Web/src/main/resources/Spring-config.xml b/iBase4J-SYS-Web/src/main/resources/Spring-config.xml index 4548ebd9..97fd099c 100644 --- a/iBase4J-SYS-Web/src/main/resources/Spring-config.xml +++ b/iBase4J-SYS-Web/src/main/resources/Spring-config.xml @@ -14,7 +14,7 @@ - ${system.config.path} + classpath*:config/system.properties diff --git a/pom.xml b/pom.xml index f502b7ec..bc30afda 100644 --- a/pom.xml +++ b/pom.xml @@ -23,9 +23,6 @@ ${project.artifactId} - - classpath:config/jdbc.properties - classpath:config/system.properties UTF-8 3.0.5 -- Gitee From 0d14460fab6f26d3b7a9aaffdd54e9e124961fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Wed, 4 Apr 2018 21:32:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?= 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 bc30afda..90faeffd 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ ${project.artifactId} UTF-8 - 3.0.5 + 3.0.6 5.0.2.RELEASE 2.0.0.RELEASE -- Gitee