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 f16e86a62..dd8af7ec1 100644
--- a/doc/若依环境使用手册v1.0.2.docx
+++ b/doc/若依环境使用手册v1.0.3.docx
@@ -53,9 +53,12 @@
4. 部署若依系统
-4.1 War部署方式
+4.1 war部署方式
4.1.1 修改pom.xml文件。将jar修改为war
+如果是分模块需要修改ruoyi-admin
+
+
4.1.2 在spring-boot-starter依赖中移除tomcat模块
@@ -64,6 +67,7 @@
org.springframework.boot
+
4.1.3 部署到tomcat的webapps目录下面
默认为RuoYi.war
@@ -72,4 +76,4 @@
4.2 Jar方式部署
执行命令:java - jar RuoYi.jar
-脚本执行:ry.sh start
+脚本执行:ry.sh start 启动stop 停止
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 6c927d9e0..ab2412975 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 3ec6911a4..a1acec922 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 9f10e35d9..1fc415d3e 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 @@