From 790aa0d24bee0036d9a697a18c130d531649213b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E4=B8=9B?= <8461269+ouwei2020@user.noreply.gitee.com> Date: Tue, 26 Oct 2021 01:42:12 +0000 Subject: [PATCH 1/6] =?UTF-8?q?update=20ruoyi-common/src/main/java/com/ruo?= =?UTF-8?q?yi/common/core/redis/RedisCache.java.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4Hash=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/redis/RedisCache.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java index 238753359..3246b7731 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java @@ -209,6 +209,18 @@ public class RedisCache return opsForHash.get(key, hKey); } + /** + * 删除Hash中的数据 + * + * @param key + * @param mapkey + */ + public void delCacheMapValue(final String key, final String hkey) + { + HashOperations hashOperations = redisTemplate.opsForHash(); + hashOperations.delete(key, hkey); + } + /** * 获取多个Hash中的数据 * From 0628dc9b2f175602e9d4cc921986318d331abc23 Mon Sep 17 00:00:00 2001 From: Remenber_Ray <343509740@qq.com> Date: Tue, 26 Oct 2021 08:02:48 +0000 Subject: [PATCH 2/6] update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java. --- .../java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b3febada9..7e8443c0f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -179,7 +179,7 @@ public class SysUserServiceImpl implements ISysUserService } /** - * 校验用户名称是否唯一 + * 校验手机号码是否唯一 * * @param user 用户信息 * @return From 839f631d6ba36b1e2c5cbfcd7d414f62d3afd840 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 27 Oct 2021 16:22:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Jaxb=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2jdk8=E4=BB=A5=E4=B8=8A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E5=85=BC=E5=AE=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index eb84d30ce..278434bbe 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -89,12 +89,18 @@ snakeyaml - + io.jsonwebtoken jjwt + + + javax.xml.bind + jaxb-api + + org.springframework.boot From 2eb55528ec9e736f9754c86d5984f5dc8ea819d8 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 27 Oct 2021 16:23:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.5.6?= 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 6feb0ee79..2f3dd728d 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.5 + 2.5.6 pom import From 160beb8e1ce2d4ea65e251a4715280f2be968faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 28 Oct 2021 09:44:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?update=20jdk11=20=E9=80=82=E9=85=8D?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=20=E8=B0=83=E6=95=B4=E5=88=B0=20common=20?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 17 +++++++---------- ruoyi-common/pom.xml | 6 +++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index fcfec2302..5b6144de1 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,13 @@ ${jwt.version} + + + com.sun.xml.bind + jaxb-impl + ${jaxb.version} + + com.baomidou @@ -323,16 +330,6 @@ pom - - - - - com.sun.xml.bind - jaxb-impl - ${jaxb.version} - - - diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index b6e9f9a6e..d27607267 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -76,10 +76,10 @@ jjwt - + - javax.xml.bind - jaxb-api + com.sun.xml.bind + jaxb-impl From 3353ead5d36abc44ac3121209b49d89fcb1b7fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 28 Oct 2021 09:45:29 +0800 Subject: [PATCH 6/6] =?UTF-8?q?update=20=E6=90=9C=E7=B4=A2=E6=A1=86=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=9C=AC=E5=9F=9F=E7=94=9F=E6=88=90?= =?UTF-8?q?=20=E7=94=A8=E4=BA=8E=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 2 +- ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index c159016e2..24494adf3 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -11,7 +11,7 @@ #else #set($comment=$column.columnComment) #end -#if($column.htmlType == "input") +#if($column.htmlType == "input" || $column.htmlType == "textarea") - +