2023年9月22日17:26:35

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 RuoYi
+Copyright (c) 2018 iot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -5,10 +5,10 @@
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。
-* 提供了一个Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
-* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
+* 提供了一个Oracle版本[iot-Vue-Oracle](https://github.com/yangzongzhuan/iot-Vue-Oracle)，保持同步更新。
+* 不分离版本，请移步[iot](https://gitee.com/y_project/iot)，微服务版本，请移步[iot-Cloud](https://gitee.com/y_project/iot-Cloud)
 * 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
-* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)  
+* 阿里云折扣场：[点我进入](http://aly.iot.vip)，腾讯云秒杀场：[点我进入](http://txy.iot.vip)  
 * 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)  
 
 ## 内置功能
@@ -36,8 +36,8 @@
 - admin/admin123  
 - 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
 
-演示地址：http://vue.ruoyi.vip  
-文档地址：http://doc.ruoyi.vip
+演示地址：http://vue.iot.vip  
+文档地址：http://doc.iot.vip
 
 ## 演示图
 

ruoyi-admin/pom.xml → iot-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>iot</artifactId>
+        <groupId>com.iot</groupId>
         <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>iot-admin</artifactId>
 
     <description>
         web服务入口
@@ -94,38 +94,20 @@
 
         <!-- 核心模块-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.iot</groupId>
+            <artifactId>iot-framework</artifactId>
         </dependency>
 
         <!-- 定时任务-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-quartz</artifactId>
+            <groupId>com.iot</groupId>
+            <artifactId>iot-quartz</artifactId>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
-        </dependency>
-
-        <!-- 仓库模块-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-warehouse</artifactId>
-        </dependency>
-
-        <!--车队模块-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-fleet</artifactId>
-        </dependency>
-
-        <!-- 插件模块 -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-plugin</artifactId>
+            <groupId>com.iot</groupId>
+            <artifactId>iot-generator</artifactId>
         </dependency>
 
         <!--解析Xml 文件-->
@@ -140,11 +122,6 @@
             <artifactId>okhttp</artifactId>
             <version>3.11.0</version>
         </dependency>
-        <!--航运模块-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-shipping</artifactId>
-        </dependency>
 
     </dependencies>
 

iot-admin/src/main/java/com/iot/Application.java

@@ -0,0 +1,20 @@
+package com.iot;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * 启动程序
+ *
+ * @author iot
+ */
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@MapperScan("mapper")
+public class Application {
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  工业物联网启动成功   ლ(´ڡ`ლ)ﾞ  \n");
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → iot-admin/src/main/java/com/iot/IotServletInitializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.iot;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
 /**
  * web容器中进行部署
  * 
- * @author ruoyi
+ * @author iot
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class IotServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(RuoYiApplication.class);
+        return application.sources(Application.class);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → iot-admin/src/main/java/com/iot/web/controller/common/CaptchaController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.common;
+package com.iot.web.controller.common;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -6,22 +6,23 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+
+import com.iot.common.constant.Constants;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.redis.RedisCache;
+import com.iot.common.utils.sign.Base64;
+import com.iot.common.utils.uuid.IdUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.google.code.kaptcha.Producer;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
 
 /**
  * 验证码操作处理
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 public class CaptchaController
@@ -36,7 +37,7 @@ public class CaptchaController
     private RedisCache redisCache;
     
     // 验证码类型
-    @Value("${ruoyi.captchaType}")
+    @Value("${iot.captchaType}")
     private String captchaType;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java → iot-admin/src/main/java/com/iot/web/controller/common/CommonController.java

@@ -1,9 +1,17 @@
-package com.ruoyi.web.controller.common;
+package com.iot.web.controller.common;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.iot.common.config.IotConfig;
+import com.iot.common.constant.Constants;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.utils.StringUtils;
+import com.iot.common.utils.file.FileUploadUtils;
+import com.iot.common.utils.file.FileUtils;
+import com.iot.common.utils.file.ImageUtils;
+import com.iot.common.utils.file.MimeTypeUtils;
+import com.iot.framework.config.ServerConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,22 +20,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-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.ruoyi.framework.config.ServerConfig;
-
-import static com.ruoyi.common.utils.file.FileUploadUtils.getExtension;
-import static com.ruoyi.common.utils.file.FileUploadUtils.isPicture;
-import static com.ruoyi.common.utils.file.ImageUtils.imageMethod;
 
 /**
  * 通用请求处理
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 public class CommonController
@@ -54,7 +51,7 @@ public class CommonController
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);*/
             String realFileName = fileName;
-            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+            String filePath = IotConfig.getDownloadPath() + fileName;
 
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
@@ -80,11 +77,11 @@ public class CommonController
         {
             AjaxResult ajax = AjaxResult.success();
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
-            String extension = getExtension(file);
+            String filePath = IotConfig.getUploadPath();
+            String extension = FileUploadUtils.getExtension(file);
             MultipartFile multipartFile = null;
-            if (isPicture(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
-                multipartFile = imageMethod(file);
+            if (FileUploadUtils.isPicture(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
+                multipartFile = ImageUtils.imageMethod(file);
                 String thumbnail = FileUploadUtils.upload(filePath, multipartFile);
                 String url = serverConfig.getUrl() + thumbnail;
                 ajax.put("thumbnailUrl", url);
@@ -120,7 +117,7 @@ public class CommonController
                 throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
             }
             // 本地资源路径
-            String localPath = RuoYiConfig.getProfile();
+            String localPath = IotConfig.getProfile();
             // 数据库资源地址
             String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
             // 下载名称

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java → iot-admin/src/main/java/com/iot/web/controller/monitor/CacheController.java

@@ -1,10 +1,13 @@
-package com.ruoyi.web.controller.monitor;
+package com.iot.web.controller.monitor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -12,13 +15,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 缓存监控
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/monitor/cache")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java → iot-admin/src/main/java/com/iot/web/controller/monitor/ServerController.java

@@ -1,16 +1,16 @@
-package com.ruoyi.web.controller.monitor;
+package com.iot.web.controller.monitor;
 
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.framework.web.domain.Server;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
 
 /**
  * 服务器监控
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/monitor/server")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → iot-admin/src/main/java/com/iot/web/controller/monitor/SysLogininforController.java

@@ -1,7 +1,15 @@
-package com.ruoyi.web.controller.monitor;
+package com.iot.web.controller.monitor;
 
 import java.util.List;
 
+import com.iot.common.annotation.Log;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.domain.SysLogininfor;
+import com.iot.system.service.ISysLogininforService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -9,19 +17,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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;
 
 /**
  * 系统访问记录
  *
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/monitor/logininfor")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → iot-admin/src/main/java/com/iot/web/controller/monitor/SysOperlogController.java

@@ -1,6 +1,15 @@
-package com.ruoyi.web.controller.monitor;
+package com.iot.web.controller.monitor;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.domain.SysOperLog;
+import com.iot.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -8,19 +17,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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;
 
 /**
  * 操作日志记录
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/monitor/operlog")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → iot-admin/src/main/java/com/iot/web/controller/monitor/SysUserOnlineController.java

@@ -1,9 +1,21 @@
-package com.ruoyi.web.controller.monitor;
+package com.iot.web.controller.monitor;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.Constants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.model.LoginUser;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.core.redis.RedisCache;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.StringUtils;
+import com.iot.system.domain.SysUserOnline;
+import com.iot.system.service.ISysUserOnlineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -11,22 +23,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户监控
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/monitor/online")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysConfigController.java

@@ -1,6 +1,18 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.annotation.RepeatSubmit;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.domain.SysConfig;
+import com.iot.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -12,22 +24,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
-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.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.service.ISysConfigService;
 
 /**
  * 参数配置 信息操作处理
  *
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/config")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysDeptController.java

@@ -1,8 +1,17 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.Iterator;
 import java.util.List;
 
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysDept;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.StringUtils;
+import com.iot.system.service.ISysDeptService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -15,20 +24,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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.entity.SysDept;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysDeptService;
 
 /**
  * 部门信息
  *
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/dept")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysDictDataController.java

@@ -1,6 +1,17 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysDictData;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.service.ISysDictDataService;
+import com.iot.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -12,21 +23,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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.domain.entity.SysDictData;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictDataService;
-import com.ruoyi.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/dict/data")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysDictTypeController.java

@@ -1,6 +1,17 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysDictType;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -12,21 +23,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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.entity.SysDictType;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/dict/type")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysLoginController.java

@@ -1,28 +1,26 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
 
+import com.iot.common.constant.Constants;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysMenu;
+import com.iot.common.core.domain.model.LoginBody;
+import com.iot.common.core.domain.model.LoginUser;
+import com.iot.common.utils.ServletUtils;
+import com.iot.framework.web.service.SysLoginService;
+import com.iot.framework.web.service.SysPermissionService;
+import com.iot.framework.web.service.TokenService;
+import com.iot.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysMenuService;
-
-import javax.servlet.http.HttpServletRequest;
+import com.iot.common.core.domain.entity.SysUser;
 
 /**
  * 登录验证
  *
- * @author ruoyi
+ * @author iot
  */
 @RestController
 public class SysLoginController {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysMenuController.java

@@ -1,6 +1,20 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.Constants;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysMenu;
+import com.iot.common.core.domain.model.LoginUser;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.ServletUtils;
+import com.iot.common.utils.StringUtils;
+import com.iot.framework.web.service.TokenService;
+import com.iot.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -12,24 +26,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
-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.entity.SysMenu;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysMenuService;
 
 /**
  * 菜单信息
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/menu")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysNoticeController.java

@@ -1,6 +1,15 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.system.domain.SysNotice;
+import com.iot.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -12,19 +21,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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.SecurityUtils;
-import com.ruoyi.system.domain.SysNotice;
-import com.ruoyi.system.service.ISysNoticeService;
 
 /**
  * 公告 信息操作处理
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/notice")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysPostController.java

@@ -1,6 +1,17 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.domain.SysPost;
+import com.iot.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -12,21 +23,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.service.ISysPostService;
 
 /**
  * 岗位信息操作处理
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/post")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysProfileController.java

@@ -1,6 +1,18 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.io.IOException;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.config.IotConfig;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.model.LoginUser;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.ServletUtils;
+import com.iot.common.utils.file.FileUploadUtils;
+import com.iot.framework.web.service.TokenService;
+import com.iot.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,23 +22,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysUserService;
+import com.iot.common.core.domain.entity.SysUser;
 
 /**
  * 个人信息 业务处理
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/user/profile")
@@ -111,7 +112,7 @@ public class SysProfileController extends BaseController
         if (!file.isEmpty())
         {
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+            String avatar = FileUploadUtils.upload(IotConfig.getAvatarPath(), file);
             if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
             {
                 AjaxResult ajax = AjaxResult.success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysRoleController.java

@@ -1,8 +1,24 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
 import java.util.List;
 import java.util.Map;
 
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysRole;
+import com.iot.common.core.domain.model.LoginUser;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.ServletUtils;
+import com.iot.common.utils.StringUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.framework.web.service.SysPermissionService;
+import com.iot.framework.web.service.TokenService;
+import com.iot.system.service.ISysRoleService;
+import com.iot.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -14,27 +30,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-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.entity.SysRole;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 角色信息
  * 
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/role")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTableSetController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysTableSetController.java

@@ -1,16 +1,15 @@
-package com.ruoyi.web.controller.system;
+package com.iot.web.controller.system;
 
-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.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysTableSet;
-import com.ruoyi.system.domain.SysTableSetQuery;
-import com.ruoyi.system.service.ISysTableSetService;
-import lombok.RequiredArgsConstructor;
+import com.iot.common.annotation.Log;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.StringUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.system.domain.SysTableSet;
+import com.iot.system.domain.SysTableSetQuery;
+import com.iot.system.service.ISysTableSetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -20,7 +19,7 @@ import java.util.List;
 /**
  * 列宽修改Controller
  *
- * @author ruoyi
+ * @author iot
  * @date 2021-01-30
  */
 //@RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -29,7 +28,7 @@ import java.util.List;
 public class SysTableSetController extends BaseController {
 
     @Autowired
-    private  ISysTableSetService iSysTableSetService;
+    private ISysTableSetService iSysTableSetService;
 
     /**
      * 查询列宽修改列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → iot-admin/src/main/java/com/iot/web/controller/system/SysUserController.java

@@ -1,24 +1,24 @@
-package com.ruoyi.web.controller.system;
-
-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.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+package com.iot.web.controller.system;
+
+import com.iot.common.annotation.Log;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.domain.entity.SysRole;
+import com.iot.common.core.domain.entity.SysUser;
+import com.iot.common.core.domain.model.LoginUser;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.utils.SecurityUtils;
+import com.iot.common.utils.ServletUtils;
+import com.iot.common.utils.StringUtils;
+import com.iot.common.utils.poi.ExcelUtil;
+import com.iot.common.utils.spring.SpringUtils;
+import com.iot.framework.web.service.TokenService;
+import com.iot.system.service.ISysDeptService;
+import com.iot.system.service.ISysPostService;
+import com.iot.system.service.ISysRoleService;
+import com.iot.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 /**
  * 用户信息
  *
- * @author ruoyi
+ * @author iot
  */
 @RestController
 @RequestMapping("/system/user")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java → iot-admin/src/main/java/com/iot/web/controller/tool/SwaggerController.java

@@ -1,15 +1,15 @@
-package com.ruoyi.web.controller.tool;
+package com.iot.web.controller.tool;
 
+import com.iot.common.core.controller.BaseController;
 import org.springframework.security.access.prepost.PreAuthorize;
 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;
 
 /**
  * swagger 接口
  * 
- * @author ruoyi
+ * @author iot
  */
 @Controller
 @RequestMapping("/tool/swagger")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java → iot-admin/src/main/java/com/iot/web/controller/tool/TestController.java

@@ -1,9 +1,13 @@
-package com.ruoyi.web.controller.tool;
+package com.iot.web.controller.tool;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.iot.common.core.controller.BaseController;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.utils.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -11,9 +15,6 @@ 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiModel;
@@ -23,7 +24,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * swagger 用户测试方法
  * 
- * @author ruoyi
+ * @author iot
  */
 @Api("用户信息管理")
 @RestController

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java → iot-admin/src/main/java/com/iot/web/core/config/SwaggerConfig.java

@@ -1,12 +1,13 @@
-package com.ruoyi.web.core.config;
+package com.iot.web.core.config;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.iot.common.config.IotConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.config.RuoYiConfig;
 import io.swagger.annotations.ApiOperation;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
@@ -24,7 +25,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 /**
  * Swagger2的接口配置
  * 
- * @author ruoyi
+ * @author iot
  */
 @Configuration
 @EnableSwagger2
@@ -32,7 +33,7 @@ public class SwaggerConfig
 {
     /** 系统基础配置 */
     @Autowired
-    private RuoYiConfig ruoyiConfig;
+    private IotConfig iotConfig;
 
     /** 是否开启swagger */
     @Value("${swagger.enabled}")
@@ -58,7 +59,7 @@ public class SwaggerConfig
                 // 扫描所有有注解的api，用这种方式更灵活
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 // 扫描指定包中的swagger注解
-                // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
+                // .apis(RequestHandlerSelectors.basePackage("com.iot.project.tool.swagger"))
                 // 扫描所有 .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build()
@@ -117,9 +118,9 @@ public class SwaggerConfig
                 // 描述
                 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息
-                .contact(new Contact(ruoyiConfig.getName(), null, null))
+                .contact(new Contact(iotConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + ruoyiConfig.getVersion())
+                .version("版本号:" + iotConfig.getVersion())
                 .build();
     }
 }

ruoyi-admin/src/main/resources/application.yml → iot-admin/src/main/resources/application.yml

@@ -1,19 +1,19 @@
 # 项目相关配置
-ruoyi:
+iot:
   # 名称
-  name: RuoYi
+  name: iot
   # 版本
   version: 3.2.1
   # 版权年份
   copyrightYear: 2020
   # 实例演示开关
   demoEnabled: true
-    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    # 文件路径 示例（ Windows配置D:/iot/uploadPath，Linux配置 /home/iot/uploadPath）
     # 本地文件上传路径
-#  profile: D:/ruoyi/uploadPath
-  profile: /home/ruoyi/uploadPath
+#  profile: D:/iot/uploadPath
+  profile: /home/iot/uploadPath
   # 服务器文件路径
-#  profile: /home/ruoyi/uploadPath
+#  profile: /home/iot/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -39,7 +39,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.iot: debug
     org.springframework: warn
 
 # Spring配置
@@ -143,7 +143,7 @@ token:
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
+    typeAliasesPackage: com.iot.**.domain
     # 配置mapper的扫描，找到所有的mapper.xml映射文件
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件

ruoyi-admin/src/main/resources/banner.txt → iot-admin/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
-Application Version: ${ruoyi.version}
+Application Version: ${iot.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //

ruoyi-admin/src/main/resources/logback.xml → iot-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/iot/logs" />
 <!--    <property name="log.path" value="/Users/longyufei/dev/WarehouseManagement" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -73,7 +73,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.iot" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

ruoyi-common/pom.xml → iot-common/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>iot</artifactId>
+        <groupId>com.iot</groupId>
         <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common</artifactId>
+    <artifactId>iot-common</artifactId>
 
     <description>
         common通用工具

ruoyi-common/src/main/java/com/ruoyi/common/MapUtils.java → iot-common/src/main/java/com/iot/common/MapUtils.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common;
+package com.iot.common;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.monitoringAlarms.utils.HttpUtil;
+import com.iot.common.monitoringAlarms.utils.HttpUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java → iot-common/src/main/java/com/iot/common/annotation/DataScope.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.iot.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 /**
  * 数据权限过滤注解
  *
- * @author ruoyi
+ * @author iot
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java → iot-common/src/main/java/com/iot/common/annotation/DataSource.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.iot.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -6,14 +6,14 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.common.enums.DataSourceType;
+import com.iot.common.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解
  *
  * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
  *
- * @author ruoyi
+ * @author iot
  */
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java → iot-common/src/main/java/com/iot/common/annotation/Excel.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.iot.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 自定义导出Excel数据注解
  * 
- * @author ruoyi
+ * @author iot
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java → iot-common/src/main/java/com/iot/common/annotation/Excels.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.annotation;
+package com.iot.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 /**
  * Excel注解集
  * 
- * @author ruoyi
+ * @author iot
  */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java → iot-common/src/main/java/com/iot/common/annotation/Log.java

@@ -1,17 +1,17 @@
-package com.ruoyi.common.annotation;
+package com.iot.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.enums.OperatorType;
+import com.iot.common.enums.BusinessType;
+import com.iot.common.enums.OperatorType;
 
 /**
  * 自定义操作日志记录注解
  * 
- * @author ruoyi
+ * @author iot
  *
  */
 @Target({ ElementType.PARAMETER, ElementType.METHOD })

ruoyi-common/src/main/java/com/ruoyi/common/constant/CcbConstants.java → iot-common/src/main/java/com/iot/common/constant/CcbConstants.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.iot.common.constant;
 
 
 public class CcbConstants {

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java → iot-common/src/main/java/com/iot/common/constant/Constants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.iot.common.constant;
 
 /**
  * 通用常量信息
  * 
- * @author ruoyi
+ * @author iot
  */
 public class Constants
 {

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java → iot-common/src/main/java/com/iot/common/constant/GenConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.iot.common.constant;
 
 /**
  * 代码生成通用常量
  * 
- * @author ruoyi
+ * @author iot
  */
 public class GenConstants
 {

ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java → iot-common/src/main/java/com/iot/common/constant/HttpStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.iot.common.constant;
 
 /**
  * 返回状态码
  * 
- * @author ruoyi
+ * @author iot
  */
 public class HttpStatus
 {

ruoyi-common/src/main/java/com/ruoyi/common/constant/LiveBroadcast.java → iot-common/src/main/java/com/iot/common/constant/LiveBroadcast.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.constant;
+package com.iot.common.constant;
 
 public class LiveBroadcast {
 

ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java → iot-common/src/main/java/com/iot/common/constant/UserConstants.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.constant;
+package com.iot.common.constant;
 
 /**
  * 用户常量信息
  *
- * @author ruoyi
+ * @author iot
  */
 public class UserConstants {
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java → iot-common/src/main/java/com/iot/common/core/controller/BaseController.java

@@ -1,28 +1,28 @@
-package com.ruoyi.common.core.controller;
+package com.iot.common.core.controller;
 
 import java.beans.PropertyEditorSupport;
 import java.util.Date;
 import java.util.List;
 
+import com.iot.common.constant.HttpStatus;
+import com.iot.common.core.domain.AjaxResult;
+import com.iot.common.core.page.PageDomain;
+import com.iot.common.core.page.TableDataInfo;
+import com.iot.common.core.page.TableSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.ruoyi.common.constant.HttpStatus;
-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.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
+import com.iot.common.utils.DateUtils;
+import com.iot.common.utils.StringUtils;
+import com.iot.common.utils.sql.SqlUtil;
 
 /**
  * web层通用数据处理
  *
- * @author ruoyi
+ * @author iot
  */
 public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(BaseController.class);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java → iot-common/src/main/java/com/iot/common/core/domain/AjaxResult.java

@@ -1,14 +1,14 @@
-package com.ruoyi.common.core.domain;
+package com.iot.common.core.domain;
 
 import java.util.HashMap;
 
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.constant.HttpStatus;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 操作消息提醒
  *
- * @author ruoyi
+ * @author iot
  */
 public class AjaxResult extends HashMap<String, Object> {
     private static final long serialVersionUID = 1L;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java → iot-common/src/main/java/com/iot/common/core/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain;
+package com.iot.common.core.domain;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 /**
  * Entity基类
  *
- * @author ruoyi
+ * @author iot
  */
 public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java → iot-common/src/main/java/com/iot/common/core/domain/TreeEntity.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain;
+package com.iot.common.core.domain;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * Tree基类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class TreeEntity extends BaseEntity
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java → iot-common/src/main/java/com/iot/common/core/domain/TreeSelect.java

@@ -1,17 +1,17 @@
-package com.ruoyi.common.core.domain;
+package com.iot.common.core.domain;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.iot.common.core.domain.entity.SysDept;
+import com.iot.common.core.domain.entity.SysMenu;
+import com.iot.common.core.domain.entity.TWarehouse;
 
 /**
  * Treeselect树结构实体类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class TreeSelect implements Serializable
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java → iot-common/src/main/java/com/iot/common/core/domain/entity/SysDept.java

@@ -1,7 +1,7 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.iot.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 部门表 sys_dept
  *
- * @author ruoyi
+ * @author iot
  */
 public class SysDept extends BaseEntity {
     private static final long serialVersionUID = 1L;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java → iot-common/src/main/java/com/iot/common/core/domain/entity/SysDictData.java

@@ -1,29 +1,29 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.iot.common.annotation.Excel;
+import com.iot.common.constant.UserConstants;
+import com.iot.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 字典数据表 sys_dict_data
  * 
- * @author ruoyi
+ * @author iot
  */
 public class SysDictData extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 字典编码 */
-    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+    @Excel(name = "字典编码", cellType = Excel.ColumnType.NUMERIC)
     private Long dictCode;
 
     /** 字典排序 */
-    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    @Excel(name = "字典排序", cellType = Excel.ColumnType.NUMERIC)
     private Long dictSort;
 
     /** 字典标签 */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java → iot-common/src/main/java/com/iot/common/core/domain/entity/SysDictType.java

@@ -1,24 +1,24 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.iot.common.annotation.Excel;
+import com.iot.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 字典类型表 sys_dict_type
  * 
- * @author ruoyi
+ * @author iot
  */
 public class SysDictType extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 字典主键 */
-    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+    @Excel(name = "字典主键", cellType = Excel.ColumnType.NUMERIC)
     private Long dictId;
 
     /** 字典名称 */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java → iot-common/src/main/java/com/iot/common/core/domain/entity/SysMenu.java

@@ -1,17 +1,18 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.iot.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 菜单权限表 sys_menu
  * 
- * @author ruoyi
+ * @author iot
  */
 public class SysMenu extends BaseEntity
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java → iot-common/src/main/java/com/iot/common/core/domain/entity/SysRole.java

@@ -1,9 +1,8 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.iot.common.annotation.Excel;
+import com.iot.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,14 +12,14 @@ import javax.validation.constraints.Size;
 /**
  * 角色表 sys_role
  * 
- * @author ruoyi
+ * @author iot
  */
 public class SysRole extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 角色ID */
-    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+    @Excel(name = "角色序号", cellType = Excel.ColumnType.NUMERIC)
     private Long roleId;
 
     /** 角色名称 */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java → iot-common/src/main/java/com/iot/common/core/domain/entity/SysUser.java

@@ -1,37 +1,33 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.iot.common.annotation.Excel;
+import com.iot.common.annotation.Excels;
+import com.iot.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 用户对象 sys_user
  *
- * @author ruoyi
+ * @author iot
  */
 public class SysUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    @Excel(name = "用户序号", cellType = Excel.ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
     /** 部门ID */
-    @Excel(name = "部门编号", type = Type.IMPORT)
+    @Excel(name = "部门编号", type = Excel.Type.IMPORT)
     private Long deptId;
 
     /** 用户账号 */
@@ -93,17 +89,17 @@ public class SysUser extends BaseEntity
     private String delFlag;
 
     /** 最后登录IP */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
+    @Excel(name = "最后登录IP", type = Excel.Type.EXPORT)
     private String loginIp;
 
     /** 最后登录时间 */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
     private Date loginDate;
 
     /** 部门对象 */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Excel.Type.EXPORT)
     })
     private SysDept dept;
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TWarehouse.java → iot-common/src/main/java/com/iot/common/core/domain/entity/TWarehouse.java

@@ -1,8 +1,8 @@
-package com.ruoyi.common.core.domain.entity;
+package com.iot.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.iot.common.annotation.Excel;
+import com.iot.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 仓库对象 t_warehouse
  *
- * @author ruoyi
+ * @author iot
  * @date 2021-01-07fGoodsType
  */
 public class TWarehouse extends BaseEntity

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/enums/WarehouseEnum.java → iot-common/src/main/java/com/iot/common/core/domain/enums/WarehouseEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.domain.enums;
+package com.iot.common.core.domain.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java → iot-common/src/main/java/com/iot/common/core/domain/model/LoginBody.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.domain.model;
+package com.iot.common.core.domain.model;
 
 import lombok.Data;
 
 /**
  * 用户登录对象
  *
- * @author ruoyi
+ * @author iot
  */
 @Data
 public class LoginBody {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java → iot-common/src/main/java/com/iot/common/core/domain/model/LoginUser.java

@@ -1,16 +1,16 @@
-package com.ruoyi.common.core.domain.model;
+package com.iot.common.core.domain.model;
 
 import java.util.Collection;
 import java.util.Set;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.iot.common.core.domain.entity.SysUser;
 
 /**
  * 登录用户身份权限
  * 
- * @author ruoyi
+ * @author iot
  */
 public class LoginUser implements UserDetails
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java → iot-common/src/main/java/com/iot/common/core/page/PageDomain.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.page;
+package com.iot.common.core.page;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 分页数据
  * 
- * @author ruoyi
+ * @author iot
  */
 public class PageDomain
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java → iot-common/src/main/java/com/iot/common/core/page/TableDataInfo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.page;
+package com.iot.common.core.page;
 
 import java.io.Serializable;
 import java.util.List;
@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * 表格分页数据对象
  * 
- * @author ruoyi
+ * @author iot
  */
 public class TableDataInfo implements Serializable
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java → iot-common/src/main/java/com/iot/common/core/page/TableSupport.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.page;
+package com.iot.common.core.page;
 
-import com.ruoyi.common.utils.ServletUtils;
+import com.iot.common.utils.ServletUtils;
 
 /**
  * 表格数据处理
  * 
- * @author ruoyi
+ * @author iot
  */
 public class TableSupport
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → iot-common/src/main/java/com/iot/common/core/text/CharsetKit.java

@@ -1,13 +1,13 @@
-package com.ruoyi.common.core.text;
+package com.iot.common.core.text;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 字符集工具类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class CharsetKit
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java → iot-common/src/main/java/com/iot/common/core/text/Convert.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.core.text;
+package com.iot.common.core.text;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -6,12 +6,12 @@ import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 类型转换器
  * 
- * @author ruoyi
+ * @author iot
  */
 public class Convert
 {

ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → iot-common/src/main/java/com/iot/common/core/text/StrFormatter.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.core.text;
+package com.iot.common.core.text;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 字符串格式化
  * 
- * @author ruoyi
+ * @author iot
  */
 public class StrFormatter
 {

ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java → iot-common/src/main/java/com/iot/common/enums/BusinessStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.iot.common.enums;
 
 /**
  * 操作状态
  * 
- * @author ruoyi
+ * @author iot
  *
  */
 public enum BusinessStatus

ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java → iot-common/src/main/java/com/iot/common/enums/BusinessType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.iot.common.enums;
 
 /**
  * 业务操作类型
  * 
- * @author ruoyi
+ * @author iot
  */
 public enum BusinessType
 {

ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java → iot-common/src/main/java/com/iot/common/enums/DataSourceType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.iot.common.enums;
 
 /**
  * 数据源
  * 
- * @author ruoyi
+ * @author iot
  */
 public enum DataSourceType
 {

ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java → iot-common/src/main/java/com/iot/common/enums/HttpMethod.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.enums;
+package com.iot.common.enums;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,7 +7,7 @@ import org.springframework.lang.Nullable;
 /**
  * 请求方式
  *
- * @author ruoyi
+ * @author iot
  */
 public enum HttpMethod
 {

ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java → iot-common/src/main/java/com/iot/common/enums/OperatorType.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.iot.common.enums;
 
 /**
  * 操作人类别
  * 
- * @author ruoyi
+ * @author iot
  */
 public enum OperatorType
 {

ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java → iot-common/src/main/java/com/iot/common/enums/UserStatus.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.enums;
+package com.iot.common.enums;
 
 /**
  * 用户状态
  * 
- * @author ruoyi
+ * @author iot
  */
 public enum UserStatus
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/BaseException.java → iot-common/src/main/java/com/iot/common/exception/BaseException.java

@@ -1,12 +1,12 @@
-package com.ruoyi.common.exception;
+package com.iot.common.exception;
 
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.MessageUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 基础异常
  * 
- * @author ruoyi
+ * @author iot
  */
 public class BaseException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java → iot-common/src/main/java/com/iot/common/exception/CustomException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.iot.common.exception;
 
 /**
  * 自定义异常
  * 
- * @author ruoyi
+ * @author iot
  */
 public class CustomException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java → iot-common/src/main/java/com/iot/common/exception/DemoModeException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.iot.common.exception;
 
 /**
  * 演示模式异常
  * 
- * @author ruoyi
+ * @author iot
  */
 public class DemoModeException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/StorageFeeException.java → iot-common/src/main/java/com/iot/common/exception/StorageFeeException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception;
+package com.iot.common.exception;
 
 /**
  * @author caifc

ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java → iot-common/src/main/java/com/iot/common/exception/UtilException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception;
+package com.iot.common.exception;
 
 /**
  * 工具类异常
  * 
- * @author ruoyi
+ * @author iot
  */
 public class UtilException extends RuntimeException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/WarehouseException.java → iot-common/src/main/java/com/iot/common/exception/WarehouseException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception;
+package com.iot.common.exception;
 
 /**
  * @author caifc

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java → iot-common/src/main/java/com/iot/common/exception/file/FileException.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.exception.file;
+package com.iot.common.exception.file;
 
-import com.ruoyi.common.exception.BaseException;
+import com.iot.common.exception.BaseException;
 
 /**
  * 文件信息异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class FileException extends BaseException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java → iot-common/src/main/java/com/iot/common/exception/file/FileNameLengthLimitExceededException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.file;
+package com.iot.common.exception.file;
 
 /**
  * 文件名称超长限制异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class FileNameLengthLimitExceededException extends FileException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java → iot-common/src/main/java/com/iot/common/exception/file/FileSizeLimitExceededException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.file;
+package com.iot.common.exception.file;
 
 /**
  * 文件名大小限制异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class FileSizeLimitExceededException extends FileException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java → iot-common/src/main/java/com/iot/common/exception/file/InvalidExtensionException.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.exception.file;
+package com.iot.common.exception.file;
 
 import java.util.Arrays;
 import org.apache.commons.fileupload.FileUploadException;
@@ -6,7 +6,7 @@ import org.apache.commons.fileupload.FileUploadException;
 /**
  * 文件上传 误异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class InvalidExtensionException extends FileUploadException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java → iot-common/src/main/java/com/iot/common/exception/job/TaskException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.job;
+package com.iot.common.exception.job;
 
 /**
  * 计划策略异常
  * 
- * @author ruoyi
+ * @author iot
  */
 public class TaskException extends Exception
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java → iot-common/src/main/java/com/iot/common/exception/user/CaptchaException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.user;
+package com.iot.common.exception.user;
 
 /**
  * 验证码错误异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class CaptchaException extends UserException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java → iot-common/src/main/java/com/iot/common/exception/user/CaptchaExpireException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.user;
+package com.iot.common.exception.user;
 
 /**
  * 验证码失效异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class CaptchaExpireException extends UserException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java → iot-common/src/main/java/com/iot/common/exception/user/UserException.java

@@ -1,11 +1,11 @@
-package com.ruoyi.common.exception.user;
+package com.iot.common.exception.user;
 
-import com.ruoyi.common.exception.BaseException;
+import com.iot.common.exception.BaseException;
 
 /**
  * 用户信息异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class UserException extends BaseException
 {

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java → iot-common/src/main/java/com/iot/common/exception/user/UserPasswordNotMatchException.java

@@ -1,9 +1,9 @@
-package com.ruoyi.common.exception.user;
+package com.iot.common.exception.user;
 
 /**
  * 用户密码不正确或不符合规范异常类
  * 
- * @author ruoyi
+ * @author iot
  */
 public class UserPasswordNotMatchException extends UserException
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java → iot-common/src/main/java/com/iot/common/filter/RepeatableFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.iot.common.filter;
 
 import java.io.IOException;
 import javax.servlet.Filter;
@@ -9,12 +9,12 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * Repeatable 过滤器
  * 
- * @author ruoyi
+ * @author iot
  */
 public class RepeatableFilter implements Filter
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java → iot-common/src/main/java/com/iot/common/filter/RepeatedlyRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.iot.common.filter;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -9,12 +9,12 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import com.ruoyi.common.utils.http.HttpHelper;
+import com.iot.common.utils.http.HttpHelper;
 
 /**
  * 构建可重复读取inputStream的request
  * 
- * @author ruoyi
+ * @author iot
  */
 public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java → iot-common/src/main/java/com/iot/common/filter/XssFilter.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.iot.common.filter;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,12 +13,12 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.utils.StringUtils;
+import com.iot.common.utils.StringUtils;
 
 /**
  * 防止XSS攻击的过滤器
  * 
- * @author ruoyi
+ * @author iot
  */
 public class XssFilter implements Filter
 {

ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java → iot-common/src/main/java/com/iot/common/filter/XssHttpServletRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.filter;
+package com.iot.common.filter;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -9,13 +9,13 @@ import javax.servlet.http.HttpServletRequestWrapper;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.html.EscapeUtil;
+import com.iot.common.utils.StringUtils;
+import com.iot.common.utils.html.EscapeUtil;
 
 /**
  * XSS过滤处理
  * 
- * @author ruoyi
+ * @author iot
  */
 public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
 {

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/main/OpenApi.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/main/OpenApi.java

@@ -1,16 +1,14 @@
-package com.ruoyi.common.monitoringAlarms.main;
+package com.iot.common.monitoringAlarms.main;
 
 import com.google.gson.Gson;
-import com.ruoyi.common.monitoringAlarms.req.QueryAlarmInfoListBean;
-import com.ruoyi.common.monitoringAlarms.req.QueryTokenBean;
-import com.ruoyi.common.monitoringAlarms.resp.QueryTimerResp;
-import com.ruoyi.common.monitoringAlarms.resp.QueryTokenResp;
-import com.ruoyi.common.monitoringAlarms.utils.HttpUtil;
-import com.ruoyi.common.monitoringAlarms.utils.RequestUtils;
-import com.ruoyi.common.monitoringAlarms.utils.VerifyCodeUtils;
-import com.ruoyi.common.utils.JsonUtil;
-
-import java.util.Date;
+import com.iot.common.monitoringAlarms.req.QueryAlarmInfoListBean;
+import com.iot.common.monitoringAlarms.req.QueryTokenBean;
+import com.iot.common.monitoringAlarms.resp.QueryTimerResp;
+import com.iot.common.monitoringAlarms.resp.QueryTokenResp;
+import com.iot.common.monitoringAlarms.utils.HttpUtil;
+import com.iot.common.monitoringAlarms.utils.RequestUtils;
+import com.iot.common.monitoringAlarms.utils.VerifyCodeUtils;
+import com.iot.common.utils.JsonUtil;
 
 public class OpenApi {
 

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/req/BaseBean.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/req/BaseBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.monitoringAlarms.req;
+package com.iot.common.monitoringAlarms.req;
 
 public class BaseBean {
 

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/req/QueryAlarmInfoListBean.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/req/QueryAlarmInfoListBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.monitoringAlarms.req;
+package com.iot.common.monitoringAlarms.req;
 
 import java.util.List;
 

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/req/QueryTokenBean.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/req/QueryTokenBean.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.monitoringAlarms.req;
+package com.iot.common.monitoringAlarms.req;
 
 /**
  *  获取token bean

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/QueryTimerResp.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/resp/QueryTimerResp.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.monitoringAlarms.resp;
+package com.iot.common.monitoringAlarms.resp;
 
 public class QueryTimerResp {
 

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/TimerData.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/resp/TimerData.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.monitoringAlarms.resp;
+package com.iot.common.monitoringAlarms.resp;
 
 public class TimerData {
 

ruoyi-common/src/main/java/com/ruoyi/common/monitoringAlarms/resp/TokenData.java → iot-common/src/main/java/com/iot/common/monitoringAlarms/resp/TokenData.java

@@ -1,4 +1,4 @@
-package com.ruoyi.common.monitoringAlarms.resp;
+package com.iot.common.monitoringAlarms.resp;
 
 public class TokenData {