Merge branch 'master' of https://gitee.com/y_project/RuoYi

ruoyi-admin/pom.xml

@@ -8,7 +8,7 @@
         <version>3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-	
+	<packaging>jar</packaging>
     <artifactId>ruoyi-admin</artifactId>
 	
 	<description>
@@ -76,8 +76,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>   
+                <groupId>org.apache.maven.plugins</groupId>   
+                <artifactId>maven-war-plugin</artifactId>   
+                <version>3.0.0</version>   
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${artifactId}</warName>
+                </configuration>   
+		   </plugin>   
         </plugins>
-        <finalName>ruoyi-${ruoyi.version}</finalName>
+        <finalName>${artifactId}</finalName>
     </build>
 	
 </project>

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
 

ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html

@@ -58,7 +58,7 @@
 	<div th:include="include :: footer"></div>
 	<script th:inline="javascript">
 		var removeFlag = [[${@permission.hasPermi('monitor:job:remove')}]];
-		var datas = [[${@dict.getType('sys_job_status')}]];
+		var datas = [[${@dict.getType('sys_common_status')}]];
 		var prefix = ctx + "monitor/jobLog";
 
 		$(function() {