若依3.2

!65 代码生成包名修改
Merge pull request !65 from yutel/master
2019-01-16 23:14:37 +08:00 · 2019-01-16 18:08:19 +08:00 · 2019-01-16 18:02:16 +08:00 · 2019-01-16 15:28:32 +08:00 · 2019-01-16 14:56:27 +08:00 · 2019-01-16 13:24:46 +08:00
495 changed files with 22818 additions and 21946 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,43 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
--- a/README.md
+++ b/README.md
@ -2,17 +2,13 @@

 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适的。于是利用空闲休息时间开始自己写了一套后台系统。如此有了若依。她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。

-性别男，若依是女儿的名字。
+性别男，若依是给还没有出生女儿取的名字（寓意：你若不离不弃，我必生死相依）

 若依基于hplus和inspinia两套后台系统模板开发。有需要可自行到群内下载。

-http://www.zi-han.net/theme/hplus
+> RuoYi从3.0开始，进行模块拆分，将原先的单应用转变为多模块，如需单应用，请移步 [RuoYi-fast](https://gitee.com/y_project/RuoYi-fast)  

-http://webapplayers.com/inspinia_admin-v2.7.1
-
-阿里云优惠活动（2CPU 4GRAM 1M带宽 40G高效云盘）：https://promotion.aliyun.com/ntms/act/vm/aliyun-group/buy.html?group=BphATfDhsQ
-
-云产品通用1000元代金券，可叠加官网常规优惠使用 ：https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof
+> 推荐使用阿里云部署，通用云产品代金券 ：[点我领取](https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof)  

 ## 内置功能

@ -30,43 +26,47 @@ http://webapplayers.com/inspinia_admin-v2.7.1
 12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。
 13. 代码生成：前后端代码的生成（java、html、xml、sql)支持CRUD下载 。
 14. 系统接口：根据业务代码自动生成相关的api接口文档。
-15. 在线构建器：拖动表单元素生成相应的HTML代码。
-16. 连接池监视：监视当期系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
+15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。
+16. 在线构建器：拖动表单元素生成相应的HTML代码。
+17. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
 ## 在线体验
-> admin/admin123
+> admin/admin123  
+> 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。

-地址：http://www.ruoyi.club
+演示地址：http://ruoyi.vip  
+
+文档地址：http://doc.ruoyi.vip

 ## 演示图

 <table>
    <tr>
        <td><img src="https://oscimg.oschina.net/oscnet/25b5e333768d013d45a990c152dbe4d9d6e.jpg"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132411_4c5I_1438828.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/dfadf4d864242745486aa0167110dfcbeb8.jpg"/></td>
    </tr>
    <tr>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132436_rRBh_1438828.png"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132442_umjM_1438828.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/2e1ed87df9b476ed73ed650df20cf009b78.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/91bef110740ba9e36ff00804f8748a787fb.jpg"/></td>
    </tr>
    <tr>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132449_OtY8_1438828.png"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132454_4Evz_1438828.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/9a2851988f4e7433c9322154534865f57d7.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/396293f80b1e8cce8671f56c296bee78a3a.jpg"/></td>
    </tr>
    <tr>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132520_Zzkj_1438828.png"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132539_5bJe_1438828.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/787b3b06430a403655b48b9bcd1fa829555.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/a51820009836276b778bc89d4d0e217e26d.jpg"/></td>
    </tr>
 	<tr>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132548_ne4U_1438828.png"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132557_Fab4_1438828.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/5fb138478adeda6825e206d21f67ecd0625.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/fa2f027a10707a4eb4fc47d5ea1c3d2b772.jpg"/></td>
    </tr>
 	<tr>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132617_MLmV_1438828.png"/></td>
-        <td><img src="https://static.oschina.net/uploads/space/2018/0902/132626_3iBs_1438828.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/a714056081523b7dfa782cda866e8be4adc.jpg"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/ab4b5797dfb2bc68c4974ad5458bd5f5bcf.jpg"/></td>
    </tr>
 </table>


 ## 若依交流群

