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

bmw-admin/pom.xml

@@ -3,13 +3,13 @@
          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>
+        <artifactId>bmw</artifactId>
+        <groupId>com.bmw</groupId>
         <version>3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>bmw-admin</artifactId>
 	
 	<description>
 	    web服务入口
@@ -57,20 +57,26 @@
 
 		<!-- 核心模块-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.bmw</groupId>
+            <artifactId>bmw-framework</artifactId>
         </dependency>
         
         <!-- 定时任务-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-quartz</artifactId>
+            <groupId>com.bmw</groupId>
+            <artifactId>bmw-quartz</artifactId>
         </dependency>
         
         <!-- 代码生成-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
+            <groupId>com.bmw</groupId>
+            <artifactId>bmw-generator</artifactId>
+        </dependency>
+
+        <!-- 服务中心-->
+        <dependency>
+            <groupId>com.bmw</groupId>
+            <artifactId>bmw-servicecenter</artifactId>
         </dependency>
         
     </dependencies>

bmw-admin/src/main/java/com/bmw/BmwApplication.java

@@ -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("启动成功");
+    }
+}

bmw-admin/src/main/java/com/bmw/BmwServletInitializer.java

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

bmw-admin/src/main/java/com/bmw/web/controller/common/CommonController.java

@@ -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.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.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.Global;
-import com.ruoyi.common.config.ServerConfig;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
+import com.bmw.common.config.Global;
+import com.bmw.common.config.ServerConfig;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.utils.StringUtils;
+import com.bmw.common.utils.file.FileUploadUtils;
+import com.bmw.common.utils.file.FileUtils;
 
 /**
  * 通用请求处理

bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoDialogController.java

@@ -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.web.bind.annotation.GetMapping;

bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoFormController.java

@@ -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.List;
@@ -6,7 +6,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.bmw.common.core.domain.AjaxResult;
 
 /**
  * 表单相关

bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoIconController.java

@@ -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.web.bind.annotation.GetMapping;

bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoOperateController.java

@@ -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.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.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.web.controller.demo.domain.UserOperateModel;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.PageDomain;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.core.page.TableSupport;
+import com.bmw.common.core.text.Convert;
+import com.bmw.common.exception.BusinessException;
+import com.bmw.common.utils.StringUtils;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.web.controller.demo.domain.UserOperateModel;
 
 /**
  * 操作控制

bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoReportController.java

@@ -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.web.bind.annotation.GetMapping;

bmw-admin/src/main/java/com/bmw/web/controller/demo/controller/DemoTableController.java

@@ -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.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.ResponseBody;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.page.PageDomain;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.core.page.TableSupport;
+import com.bmw.common.utils.DateUtils;
+import com.bmw.common.utils.StringUtils;
 
 /**
  * 表格相关

bmw-admin/src/main/java/com/bmw/web/controller/demo/domain/UserOperateModel.java

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

bmw-admin/src/main/java/com/bmw/web/controller/monitor/DruidController.java

@@ -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.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
+import com.bmw.common.core.controller.BaseController;
 
 /**
  * druid 监控

bmw-admin/src/main/java/com/bmw/web/controller/monitor/ServerController.java

@@ -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.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.common.core.controller.BaseController;
-import com.ruoyi.framework.web.domain.Server;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.framework.web.domain.Server;
 
 /**
  * 服务器监控

bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysLogininforController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.bmw.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.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysLogininfor;
-import com.ruoyi.system.service.ISysLogininforService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.system.domain.SysLogininfor;
+import com.bmw.system.service.ISysLogininforService;
 
 /**
  * 系统访问记录

bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysOperlogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.bmw.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.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysOperLog;
-import com.ruoyi.system.service.ISysOperLogService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.system.domain.SysOperLog;
+import com.bmw.system.service.ISysOperLogService;
 
 /**
  * 操作日志记录

bmw-admin/src/main/java/com/bmw/web/controller/monitor/SysUserOnlineController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.bmw.web.controller.monitor;
 
 import java.util.List;
 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.enums.OnlineStatus;
-import com.ruoyi.framework.shiro.session.OnlineSession;
-import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.enums.OnlineStatus;
+import com.bmw.framework.shiro.session.OnlineSession;
+import com.bmw.framework.shiro.session.OnlineSessionDAO;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysUserOnline;
+import com.bmw.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户监控

bmw-admin/src/main/java/com/bmw/web/controller/system/SysCaptchaController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.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.common.core.controller.BaseController;
+import com.bmw.common.core.controller.BaseController;
 
 /**
  * 图片验证码（支持算术形式）

bmw-admin/src/main/java/com/bmw/web/controller/system/SysConfigController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.service.ISysConfigService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysConfig;
+import com.bmw.system.service.ISysConfigService;
 
 /**
  * 参数配置 信息操作处理

bmw-admin/src/main/java/com/bmw/web/controller/system/SysDeptController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.Ztree;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-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.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.domain.Ztree;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.StringUtils;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysDept;
+import com.bmw.system.domain.SysRole;
+import com.bmw.system.service.ISysDeptService;
 
 /**
  * 部门信息

bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictDataController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysDictData;
-import com.ruoyi.system.service.ISysDictDataService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysDictData;
+import com.bmw.system.service.ISysDictDataService;
 
 /**
  * 数据字典信息

bmw-admin/src/main/java/com/bmw/web/controller/system/SysDictTypeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysDictType;
-import com.ruoyi.system.service.ISysDictTypeService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysDictType;
+import com.bmw.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息

bmw-admin/src/main/java/com/bmw/web/controller/system/SysIndexController.java

@@ -1,16 +1,16 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.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.common.core.controller.BaseController;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysMenu;
-import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.system.service.ISysMenuService;
+import com.bmw.common.config.Global;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysMenu;
+import com.bmw.system.domain.SysUser;
+import com.bmw.system.service.ISysMenuService;
 
 /**
  * 首页 业务处理

bmw-admin/src/main/java/com/bmw/web/controller/system/SysLoginController.java

@@ -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.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.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.utils.ServletUtils;
+import com.bmw.common.utils.StringUtils;
 
 /**
  * 登录验证

bmw-admin/src/main/java/com/bmw/web/controller/system/SysMenuController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.Ztree;
-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.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.domain.Ztree;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysMenu;
+import com.bmw.system.domain.SysRole;
+import com.bmw.system.service.ISysMenuService;
 
 /**
  * 菜单信息

bmw-admin/src/main/java/com/bmw/web/controller/system/SysNoticeController.java

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

bmw-admin/src/main/java/com/bmw/web/controller/system/SysPostController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.service.ISysPostService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysPost;
+import com.bmw.system.service.ISysPostService;
 
 /**
  * 岗位信息操作处理

bmw-admin/src/main/java/com/bmw/web/controller/system/SysProfileController.java

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

bmw-admin/src/main/java/com/bmw/web/controller/system/SysRoleController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysRole;
-import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysRole;
+import com.bmw.system.domain.SysUser;
+import com.bmw.system.domain.SysUserRole;
+import com.bmw.system.service.ISysRoleService;
+import com.bmw.system.service.ISysUserService;
 
 /**
  * 角色信息

bmw-admin/src/main/java/com/bmw/web/controller/system/SysUserController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.bmw.web.controller.system;
 
 import java.util.List;
 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.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.shiro.service.SysPasswordService;
-import com.ruoyi.framework.util.ShiroUtils;
-import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+import com.bmw.common.annotation.Log;
+import com.bmw.common.constant.UserConstants;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.core.page.TableDataInfo;
+import com.bmw.common.enums.BusinessType;
+import com.bmw.common.utils.StringUtils;
+import com.bmw.common.utils.poi.ExcelUtil;
+import com.bmw.framework.shiro.service.SysPasswordService;
+import com.bmw.framework.util.ShiroUtils;
+import com.bmw.system.domain.SysUser;
+import com.bmw.system.service.ISysPostService;
+import com.bmw.system.service.ISysRoleService;
+import com.bmw.system.service.ISysUserService;
 
 /**
  * 用户信息

bmw-admin/src/main/java/com/bmw/web/controller/tool/BuildController.java

@@ -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.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
+import com.bmw.common.core.controller.BaseController;
 
 /**
  * build 表单构建

bmw-admin/src/main/java/com/bmw/web/controller/tool/SwaggerController.java

@@ -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.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.ruoyi.common.core.controller.BaseController;
+import com.bmw.common.core.controller.BaseController;
 
 /**
  * swagger 接口

bmw-admin/src/main/java/com/bmw/web/controller/tool/TestController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.tool;
+package com.bmw.web.controller.tool;
 
 import java.util.ArrayList;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
+import com.bmw.common.core.controller.BaseController;
+import com.bmw.common.core.domain.AjaxResult;
+import com.bmw.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiModel;

bmw-admin/src/main/java/com/bmw/web/core/config/SwaggerConfig.java

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

bmw-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             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
-                password: password
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

bmw-admin/src/main/resources/application.yml

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

bmw-admin/src/main/resources/banner.txt

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

bmw-admin/src/main/resources/ehcache/ehcache-shiro.xml

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

bmw-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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" />
 
@@ -72,7 +72,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.bmw" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />