ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !111 from 王炸ll/feature/mwu2

This commit is contained in:
Gitee 2019-07-26 15:17:42 +08:00
parent 9cf4b8935f 60f67dcd57
commit 88d532a056
606 changed files with 115398 additions and 112529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-admin/pom.xml → bmw-admin/pom.xml
View File

@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi</artifactId> <artifactId>bmw</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.bmw</groupId>
<version>3.4</version> <version>3.4</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId> <artifactId>bmw-admin</artifactId>
<description> <description>
web服务入口 web服务入口
@ -57,20 +57,26 @@
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.bmw</groupId>
<artifactId>ruoyi-framework</artifactId> <artifactId>bmw-framework</artifactId>
</dependency> </dependency>
<!-- 定时任务--> <!-- 定时任务-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.bmw</groupId>
<artifactId>ruoyi-quartz</artifactId> <artifactId>bmw-quartz</artifactId>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.bmw</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>bmw-generator</artifactId>
</dependency>
<!-- 服务中心-->
<dependency>
<groupId>com.bmw</groupId>
<artifactId>bmw-servicecenter</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

21
bmw-admin/src/main/java/com/bmw/BmwApplication.java Normal file
View File

@ -0,0 +1,21 @@
package com.bmw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
/**
* 启动程序
*
* @author ruoyi
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class BmwApplication
{
public static void main(String[] args)
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(BmwApplication.class, args);
System.out.println("启动成功");
}
}

6
ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → bmw-admin/src/main/java/com/bmw/BmwServletInitializer.java
View File

@ -1,4 +1,4 @@
package com.ruoyi; package com.bmw;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
* *
* @author ruoyi * @author ruoyi
*/ */
public class RuoYiServletInitializer extends SpringBootServletInitializer public class BmwServletInitializer extends SpringBootServletInitializer
{ {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
{ {
return application.sources(RuoYiApplication.class); return application.sources(BmwApplication.class);
} }
} }

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java → bmw-admin/src/main/java/com/bmw/web/controller/common/CommonController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.common; package com.bmw.web.controller.common;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.Global; import com.bmw.common.config.Global;
import com.ruoyi.common.config.ServerConfig; import com.bmw.common.config.ServerConfig;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.bmw.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.bmw.common.utils.file.FileUtils;
/** /**
* 通用请求处理 * 通用请求处理

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoDialogController.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoDialogController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.demo.controller; package com.bmw.web.controller.demo.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoFormController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.demo.controller; package com.bmw.web.controller.demo.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -6,7 +6,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
/** /**
* 表单相关 * 表单相关

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoIconController.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoIconController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.demo.controller; package com.bmw.web.controller.demo.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoOperateController.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoOperateController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.demo.controller; package com.bmw.web.controller.demo.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain; import com.bmw.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport; import com.bmw.common.core.page.TableSupport;
import com.ruoyi.common.core.text.Convert; import com.bmw.common.core.text.Convert;
import com.ruoyi.common.exception.BusinessException; import com.bmw.common.exception.BusinessException;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.web.controller.demo.domain.UserOperateModel; import com.bmw.web.controller.demo.domain.UserOperateModel;
/** /**
* 操作控制 * 操作控制

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoReportController.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoReportController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.demo.controller; package com.bmw.web.controller.demo.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoTableController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.demo.controller; package com.bmw.web.controller.demo.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -11,12 +11,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.page.PageDomain; import com.bmw.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport; import com.bmw.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils; import com.bmw.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
/** /**
* 表格相关 * 表格相关

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/domain/UserOperateModel.java → bmw-admin/src/main/java/com/bmw/web/controller/demo/domain/UserOperateModel.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.demo.domain; package com.bmw.web.controller.demo.domain;
import java.util.Date; import java.util.Date;
import com.ruoyi.common.annotation.Excel; import com.bmw.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.Type; import com.bmw.common.annotation.Excel.Type;
import com.ruoyi.common.core.domain.BaseEntity; import com.bmw.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.DateUtils; import com.bmw.common.utils.DateUtils;
public class UserOperateModel extends BaseEntity public class UserOperateModel extends BaseEntity
{ {

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/DruidController.java → bmw-admin/src/main/java/com/bmw/web/controller/monitor/DruidController.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.monitor; package com.bmw.web.controller.monitor;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
/** /**
* druid 监控 * druid 监控

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java → bmw-admin/src/main/java/com/bmw/web/controller/monitor/ServerController.java
View File

@ -1,12 +1,12 @@
package com.ruoyi.web.controller.monitor; package com.bmw.web.controller.monitor;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.framework.web.domain.Server; import com.bmw.framework.web.domain.Server;
/** /**
* 服务器监控 * 服务器监控

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysLogininforController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor; package com.bmw.web.controller.monitor;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor; import com.bmw.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService; import com.bmw.system.service.ISysLogininforService;
/** /**
* 系统访问记录 * 系统访问记录

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysOperlogController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor; package com.bmw.web.controller.monitor;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog; import com.bmw.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService; import com.bmw.system.service.ISysOperLogService;
/** /**
* 操作日志记录 * 操作日志记录

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysUserOnlineController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor; package com.bmw.web.controller.monitor;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -9,17 +9,17 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.enums.OnlineStatus; import com.bmw.common.enums.OnlineStatus;
import com.ruoyi.framework.shiro.session.OnlineSession; import com.bmw.framework.shiro.session.OnlineSession;
import com.ruoyi.framework.shiro.session.OnlineSessionDAO; import com.bmw.framework.shiro.session.OnlineSessionDAO;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysUserOnline; import com.bmw.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService; import com.bmw.system.service.ISysUserOnlineService;
/** /**
* 在线用户监控 * 在线用户监控

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysCaptchaController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysCaptchaController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.Producer; import com.google.code.kaptcha.Producer;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
/** /**
* 图片验证码（支持算术形式） * 图片验证码（支持算术形式）

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysConfigController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysConfig; import com.bmw.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService; import com.bmw.system.service.ISysConfigService;
/** /**
* 参数配置 信息操作处理 * 参数配置 信息操作处理

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysDeptController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.Ztree; import com.bmw.common.core.domain.Ztree;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysDept; import com.bmw.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole; import com.bmw.system.domain.SysRole;
import com.ruoyi.system.service.ISysDeptService; import com.bmw.system.service.ISysDeptService;
/** /**
* 部门信息 * 部门信息

20
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictDataController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysDictData; import com.bmw.system.domain.SysDictData;
import com.ruoyi.system.service.ISysDictDataService; import com.bmw.system.service.ISysDictDataService;
/** /**
* 数据字典信息 * 数据字典信息

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictTypeController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysDictType; import com.bmw.system.domain.SysDictType;
import com.ruoyi.system.service.ISysDictTypeService; import com.bmw.system.service.ISysDictTypeService;
/** /**
* 数据字典信息 * 数据字典信息

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysIndexController.java
View File

@ -1,16 +1,16 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import com.ruoyi.common.config.Global; import com.bmw.common.config.Global;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysMenu; import com.bmw.system.domain.SysMenu;
import com.ruoyi.system.domain.SysUser; import com.bmw.system.domain.SysUser;
import com.ruoyi.system.service.ISysMenuService; import com.bmw.system.service.ISysMenuService;
/** /**
* 首页 业务处理 * 首页 业务处理

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysLoginController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils; import com.bmw.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
/** /**
* 登录验证 * 登录验证

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysMenuController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.Ztree; import com.bmw.common.core.domain.Ztree;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysMenu; import com.bmw.system.domain.SysMenu;
import com.ruoyi.system.domain.SysRole; import com.bmw.system.domain.SysRole;
import com.ruoyi.system.service.ISysMenuService; import com.bmw.system.service.ISysMenuService;
/** /**
* 菜单信息 * 菜单信息

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysNoticeController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysNotice; import com.bmw.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService; import com.bmw.system.service.ISysNoticeService;
/** /**
* 公告 信息操作处理 * 公告 信息操作处理

22
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysPostController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysPost; import com.bmw.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService; import com.bmw.system.service.ISysPostService;
/** /**
* 岗位信息操作处理 * 岗位信息操作处理

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysProfileController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.config.Global; import com.bmw.common.config.Global;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils; import com.bmw.common.utils.file.FileUploadUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService; import com.bmw.framework.shiro.service.SysPasswordService;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysUser; import com.bmw.system.domain.SysUser;
import com.ruoyi.system.service.ISysUserService; import com.bmw.system.service.ISysUserService;
/** /**
* 个人信息 业务处理 * 个人信息 业务处理

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysRoleController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -11,19 +11,19 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysRole; import com.bmw.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser; import com.bmw.system.domain.SysUser;
import com.ruoyi.system.domain.SysUserRole; import com.bmw.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService; import com.bmw.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.bmw.system.service.ISysUserService;
/** /**
* 角色信息 * 角色信息

30
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → bmw-admin/src/main/java/com/bmw/web/controller/system/SysUserController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.bmw.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -12,20 +12,20 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log; import com.bmw.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.bmw.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.bmw.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.bmw.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.bmw.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.shiro.service.SysPasswordService; import com.bmw.framework.shiro.service.SysPasswordService;
import com.ruoyi.framework.util.ShiroUtils; import com.bmw.framework.util.ShiroUtils;
import com.ruoyi.system.domain.SysUser; import com.bmw.system.domain.SysUser;
import com.ruoyi.system.service.ISysPostService; import com.bmw.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService; import com.bmw.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.bmw.system.service.ISysUserService;
/** /**
* 用户信息 * 用户信息

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/BuildController.java → bmw-admin/src/main/java/com/bmw/web/controller/tool/BuildController.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.tool; package com.bmw.web.controller.tool;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
/** /**
* build 表单构建 * build 表单构建

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java → bmw-admin/src/main/java/com/bmw/web/controller/tool/SwaggerController.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.tool; package com.bmw.web.controller.tool;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
/** /**
* swagger 接口 * swagger 接口

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java → bmw-admin/src/main/java/com/bmw/web/controller/tool/TestController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.tool; package com.bmw.web.controller.tool;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController; import com.bmw.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.bmw.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.bmw.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

8
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java → bmw-admin/src/main/java/com/bmw/web/core/config/SwaggerConfig.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.web.core.config; package com.bmw.web.core.config;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.Global; import com.bmw.common.config.Global;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
@ -36,7 +36,7 @@ public class SwaggerConfig
// 扫描所有有注解的api，用这种方式更灵活 // 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解 // 扫描指定包中的swagger注解
//.apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) //.apis(RequestHandlerSelectors.basePackage("com.bmw.project.tool.swagger"))
// 扫描所有 .apis(RequestHandlerSelectors.any()) // 扫描所有 .apis(RequestHandlerSelectors.any())
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();
@ -50,7 +50,7 @@ public class SwaggerConfig
// 用ApiInfoBuilder进行定制 // 用ApiInfoBuilder进行定制
return new ApiInfoBuilder() return new ApiInfoBuilder()
// 设置标题 // 设置标题
.title("标题：若依管理系统_接口文档") .title("标题：系统_接口文档")
// 描述 // 描述
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
// 作者信息 // 作者信息

4
ruoyi-admin/src/main/resources/application-druid.yml → bmw-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: password password: 123456
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

10
ruoyi-admin/src/main/resources/application.yml → bmw-admin/src/main/resources/application.yml
View File

@ -1,7 +1,7 @@
# 项目相关配置 # 项目相关配置
ruoyi: ruoyi:
# 名称 # 名称
name: RuoYi name: BMW
# 版本 # 版本
version: 3.4.0 version: 3.4.0
# 版权年份 # 版权年份
@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath profile: D:/bmw/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: true addressEnabled: true
@ -19,7 +19,7 @@ server:
port: 80 port: 80
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /bmw
tomcat: tomcat:
# tomcat的URI编码 # tomcat的URI编码
uri-encoding: UTF-8 uri-encoding: UTF-8
@ -31,7 +31,7 @@ server:
# 日志配置 # 日志配置
logging: logging:
level: level:
com.ruoyi: debug com.bmw: debug
org.springframework: warn org.springframework: warn
# 用户配置 # 用户配置
@ -73,7 +73,7 @@ spring:
# MyBatis # MyBatis
mybatis: mybatis:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.ruoyi typeAliasesPackage: com.bmw
# 配置mapper的扫描，找到所有的mapper.xml映射文件 # 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件 # 加载全局的配置文件

8
bmw-admin/src/main/resources/banner.txt Normal file
View File

@ -0,0 +1,8 @@
Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version}
______ ___ ___ _ _
| ___ \| \/ || | | |
| |_/ /| . . || | | |
| ___ \| |\/| || |/\| |
| |_/ /| | | |\ /\ /
\____/ \_| |_/ \/ \/

2
ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml → bmw-admin/src/main/resources/ehcache/ehcache-shiro.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ehcache name="ruoyi" updateCheck="false"> <ehcache name="bmw" updateCheck="false">
<!-- 磁盘缓存位置 --> <!-- 磁盘缓存位置 -->
<diskStore path="java.io.tmpdir"/> <diskStore path="java.io.tmpdir"/>

4
ruoyi-admin/src/main/resources/logback.xml → bmw-admin/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="/home/ruoyi/logs" /> <property name="log.path" value="/home/bmw/logs" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@ -72,7 +72,7 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" /> <logger name="com.bmw" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />

0
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml → bmw-admin/src/main/resources/mybatis/mybatis-config.xml
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/beautifyhtml/beautifyhtml.js → bmw-admin/src/main/resources/static/ajax/libs/beautifyhtml/beautifyhtml.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/blockUI/jquery.blockUI.js → bmw-admin/src/main/resources/static/ajax/libs/blockUI/jquery.blockUI.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.css → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/loading-sm.gif → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/loading-sm.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/loading.gif → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/loading.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 847 B

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.css → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.css → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/tableExport.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/export/tableExport.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/bootstrap-table-reorder.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/bootstrap-table-reorder.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/jquery.tablednd.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder/jquery.tablednd.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js → bmw-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.css → bmw-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.css
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.js → bmw-admin/src/main/resources/static/ajax/libs/cropbox/cropbox.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.css → bmw-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.js → bmw-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.min.css → bmw-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.min.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.min.js → bmw-admin/src/main/resources/static/ajax/libs/datapicker/bootstrap-datetimepicker.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.css → bmw-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.js → bmw-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.css → bmw-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js → bmw-admin/src/main/resources/static/ajax/libs/duallistbox/bootstrap-duallistbox.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/curvedLines.js → bmw-admin/src/main/resources/static/ajax/libs/flot/curvedLines.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.js → bmw-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.pie.js → bmw-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.pie.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.resize.js → bmw-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.resize.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.spline.js → bmw-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.spline.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.symbol.js → bmw-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.symbol.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.tooltip.min.js → bmw-admin/src/main/resources/static/ajax/libs/flot/jquery.flot.tooltip.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js → bmw-admin/src/main/resources/static/ajax/libs/fullscreen/jquery.fullscreen.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/custom.css → bmw-admin/src/main/resources/static/ajax/libs/iCheck/custom.css
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green-login.png → bmw-admin/src/main/resources/static/ajax/libs/iCheck/green-login.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

0
ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green.png → bmw-admin/src/main/resources/static/ajax/libs/iCheck/green.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/green@2x.png → bmw-admin/src/main/resources/static/ajax/libs/iCheck/green@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
ruoyi-admin/src/main/resources/static/ajax/libs/iCheck/icheck.min.js → bmw-admin/src/main/resources/static/ajax/libs/iCheck/icheck.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.css → bmw-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.css
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.js → bmw-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.min.css → bmw-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.min.css vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.min.js → bmw-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.min.js vendored
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.css → bmw-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.css
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js → bmw-admin/src/main/resources/static/ajax/libs/jquery-layout/jquery.layout-latest.js
View File

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_close.png → bmw-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 601 B

After

Width:  |  Height:  |  Size: 601 B

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_open.png → bmw-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/1_open.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 580 B

After

Width:  |  Height:  |  Size: 580 B

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/2.png → bmw-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 570 B

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/3.png → bmw-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

0
ruoyi-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/4.png → bmw-admin/src/main/resources/static/ajax/libs/jquery-ztree/3.5/css/default/img/diy/4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 399 B

Some files were not shown because too many files have changed in this diff Show More