diff --git a/doc/若依环境使用手册v1.0.2.docx b/doc/若依环境使用手册v1.0.3.docx similarity index 92% rename from doc/若依环境使用手册v1.0.2.docx rename to doc/若依环境使用手册v1.0.3.docx index f16e86a6..dd8af7ec 100644 Binary files a/doc/若依环境使用手册v1.0.2.docx and b/doc/若依环境使用手册v1.0.3.docx differ diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 6c927d9e..ab241297 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -8,7 +8,7 @@ 3.0 4.0.0 - + jar ruoyi-admin @@ -76,8 +76,17 @@ + + org.apache.maven.plugins + maven-war-plugin + 3.0.0 + + false + ${artifactId} + + - ruoyi-${ruoyi.version} + ${artifactId} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 3ec6911a..a1acec92 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -72,7 +72,7 @@ mybatis: # 搜索指定包别名 typeAliasesPackage: com.ruoyi # 配置mapper的扫描,找到所有的mapper.xml映射文件 - mapperLocations: classpath:mapper/system/*Mapper.xml,classpath:mapper/quartz/*Mapper.xml,classpath:mapper/generator/*Mapper.xml + mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mapper/mybatis-config.xml diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html index 9f10e35d..1fc415d3 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html @@ -58,7 +58,7 @@