From 212012dc6266d3b340316d803cf9ee69f3ec5c0d Mon Sep 17 00:00:00 2001 From: FlyFive <826323891@qq.com> Date: Mon, 2 Nov 2020 11:49:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E9=80=89=E6=8B=A9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C=E7=A1=AE=E8=AE=A4=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=BF=85=E5=A1=AB=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E3=80=82=E4=BD=BF=E7=94=A8blur=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E9=80=89=E6=8B=A9=E4=B9=8B=E5=90=8E=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=B6=88=E6=81=AF=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=B6=88=E5=A4=B1=EF=BC=8C=E4=BD=BF=E7=94=A8change=E4=BC=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B6=88=E5=A4=B1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/notice/index.vue | 2 +- ruoyi-ui/src/views/system/user/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 86ca769d..44bd5ed3 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -221,7 +221,7 @@ export default { { required: true, message: "公告标题不能为空", trigger: "blur" } ], noticeType: [ - { required: true, message: "公告类型不能为空", trigger: "blur" } + { required: true, message: "公告类型不能为空", trigger: "change" } ] } }; diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index ebc6d2a9..78bef4b3 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -422,7 +422,7 @@ export default { { required: true, message: "用户昵称不能为空", trigger: "blur" } ], deptId: [ - { required: true, message: "归属部门不能为空", trigger: "blur" } + { required: true, message: "归属部门不能为空", trigger: "change" } ], password: [ { required: true, message: "用户密码不能为空", trigger: "blur" } From 082b19e33adca05a46399c78d1a29a2b527f4837 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 2 Nov 2020 17:34:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?mapperLocations=E9=85=8D=E7=BD=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/framework/config/MyBatisConfig.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index 508bc457..e30fe74f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -2,6 +2,7 @@ package com.ruoyi.framework.config; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import javax.sql.DataSource; @@ -21,6 +22,7 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.util.ClassUtils; +import com.ruoyi.common.utils.StringUtils; /** * Mybatis支持*匹配扫描包 @@ -89,6 +91,28 @@ public class MyBatisConfig return typeAliasesPackage; } + public Resource[] resolveMapperLocations(String[] mapperLocations) + { + ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); + List resources = new ArrayList(); + if (mapperLocations != null) + { + for (String mapperLocation : mapperLocations) + { + try + { + Resource[] mappers = resourceResolver.getResources(mapperLocation); + resources.addAll(Arrays.asList(mappers)); + } + catch (IOException e) + { + // ignore + } + } + } + return resources.toArray(new Resource[resources.size()]); + } + @Bean public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception { @@ -101,7 +125,7 @@ public class MyBatisConfig final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); sessionFactory.setDataSource(dataSource); sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations)); + sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); return sessionFactory.getObject(); }