-QQ群： [![加入QQ群](https://img.shields.io/badge/QQ群-1389287-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=4a9a52f5d9d9c65a8ea67859170ba835d95fc50ec74a2a722293e60e036b5016) 或 [![加入QQ群](https://img.shields.io/badge/QQ群-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN)，推荐点击按钮入群，当然如果无法成功操作，请自行搜索群号`1389287`进行添加
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN)  [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW)  [![加入QQ群](https://img.shields.io/badge/QQ群-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z)  点击按钮入群。
--- a/bin/clean.bat
+++ b/bin/clean.bat
@ -0,0 +1,14 @@
+@echo off
+echo.
+echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD>
+echo.
+pause
+echo.
+
+cd %~dp0
+cd..
+
+call mvn clean
+
+cd bin
+pause
--- a/bin/package.bat
+++ b/bin/package.bat
@ -0,0 +1,13 @@
+@echo off
+echo.
+echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̣<EFBFBD><CCA3><EFBFBD><EFBFBD><EFBFBD>jar<61><72><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
+echo.
+pause
+echo.
+
+cd %~dp0
+cd..
+
+call mvn clean package -Dmaven.test.skip=true
+
+pause
--- a/doc/若依环境使用手册v1.0.3.docx
+++ b/doc/若依环境使用手册v1.0.3.docx
--- a/pom.xml
+++ b/pom.xml
@ -1,260 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>3.2</version>

-	<groupId>com.ruoyi</groupId>
-	<artifactId>RuoYi</artifactId>
-	<version>2.4.0</version>
-	<packaging>jar</packaging>
-
-	<name>RuoYi</name>
-	<description>若依管理系统</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.4.RELEASE</version>
-		<relativePath />
-	</parent>
-
-	<properties>
+    <name>ruoyi</name>
+	<url>http://www.ruoyi.vip</url>
+    <description>若依管理系统</description>
+    
+    <properties>
+	    <ruoyi.version>3.2</ruoyi.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<shiro.version>1.4.0</shiro.version>
 		<thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
-		<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
-		<pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
-		<fastjson.version>1.2.47</fastjson.version>
+		<mybatis.boot.version>1.3.2</mybatis.boot.version>
 		<druid.version>1.1.10</druid.version>
-		<commons.io.version>2.5</commons.io.version>
-		<commons.fileupload.version>1.3.3</commons.fileupload.version>
 		<bitwalker.version>1.19</bitwalker.version>
-		<lombok.version>1.16.18</lombok.version>
-		<velocity.version>1.7</velocity.version>
 		<kaptcha.version>2.3.2</kaptcha.version>
 		<swagger.version>2.7.0</swagger.version>
-		<jsoup.version>1.11.3</jsoup.version>
+		<pagehelper.boot.version>1.2.5</pagehelper.boot.version>
+		<oshi.version>3.9.1</oshi.version>
 	</properties>
+	
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+	    <module>ruoyi-admin</module>
+		<module>ruoyi-framework</module>
+		<module>ruoyi-system</module>
+		<module>ruoyi-quartz</module>
+		<module>ruoyi-generator</module>
+        <module>ruoyi-common</module>
+    </modules>
+    <packaging>pom</packaging>
+

 	<dependencies>

-		<!-- SpringBoot 核心包 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-			<!--
-			 <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-             -->
-		</dependency>
-
-		<!-- SpringBoot 测试 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- SpringBoot 拦截器 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-		</dependency>
-
-		<!-- SpringBoot Web容器 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<!-- SpringBoot集成thymeleaf模板 -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-
-		<!-- spring-boot-devtools -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional> <!-- 表示依赖不会传递 -->
-		</dependency>
-
-		<!-- Mysql驱动包 -->
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
-
-		<!-- SpringBoot集成mybatis框架 -->
-		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>${mybatis.spring.boot.starter.version}</version>
-		</dependency>
-
-		<!-- pagehelper 分页插件 -->
-		<dependency>
-			<groupId>com.github.pagehelper</groupId>
-			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>${pagehelper.spring.boot.starter.version}</version>
-		</dependency>
-
-		<!--阿里数据库连接池 -->
-		<dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-
-		<!--常用工具类 -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<!--io常用工具类 -->
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons.io.version}</version>
-		</dependency>
-
-		<!--文件上传工具类 -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>${commons.fileupload.version}</version>
-		</dependency>
-
-		<!--Shiro核心框架 -->
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-core</artifactId>
-			<version>${shiro.version}</version>
-		</dependency>
-
-		<!-- Shiro使用Srping框架 -->
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-spring</artifactId>
-			<version>${shiro.version}</version>
-		</dependency>
-
-		<!-- Shiro使用EhCache缓存框架 -->
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-ehcache</artifactId>
-			<version>${shiro.version}</version>
-		</dependency>
-
-		<!-- thymeleaf模板引擎和shiro框架的整合 -->
-		<dependency>
-			<groupId>com.github.theborakompanioni</groupId>
-			<artifactId>thymeleaf-extras-shiro</artifactId>
-			<version>${thymeleaf.extras.shiro.version}</version>
-		</dependency>
-
-		<!-- 阿里JSON解析器 -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
-		</dependency>
-
-		<!-- 解析客户端操作系统、浏览器等 -->
-		<dependency>
-			<groupId>eu.bitwalker</groupId>
-			<artifactId>UserAgentUtils</artifactId>
-			<version>${bitwalker.version}</version>
-		</dependency>
-
 		<!--Spring框架基本的核心工具-->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
 		</dependency>

-		<!-- 定时任务 -->
-		<dependency>
-			<groupId>org.quartz-scheduler</groupId>
-			<artifactId>quartz</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.mchange</groupId>
-					<artifactId>c3p0</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+        <!-- SpringBoot集成mybatis框架 -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${mybatis.boot.version}</version>
+        </dependency>

-		<!--velocity代码生成使用模板 -->
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity</artifactId>
-			<version>${velocity.version}</version>
-		</dependency>
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>

-		<!--验证码 -->
-		<dependency>
-			<groupId>com.github.penggle</groupId>
-			<artifactId>kaptcha</artifactId>
-			<version>${kaptcha.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>javax.servlet-api</artifactId>
-					<groupId>javax.servlet</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- swagger2-->
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-
-		<!-- swagger2-UI-->
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>${swagger.version}</version>
-		</dependency>
-
-		<!-- HTML解析器 -->
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-			<version>${jsoup.version}</version>
+       <dependency>
+		    <groupId>javax.servlet</groupId>
+		    <artifactId>javax.servlet-api</artifactId>
 		</dependency>
 		
-		<!-- excel工具 -->
+		<!-- 日志工具类 -->
 		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>3.9</version>
-		</dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>

 	</dependencies>

 	<build>
-		<finalName>${project.artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>

 	<repositories>
 		<repository>
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+	<packaging>jar</packaging>
+    <artifactId>ruoyi-admin</artifactId>
+	
+	<description>
+	    web服务入口
+	</description>
+
+
+    <dependencies>
+
+        <!-- spring-boot-devtools -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional> <!-- 表示依赖不会传递 -->
+		</dependency>
+
+		<!-- swagger2-->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+		
+		<!-- swagger2-UI-->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger.version}</version>
+		</dependency>
+
+		<!-- 核心模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+					<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+				</configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </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>${artifactId}</finalName>
+    </build>
+	
+</project>
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 * @author ruoyi
 */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan("com.ruoyi.project.*.*.mapper")
+@MapperScan("com.ruoyi.*.mapper")
 public class RuoYiApplication
 {
    public static void main(String[] args)
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java
@ -15,5 +15,4 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer
    {
        return application.sources(RuoYiApplication.class);
    }
-
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.common;
+package com.ruoyi.web.controller.common;

 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@ -6,10 +6,17 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.config.Global;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.framework.util.FileUploadUtils;

 /**
 * 通用请求处理
@ -21,17 +28,32 @@ public class CommonController
 {
    private static final Logger log = LoggerFactory.getLogger(CommonController.class);

-    @RequestMapping("common/download")
+    /**
+     * 文件上传路径
+     */
+    public static final String UPLOAD_PATH = "/profile/upload/";
+
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 通用下载请求
+     * 
+     * @param fileName 文件名称
+     * @param delete 是否删除
+     */
+    @GetMapping("common/download")
    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
    {
        String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
        try
        {
-            String filePath = ResourceUtils.getURL("classpath:").getPath() + "static/file/" + fileName;
+            String filePath = Global.getDownloadPath() + fileName;

            response.setCharacterEncoding("utf-8");
            response.setContentType("multipart/form-data");
-            response.setHeader("Content-Disposition", "attachment;fileName=" + setFileDownloadHeader(request, realFileName));
+            response.setHeader("Content-Disposition",
+                    "attachment;fileName=" + setFileDownloadHeader(request, realFileName));
            FileUtils.writeBytes(filePath, response.getOutputStream());
            if (delete)
            {
@ -44,6 +66,31 @@ public class CommonController
        }
    }

+    /**
+     * 通用上传请求
+     */
+    @PostMapping("/common/upload")
+    @ResponseBody
+    public AjaxResult uploadFile(MultipartFile file) throws Exception
+    {
+        try
+        {
+            // 上传文件路径
+            String filePath = Global.getUploadPath();
+            // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + UPLOAD_PATH + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("fileName", fileName);
+            ajax.put("url", url);
+            return ajax;
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
    public String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
    {
        final String agent = request.getHeader("USER-AGENT");
@ -70,6 +117,5 @@ public class CommonController
            filename = URLEncoder.encode(filename, "utf-8");
        }
        return filename;
-
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java
@ -1,10 +1,10 @@
-package com.ruoyi.project.monitor.druid;
+package com.ruoyi.web.controller.monitor;

 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * druid 监控
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
@ -0,0 +1,31 @@
+package com.ruoyi.web.controller.monitor;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.framework.web.base.BaseController;
+import com.ruoyi.framework.web.domain.Server;
+
+/**
+ * 服务器监控
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/monitor/server")
+public class ServerController extends BaseController
+{
+    private String prefix = "monitor/server";
+
+    @RequiresPermissions("monitor:server:view")
+    @GetMapping()
+    public String server(ModelMap mmap) throws Exception
+    {
+        Server server = new Server();
+        server.copyTo();
+        mmap.put("server", server);
+        return prefix + "/server";
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.monitor.job.controller;
+package com.ruoyi.web.controller.monitor;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,14 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.job.domain.Job;
-import com.ruoyi.project.monitor.job.service.IJobService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.quartz.domain.SysJob;
+import com.ruoyi.quartz.service.ISysJobService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 调度任务信息操作处理
@ -26,12 +27,12 @@ import com.ruoyi.project.monitor.job.service.IJobService;
 */
@Controller
@RequestMapping("/monitor/job")
-public class JobController extends BaseController
+public class SysJobController extends BaseController
 {
    private String prefix = "monitor/job";

    @Autowired
-    private IJobService jobService;
+    private ISysJobService jobService;

    @RequiresPermissions("monitor:job:view")
    @GetMapping()
@ -43,10 +44,10 @@ public class JobController extends BaseController
    @RequiresPermissions("monitor:job:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(Job job)
+    public TableDataInfo list(SysJob job)
    {
        startPage();
-        List<Job> list = jobService.selectJobList(job);
+        List<SysJob> list = jobService.selectJobList(job);
        return getDataTable(list);
    }

@ -54,18 +55,11 @@ public class JobController extends BaseController
    @RequiresPermissions("monitor:job:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(Job job) throws Exception
+    public AjaxResult export(SysJob job)
    {
-        try
-        {
-            List<Job> list = jobService.selectJobList(job);
-            ExcelUtil<Job> util = new ExcelUtil<Job>(Job.class);
-            return util.exportExcel(list, "job");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysJob> list = jobService.selectJobList(job);
+        ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
+        return util.exportExcel(list, "定时任务");
    }

    @Log(title = "定时任务", businessType = BusinessType.DELETE)
@ -86,6 +80,15 @@ public class JobController extends BaseController
        }
    }

+    @RequiresPermissions("monitor:job:detail")
+    @GetMapping("/detail/{jobId}")
+    public String detail(@PathVariable("jobId") Long jobId, ModelMap mmap)
+    {
+        mmap.put("name", "job");
+        mmap.put("job", jobService.selectJobById(jobId));
+        return prefix + "/detail";
+    }
+
    /**
     * 任务调度状态修改
     */
@ -93,8 +96,9 @@ public class JobController extends BaseController
    @RequiresPermissions("monitor:job:changeStatus")
    @PostMapping("/changeStatus")
    @ResponseBody
-    public AjaxResult changeStatus(Job job)
+    public AjaxResult changeStatus(SysJob job)
    {
+        job.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(jobService.changeStatus(job));
    }

@ -105,7 +109,7 @@ public class JobController extends BaseController
    @RequiresPermissions("monitor:job:changeStatus")
    @PostMapping("/run")
    @ResponseBody
-    public AjaxResult run(Job job)
+    public AjaxResult run(SysJob job)
    {
        return toAjax(jobService.run(job));
    }
@ -126,8 +130,9 @@ public class JobController extends BaseController
    @RequiresPermissions("monitor:job:add")
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(Job job)
+    public AjaxResult addSave(SysJob job)
    {
+        job.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(jobService.insertJobCron(job));
    }

@ -148,8 +153,19 @@ public class JobController extends BaseController
    @RequiresPermissions("monitor:job:edit")
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(Job job)
+    public AjaxResult editSave(SysJob job)
    {
+        job.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(jobService.updateJobCron(job));
    }
+    
+    /**
+     * 校验cron表达式是否有效
+     */
+    @PostMapping("/checkCronExpressionIsValid")
+    @ResponseBody
+    public boolean checkCronExpressionIsValid(SysJob job)
+    {
+        return jobService.checkCronExpressionIsValid(job.getCronExpression());
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysJobLogController.java
@ -0,0 +1,91 @@
+package com.ruoyi.web.controller.monitor;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.base.BaseController;
+import com.ruoyi.quartz.domain.SysJobLog;
+import com.ruoyi.quartz.service.ISysJobLogService;
+
+/**
+ * 调度日志操作处理
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/monitor/jobLog")
+public class SysJobLogController extends BaseController
+{
+    private String prefix = "monitor/job";
+
+    @Autowired
+    private ISysJobLogService jobLogService;
+
+    @RequiresPermissions("monitor:job:view")
+    @GetMapping()
+    public String jobLog()
+    {
+        return prefix + "/jobLog";
+    }
+
+    @RequiresPermissions("monitor:job:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SysJobLog jobLog)
+    {
+        startPage();
+        List<SysJobLog> list = jobLogService.selectJobLogList(jobLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "调度日志", businessType = BusinessType.EXPORT)
+    @RequiresPermissions("monitor:job:export")
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SysJobLog jobLog)
+    {
+        List<SysJobLog> list = jobLogService.selectJobLogList(jobLog);
+        ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
+        return util.exportExcel(list, "调度日志");
+    }
+
+    @Log(title = "调度日志", businessType = BusinessType.DELETE)
+    @RequiresPermissions("monitor:job:remove")
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(jobLogService.deleteJobLogByIds(ids));
+    }
+
+    @RequiresPermissions("monitor:job:detail")
+    @GetMapping("/detail/{jobLogId}")
+    public String detail(@PathVariable("jobLogId") Long jobLogId, ModelMap mmap)
+    {
+        mmap.put("name", "jobLog");
+        mmap.put("jobLog", jobLogService.selectJobLogById(jobLogId));
+        return prefix + "/detail";
+    }
+
+    @Log(title = "调度日志", businessType = BusinessType.CLEAN)
+    @RequiresPermissions("monitor:job:remove")
+    @PostMapping("/clean")
+    @ResponseBody
+    public AjaxResult clean()
+    {
+        jobLogService.cleanJobLog();
+        return success();
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.monitor.logininfor.controller;
+package com.ruoyi.web.controller.monitor;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
-import com.ruoyi.project.monitor.logininfor.service.ILogininforService;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.service.ISysLogininforService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 系统访问记录
@ -24,12 +24,12 @@ import com.ruoyi.project.monitor.logininfor.service.ILogininforService;
 */
@Controller
@RequestMapping("/monitor/logininfor")
-public class LogininforController extends BaseController
+public class SysLogininforController extends BaseController
 {
    private String prefix = "monitor/logininfor";

    @Autowired
-    private ILogininforService logininforService;
+    private ISysLogininforService logininforService;

    @RequiresPermissions("monitor:logininfor:view")
    @GetMapping()
@ -41,10 +41,10 @@ public class LogininforController extends BaseController
    @RequiresPermissions("monitor:logininfor:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(Logininfor logininfor)
+    public TableDataInfo list(SysLogininfor logininfor)
    {
        startPage();
-        List<Logininfor> list = logininforService.selectLogininforList(logininfor);
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
        return getDataTable(list);
    }

@ -52,18 +52,11 @@ public class LogininforController extends BaseController
    @RequiresPermissions("monitor:logininfor:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(Logininfor logininfor) throws Exception
+    public AjaxResult export(SysLogininfor logininfor)
    {
-        try
-        {
-            List<Logininfor> list = logininforService.selectLogininforList(logininfor);
-            ExcelUtil<Logininfor> util = new ExcelUtil<Logininfor>(Logininfor.class);
-            return util.exportExcel(list, "logininfor");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        return util.exportExcel(list, "登陆日志");
    }

    @RequiresPermissions("monitor:logininfor:remove")
@ -74,4 +67,14 @@ public class LogininforController extends BaseController
    {
        return toAjax(logininforService.deleteLogininforByIds(ids));
    }
+    
+    @RequiresPermissions("monitor:logininfor:remove")
+    @Log(title = "登陆日志", businessType = BusinessType.CLEAN)
+    @PostMapping("/clean")
+    @ResponseBody
+    public AjaxResult clean()
+    {
+        logininforService.cleanLogininfor();
+        return success();
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.monitor.operlog.controller;
+package com.ruoyi.web.controller.monitor;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.operlog.domain.OperLog;
-import com.ruoyi.project.monitor.operlog.service.IOperLogService;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.service.ISysOperLogService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 操作日志记录
@ -26,12 +26,12 @@ import com.ruoyi.project.monitor.operlog.service.IOperLogService;
 */
@Controller
@RequestMapping("/monitor/operlog")
-public class OperlogController extends BaseController
+public class SysOperlogController extends BaseController
 {
    private String prefix = "monitor/operlog";

    @Autowired
-    private IOperLogService operLogService;
+    private ISysOperLogService operLogService;

    @RequiresPermissions("monitor:operlog:view")
    @GetMapping()
@ -43,10 +43,10 @@ public class OperlogController extends BaseController
    @RequiresPermissions("monitor:operlog:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(OperLog operLog)
+    public TableDataInfo list(SysOperLog operLog)
    {
        startPage();
-        List<OperLog> list = operLogService.selectOperLogList(operLog);
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
        return getDataTable(list);
    }

@ -54,18 +54,11 @@ public class OperlogController extends BaseController
    @RequiresPermissions("monitor:operlog:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(OperLog operLog) throws Exception
+    public AjaxResult export(SysOperLog operLog)
    {
-        try
-        {
-            List<OperLog> list = operLogService.selectOperLogList(operLog);
-            ExcelUtil<OperLog> util = new ExcelUtil<OperLog>(OperLog.class);
-            return util.exportExcel(list, "operLog");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        return util.exportExcel(list, "操作日志");
    }

    @RequiresPermissions("monitor:operlog:remove")
@ -78,9 +71,19 @@ public class OperlogController extends BaseController

    @RequiresPermissions("monitor:operlog:detail")
    @GetMapping("/detail/{operId}")
-    public String detail(@PathVariable("operId") Long deptId, ModelMap mmap)
+    public String detail(@PathVariable("operId") Long operId, ModelMap mmap)
    {
-        mmap.put("operLog", operLogService.selectOperLogById(deptId));
+        mmap.put("operLog", operLogService.selectOperLogById(operId));
        return prefix + "/detail";
    }
+    
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @RequiresPermissions("monitor:operlog:remove")
+    @PostMapping("/clean")
+    @ResponseBody
+    public AjaxResult clean()
+    {
+        operLogService.cleanOperLog();
+        return success();
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.monitor.online.controller;
+package com.ruoyi.web.controller.monitor;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -9,16 +9,17 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.utils.security.ShiroUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.OnlineStatus;
+import com.ruoyi.common.page.TableDataInfo;
+import com.ruoyi.framework.shiro.session.OnlineSession;
 import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.online.domain.OnlineSession;
-import com.ruoyi.project.monitor.online.domain.UserOnline;
-import com.ruoyi.project.monitor.online.service.IUserOnlineService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 在线用户监控
@ -27,12 +28,12 @@ import com.ruoyi.project.monitor.online.service.IUserOnlineService;
 */
@Controller
@RequestMapping("/monitor/online")
-public class UserOnlineController extends BaseController
+public class SysUserOnlineController extends BaseController
 {
    private String prefix = "monitor/online";

    @Autowired
-    private IUserOnlineService userOnlineService;
+    private ISysUserOnlineService userOnlineService;

    @Autowired
    private OnlineSessionDAO onlineSessionDAO;
@ -47,10 +48,10 @@ public class UserOnlineController extends BaseController
    @RequiresPermissions("monitor:online:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(UserOnline userOnline)
+    public TableDataInfo list(SysUserOnline userOnline)
    {
        startPage();
-        List<UserOnline> list = userOnlineService.selectUserOnlineList(userOnline);
+        List<SysUserOnline> list = userOnlineService.selectUserOnlineList(userOnline);
        return getDataTable(list);
    }

@ -62,7 +63,7 @@ public class UserOnlineController extends BaseController
    {
        for (String sessionId : ids)
        {
-            UserOnline online = userOnlineService.selectOnlineById(sessionId);
+            SysUserOnline online = userOnlineService.selectOnlineById(sessionId);
            if (online == null)
            {
                return error("用户已下线");
@ -76,8 +77,8 @@ public class UserOnlineController extends BaseController
            {
                return error("当前登陆用户无法强退");
            }
-            onlineSession.setStatus(OnlineSession.OnlineStatus.off_line);
-            online.setStatus(OnlineSession.OnlineStatus.off_line);
+            onlineSession.setStatus(OnlineStatus.off_line);
+            online.setStatus(OnlineStatus.off_line);
            userOnlineService.saveOnline(online);
        }
        return success();
@ -89,7 +90,7 @@ public class UserOnlineController extends BaseController
    @ResponseBody
    public AjaxResult forceLogout(String sessionId)
    {
-        UserOnline online = userOnlineService.selectOnlineById(sessionId);
+        SysUserOnline online = userOnlineService.selectOnlineById(sessionId);
        if (sessionId.equals(ShiroUtils.getSessionId()))
        {
            return error("当前登陆用户无法强退");
@ -103,10 +104,9 @@ public class UserOnlineController extends BaseController
        {
            return error("用户已下线");
        }
-        onlineSession.setStatus(OnlineSession.OnlineStatus.off_line);
-        online.setStatus(OnlineSession.OnlineStatus.off_line);
+        onlineSession.setStatus(OnlineStatus.off_line);
+        online.setStatus(OnlineStatus.off_line);
        userOnlineService.saveOnline(online);
        return success();
    }
-
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.user.controller;
+package com.ruoyi.web.controller.system;

 import java.awt.image.BufferedImage;
 import java.io.IOException;
@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 import com.google.code.kaptcha.Constants;
 import com.google.code.kaptcha.Producer;
-import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 图片验证码（支持算术形式）
@ -23,9 +23,8 @@ import com.ruoyi.framework.web.controller.BaseController;
 */
@Controller
@RequestMapping("/captcha")
-public class CaptchaController extends BaseController
+public class SysCaptchaController extends BaseController
 {
-
    @Resource(name = "captchaProducer")
    private Producer captchaProducer;

--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.config.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,14 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.config.domain.Config;
-import com.ruoyi.project.system.config.service.IConfigService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 参数配置 信息操作处理
@ -26,12 +27,12 @@ import com.ruoyi.project.system.config.service.IConfigService;
 */
@Controller
@RequestMapping("/system/config")
-public class ConfigController extends BaseController
+public class SysConfigController extends BaseController
 {
    private String prefix = "system/config";

    @Autowired
-    private IConfigService configService;
+    private ISysConfigService configService;

    @RequiresPermissions("system:config:view")
    @GetMapping()
@ -46,10 +47,10 @@ public class ConfigController extends BaseController
    @RequiresPermissions("system:config:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(Config config)
+    public TableDataInfo list(SysConfig config)
    {
        startPage();
-        List<Config> list = configService.selectConfigList(config);
+        List<SysConfig> list = configService.selectConfigList(config);
        return getDataTable(list);
    }

@ -57,18 +58,11 @@ public class ConfigController extends BaseController
    @RequiresPermissions("system:config:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(Config config) throws Exception
+    public AjaxResult export(SysConfig config)
    {
-        try
-        {
-            List<Config> list = configService.selectConfigList(config);
-            ExcelUtil<Config> util = new ExcelUtil<Config>(Config.class);
-            return util.exportExcel(list, "config");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysConfig> list = configService.selectConfigList(config);
+        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        return util.exportExcel(list, "参数数据");
    }

    /**
@ -87,8 +81,9 @@ public class ConfigController extends BaseController
    @Log(title = "参数管理", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(Config config)
+    public AjaxResult addSave(SysConfig config)
    {
+        config.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(configService.insertConfig(config));
    }

@ -109,8 +104,9 @@ public class ConfigController extends BaseController
    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(Config config)
+    public AjaxResult editSave(SysConfig config)
    {
+        config.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(configService.updateConfig(config));
    }

@ -131,9 +127,8 @@ public class ConfigController extends BaseController
     */
    @PostMapping("/checkConfigKeyUnique")
    @ResponseBody
-    public String checkConfigKeyUnique(Config config)
+    public String checkConfigKeyUnique(SysConfig config)
    {
        return configService.checkConfigKeyUnique(config);
    }
-
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@ -1,8 +1,7 @@
-package com.ruoyi.project.system.dept.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import java.util.Map;
-
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@ -12,14 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.dept.domain.Dept;
-import com.ruoyi.project.system.dept.service.IDeptService;
-import com.ruoyi.project.system.role.domain.Role;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysDept;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 部门信息
@ -28,12 +28,12 @@ import com.ruoyi.project.system.role.domain.Role;
 */
@Controller
@RequestMapping("/system/dept")
-public class DeptController extends BaseController
+public class SysDeptController extends BaseController
 {
    private String prefix = "system/dept";

    @Autowired
-    private IDeptService deptService;
+    private ISysDeptService deptService;

    @RequiresPermissions("system:dept:view")
    @GetMapping()
@ -45,9 +45,9 @@ public class DeptController extends BaseController
    @RequiresPermissions("system:dept:list")
    @GetMapping("/list")
    @ResponseBody
-    public List<Dept> list(Dept dept)
+    public List<SysDept> list(SysDept dept)
    {
-        List<Dept> deptList = deptService.selectDeptList(dept);
+        List<SysDept> deptList = deptService.selectDeptList(dept);
        return deptList;
    }

@ -68,8 +68,9 @@ public class DeptController extends BaseController
    @RequiresPermissions("system:dept:add")
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(Dept dept)
+    public AjaxResult addSave(SysDept dept)
    {
+        dept.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(deptService.insertDept(dept));
    }

@ -79,7 +80,12 @@ public class DeptController extends BaseController
    @GetMapping("/edit/{deptId}")
    public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap)
    {
-        mmap.put("dept", deptService.selectDeptById(deptId));
+        SysDept dept = deptService.selectDeptById(deptId);
+        if (StringUtils.isNotNull(dept) && 100L == deptId)
+        {
+            dept.setParentName("无");
+        }
+        mmap.put("dept", dept);
        return prefix + "/edit";
    }

@ -90,8 +96,9 @@ public class DeptController extends BaseController
    @RequiresPermissions("system:dept:edit")
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(Dept dept)
+    public AjaxResult editSave(SysDept dept)
    {
+        dept.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(deptService.updateDept(dept));
    }

@ -120,7 +127,7 @@ public class DeptController extends BaseController
     */
    @PostMapping("/checkDeptNameUnique")
    @ResponseBody
-    public String checkDeptNameUnique(Dept dept)
+    public String checkDeptNameUnique(SysDept dept)
    {
        return deptService.checkDeptNameUnique(dept);
    }
@ -142,7 +149,7 @@ public class DeptController extends BaseController
    @ResponseBody
    public List<Map<String, Object>> treeData()
    {
-        List<Map<String, Object>> tree = deptService.selectDeptTree();
+        List<Map<String, Object>> tree = deptService.selectDeptTree(new SysDept());
        return tree;
    }

@ -151,7 +158,7 @@ public class DeptController extends BaseController
     */
    @GetMapping("/roleDeptTreeData")
    @ResponseBody
-    public List<Map<String, Object>> deptTreeData(Role role)
+    public List<Map<String, Object>> deptTreeData(SysRole role)
    {
        List<Map<String, Object>> tree = deptService.roleDeptTreeData(role);
        return tree;
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.dict.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,14 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.dict.domain.DictData;
-import com.ruoyi.project.system.dict.service.IDictDataService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysDictData;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 数据字典信息
@ -26,12 +27,12 @@ import com.ruoyi.project.system.dict.service.IDictDataService;
 */
@Controller
@RequestMapping("/system/dict/data")
-public class DictDataController extends BaseController
+public class SysDictDataController extends BaseController
 {
    private String prefix = "system/dict/data";

    @Autowired
-    private IDictDataService dictDataService;
+    private ISysDictDataService dictDataService;

    @RequiresPermissions("system:dict:view")
    @GetMapping()
@ -43,10 +44,10 @@ public class DictDataController extends BaseController
    @PostMapping("/list")
    @RequiresPermissions("system:dict:list")
    @ResponseBody
-    public TableDataInfo list(DictData dictData)
+    public TableDataInfo list(SysDictData dictData)
    {
        startPage();
-        List<DictData> list = dictDataService.selectDictDataList(dictData);
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
        return getDataTable(list);
    }

@ -54,18 +55,11 @@ public class DictDataController extends BaseController
    @RequiresPermissions("system:dict:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(DictData dictData) throws Exception
+    public AjaxResult export(SysDictData dictData)
    {
-        try
-        {
-            List<DictData> list = dictDataService.selectDictDataList(dictData);
-            ExcelUtil<DictData> util = new ExcelUtil<DictData>(DictData.class);
-            return util.exportExcel(list, "dictData");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        return util.exportExcel(list, "字典数据");
    }

    /**
@ -85,8 +79,9 @@ public class DictDataController extends BaseController
    @RequiresPermissions("system:dict:add")
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(DictData dict)
+    public AjaxResult addSave(SysDictData dict)
    {
+        dict.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(dictDataService.insertDictData(dict));
    }

@ -107,8 +102,9 @@ public class DictDataController extends BaseController
    @RequiresPermissions("system:dict:edit")
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(DictData dict)
+    public AjaxResult editSave(SysDictData dict)
    {
+        dict.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(dictDataService.updateDictData(dict));
    }

--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.dict.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,14 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.dict.domain.DictType;
-import com.ruoyi.project.system.dict.service.IDictTypeService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysDictType;
+import com.ruoyi.system.service.ISysDictTypeService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 数据字典信息
@ -26,12 +27,12 @@ import com.ruoyi.project.system.dict.service.IDictTypeService;
 */
@Controller
@RequestMapping("/system/dict")
-public class DictTypeController extends BaseController
+public class SysDictTypeController extends BaseController
 {
    private String prefix = "system/dict/type";

    @Autowired
-    private IDictTypeService dictTypeService;
+    private ISysDictTypeService dictTypeService;

    @RequiresPermissions("system:dict:view")
    @GetMapping()
@ -43,10 +44,10 @@ public class DictTypeController extends BaseController
    @PostMapping("/list")
    @RequiresPermissions("system:dict:list")
    @ResponseBody
-    public TableDataInfo list(DictType dictType)
+    public TableDataInfo list(SysDictType dictType)
    {
        startPage();
-        List<DictType> list = dictTypeService.selectDictTypeList(dictType);
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
        return getDataTable(list);
    }

@ -54,18 +55,12 @@ public class DictTypeController extends BaseController
    @RequiresPermissions("system:dict:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(DictType dictType) throws Exception
+    public AjaxResult export(SysDictType dictType)
    {
-        try
-        {
-            List<DictType> list = dictTypeService.selectDictTypeList(dictType);
-            ExcelUtil<DictType> util = new ExcelUtil<DictType>(DictType.class);
-            return util.exportExcel(list, "dictType");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        return util.exportExcel(list, "字典类型");
    }

    /**
@ -84,8 +79,9 @@ public class DictTypeController extends BaseController
    @RequiresPermissions("system:dict:add")
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(DictType dict)
+    public AjaxResult addSave(SysDictType dict)
    {
+        dict.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(dictTypeService.insertDictType(dict));
    }

@ -106,8 +102,9 @@ public class DictTypeController extends BaseController
    @RequiresPermissions("system:dict:edit")
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(DictType dict)
+    public AjaxResult editSave(SysDictType dict)
    {
+        dict.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(dictTypeService.updateDictType(dict));
    }

@ -144,7 +141,7 @@ public class DictTypeController extends BaseController
     */
    @PostMapping("/checkDictTypeUnique")
    @ResponseBody
-    public String checkDictTypeUnique(DictType dictType)
+    public String checkDictTypeUnique(SysDictType dictType)
    {
        return dictTypeService.checkDictTypeUnique(dictType);
    }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
@ -0,0 +1,46 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import com.ruoyi.common.config.Global;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.framework.web.base.BaseController;
+
+/**
+ * 首页 业务处理
+ * 
+ * @author ruoyi
+ */
+@Controller
+public class SysIndexController extends BaseController
+{
+    @Autowired
+    private ISysMenuService menuService;
+
+    // 系统首页
+    @GetMapping("/index")
+    public String index(ModelMap mmap)
+    {
+        // 取身份信息
+        SysUser user = getSysUser();
+        // 根据用户id取出菜单
+        List<SysMenu> menus = menuService.selectMenusByUser(user);
+        mmap.put("menus", menus);
+        mmap.put("user", user);
+        mmap.put("copyrightYear", Global.getCopyrightYear());
+        return "index";
+    }
+
+    // 系统介绍
+    @GetMapping("/system/main")
+    public String main(ModelMap mmap)
+    {
+        mmap.put("version", Global.getVersion());
+        return "main";
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.user.controller;
+package com.ruoyi.web.controller.system;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@ -10,10 +10,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.base.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.util.ServletUtils;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 登录验证
@ -21,9 +21,8 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 * @author ruoyi
 */
@Controller
-public class LoginController extends BaseController
+public class SysLoginController extends BaseController
 {
-
    @GetMapping("/login")
    public String login(HttpServletRequest request, HttpServletResponse response)
    {
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.menu.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import java.util.Map;
@ -11,13 +11,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.menu.domain.Menu;
-import com.ruoyi.project.system.menu.service.IMenuService;
-import com.ruoyi.project.system.role.domain.Role;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 菜单信息
@ -26,13 +27,12 @@ import com.ruoyi.project.system.role.domain.Role;
 */
@Controller
@RequestMapping("/system/menu")
-public class MenuController extends BaseController
+public class SysMenuController extends BaseController
 {
-
    private String prefix = "system/menu";

    @Autowired
-    private IMenuService menuService;
+    private ISysMenuService menuService;

    @RequiresPermissions("system:menu:view")
    @GetMapping()
@ -44,9 +44,9 @@ public class MenuController extends BaseController
    @RequiresPermissions("system:menu:list")
    @GetMapping("/list")
    @ResponseBody
-    public List<Menu> list(Menu menu)
+    public List<SysMenu> list(SysMenu menu)
    {
-        List<Menu> menuList = menuService.selectMenuList(menu);
+        List<SysMenu> menuList = menuService.selectMenuList(menu);
        return menuList;
    }

@ -67,6 +67,7 @@ public class MenuController extends BaseController
        {
            return error(1, "菜单已分配,不允许删除");
        }
+        ShiroUtils.clearCachedAuthorizationInfo();
        return toAjax(menuService.deleteMenuById(menuId));
    }

@ -76,14 +77,14 @@ public class MenuController extends BaseController
    @GetMapping("/add/{parentId}")
    public String add(@PathVariable("parentId") Long parentId, ModelMap mmap)
    {
-        Menu menu = null;
+        SysMenu menu = null;
        if (0L != parentId)
        {
            menu = menuService.selectMenuById(parentId);
        }
        else
        {
-            menu = new Menu();
+            menu = new SysMenu();
            menu.setMenuId(0L);
            menu.setMenuName("主目录");
        }
@ -98,8 +99,10 @@ public class MenuController extends BaseController
    @RequiresPermissions("system:menu:add")
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(Menu menu)
+    public AjaxResult addSave(SysMenu menu)
    {
+        menu.setCreateBy(ShiroUtils.getLoginName());
+        ShiroUtils.clearCachedAuthorizationInfo();
        return toAjax(menuService.insertMenu(menu));
    }

@ -120,8 +123,10 @@ public class MenuController extends BaseController
    @RequiresPermissions("system:menu:edit")
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(Menu menu)
+    public AjaxResult editSave(SysMenu menu)
    {
+        menu.setUpdateBy(ShiroUtils.getLoginName());
+        ShiroUtils.clearCachedAuthorizationInfo();
        return toAjax(menuService.updateMenu(menu));
    }

@ -139,7 +144,7 @@ public class MenuController extends BaseController
     */
    @PostMapping("/checkMenuNameUnique")
    @ResponseBody
-    public String checkMenuNameUnique(Menu menu)
+    public String checkMenuNameUnique(SysMenu menu)
    {
        return menuService.checkMenuNameUnique(menu);
    }
@ -149,7 +154,7 @@ public class MenuController extends BaseController
     */
    @GetMapping("/roleMenuTreeData")
    @ResponseBody
-    public List<Map<String, Object>> roleMenuTreeData(Role role)
+    public List<Map<String, Object>> roleMenuTreeData(SysRole role)
    {
        List<Map<String, Object>> tree = menuService.roleMenuTreeData(role);
        return tree;
@ -160,7 +165,7 @@ public class MenuController extends BaseController
     */
    @GetMapping("/menuTreeData")
    @ResponseBody
-    public List<Map<String, Object>> menuTreeData(Role role)
+    public List<Map<String, Object>> menuTreeData(SysRole role)
    {
        List<Map<String, Object>> tree = menuService.menuTreeData();
        return tree;
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.notice.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,13 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.notice.domain.Notice;
-import com.ruoyi.project.system.notice.service.INoticeService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.service.ISysNoticeService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 公告 信息操作处理
@ -25,12 +26,12 @@ import com.ruoyi.project.system.notice.service.INoticeService;
 */
@Controller
@RequestMapping("/system/notice")
-public class NoticeController extends BaseController
+public class SysNoticeController extends BaseController
 {
    private String prefix = "system/notice";

    @Autowired
-    private INoticeService noticeService;
+    private ISysNoticeService noticeService;

    @RequiresPermissions("system:notice:view")
    @GetMapping()
@ -45,10 +46,10 @@ public class NoticeController extends BaseController
    @RequiresPermissions("system:notice:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(Notice notice)
+    public TableDataInfo list(SysNotice notice)
    {
        startPage();
-        List<Notice> list = noticeService.selectNoticeList(notice);
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
        return getDataTable(list);
    }

@ -68,8 +69,9 @@ public class NoticeController extends BaseController
    @Log(title = "通知公告", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(Notice notice)
+    public AjaxResult addSave(SysNotice notice)
    {
+        notice.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(noticeService.insertNotice(notice));
    }

@ -90,8 +92,9 @@ public class NoticeController extends BaseController
    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(Notice notice)
+    public AjaxResult editSave(SysNotice notice)
    {
+        notice.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(noticeService.updateNotice(notice));
    }

@ -106,5 +109,4 @@ public class NoticeController extends BaseController
    {
        return toAjax(noticeService.deleteNoticeByIds(ids));
    }
-
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.post.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -10,14 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.post.domain.Post;
-import com.ruoyi.project.system.post.service.IPostService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 岗位信息操作处理
@ -26,12 +27,12 @@ import com.ruoyi.project.system.post.service.IPostService;
 */
@Controller
@RequestMapping("/system/post")
-public class PostController extends BaseController
+public class SysPostController extends BaseController
 {
    private String prefix = "system/post";

    @Autowired
-    private IPostService postService;
+    private ISysPostService postService;

    @RequiresPermissions("system:post:view")
    @GetMapping()
@ -43,10 +44,10 @@ public class PostController extends BaseController
    @RequiresPermissions("system:post:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(Post post)
+    public TableDataInfo list(SysPost post)
    {
        startPage();
-        List<Post> list = postService.selectPostList(post);
+        List<SysPost> list = postService.selectPostList(post);
        return getDataTable(list);
    }

@ -54,18 +55,11 @@ public class PostController extends BaseController
    @RequiresPermissions("system:post:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(Post post) throws Exception
+    public AjaxResult export(SysPost post)
    {
-        try
-        {
-            List<Post> list = postService.selectPostList(post);
-            ExcelUtil<Post> util = new ExcelUtil<Post>(Post.class);
-            return util.exportExcel(list, "post");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysPost> list = postService.selectPostList(post);
+        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        return util.exportExcel(list, "岗位数据");
    }

    @RequiresPermissions("system:post:remove")
@ -100,8 +94,9 @@ public class PostController extends BaseController
    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ResponseBody
-    public AjaxResult addSave(Post post)
+    public AjaxResult addSave(SysPost post)
    {
+        post.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(postService.insertPost(post));
    }

@ -122,8 +117,9 @@ public class PostController extends BaseController
    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @ResponseBody
-    public AjaxResult editSave(Post post)
+    public AjaxResult editSave(SysPost post)
    {
+        post.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(postService.updatePost(post));
    }

@ -132,7 +128,7 @@ public class PostController extends BaseController
     */
    @PostMapping("/checkPostNameUnique")
    @ResponseBody
-    public String checkPostNameUnique(Post post)
+    public String checkPostNameUnique(SysPost post)
    {
        return postService.checkPostNameUnique(post);
    }
@ -142,9 +138,8 @@ public class PostController extends BaseController
     */
    @PostMapping("/checkPostCodeUnique")
    @ResponseBody
-    public String checkPostCodeUnique(Post post)
+    public String checkPostCodeUnique(SysPost post)
    {
        return postService.checkPostCodeUnique(post);
    }
-
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@ -0,0 +1,178 @@
+package com.ruoyi.web.controller.system;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.config.Global;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.shiro.service.SysPasswordService;
+import com.ruoyi.framework.util.FileUploadUtils;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.framework.web.base.BaseController;
+
+/**
+ * 个人信息 业务处理
+ * 
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController
+{
+    private static final Logger log = LoggerFactory.getLogger(SysProfileController.class);
+
+    private String prefix = "system/user/profile";
+
+    @Autowired
+    private ISysUserService userService;
+    
+    @Autowired
+    private SysPasswordService passwordService;
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping()
+    public String profile(ModelMap mmap)
+    {
+        SysUser user = getSysUser();
+        user.setSex(dictDataService.selectDictLabel("sys_user_sex", user.getSex()));
+        mmap.put("user", user);
+        mmap.put("roleGroup", userService.selectUserRoleGroup(user.getUserId()));
+        mmap.put("postGroup", userService.selectUserPostGroup(user.getUserId()));
+        return prefix + "/profile";
+    }
+
+    @GetMapping("/checkPassword")
+    @ResponseBody
+    public boolean checkPassword(String password)
+    {
+        SysUser user = getSysUser();
+        if (passwordService.matches(user, password))
+        {
+            return true;
+        }
+        return false;
+    }
+
+    @GetMapping("/resetPwd")
+    public String resetPwd(ModelMap mmap)
+    {
+        SysUser user = getSysUser();
+        mmap.put("user", userService.selectUserById(user.getUserId()));
+        return prefix + "/resetPwd";
+    }
+
+    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
+    @PostMapping("/resetPwd")
+    @ResponseBody
+    public AjaxResult resetPwd(String oldPassword, String newPassword)
+    {
+        SysUser user = getSysUser();
+        if (StringUtils.isNotEmpty(newPassword) && passwordService.matches(user, oldPassword))
+        {
+            user.setSalt(ShiroUtils.randomSalt());
+            user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
+            if (userService.resetUserPwd(user) > 0)
+            {
+                setSysUser(userService.selectUserById(user.getUserId()));
+                return success();
+            }
+            return error();
+        }
+        else
+        {
+            return error("修改密码失败，旧密码错误");
+        }
+    }
+
+    /**
+     * 修改用户
+     */
+    @GetMapping("/edit")
+    public String edit(ModelMap mmap)
+    {
+        SysUser user = getSysUser();
+        mmap.put("user", userService.selectUserById(user.getUserId()));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改头像
+     */
+    @GetMapping("/avatar")
+    public String avatar(ModelMap mmap)
+    {
+        SysUser user = getSysUser();
+        mmap.put("user", userService.selectUserById(user.getUserId()));
+        return prefix + "/avatar";
+    }
+
+    /**
+     * 修改用户
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ResponseBody
+    public AjaxResult update(SysUser user)
+    {
+        SysUser currentUser = getSysUser();
+        currentUser.setUserName(user.getUserName());
+        currentUser.setEmail(user.getEmail());
+        currentUser.setPhonenumber(user.getPhonenumber());
+        currentUser.setSex(user.getSex());
+        if (userService.updateUserInfo(currentUser) > 0)
+        {
+            setSysUser(userService.selectUserById(currentUser.getUserId()));
+            return success();
+        }
+        return error();
+    }
+
+    /**
+     * 保存头像
+     */
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateAvatar")
+    @ResponseBody
+    public AjaxResult updateAvatar(@RequestParam("avatarfile") MultipartFile file)
+    {
+        SysUser currentUser = getSysUser();
+        try
+        {
+            if (!file.isEmpty())
+            {
+                String avatar = FileUploadUtils.upload(Global.getAvatarPath(), file);
+                currentUser.setAvatar(avatar);
+                if (userService.updateUserInfo(currentUser) > 0)
+                {
+                    setSysUser(userService.selectUserById(currentUser.getUserId()));
+                    return success();
+                }
+            }
+            return error();
+        }
+        catch (Exception e)
+        {
+            log.error("修改头像失败！", e);
+            return error(e.getMessage());
+        }
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.role.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,14 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.role.domain.Role;
-import com.ruoyi.project.system.role.service.IRoleService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 角色信息
@ -27,13 +28,12 @@ import com.ruoyi.project.system.role.service.IRoleService;
 */
@Controller
@RequestMapping("/system/role")
-public class RoleController extends BaseController
+public class SysRoleController extends BaseController
 {
-
    private String prefix = "system/role";

    @Autowired
-    private IRoleService roleService;
+    private ISysRoleService roleService;

    @RequiresPermissions("system:role:view")
    @GetMapping()
@ -45,10 +45,10 @@ public class RoleController extends BaseController
    @RequiresPermissions("system:role:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(Role role)
+    public TableDataInfo list(SysRole role)
    {
        startPage();
-        List<Role> list = roleService.selectRoleList(role);
+        List<SysRole> list = roleService.selectRoleList(role);
        return getDataTable(list);
    }

@ -56,18 +56,11 @@ public class RoleController extends BaseController
    @RequiresPermissions("system:role:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(Role role) throws Exception
+    public AjaxResult export(SysRole role)
    {
-        try
-        {
-            List<Role> list = roleService.selectRoleList(role);
-            ExcelUtil<Role> util = new ExcelUtil<Role>(Role.class);
-            return util.exportExcel(list, "role");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysRole> list = roleService.selectRoleList(role);
+        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        return util.exportExcel(list, "角色数据");
    }

    /**
@ -87,8 +80,10 @@ public class RoleController extends BaseController
    @PostMapping("/add")
    @Transactional(rollbackFor = Exception.class)
    @ResponseBody
-    public AjaxResult addSave(Role role)
+    public AjaxResult addSave(SysRole role)
    {
+        role.setCreateBy(ShiroUtils.getLoginName());
+        ShiroUtils.clearCachedAuthorizationInfo();
        return toAjax(roleService.insertRole(role));

    }
@ -111,8 +106,10 @@ public class RoleController extends BaseController
    @PostMapping("/edit")
    @Transactional(rollbackFor = Exception.class)
    @ResponseBody
-    public AjaxResult editSave(Role role)
+    public AjaxResult editSave(SysRole role)
    {
+        role.setUpdateBy(ShiroUtils.getLoginName());
+        ShiroUtils.clearCachedAuthorizationInfo();
        return toAjax(roleService.updateRole(role));
    }

@ -134,8 +131,9 @@ public class RoleController extends BaseController
    @PostMapping("/rule")
    @Transactional(rollbackFor = Exception.class)
    @ResponseBody
-    public AjaxResult ruleSave(Role role)
+    public AjaxResult ruleSave(SysRole role)
    {
+        role.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(roleService.updateRule(role));
    }

@ -160,7 +158,7 @@ public class RoleController extends BaseController
     */
    @PostMapping("/checkRoleNameUnique")
    @ResponseBody
-    public String checkRoleNameUnique(Role role)
+    public String checkRoleNameUnique(SysRole role)
    {
        return roleService.checkRoleNameUnique(role);
    }
@ -170,7 +168,7 @@ public class RoleController extends BaseController
     */
    @PostMapping("/checkRoleKeyUnique")
    @ResponseBody
-    public String checkRoleKeyUnique(Role role)
+    public String checkRoleKeyUnique(SysRole role)
    {
        return roleService.checkRoleKeyUnique(role);
    }
@ -184,4 +182,15 @@ public class RoleController extends BaseController
        return prefix + "/tree";
    }

+    /**
+     * 角色状态修改
+     */
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:role:edit")
+    @PostMapping("/changeStatus")
+    @ResponseBody
+    public AjaxResult changeStatus(SysRole role)
+    {
+        return toAjax(roleService.changeStatus(role));
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.system.user.controller;
+package com.ruoyi.web.controller.system;

 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,17 +11,20 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.post.service.IPostService;
-import com.ruoyi.project.system.role.service.IRoleService;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.framework.shiro.service.SysPasswordService;
+import com.ruoyi.framework.util.ShiroUtils;
+import com.ruoyi.framework.web.base.BaseController;
+import com.ruoyi.system.domain.SysUser;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;

 /**
 * 用户信息
@ -30,18 +33,21 @@ import com.ruoyi.project.system.user.service.IUserService;
 */
@Controller
@RequestMapping("/system/user")
-public class UserController extends BaseController
+public class SysUserController extends BaseController
 {
    private String prefix = "system/user";

    @Autowired
-    private IUserService userService;
+    private ISysUserService userService;

    @Autowired
-    private IRoleService roleService;
+    private ISysRoleService roleService;

    @Autowired
-    private IPostService postService;
+    private ISysPostService postService;
+
+    @Autowired
+    private SysPasswordService passwordService;

    @RequiresPermissions("system:user:view")
    @GetMapping()
@ -53,10 +59,10 @@ public class UserController extends BaseController
    @RequiresPermissions("system:user:list")
    @PostMapping("/list")
    @ResponseBody
-    public TableDataInfo list(User user)
+    public TableDataInfo list(SysUser user)
    {
        startPage();
-        List<User> list = userService.selectUserList(user);
+        List<SysUser> list = userService.selectUserList(user);
        return getDataTable(list);
    }

@ -64,18 +70,33 @@ public class UserController extends BaseController
    @RequiresPermissions("system:user:export")
    @PostMapping("/export")
    @ResponseBody
-    public AjaxResult export(User user) throws Exception
+    public AjaxResult export(SysUser user)
    {
-        try
-        {
-            List<User> list = userService.selectUserList(user);
-            ExcelUtil<User> util = new ExcelUtil<User>(User.class);
-            return util.exportExcel(list, "user");
-        }
-        catch (Exception e)
-        {
-            return error("导出Excel失败，请联系网站管理员！");
-        }
+        List<SysUser> list = userService.selectUserList(user);
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.exportExcel(list, "用户数据");
+    }
+
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @RequiresPermissions("system:user:import")
+    @PostMapping("/importData")
+    @ResponseBody
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        List<SysUser> userList = util.importExcel(file.getInputStream());
+        String operName = getSysUser().getLoginName();
+        String message = userService.importUser(userList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }
+
+    @RequiresPermissions("system:user:view")
+    @GetMapping("/importTemplate")
+    @ResponseBody
+    public AjaxResult importTemplate()
+    {
+        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        return util.importTemplateExcel("用户数据");
    }

    /**
@ -97,12 +118,15 @@ public class UserController extends BaseController
    @PostMapping("/add")
    @Transactional(rollbackFor = Exception.class)
    @ResponseBody
-    public AjaxResult addSave(User user)
+    public AjaxResult addSave(SysUser user)
    {
-        if (StringUtils.isNotNull(user.getUserId()) && User.isAdmin(user.getUserId()))
+        if (StringUtils.isNotNull(user.getUserId()) && SysUser.isAdmin(user.getUserId()))
        {
            return error("不允许修改超级管理员用户");
        }
+        user.setSalt(ShiroUtils.randomSalt());
+        user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
+        user.setCreateBy(ShiroUtils.getLoginName());
        return toAjax(userService.insertUser(user));
    }

@ -126,12 +150,13 @@ public class UserController extends BaseController
    @PostMapping("/edit")
    @Transactional(rollbackFor = Exception.class)
    @ResponseBody
-    public AjaxResult editSave(User user)
+    public AjaxResult editSave(SysUser user)
    {
-        if (StringUtils.isNotNull(user.getUserId()) && User.isAdmin(user.getUserId()))
+        if (StringUtils.isNotNull(user.getUserId()) && SysUser.isAdmin(user.getUserId()))
        {
            return error("不允许修改超级管理员用户");
        }
+        user.setUpdateBy(ShiroUtils.getLoginName());
        return toAjax(userService.updateUser(user));
    }

@ -148,8 +173,10 @@ public class UserController extends BaseController
    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
    @PostMapping("/resetPwd")
    @ResponseBody
-    public AjaxResult resetPwd(User user)
+    public AjaxResult resetPwdSave(SysUser user)
    {
+        user.setSalt(ShiroUtils.randomSalt());
+        user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
        return toAjax(userService.resetUserPwd(user));
    }

@ -174,7 +201,7 @@ public class UserController extends BaseController
     */
    @PostMapping("/checkLoginNameUnique")
    @ResponseBody
-    public String checkLoginNameUnique(User user)
+    public String checkLoginNameUnique(SysUser user)
    {
        return userService.checkLoginNameUnique(user.getLoginName());
    }
@ -184,7 +211,7 @@ public class UserController extends BaseController
     */
    @PostMapping("/checkPhoneUnique")
    @ResponseBody
-    public String checkPhoneUnique(User user)
+    public String checkPhoneUnique(SysUser user)
    {
        return userService.checkPhoneUnique(user);
    }
@ -194,8 +221,20 @@ public class UserController extends BaseController
     */
    @PostMapping("/checkEmailUnique")
    @ResponseBody
-    public String checkEmailUnique(User user)
+    public String checkEmailUnique(SysUser user)
    {
        return userService.checkEmailUnique(user);
    }
+
+    /**
+     * 用户状态修改
+     */
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("system:user:edit")
+    @PostMapping("/changeStatus")
+    @ResponseBody
+    public AjaxResult changeStatus(SysUser user)
+    {
+        return toAjax(userService.changeStatus(user));
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java
@ -1,10 +1,10 @@
-package com.ruoyi.project.tool.build;
+package com.ruoyi.web.controller.tool;

 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * build 表单构建
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/GenController.java
@ -1,4 +1,4 @@
-package com.ruoyi.project.tool.gen.controller;
+package com.ruoyi.web.controller.tool;

 import java.io.IOException;
 import java.util.List;
@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.page.TableDataInfo;
 import com.ruoyi.common.support.Convert;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.tool.gen.domain.TableInfo;
-import com.ruoyi.project.tool.gen.service.IGenService;
+import com.ruoyi.generator.domain.TableInfo;
+import com.ruoyi.generator.service.IGenService;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * 代码生成 操作处理
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
@ -1,10 +1,10 @@
-package com.ruoyi.project.tool.swagger;
+package com.ruoyi.web.controller.tool;

 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.base.BaseController;

 /**
 * swagger 接口
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
@ -1,15 +1,18 @@
-package com.ruoyi.project.tool.swagger;
+package com.ruoyi.web.controller.tool;

 import java.util.ArrayList;
 import java.util.List;
+
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+
+import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.framework.web.base.BaseController;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@ -1,8 +1,8 @@
-package com.ruoyi.framework.config;
+package com.ruoyi.web.core.config;

-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import com.ruoyi.common.config.Global;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@ -21,10 +21,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableSwagger2
 public class SwaggerConfig
 {
-    /** 系统基础配置 */
-    @Autowired
-    private RuoYiConfig ruoYiConfig;
-
    /**
     * 创建API
     */
@ -36,7 +32,7 @@ public class SwaggerConfig
                .apiInfo(apiInfo())
                .select()
                // 指定当前包路径
-                .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                .apis(RequestHandlerSelectors.basePackage("com.ruoyi.web.controller.tool"))
                // 扫描所有 .apis(RequestHandlerSelectors.any())
                .paths(PathSelectors.any())
                .build();
@ -51,8 +47,8 @@ public class SwaggerConfig
        return new ApiInfoBuilder()
                .title("标题：若依管理系统_接口文档")
                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
-                .contact(new Contact(ruoYiConfig.getName(), null, null))
-                .version("版本号:" + ruoYiConfig.getVersion())
+                .contact(new Contact(Global.getName(), null, null))
+                .version("版本号:" + Global.getVersion())
                .build();
    }
 }
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@ -2,11 +2,11 @@
 spring:
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.jdbc.Driver
+        driverClassName: com.mysql.cj.jdbc.Driver
        druid:
            # 主库数据源
            master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
+                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: password
            # 从库数据源
@ -17,32 +17,33 @@ spring:
                username: 
                password: 
            # 初始连接数
-            initial-size: 10
-            # 最大连接池数量
-            max-active: 100
+            initialSize: 5
            # 最小连接池数量
-            min-idle: 10
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
            # 配置获取连接等待超时的时间
-            max-wait: 60000
-            # 打开PSCache，并且指定每个连接上PSCache的大小
-            pool-prepared-statements: true
-            max-pool-prepared-statement-per-connection-size: 20
+            maxWait: 60000
            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
            timeBetweenEvictionRunsMillis: 60000
            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            min-evictable-idle-time-millis: 300000
-            validation-query: SELECT 1 FROM DUAL
-            test-while-idle: true
-            test-on-borrow: false
-            test-on-return: false
-            stat-view-servlet:
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false      
+            statViewServlet:
                enabled: true
                url-pattern: /monitor/druid/*
            filter:
                stat:
+                    # 慢SQL记录
                    log-slow-sql: true
                    slow-sql-millis: 1000
-                    merge-sql: false
+                    merge-sql: true
                wall:
                    config:
                        multi-statement-allow: true
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -1,18 +1,19 @@
 # 项目相关配置
 ruoyi:
-  #名称
+  # 名称
  name: RuoYi
-  #版本
-  version: 2.4.0
-  #版权年份
-  copyrightYear: 2018
-  #头像上传路径
+  # 版本
+  version: 3.2.0
+  # 版权年份
+  copyrightYear: 2019
+  # 文件上传路径
  profile: D:/profile/
  # 获取ip地址开关
-  addressEnabled: false
-#开发环境配置
+  addressEnabled: true
+
+# 开发环境配置
 server:
-  #服务端口
+  # 服务端口
  port: 80
  servlet:
    # 项目contextPath
@ -24,55 +25,64 @@ server:
    max-threads: 800
    # Tomcat启动初始化的线程数，默认值25
    min-spare-threads: 30
-#日志配置
+ 
+# 日志配置
 logging:
  level:
    com.ruoyi: debug
    org.springframework: WARN
    org.spring.springboot.dao: debug
-#用户配置
+
+# 用户配置
 user:
  password:
-    #密码错误{maxRetryCount}次锁定10分钟
+    # 密码错误{maxRetryCount}次锁定10分钟
    maxRetryCount: 5
-#Spring配置
+
+# Spring配置
 spring:
+  # 模板引擎
  thymeleaf:
    mode: HTML
    encoding: utf-8
    # 禁用缓存
    cache: false
+  # 资源信息
  messages:
-    #国际化资源文件路径
+    # 国际化资源文件路径
    basename: i18n/messages
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
  profiles: 
    active: druid
-  #文件上传
+  # 文件上传
  servlet:
     multipart:
       max-file-size:  30MB
       max-request-size:  30MB
+  # 服务模块
  devtools:
    restart:
-      #热部署开关
+      # 热部署开关
      enabled: true
+
 # MyBatis
 mybatis:
    # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.project
+    typeAliasesPackage: com.ruoyi
    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath:mybatis/**/*Mapper.xml
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-# PageHelper
+    configLocation: classpath:mapper/mybatis-config.xml
+
+# PageHelper分页插件
 pagehelper: 
  helperDialect: mysql
  reasonable: true
  supportMethodsArguments: true
  params: count=countSql 
+
 # Shiro
 shiro:
  user:
@ -102,6 +112,7 @@ shiro:
    dbSyncPeriod: 1
    # 相隔多久检查一次session的有效性，默认就是10分钟
    validationInterval: 10
+
 # 防止XSS攻击
 xss: 
  # 过滤开关
@ -110,12 +121,13 @@ xss:
  excludes: /system/notice/*
  # 匹配链接
  urlPatterns: /system/*,/monitor/*,/tool/*
+
 # 代码生成
 gen: 
  # 作者
  author: ruoyi
-  # 默认生成包路径 module 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.project.module
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: com.ruoyi.system
  # 自动去除表前缀，默认是true
  autoRemovePre: true
  # 表前缀(类名不会包含表前缀)
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ b/ruoyi-admin/src/main/resources/banner.txt
@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version}
 //      ========`-.____`-.___\_____/___.-`____.-'========         //
 //                           `=---='                              //
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//            佛祖保佑       永不宕机     永无BUG                 //
+//             佛祖保佑       永不宕机      永无BUG               //
 ////////////////////////////////////////////////////////////////////
--- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
+++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ehcache name="ruoyi">
+<ehcache name="ruoyi" updateCheck="false">

    <!-- 磁盘缓存位置 -->
    <diskStore path="java.io.tmpdir"/>
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@ -3,11 +3,11 @@ not.null=* 必须填写
 user.jcaptcha.error=验证码错误
 user.not.exists=用户不存在/密码错误
 user.password.not.match=用户不存在/密码错误
-user.password.retry.limit.count=密码输入错误{0}次，{1}
+user.password.retry.limit.count=密码输入错误{0}次
 user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
 user.password.delete=对不起，您的账号已被删除
-user.blocked=用户已封禁，原因：{0}
-role.blocked=角色已封禁，原因：{0}
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
 user.logout.success=退出成功

 length.not.valid=长度必须在{min}到{max}个字符之间
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/beautifyhtml/beautifyhtml.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/beautifyhtml/beautifyhtml.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/blockUI/jquery.blockUI.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/blockUI/jquery.blockUI.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/tableExport.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/tableExport.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js
@ -0,0 +1,92 @@
+/**
+ * 基于bootstrap-table-mobile修改
+ * 修正部分iPhone手机不显示卡片视图
+ * Copyright (c) 2019 ruoyi
+ */
+!function ($) {
+    
+    'use strict';
+    
+    var resetView = function (that) {
+        if (that.options.height || that.options.showFooter) {
+            setTimeout(that.resetView(), 1);
+        }
+    };
+    
+    // 判断是否 iphone
+    var isIPhone = function () {
+	    let browserName = navigator.userAgent.toLowerCase();
+	    return /(iphone)/i.test(browserName);
+	};
+
+    var changeView = function (that, width, height) {
+        if (that.options.minHeight) {
+            if (checkValuesLessEqual(width, that.options.minWidth) && checkValuesLessEqual(height, that.options.minHeight)) {
+                conditionCardView(that);
+            } else if (checkValuesGreater(width, that.options.minWidth) && checkValuesGreater(height, that.options.minHeight)) {
+                conditionFullView(that);
+            }
+        } else {
+            if (checkValuesLessEqual(width, that.options.minWidth) || isIPhone()) {
+                conditionCardView(that);
+            } else if (checkValuesGreater(width, that.options.minWidth)) {
+                conditionFullView(that);
+            }
+        }
+
+        resetView(that);
+    };
+
+    var checkValuesLessEqual = function (currentValue, targetValue) {
+        return currentValue <= targetValue;
+    };
+
+    var checkValuesGreater = function (currentValue, targetValue) {
+        return currentValue > targetValue;
+    };
+
+    var conditionCardView = function (that) {
+        changeTableView(that, false);
+    };
+
+    var conditionFullView = function (that) {
+        changeTableView(that, true);
+    };
+
+    var changeTableView = function (that, cardViewState) {
+        that.options.cardView = cardViewState;
+        that.toggleView();
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, {
+        mobileResponsive: false,
+        minWidth: 562,
+        minHeight: undefined,
+        checkOnInit: true,
+        toggled: false
+    });
+
+    var BootstrapTable = $.fn.bootstrapTable.Constructor,
+        _init = BootstrapTable.prototype.init;
+
+    BootstrapTable.prototype.init = function () {
+        _init.apply(this, Array.prototype.slice.apply(arguments));
+
+        if (!this.options.mobileResponsive) {
+            return;
+        }
+
+        if (!this.options.minWidth) {
+            return;
+        }
+
+        var that = this;
+        $(window).resize(function () {
+            changeView(that, $(this).width(), $(this).height())
+        });
+
+        if (this.options.checkOnInit) {
+            changeView(this, $(window).width(), $(window).height());
+        }
+    };
+}(jQuery);
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.css
@ -1,10 +1,14 @@
-.bootstrap-tree-table .treetable-indent {width:16px; height: 16px; display: inline-block; position: relative;}
-.bootstrap-tree-table .treetable-expander {width:16px; height: 16px; display: inline-block; position: relative; cursor: pointer;}
-.bootstrap-tree-table .treetable-selected{background: #f5f5f5 !important;}
-.bootstrap-tree-table .treetable-table{border:0 !important;margin-bottom:0}
-.bootstrap-tree-table .treetable-table tbody {display:block;height:auto;overflow-y:auto;}
-.bootstrap-tree-table .treetable-table thead, .treetable-table tbody tr {display:table;width:100%;table-layout:fixed;}
-.bootstrap-tree-table .treetable-thead th{line-height:24px;border: 0 !important;border-radius: 4px;border-left:0px solid #e7eaec !important;border-bottom:1px solid #ccc!important;text-align: center;}
-.bootstrap-tree-table .treetable-thead tr :first-child{border-left:0 !important}
-.bootstrap-tree-table .treetable-tbody td{border: 0 !important;border-left:0px solid #e7eaec !important;border-bottom:1px solid #e7eaec!important;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
-.bootstrap-tree-table .treetable-tbody tr :first-child{border-left:0 !important}
+.bootstrap-tree-table .treetable-indent {width:16px; height: 16px; display: inline-block; position: relative;}
+.bootstrap-tree-table .treetable-expander {width:16px; height: 16px; display: inline-block; position: relative; cursor: pointer;}
+.bootstrap-tree-table .treetable-selected{background: #f5f5f5 !important;}
+.bootstrap-tree-table .treetable-table{border:0 !important;margin-bottom:0}
+.bootstrap-tree-table .treetable-table tbody {display:block;height:auto;overflow-y:auto;}
+.bootstrap-tree-table .treetable-table thead, .treetable-table tbody tr {display:table;width:100%;table-layout:fixed;}
+.bootstrap-tree-table .treetable-thead th{line-height:24px;border: 0 !important;border-radius: 4px;border-left:0px solid #e7eaec !important;border-bottom:1px solid #ccc!important;text-align: left;}
+.bootstrap-tree-table .treetable-thead tr :first-child{border-left:0 !important}
+.bootstrap-tree-table .treetable-tbody td{border: 0 !important;border-left:0px solid #e7eaec !important;border-bottom:1px solid #e7eaec!important;overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
+.bootstrap-tree-table .treetable-tbody tr :first-child{border-left:0 !important}
+.bootstrap-tree-table .treetable-bars .tool-left, .bootstrap-tree-table .treetable-bars .tool-right{margin-top: 10px; margin-bottom: 10px;}
+.bootstrap-tree-table .treetable-bars .tool-left{float: left;}
+.bootstrap-tree-table .treetable-bars .tool-right{float: right;}
+.bootstrap-tree-table .treetable-bars .columns li label{display: block;padding: 3px 20px;clear: both;font-weight: 400;line-height: 1.428571429;max-width: 100%;margin-bottom: 5px;cursor:pointer;}
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js
@ -0,0 +1,670 @@
+/**
+ * bootstrapTreeTable
+ *
+ * @author swifly
+ */
+(function($) {
+    "use strict";
+
+    $.fn.bootstrapTreeTable = function(options, param) {
+        var target = $(this).data('bootstrap.tree.table');
+        target = target ? target : $(this);
+        // 如果是调用方法
+        if (typeof options == 'string') {
+            return $.fn.bootstrapTreeTable.methods[options](target, param);
+        }
+        // 如果是初始化组件
+        options = $.extend({}, $.fn.bootstrapTreeTable.defaults, options || {});
+        target.hasSelectItem = false;// 是否有radio或checkbox
+        target.data_list = null; //用于缓存格式化后的数据-按父分组
+        target.data_obj = null; //用于缓存格式化后的数据-按id存对象
+        target.hiddenColumns = []; //用于存放被隐藏列的field
+        target.lastAjaxParams; //用户最后一次请求的参数
+        target.isFixWidth=false; //是否有固定宽度
+        // 初始化
+        var init = function() {
+            // 初始化容器
+            initContainer();
+            // 初始化工具栏
+            initToolbar();
+            // 初始化表头
+            initHeader();
+            // 初始化表体
+            initBody();
+            // 初始化数据服务
+            initServer();
+            // 动态设置表头宽度
+            autoTheadWidth(true);
+            // 缓存target对象
+            target.data('bootstrap.tree.table', target);
+        }
+        // 初始化容器
+        var initContainer = function() {
+            // 在外层包装一下div，样式用的bootstrap-table的
+            var $main_div = $("<div class='bootstrap-tree-table'></div>");
+            var $treetable = $("<div class='treetable-table'></div>");
+            target.before($main_div);
+            $main_div.append($treetable);
+            $treetable.append(target);
+            target.addClass("table");
+            if (options.striped) {
+                target.addClass('table-striped');
+            }
+            if (options.bordered) {
+                target.addClass('table-bordered');
+            }
+            if (options.hover) {
+                target.addClass('table-hover');
+            }
+            if (options.condensed) {
+                target.addClass('table-condensed');
+            }
+            target.html("");
+        }
+        // 初始化工具栏
+        var initToolbar = function() {
+            var $toolbar = $("<div class='treetable-bars'></div>");
+            if (options.toolbar) {
+                $(options.toolbar).addClass('tool-left');
+                $toolbar.append($(options.toolbar));
+            }
+            var $rightToolbar = $('<div class="btn-group tool-right">');
+            $toolbar.append($rightToolbar);
+            target.parent().before($toolbar);
+            // 是否显示刷新按钮
+            if (options.showRefresh) {
+                var $refreshBtn = $('<button class="btn btn-default btn-outline" type="button" aria-label="refresh" title="刷新"><i class="glyphicon glyphicon-repeat"></i></button>');
+                $rightToolbar.append($refreshBtn);
+                registerRefreshBtnClickEvent($refreshBtn);
+            }
+            // 是否显示列选项
+            if (options.showColumns) {
+                var $columns_div = $('<div class="btn-group pull-right" title="列"><button type="button" aria-label="columns" class="btn btn-default btn-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="glyphicon glyphicon-list"></i> <span class="caret"></span></button></div>');
+                var $columns_ul = $('<ul class="dropdown-menu columns" role="menu"></ul>');
+                $.each(options.columns, function(i, column) {
+                    if (column.field != 'selectItem') {
+                        var _li = null;
+                        if(typeof column.visible == "undefined"||column.visible==true){
+                            _li = $('<li role="menuitem"><label><input type="checkbox" checked="checked" data-field="'+column.field+'" value="'+column.field+'" > '+column.title+'</label></li>');
+                        }else{
+                            _li = $('<li role="menuitem"><label><input type="checkbox" data-field="'+column.field+'" value="'+column.field+'" > '+column.title+'</label></li>');
+                            target.hiddenColumns.push(column.field);
+                        }
+                        $columns_ul.append(_li);
+                    }
+                });
+                $columns_div.append($columns_ul);
+                $rightToolbar.append($columns_div);
+                // 注册列选项事件
+                registerColumnClickEvent();
+            }else{
+                $.each(options.columns, function(i, column) {
+                    if (column.field != 'selectItem') {
+                        if(!(typeof column.visible == "undefined"||column.visible==true)){
+                            target.hiddenColumns.push(column.field);
+                        }
+                    }
+                });
+            }
+        }
+        // 初始化隐藏列
+        var initHiddenColumns = function(){
+            $.each(target.hiddenColumns, function(i, field) {
+                target.find("."+field+"_cls").hide();
+            });
+        }
+        // 初始化表头
+        var initHeader = function() {
+            var $thr = $('<tr></tr>');
+            $.each(options.columns, function(i, column) {
+                var $th = null;
+                // 判断有没有选择列
+                if (i == 0 && column.field == 'selectItem') {
+                    target.hasSelectItem = true;
+                    $th = $('<th style="width:36px"></th>');
+                } else {
+                    $th = $('<th style="' + ((column.width) ? ('width:' + column.width) : '') + '" class="' + column.field + '_cls"></th>');
+                }
+                if((!target.isFixWidth)&& column.width){
+                    target.isFixWidth = column.width.indexOf("px")>-1?true:false;
+                }
+                $th.text(column.title);
+                $thr.append($th);
+            });
+            var $thead = $('<thead class="treetable-thead"></thead>');
+            $thead.append($thr);
+            target.append($thead);
+        }
+        // 初始化表体
+        var initBody = function() {
+            var $tbody = $('<tbody class="treetable-tbody"></tbody>');
+            target.append($tbody);
+            // 默认高度
+            if (options.height) {
+                $tbody.css("height", options.height);
+            }
+        }
+        // 初始化数据服务
+        var initServer = function(parms) {
+            // 加载数据前先清空
+            target.data_list = {};
+            target.data_obj = {};
+            var $tbody = target.find("tbody");
+            // 添加加载loading
+            var $loading = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">正在努力地加载数据中，请稍候……</div></td></tr>'
+            $tbody.html($loading);
+            if (options.url) {
+                $.ajax({
+                    type: options.type,
+                    url: options.url,
+                    data: parms ? parms : options.ajaxParams,
+                    dataType: "JSON",
+                    success: function(data, textStatus, jqXHR) {
+                        renderTable(data);
+                    },
+                    error: function(xhr, textStatus) {
+                        var _errorMsg = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">' + xhr.responseText + '</div></td></tr>'
+                        $tbody.html(_errorMsg);
+                    },
+                });
+            } else {
+                renderTable(options.data);
+            }
+        }
+        // 加载完数据后渲染表格
+        var renderTable = function(data) {
+            var $tbody = target.find("tbody");
+            // 先清空
+            $tbody.html("");
+            if (!data || data.length <= 0) {
+                var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">没有找到匹配的记录</div></td></tr>'
+                $tbody.html(_empty);
+                return;
+            }
+            // 缓存并格式化数据
+            formatData(data);
+            // 获取所有根节点
+            var rootNode = target.data_list["_root_"];
+            // 开始绘制
+            if (rootNode) {
+                $.each(rootNode, function(i, item) {
+                    var _child_row_id = "row_id_" + i
+                    recursionNode(item, 1, _child_row_id, "row_root");
+                });
+            }
+            // 下边的操作主要是为了查询时让一些没有根节点的节点显示
+            $.each(data, function(i, item) {
+                if (!item.isShow) {
+                    var tr = renderRow(item, false, 1, "", "");
+                    $tbody.append(tr);
+                }
+            });
+            target.append($tbody);
+            registerExpanderEvent();
+            registerRowClickEvent();
+            initHiddenColumns();
+            // 动态设置表头宽度
+            autoTheadWidth()
+        }
+        // 动态设置表头宽度
+        var autoTheadWidth = function(initFlag) {
+            if(options.height>0){
+                var $thead = target.find("thead");
+                var $tbody = target.find("tbody");
+                var borderWidth = parseInt(target.css("border-left-width")) + parseInt(target.css("border-right-width"))
+                
+                $thead.css("width", $tbody.children(":first").width());
+                if(initFlag){
+                    var resizeWaiter = false;
+                    $(window).resize(function() {
+                        if(!resizeWaiter){
+                            resizeWaiter = true;
+                            setTimeout(function(){
+                                if(!target.isFixWidth){
+                                    $tbody.css("width", target.parent().width()-borderWidth);
+                                }
+                                $thead.css("width", $tbody.children(":first").width());
+                                resizeWaiter = false;
+                            }, 300);
+                        }
+                    });
+                }
+            }
+        
+        }
+        // 缓存并格式化数据
+        var formatData = function(data) {
+            var _root = options.rootIdValue ? options.rootIdValue : null
+            $.each(data, function(index, item) {
+                // 添加一个默认属性，用来判断当前节点有没有被显示
+                item.isShow = false;
+                // 这里兼容几种常见Root节点写法
+                // 默认的几种判断
+                var _defaultRootFlag = item[options.parentCode] == '0' ||
+                    item[options.parentCode] == 0 ||
+                    item[options.parentCode] == null ||
+                    item[options.parentCode] == '';
+                if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) {
+                    if (!target.data_list["_root_"]) {
+                        target.data_list["_root_"] = [];
+                    }
+                    if (!target.data_obj["id_" + item[options.code]]) {
+                        target.data_list["_root_"].push(item);
+                    }
+                } else {
+                    if (!target.data_list["_n_" + item[options.parentCode]]) {
+                        target.data_list["_n_" + item[options.parentCode]] = [];
+                    }
+                    if (!target.data_obj["id_" + item[options.code]]) {
+                        target.data_list["_n_" + item[options.parentCode]].push(item);
+                    }
+                }
+                target.data_obj["id_" + item[options.code]] = item;
+            });
+        }
+        // 递归获取子节点并且设置子节点
+        var recursionNode = function(parentNode, lv, row_id, p_id) {
+            var $tbody = target.find("tbody");
+            var _ls = target.data_list["_n_" + parentNode[options.code]];
+            var $tr = renderRow(parentNode, _ls ? true : false, lv, row_id, p_id);
+            $tbody.append($tr);
+            if (_ls) {
+                $.each(_ls, function(i, item) {
+                    var _child_row_id = row_id + "_" + i
+                    recursionNode(item, (lv + 1), _child_row_id, row_id)
+                });
+            }
+        };
+        // 绘制行
+        var renderRow = function(item, isP, lv, row_id, p_id) {
+            // 标记已显示
+            item.isShow = true;
+            item.row_id = row_id;
+            item.p_id = p_id;
+            item.lv = lv;
+            var $tr = $('<tr id="' + row_id + '" pid="' + p_id + '"></tr>');
+            var _icon = options.expanderCollapsedClass;
+            if (options.expandAll) {
+                $tr.css("display", "table");
+                _icon = options.expanderExpandedClass;
+            } else if (lv == 1) {
+                $tr.css("display", "table");
+                _icon = (options.expandFirst) ? options.expanderExpandedClass : options.expanderCollapsedClass;
+            } else if (lv == 2) {
+                if (options.expandFirst) {
+                    $tr.css("display", "table");
+                } else {
+                    $tr.css("display", "none");
+                }
+                _icon = options.expanderCollapsedClass;
+            } else {
+                $tr.css("display", "none");
+                _icon = options.expanderCollapsedClass;
+            }
+            $.each(options.columns, function(index, column) {
+                // 判断有没有选择列
+                if (column.field == 'selectItem') {
+                    target.hasSelectItem = true;
+                    var $td = $('<td style="text-align:center;width:36px"></td>');
+                    if (column.radio) {
+                        var _ipt = $('<input name="select_item" type="radio" value="' + item[options.code] + '"></input>');
+                        $td.append(_ipt);
+                    }
+                    if (column.checkbox) {
+                        var _ipt = $('<input name="select_item" type="checkbox" value="' + item[options.code] + '"></input>');
+                        $td.append(_ipt);
+                    }
+                    $tr.append($td);
+                } else {
+                    var $td = $('<td name="' + column.field + '" class="' + column.field + '_cls"></td>');
+                    if(column.width){
+                        $td.css("width",column.width);
+                    }
+                    if(column.align){
+                        $td.css("text-align",column.align);
+                    }
+                    if(options.expandColumn == index){
+                        $td.css("text-align","left");
+                    }
+                    if(column.valign){
+                        $td.css("vertical-align",column.valign);
+                    }
+                    if(options.showTitle){
+                        $td.addClass("ellipsis");
+                    }
+                    // 增加formatter渲染
+                    if (column.formatter) {
+                        $td.html(column.formatter.call(this, item[column.field], item, index));
+                    } else {
+                        if(options.showTitle){
+                            // 只在字段没有formatter时才添加title属性
+                            $td.attr("title",item[column.field]);
+                        }
+                        $td.text(item[column.field]);
+                    }
+                    if (options.expandColumn == index) {
+                        if (!isP) {
+                            $td.prepend('<span class="treetable-expander"></span>')
+                        } else {
+                            $td.prepend('<span class="treetable-expander ' + _icon + '"></span>')
+                        }
+                        for (var int = 0; int < (lv - 1); int++) {
+                            $td.prepend('<span class="treetable-indent"></span>')
+                        }
+                    }
+                    $tr.append($td);
+                }
+            });
+            return $tr;
+        }
+        // 注册刷新按钮点击事件
+        var registerRefreshBtnClickEvent = function(btn) {
+            $(btn).off('click').on('click', function () {
+                target.refresh();
+            });
+        }
+        // 注册列选项事件
+        var registerColumnClickEvent = function() {
+            $(".bootstrap-tree-table .treetable-bars .columns label input").off('click').on('click', function () {
+                var $this = $(this);
+                if($this.prop('checked')){
+                    target.showColumn($(this).val());
+                }else{
+                    target.hideColumn($(this).val());
+                }
+            });
+        }
+        // 注册行点击选中事件
+        var registerRowClickEvent = function() {
+            target.find("tbody").find("tr").unbind();
+            target.find("tbody").find("tr").click(function() {
+                if (target.hasSelectItem) {
+                    var _ipt = $(this).find("input[name='select_item']");
+                    if (_ipt.attr("type") == "radio") {
+                        _ipt.prop('checked', true);
+                        target.find("tbody").find("tr").removeClass("treetable-selected");
+                        $(this).addClass("treetable-selected");
+                    } else {
+                        if (_ipt.prop('checked')) {
+                            _ipt.prop('checked', false);
+                            $(this).removeClass("treetable-selected");
+                        } else {
+                            _ipt.prop('checked', true);
+                            $(this).addClass("treetable-selected");
+                        }
+                    }
+                }
+            });
+        }
+        // 注册小图标点击事件--展开缩起
+        var registerExpanderEvent = function() {
+            target.find("tbody").find("tr").find(".treetable-expander").unbind();
+            target.find("tbody").find("tr").find(".treetable-expander").click(function() {
+                var _isExpanded = $(this).hasClass(options.expanderExpandedClass);
+                var _isCollapsed = $(this).hasClass(options.expanderCollapsedClass);
+                if (_isExpanded || _isCollapsed) {
+                    var tr = $(this).parent().parent();
+                    var row_id = tr.attr("id");
+                    var _ls = target.find("tbody").find("tr[id^='" + row_id + "_']"); //下所有
+                    if (_isExpanded) {
+                        $(this).removeClass(options.expanderExpandedClass);
+                        $(this).addClass(options.expanderCollapsedClass);
+                        if (_ls && _ls.length > 0) {
+                            $.each(_ls, function(index, item) {
+                                $(item).css("display", "none");
+                            });
+                        }
+                    } else {
+                        $(this).removeClass(options.expanderCollapsedClass);
+                        $(this).addClass(options.expanderExpandedClass);
+                        if (_ls && _ls.length > 0) {
+                            $.each(_ls, function(index, item) {
+                                // 父icon
+                                var _p_icon = $("#" + $(item).attr("pid")).children().eq(options.expandColumn).find(".treetable-expander");
+                                if (_p_icon.hasClass(options.expanderExpandedClass)) {
+                                    $(item).css("display", "table");
+                                }
+                            });
+                        }
+                    }
+                }
+            });
+        }
+        // 刷新数据
+        target.refresh = function(parms) {
+            if(parms){
+                target.lastAjaxParams=parms;
+            }
+            initServer(target.lastAjaxParams);
+        }
+        // 添加数据刷新表格
+        target.appendData = function(data) {
+            // 下边的操作主要是为了查询时让一些没有根节点的节点显示
+            $.each(data, function(i, item) {
+                var _data = target.data_obj["id_" + item[options.code]];
+                var _p_data = target.data_obj["id_" + item[options.parentCode]];
+                var _c_list = target.data_list["_n_" + item[options.parentCode]];
+                var row_id = ""; //行id
+                var p_id = ""; //父行id
+                var _lv = 1; //如果没有父就是1默认显示
+                var tr; //要添加行的对象
+                if (_data && _data.row_id && _data.row_id != "") {
+                    row_id = _data.row_id; // 如果已经存在了，就直接引用原来的
+                }
+                if (_p_data) {
+                    p_id = _p_data.row_id;
+                    if (row_id == "") {
+                        var _tmp = 0
+                        if (_c_list && _c_list.length > 0) {
+                            _tmp = _c_list.length;
+                        }
+                        row_id = _p_data.row_id + "_" + _tmp;
+                    }
+                    _lv = _p_data.lv + 1; //如果有父
+                    // 绘制行
+                    tr = renderRow(item, false, _lv, row_id, p_id);
+
+                    var _p_icon = $("#" + _p_data.row_id).children().eq(options.expandColumn).find(".treetable-expander");
+                    var _isExpanded = _p_icon.hasClass(options.expanderExpandedClass);
+                    var _isCollapsed = _p_icon.hasClass(options.expanderCollapsedClass);
+                    // 父节点有没有展开收缩按钮
+                    if (_isExpanded || _isCollapsed) {
+                        // 父节点展开状态显示新加行
+                        if (_isExpanded) {
+                            tr.css("display", "table");
+                        }
+                    } else {
+                        // 父节点没有展开收缩按钮则添加
+                        _p_icon.addClass(options.expanderCollapsedClass);
+                    }
+
+                    if (_data) {
+                        $("#" + _data.row_id).before(tr);
+                        $("#" + _data.row_id).remove();
+                    } else {
+                        // 计算父的同级下一行
+                        var _tmp_ls = _p_data.row_id.split("_");
+                        var _p_next = _p_data.row_id.substring(0, _p_data.row_id.length - 1) + (parseInt(_tmp_ls[_tmp_ls.length - 1]) + 1);
+                        // 画上
+                        $("#" + _p_next).before(tr);
+                    }
+                } else {
+                    tr = renderRow(item, false, _lv, row_id, p_id);
+                    if (_data) {
+                        $("#" + _data.row_id).before(tr);
+                        $("#" + _data.row_id).remove();
+                    } else {
+                        // 画上
+                        var tbody = target.find("tbody");
+                        tbody.append(tr);
+                    }
+                }
+                item.isShow = true;
+                // 缓存并格式化数据
+                formatData([item]);
+            });
+            registerExpanderEvent();
+            registerRowClickEvent();
+            initHiddenColumns();
+        }
+
+        // 展开/折叠指定的行
+        target.toggleRow=function(id) {
+            var _rowData = target.data_obj["id_" + id];
+            var $row_expander = $("#"+_rowData.row_id).find(".treetable-expander");
+            $row_expander.trigger("click");
+        }
+        // 展开指定的行
+        target.expandRow=function(id) {
+            var _rowData = target.data_obj["id_" + id];
+            var $row_expander = $("#"+_rowData.row_id).find(".treetable-expander");
+            var _isCollapsed = $row_expander.hasClass(target.options.expanderCollapsedClass);
+            if (_isCollapsed) {
+                $row_expander.trigger("click");
+            }
+        }
+        // 折叠 指定的行
+        target.collapseRow=function(id) {
+            var _rowData = target.data_obj["id_" + id];
+            var $row_expander = $("#"+_rowData.row_id).find(".treetable-expander");
+            var _isExpanded = $row_expander.hasClass(target.options.expanderExpandedClass);
+            if (_isExpanded) {
+                $row_expander.trigger("click");
+            }
+        }
+        // 展开所有的行
+        target.expandAll=function() {
+            target.find("tbody").find("tr").find(".treetable-expander").each(function(i,n){
+                var _isCollapsed = $(n).hasClass(options.expanderCollapsedClass);
+                if (_isCollapsed) {
+                    $(n).trigger("click");
+                }
+            })
+        }
+        // 折叠所有的行
+        target.collapseAll=function() {
+            target.find("tbody").find("tr").find(".treetable-expander").each(function(i,n){
+                var _isExpanded = $(n).hasClass(options.expanderExpandedClass);
+                if (_isExpanded) {
+                    $(n).trigger("click");
+                }
+            })
+        }
+        // 显示指定列
+        target.showColumn=function(field,flag) {
+            var _index = $.inArray(field, target.hiddenColumns);
+            if (_index > -1) {
+                target.hiddenColumns.splice(_index, 1);
+            }
+            target.find("."+field+"_cls").show();
+            //是否更新列选项状态
+            if(flag&&options.showColumns){
+                var $input = $(".bootstrap-tree-table .treetable-bars .columns label").find("input[value='"+field+"']")
+                $input.prop("checked", 'checked');
+            }
+        }
+        // 隐藏指定列
+        target.hideColumn=function(field,flag) {
+            target.hiddenColumns.push(field);
+            target.find("."+field+"_cls").hide();
+            //是否更新列选项状态
+            if(flag&&options.showColumns){
+                var $input = $(".bootstrap-tree-table .treetable-bars .columns label").find("input[value='"+field+"']")
+                $input.prop("checked", '');
+            }
+        }
+        // 初始化
+        init();
+        return target;
+    };
+
+    // 组件方法封装........
+    $.fn.bootstrapTreeTable.methods = {
+        // 为了兼容bootstrap-table的写法，统一返回数组，这里返回了表格显示列的数据
+        getSelections: function(target, data) {
+            // 所有被选中的记录input
+            var _ipt = target.find("tbody").find("tr").find("input[name='select_item']:checked");
+            var chk_value = [];
+            // 如果是radio
+            if (_ipt.attr("type") == "radio") {
+                var _data = target.data_obj["id_" + _ipt.val()];
+                chk_value.push(_data);
+            } else {
+                _ipt.each(function(_i, _item) {
+                    var _data = target.data_obj["id_" + $(_item).val()];
+                    chk_value.push(_data);
+                });
+            }
+            return chk_value;
+        },
+        // 刷新记录
+        refresh: function(target, parms) {
+            if (parms) {
+                target.refresh(parms);
+            } else {
+                target.refresh();
+            }
+        },
+        // 添加数据到表格
+        appendData: function(target, data) {
+            if (data) {
+                target.appendData(data);
+            }
+        },
+        // 展开/折叠指定的行
+        toggleRow: function(target, id) {
+            target.toggleRow(id);
+        },
+        // 展开指定的行
+        expandRow: function(target, id) {
+            target.expandRow(id);
+        },
+        // 折叠 指定的行
+        collapseRow: function(target, id) {
+            target.collapseRow(id);
+        },
+        // 展开所有的行
+        expandAll: function(target) {
+            target.expandAll();
+        },
+        // 折叠所有的行
+        collapseAll: function(target) {
+            target.collapseAll();
+        },
+        // 显示指定列
+        showColumn: function(target,field) {
+            target.showColumn(field,true);
+        },
+        // 隐藏指定列
+        hideColumn: function(target,field) {
+            target.hideColumn(field,true);
+        }
+        // 组件的其他方法也可以进行类似封装........
+    };
+
+    $.fn.bootstrapTreeTable.defaults = {
+        code: 'code',              // 选取记录返回的值,用于设置父子关系
+        parentCode: 'parentCode',  // 用于设置父子关系
+        rootIdValue: null,         // 设置根节点id值----可指定根节点，默认为null,"",0,"0"
+        data: null,                // 构造table的数据集合
+        type: "GET",               // 请求数据的ajax类型
+        url: null,                 // 请求数据的ajax的url
+        ajaxParams: {},            // 请求数据的ajax的data属性
+        expandColumn: 0,           // 在哪一列上面显示展开按钮
+        expandAll: false,          // 是否全部展开
+        expandFirst: true,         // 是否默认第一级展开--expandAll为false时生效
+        striped: false,            // 是否各行渐变色
+        bordered: true,            // 是否显示边框
+        hover: true,               // 是否鼠标悬停
+        condensed: false,          // 是否紧缩表格
+        columns: [],               // 列
+        toolbar: null,             // 顶部工具条
+        height: 0,                 // 表格高度
+        showTitle: true,           // 是否采用title属性显示字段内容（被formatter格式化的字段不会显示）
+        showColumns: true,         // 是否显示内容列下拉框
+        showRefresh: true,         // 是否显示刷新按钮
+        expanderExpandedClass: 'glyphicon glyphicon-chevron-down', // 展开的按钮的图标
+        expanderCollapsedClass: 'glyphicon glyphicon-chevron-right' // 缩起的按钮的图标
+
+    };
+})(jQuery);
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datepicker.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datepicker.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/datepicker3.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/datepicker3.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/custom.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/custom.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green-login.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green-login.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green@2x.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green@2x.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/icheck.min.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/icheck.min.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_close.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_close.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_open.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_open.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/2.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/2.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/3.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/3.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/4.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/4.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/5.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/5.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/6.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/6.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/7.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/7.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/8.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/8.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/9.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/9.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/line_conn.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/line_conn.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/loading.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/loading.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/zTreeStandard.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/zTreeStandard.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/zTreeStandard.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/zTreeStandard.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/zTreeStyle.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/line_conn.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/line_conn.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/line_conn.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/line_conn.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/loading.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/loading.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/metro.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/metro.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/metro.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/img/metro.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/left_menu.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/left_menu.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/left_menu.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/left_menu.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/line_conn.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/line_conn.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/loading.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/loading.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/zTreeStandard.gif
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/zTreeStandard.gif
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/zTreeStandard.png
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/img/zTreeStandard.png
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/simple/zTreeStyle.css
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.core-3.5.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.excheck-3.5.js
--- a/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js
+++ b/ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.exedit-3.5.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
RuoYi	d872c66d19	若依3.2	2019-01-16 23:14:37 +08:00
yutel	1042b40cfc	!65 代码生成包名修改 Merge pull request !65 from yutel/master	2019-01-16 18:08:19 +08:00
yutel	070f7bc6bd	更新 Controller.java.vm 解决代码生成时找不到ExcelUtil.java类的问题	2019-01-16 18:02:16 +08:00
RuoYi	4f1c99293f	pom 3.2	2019-01-16 15:28:32 +08:00
RuoYi	57fa243747	若依3.2	2019-01-16 14:56:27 +08:00
GeBron	04f2607398	!64 去掉注释中多余参数说明 Merge pull request !64 from GeBron/master	2019-01-16 13:24:46 +08:00
GeBron	01caa02f5e	去掉注释中多余参数说明	2019-01-16 12:58:21 +08:00
RuoYi	e37ec9f8fa	用户管理移动端默认隐藏左侧布局	2019-01-13 12:26:09 +08:00
RuoYi	122e8b61a0	详细信息弹出层显示在顶层	2019-01-12 12:08:41 +08:00
RuoYi	2345dfdf42	调整初始密码位置	2019-01-11 10:34:34 +08:00
RuoYi	77550e2f11	用户导入初始密码	2019-01-11 10:14:31 +08:00
RuoYi	ca5b4bc852	用户导入	2019-01-11 09:50:16 +08:00
RuoYi	5fc9a63231	新增用户导入权限	2019-01-10 19:51:31 +08:00
ziry	958be505c9	!62 修改样式文件小BUG及改用接口ISysUserOnlineService Merge pull request !62 from ziry/master	2019-01-10 19:09:55 +08:00
RuoYi	ec8c7f1d79	支持用户数据导入	2019-01-10 19:06:15 +08:00
ziry	030b61bc37	修改样式文件小BUG	2019-01-10 15:50:43 +08:00
RuoYi	619e1d241a	升级summernote到最新版本v0.8.11	2019-01-09 16:22:45 +08:00
RuoYi	dc07b97cdb	字典数据根据选择下拉新增	2019-01-08 19:30:24 +08:00
RuoYi	dd37524b04	修复个人信息修改漏洞	2019-01-08 15:56:49 +08:00
ziry	8c0ebd008e	更新 SysUserOnlineController.java ，改用接口ISysUserOnlineService	2019-01-08 15:42:08 +08:00
RuoYi	0c76d45349	新增修改全屏/确认取消按钮	2019-01-04 11:37:35 +08:00
若依	6237ddb3dc	!60 SysJobMapper.deleteJobById改为通过ID删除及修改注释与方法参数对应 Merge pull request !60 from ziry/master	2018-12-29 17:47:01 +08:00
ziry	8643dde074	改为通过ID删除	2018-12-29 16:32:17 +08:00
ziry	d22fa29b65	修改注释与方法参数对应	2018-12-29 16:28:54 +08:00
ziry	b66097c004	更新 banner.txt 修复启动佛祖保佑图小瑕疵	2018-12-29 15:25:32 +08:00
RuoYi	d30dc35e59	代码格式化	2018-12-29 15:18:28 +08:00
RuoYi	87c38706cd	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-12-29 15:05:53 +08:00
RuoYi	f04c1fed50	线程池代码优化	2018-12-29 15:05:29 +08:00
xjt283525476	4474c533e6	!59 修复驼峰转下划线拼接时，简称缩写作为前缀时，转换后首字母后追加了下划线，同时做了代码优化，利于阅读 Merge pull request !59 from xjt283525476/master	2018-12-29 14:25:47 +08:00
xjt283525476	4374a24f79	修复驼峰转下划线拼接时，简称缩写作为前缀时，转换后首字母后追加了下划线	2018-12-29 14:04:16 +08:00
RuoYi	383d082194	类位置迁移	2018-12-29 12:25:46 +08:00
RuoYi	e9a7cc7bc7	去除序号居中	2018-12-29 12:04:53 +08:00
xjt283525476	8b07f8925f	!57 因笔误导致无意义的判断，同时还会出现空指针异常 Merge pull request !57 from xjt283525476/master	2018-12-29 10:21:58 +08:00
j3east	2af817d8dc	!58 解决tomcat无法退出问题 Merge pull request !58 from j3east/j3east	2018-12-29 10:21:17 +08:00
cj	0e240cb244	代码风格和项目保持一致	2018-12-28 23:05:53 +08:00
cj	fc834b35cb	一键打war包	2018-12-28 22:55:31 +08:00
cj	4fa795dee9	确保应用退出时能关闭后台线程	2018-12-28 22:54:38 +08:00
RuoYi	33788ecd02	ry-ui新增序列号生成方法	2018-12-28 17:33:15 +08:00
RuoYi	3d3017804d	Excel注解支持多级获取	2018-12-28 16:15:56 +08:00
wangchl	63ee2ba2e7	修复会出现空指针异常	2018-12-28 14:23:23 +08:00
xjt283525476	aac46aa353	修复明显笔误	2018-12-27 19:41:56 +08:00
RuoYi	c6e4daedd4	摸版edit缺少;	2018-12-27 11:43:16 +08:00
GeBron	6b9b8ed889	!56 修改注释中的参数名称 Merge pull request !56 from GeBron/master	2018-12-25 23:29:09 +08:00
RuoYi	1f000d9f84	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-12-25 23:26:52 +08:00
RuoYi	9d5a702e1f	新增方法$.operate.get(url)	2018-12-25 23:24:38 +08:00
GeBron	bb1831f609	修改注释中的参数名称	2018-12-25 20:35:18 +08:00
RuoYi	c628cf7ee7	去掉多余;	2018-12-25 17:16:27 +08:00
RuoYi	1de73da333	会话检查优化	2018-12-25 11:56:16 +08:00
RuoYi	c404de1773	reset	2018-12-20 19:41:56 +08:00
wangchl	cfcd48b6b2	取消配置文件配置从数据源，改为直接从数据库中直接读取	2018-12-20 14:24:02 +08:00
RuoYi	a87e1d019d	修正getSubject命名	2018-12-19 18:10:44 +08:00
RuoYi	ef91e71d7b	修正登录必填项位置偏移	2018-12-19 14:58:06 +08:00
zhangmrit	3bacfc5951	!55 模板 Merge pull request !55 from zhangmrit/ruoyi	2018-12-19 14:54:18 +08:00
zhangmrit	b5cd54da66	时区	2018-12-19 14:51:08 +08:00
zhangmrit	0e9925a481	mysql时区和模板修复	2018-12-19 13:55:27 +08:00
RuoYi	7943b765ca	升级MYSQL驱动	2018-12-18 18:16:29 +08:00
RuoYi	a74e58f7d5	升级SpringBoot到最新版本2.1.1	2018-12-17 22:32:37 +08:00
RuoYi	ea58f8db9c	添加群号	2018-12-14 17:25:04 +08:00
RuoYi	89e21eecea	验证码配置补齐注释	2018-12-14 12:43:31 +08:00
RuoYi	35df1dbcdf	验证码文本字符间距修正	2018-12-14 12:30:33 +08:00
RuoYi	0972bba763	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-12-12 13:26:16 +08:00
RuoYi	583b06ca9a	登录界面去除iCheck插件改为自定义css（提升响应速度及部分背景图不适应）	2018-12-12 13:26:01 +08:00
RuoYi	6a4b1898b1	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-12-08 23:11:16 +08:00
RuoYi	268f0a6321	陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴（2核8G云服务器5M带宽）	2018-12-08 23:11:02 +08:00
RuoYi	e56a7e7e57	磁盘（光驱）验证除数不为零	2018-12-06 11:44:20 +08:00
RuoYi	9d225fecb9	修正部门菜单排序字段无效	2018-12-03 20:47:33 +08:00
RuoYi	d24481f9a5	部门修改不允许最后层级节点选择	2018-12-01 18:39:54 +08:00
RuoYi	6a592827e8	若依 3.1	2018-12-01 16:14:19 +08:00
RuoYi	451caf12fc	修正选中菜单项无效	2018-11-30 11:37:50 +08:00
zhangmrit	7517b1baa9	!46 多余的标签 Merge pull request !46 from zhangmrit/ruoyi	2018-11-28 19:03:37 +08:00
zhangmrit	5d582331d3	多余的标签	2018-11-28 18:32:55 +08:00
tenchiwuyo	2d99d2c286	!45 补全@Override注解；修正注释中参数项； Merge pull request !45 from tenchiwuyo/master	2018-11-28 16:47:42 +08:00
andy	d881d45829	补全@Override注解；修正注释中参数项；	2018-11-28 16:19:53 +08:00
chenzz	66aabcd2b4	!43 修复菜单,部门管理tree控件展开/折叠不可用问题 Merge pull request !43 from chenzz/Branch_bug_fix	2018-11-26 15:37:18 +08:00
chenzz	6128d816de	修复菜单,部门管理tree控件展开/折叠不可用问题	2018-11-26 15:35:37 +08:00
RuoYi	553358aa12	新增提交静默更新表格方法	2018-11-25 17:27:57 +08:00
RuoYi	650f89ac13	任务日志新增详细	2018-11-24 16:13:35 +08:00
RuoYi	1292dcf579	Excel注解新增 height/width/suffix/defaultValue	2018-11-24 08:54:01 +08:00
RuoYi	1c1078565a	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-11-23 22:43:53 +08:00
RuoYi	4d2d5defb9	Excel注解新增 dateFormat日期格式/readConverterExp读取内容转表达式	2018-11-23 22:43:20 +08:00
wangchl	75f27dc536	删出冗余代码	2018-11-23 17:16:48 +08:00
RuoYi	aa06f1adc5	代码生成datas变量全局	2018-11-23 13:26:03 +08:00
RuoYi	a42c824e92	文件路径保持与packageName一致	2018-11-22 21:33:57 +08:00
RuoYi	67e87bde94	在线用户服务修改	2018-11-22 13:03:57 +08:00
若依	a2735adc57	!39 ruoyi-system模块下SysUserOnlineServiceImpl未实现ISysUserOnlineService Merge pull request !39 from TyroneGo/master	2018-11-22 12:35:11 +08:00
Tyrone	80bda1909c	SysUserOnlineServiceImpl类没有实现ISysUserOnlineService	2018-11-22 10:27:16 +08:00
RuoYi	a46738dd9d	会话获取Principal	2018-11-22 09:28:06 +08:00
RuoYi	c96b73bbda	代码生成优化	2018-11-21 23:37:09 +08:00
RuoYi	4fed9a1e50	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-11-19 18:05:57 +08:00
RuoYi	b0495c23a6	修复热部署引起Null	2018-11-19 18:05:44 +08:00
若依	007a4e5275	!36 注解丢失 Merge pull request !36 from 麦洛/master	2018-11-19 17:06:20 +08:00
麦洛	bf01219420	添加丢失的 @Override注解	2018-11-19 15:43:18 +08:00
RuoYi	bcb7ba19f9	系统用户会话命名sysUser	2018-11-18 18:17:40 +08:00
RuoYi	d870710af1	系统用户会话命名sysUser	2018-11-18 18:02:20 +08:00
RuoYi	6244e6bf18	全局ajax提示	2018-11-15 18:34:05 +08:00
RuoYi	c1be1659ea	增加关闭全屏	2018-11-15 15:33:03 +08:00
RuoYi	6cda301f43	选项卡新增全屏显示	2018-11-15 13:35:41 +08:00
wangchl	e5b314cc96	修复定时任务无法删除参数问题	2018-11-15 12:07:20 +08:00
RuoYi	3383418837	新增打包文件	2018-11-15 08:58:54 +08:00
RuoYi	3a44c4e765	日志详细优化	2018-11-14 23:08:52 +08:00
RuoYi	0c5da2cf17	上传头像提交修改	2018-11-14 18:29:59 +08:00
CharlesSong	ecfba42651	!34 BaseController迁移到framework模块的com.ruoyi.web.base路径下 Merge pull request !34 from CharlesSong/master	2018-11-13 16:55:24 +08:00
CharlesSong	26b4f598e2	为了便于二次开发依赖framework项目 1.BaseController迁移到framework com.ruoyi.web.base中 2.admin中的properties 放到root pom中	2018-11-13 16:48:44 +08:00
RuoYi	737c2d8515	前台日期格式转化	2018-11-13 13:07:00 +08:00
RuoYi	8a005a088d	2018年度最受欢迎中国开源软件评选请给若依/RuoYi 投票，谢谢支持。 https://www.oschina.net/project/top_cn_2018?sort=1	2018-11-12 10:57:54 +08:00
RuoYi	dcc534bb2d	2018年度最受欢迎中国开源软件评选请给若依/RuoYi 投票，谢谢支持。 https://www.oschina.net/project/top_cn_2018?sort=1	2018-11-12 10:55:37 +08:00
RuoYi	ebc6a1ade2	登录失败清空验证码	2018-11-07 22:25:36 +08:00
RuoYi	834089ef08	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-11-01 17:49:35 +08:00
RuoYi	d30b66b633	阿里云双11活动1折团	2018-11-01 17:49:23 +08:00
RuoYi	6a4894e9d1	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-10-27 21:39:36 +08:00
RuoYi	a44aa5db42	校验cron表达式是否有效	2018-10-27 21:39:01 +08:00
RuoYi	71c3274333	修改finalName	2018-10-26 13:29:07 +08:00
RuoYi	1961ca5197	添加warName	2018-10-26 13:21:40 +08:00
RuoYi	ba2d7f418d	部署war包启动说明	2018-10-26 13:01:30 +08:00
RuoYi	83b4c25137	扫描路径修改	2018-10-18 16:48:05 +08:00
RuoYi	6ee8053a9b	内网不查询地址	2018-10-16 20:21:59 +08:00
Skqing	7b0e1c46c5	!32 判断如果是内网IP则不去获取IP地址 Merge pull request !32 from Skqing/master	2018-10-16 19:57:55 +08:00
tenchiwuyo	6c99bc1059	!33 修正参数名称 Merge pull request !33 from tenchiwuyo/master	2018-10-16 19:54:17 +08:00
andy	f0dadb0123	Merge remote-tracking branch 'origin/master'	2018-10-16 16:19:16 +08:00
andy	6afaae0c05	修正参数名称，deptId改为operId	2018-10-16 16:17:24 +08:00
Skqing	e4b9638bd5	判断如果是内网IP则不去获取IP地址	2018-10-16 12:47:09 +08:00
Administrator	27dee2a63a	增加16号段的电话号码验证	2018-10-15 20:38:16 +08:00
RuoYi	260feb7cef	优化一些细节	2018-10-12 14:10:25 +08:00
tenchiwuyo	c778cd2ac9	!31 表格增加行间隔色配置项 Merge pull request !31 from tenchiwuyo/master	2018-10-12 13:28:59 +08:00
andy	9660e30ca5	增加表格是否行间隔色的option配置项	2018-10-12 13:21:08 +08:00
RuoYi	5285003dee	修复个人信息-修改密码	2018-10-11 20:27:34 +08:00
RuoYi	b5e8432e2f	代码生成路径调整	2018-10-10 21:56:19 +08:00
j3east	4ac96a8348	!30 gitignore更新 Merge pull request !30 from j3east/master	2018-10-09 17:25:02 +08:00
cj	f7a0c94c16	不能直接忽略所有名为build的文件夹，因为源代码目录中含也有名为build的文件夹，	2018-10-09 15:39:01 +08:00
RuoYi	16dc6ab57e	父部门不能选择&选择树自适应	2018-10-08 13:41:45 +08:00
j3east	5b2664a87a	!29 添加gitignore Merge pull request !29 from j3east/master	2018-10-07 23:26:20 +08:00
cj	5070f1325f	添加 gitignore	2018-10-07 23:22:16 +08:00
RuoYi	bc48c80240	swagger2-UI	2018-10-07 23:10:09 +08:00
kuangbx	ebe67e7bde	Merge remote-tracking branch 'origin/master' # Conflicts: # ruoyi-admin/pom.xml # ruoyi-framework/pom.xml	2018-10-07 22:29:19 +08:00
kuangbx	211a0ab746	[修改内容]调整Pom依赖，目前ruoyi-admin只依赖ruoyi-framework,ruoyi-framework依赖ruoyi-system，ruoyi-generator,ruoyi-quartz。ruoyi-common为基础模块。 [修改人]匡宝旭 [修改时间]2018-10-07 22:06 [备注]编译，打包，测试均通过	2018-10-07 22:06:58 +08:00
RuoYi	2f0c5d2b03	若依 3.0	2018-10-07 21:36:22 +08:00
RuoYi	e166127c9f	若依 3.0	2018-10-07 14:16:47 +08:00
RuoYi	fed3aa8231	更新演示图	2018-10-06 13:11:13 +08:00
RuoYi	aca37844ba	权限标识修改	2018-10-05 19:27:24 +08:00
RuoYi	8b4ea05391	部门/菜单支持（展开/折叠）	2018-10-05 18:43:41 +08:00
RuoYi	5e5c21e14f	format	2018-10-03 23:11:09 +08:00
RuoYi	c85f36fa1f	固定按钮位置（提交/关闭）	2018-10-03 21:44:14 +08:00
RuoYi	e68e13bc16	新增清空（登录、操作、调度）日志	2018-10-03 17:42:25 +08:00
RuoYi	fffeef3db5	新增表格检索折叠按钮	2018-10-01 21:32:01 +08:00
RuoYi	4425b81e6d	新增数据权限过滤注解	2018-09-30 17:11:29 +08:00
RuoYi	eb2a24dc3c	name错误修正	2018-09-29 13:33:41 +08:00
luwenlong	cf0c212681	!27 时间格式添加报错代码生成insert时间格式判断	2018-09-28 17:36:30 +08:00
luwenlong	0b0502f308	解决生成的成袋，时间格式添加错误	2018-09-28 17:18:18 +08:00
RuoYi	e1c7db101c	配置context-path默认图片加载问题.	2018-09-27 09:02:58 +08:00
RuoYi	b64bb61207	laydate.css	2018-09-21 14:57:07 +08:00
RuoYi	c2ef17218a	Merge branch 'master' of https://gitee.com/y_project/RuoYi	2018-09-21 14:46:45 +08:00
RuoYi	7d5167b373	时间限制&升级到最新版	2018-09-21 14:46:21 +08:00
RuoYi	8ce5bb4fdf	日志打印输出替换	2018-09-20 19:54:06 +08:00
j3east	9148bb33c3	!26 让【用户管理-账号初始密码】这个参数名副其实账号初始密码	2018-09-20 09:00:12 +08:00
cj	800d3d5710	重置密码时，默认从参数表中获取	2018-09-19 21:16:53 +08:00
RuoYi	f89b4215a1	新域名 ruoyi.vip	2018-09-19 14:18:34 +08:00
RuoYi	9d581bec25	文件上传路径	2018-09-18 18:51:13 +08:00
RuoYi	b6048e5429	1、去掉ry-ui.min 2、登录去掉密码显示， 3、导出调整为绝对路径 4、新增一个detail详细方法	2018-09-18 17:43:31 +08:00
RuoYi	ac14519d76	新增群号	2018-09-14 11:15:34 +08:00
RuoYi	84068a2e2e	升级poi到最新版3.17	2018-09-04 16:49:23 +08:00
RuoYi	1cb672f8bd	修改头像显示当前图片	2018-09-04 13:14:46 +08:00