地灾监测：GeoHazardMonitor

.idea/compiler.xml

@@ -7,9 +7,12 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="admin" />
+        <module name="base-admin" />
         <module name="business-service" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="admin" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/admin/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/business-service/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/business-service/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hazard-admin/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hazard-admin/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -1,20 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="nexus" />
+      <option name="name" value="Nexus Repository" />
+      <option name="url" value="http://10.21.171.91:8084/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="public" />
-      <option name="name" value="aliyun nexus" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />

.idea/misc.xml

@@ -7,6 +7,11 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/admin/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />

admin/src/main/java/com/ozs/admin/HazardApplication.java

@@ -1,31 +0,0 @@
-package com.ozs.admin;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 启动程序
- * 
- * @author ruoyi
- */
-
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = {"com.ozs.common","com.ozs.framework","com.ozs.generator","com.ozs.quartz","com.ozs.system","com.ozs.admin"})
-public class HazardApplication
-{
-    public static void main(String[] args)
-    {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(com.ozs.admin.HazardApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
-    }
-}

admin/src/main/resources/application.yml

@@ -1,12 +0,0 @@
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  port: 8080
-  servlet:
-    # 应用的访问路径
-    context-path: /
-
-# Spring配置
-spring:
-  profiles:
-    active: druid,dev

admin/target/classes/application.yml

@@ -1,12 +0,0 @@
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  port: 8080
-  servlet:
-    # 应用的访问路径
-    context-path: /
-
-# Spring配置
-spring:
-  profiles:
-    active: druid,dev

business-service/pom.xml

@@ -10,6 +10,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>business-service</artifactId>
+    <dependencies>
 
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>base-common</artifactId>
+        </dependency>
 
-</project>
+    </dependencies>
+
+</project>

admin/pom.xml

@@ -8,8 +8,10 @@
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <artifactId>hazard-admin</artifactId>
 
-    <artifactId>admin</artifactId>
     <description>
         web服务入口
     </description>
@@ -36,11 +38,36 @@
             <version>1.6.2</version>
         </dependency>
 
-        <!-- Mysql驱动包 -->
+         <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>base-framework</artifactId>
+        </dependency>
+
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>base-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>base-generator</artifactId>
+        </dependency>
+
+        <!-- 业务代码-->
+        <dependency>
+            <groupId>com.ozs</groupId>
+            <artifactId>business-service</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -68,9 +95,9 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
                 </configuration>
-            </plugin>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

hazard-admin/src/main/java/com/ozs/HazardApplication.java

@@ -0,0 +1,21 @@
+package com.ozs;
+
+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 HazardApplication
+{
+    public static void main(String[] args)
+    {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(HazardApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  启动成功   ლ(´ڡ`ლ)ﾞ");
+    }
+}

admin/src/main/java/com/ozs/admin/HazardServletInitializer.java

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

admin/src/main/java/com/ozs/admin/web/controller/common/CaptchaController.java

@@ -1,7 +1,17 @@
-package com.ozs.admin.web.controller.common;
+package com.ozs.web.controller.common;
 
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+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.ozs.common.config.RuoYiConfig;
+import com.ozs.common.config.BaseConfig;
 import com.ozs.common.constant.CacheConstants;
 import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
@@ -9,21 +19,10 @@ import com.ozs.common.core.redis.RedisCache;
 import com.ozs.common.utils.sign.Base64;
 import com.ozs.common.utils.uuid.IdUtils;
 import com.ozs.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -37,7 +36,7 @@ public class CaptchaController
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysConfigService configService;
     /**
@@ -62,7 +61,7 @@ public class CaptchaController
         BufferedImage image = null;
 
         // 生成验证码
-        String captchaType = RuoYiConfig.getCaptchaType();
+        String captchaType = BaseConfig.getCaptchaType();
         if ("math".equals(captchaType))
         {
             String capText = captchaProducerMath.createText();

admin/src/main/java/com/ozs/admin/web/controller/common/CommonController.java

@@ -1,12 +1,9 @@
-package com.ozs.admin.web.controller.common;
+package com.ozs.web.controller.common;
 
-import com.ozs.common.config.RuoYiConfig;
-import com.ozs.common.constant.Constants;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.utils.StringUtils;
-import com.ozs.common.utils.file.FileUploadUtils;
-import com.ozs.common.utils.file.FileUtils;
-import com.ozs.framework.config.ServerConfig;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,15 +13,17 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+import com.ozs.common.config.BaseConfig;
+import com.ozs.common.constant.Constants;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.file.FileUploadUtils;
+import com.ozs.common.utils.file.FileUtils;
+import com.ozs.framework.config.ServerConfig;
 
 /**
  * 通用请求处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -40,7 +39,7 @@ public class CommonController
 
     /**
      * 通用下载请求
-     * 
+     *
      * @param fileName 文件名称
      * @param delete 是否删除
      */
@@ -54,7 +53,7 @@ public class CommonController
                 throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
             }
             String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
-            String filePath = RuoYiConfig.getDownloadPath() + fileName;
+            String filePath = BaseConfig.getDownloadPath() + fileName;
 
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
             FileUtils.setAttachmentResponseHeader(response, realFileName);
@@ -79,7 +78,7 @@ public class CommonController
         try
         {
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
+            String filePath = BaseConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;
@@ -105,7 +104,7 @@ public class CommonController
         try
         {
             // 上传文件路径
-            String filePath = RuoYiConfig.getUploadPath();
+            String filePath = BaseConfig.getUploadPath();
             List<String> urls = new ArrayList<String>();
             List<String> fileNames = new ArrayList<String>();
             List<String> newFileNames = new ArrayList<String>();
@@ -147,7 +146,7 @@ public class CommonController
                 throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
             }
             // 本地资源路径
-            String localPath = RuoYiConfig.getProfile();
+            String localPath = BaseConfig.getProfile();
             // 数据库资源地址
             String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
             // 下载名称

admin/src/main/java/com/ozs/admin/web/controller/monitor/CacheController.java

@@ -1,20 +1,29 @@
-package com.ozs.admin.web.controller.monitor;
+package com.ozs.web.controller.monitor;
 
-import com.ozs.common.constant.CacheConstants;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.utils.StringUtils;
-import com.ozs.system.domain.SysCache;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.ozs.common.constant.CacheConstants;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.system.domain.SysCache;
 
 /**
  * 缓存监控
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/monitor/ServerController.java

@@ -1,15 +1,15 @@
-package com.ozs.admin.web.controller.monitor;
+package com.ozs.web.controller.monitor;
 
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.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.ozs.common.core.domain.AjaxResult;
+import com.ozs.framework.web.domain.Server;
 
 /**
  * 服务器监控
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/monitor/SysLogininforController.java

@@ -1,5 +1,15 @@
-package com.ozs.admin.web.controller.monitor;
+package com.ozs.web.controller.monitor;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -9,16 +19,10 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.web.service.SysPasswordService;
 import com.ozs.system.domain.SysLogininfor;
 import com.ozs.system.service.ISysLogininforService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 系统访问记录
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/monitor/SysOperlogController.java

@@ -1,5 +1,15 @@
-package com.ozs.admin.web.controller.monitor;
+package com.ozs.web.controller.monitor;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -8,16 +18,10 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.domain.SysOperLog;
 import com.ozs.system.service.ISysOperLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 操作日志记录
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/monitor/SysUserOnlineController.java

@@ -1,5 +1,16 @@
-package com.ozs.admin.web.controller.monitor;
+package com.ozs.web.controller.monitor;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.ozs.common.annotation.Log;
 import com.ozs.common.constant.CacheConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -11,18 +22,10 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.system.domain.SysUserOnline;
 import com.ozs.system.service.ISysUserOnlineService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * 在线用户监控
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysConfigController.java

@@ -1,5 +1,18 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -9,17 +22,10 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.domain.SysConfig;
 import com.ozs.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 参数配置 信息操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysDeptController.java

@@ -1,5 +1,18 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -8,17 +21,10 @@ import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.system.service.ISysDeptService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 部门信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysDictDataController.java

@@ -1,5 +1,19 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -10,18 +24,10 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysDictTypeController.java

@@ -1,5 +1,18 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -9,17 +22,10 @@ import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysIndexController.java

@@ -1,10 +1,10 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
-import com.ozs.common.config.RuoYiConfig;
-import com.ozs.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.ozs.common.config.BaseConfig;
+import com.ozs.common.utils.StringUtils;
 
 /**
  * 首页
@@ -16,7 +16,7 @@ public class SysIndexController
 {
     /** 系统基础配置 */
     @Autowired
-    private RuoYiConfig ruoyiConfig;
+    private BaseConfig ruoyiConfig;
 
     /**
      * 访问首页，提示语

admin/src/main/java/com/ozs/admin/web/controller/system/SysLoginController.java

@@ -1,26 +1,25 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
-import com.ozs.framework.web.service.SysLoginService;
-import com.ozs.system.service.ISysMenuService;
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginBody;
 import com.ozs.common.utils.SecurityUtils;
+import com.ozs.framework.web.service.SysLoginService;
 import com.ozs.framework.web.service.SysPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Set;
+import com.ozs.system.service.ISysMenuService;
 
 /**
  * 登录验证
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -37,7 +36,7 @@ public class SysLoginController
 
     /**
      * 登录方法
-     * 
+     *
      * @param loginBody 登录信息
      * @return 结果
      */
@@ -54,7 +53,7 @@ public class SysLoginController
 
     /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")
@@ -74,7 +73,7 @@ public class SysLoginController
 
     /**
      * 获取路由信息
-     * 
+     *
      * @return 路由信息
      */
     @GetMapping("getRouters")

admin/src/main/java/com/ozs/admin/web/controller/system/SysMenuController.java

@@ -1,5 +1,17 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -8,16 +20,10 @@ import com.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.system.service.ISysMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 菜单信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -133,4 +139,4 @@ public class SysMenuController extends BaseController
         }
         return toAjax(menuService.deleteMenuById(menuId));
     }
-}
+}

admin/src/main/java/com/ozs/admin/web/controller/system/SysNoticeController.java

@@ -1,5 +1,17 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -7,16 +19,10 @@ import com.ozs.common.core.page.TableDataInfo;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.system.domain.SysNotice;
 import com.ozs.system.service.ISysNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * 公告 信息操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysPostController.java

@@ -1,5 +1,18 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -9,17 +22,10 @@ import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.system.domain.SysPost;
 import com.ozs.system.service.ISysPostService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 岗位信息操作处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -40,7 +46,7 @@ public class SysPostController extends BaseController
         List<SysPost> list = postService.selectPostList(post);
         return getDataTable(list);
     }
-    
+
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")
     @PostMapping("/export")

admin/src/main/java/com/ozs/admin/web/controller/system/SysProfileController.java

@@ -1,7 +1,16 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+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.ozs.common.annotation.Log;
-import com.ozs.common.config.RuoYiConfig;
+import com.ozs.common.config.BaseConfig;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
@@ -14,13 +23,10 @@ import com.ozs.common.utils.file.FileUploadUtils;
 import com.ozs.common.utils.file.MimeTypeUtils;
 import com.ozs.framework.web.service.TokenService;
 import com.ozs.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 个人信息 业务处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -122,7 +128,7 @@ public class SysProfileController extends BaseController
         if (!file.isEmpty())
         {
             LoginUser loginUser = getLoginUser();
-            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+            String avatar = FileUploadUtils.upload(BaseConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
             if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
             {
                 AjaxResult ajax = AjaxResult.success();

admin/src/main/java/com/ozs/admin/web/controller/system/SysRegisterController.java

@@ -1,19 +1,19 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.RegisterBody;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.framework.web.service.SysRegisterService;
 import com.ozs.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 注册验证
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/system/SysRoleController.java

@@ -1,5 +1,18 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -18,17 +31,10 @@ import com.ozs.system.domain.SysUserRole;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysRoleService;
 import com.ozs.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 角色信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -120,7 +126,7 @@ public class SysRoleController extends BaseController
             return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setUpdateBy(getUsername());
-        
+
         if (roleService.updateRole(role) > 0)
         {
             // 更新缓存用户权限

admin/src/main/java/com/ozs/admin/web/controller/system/SysUserController.java

@@ -1,5 +1,21 @@
-package com.ozs.admin.web.controller.system;
+package com.ozs.web.controller.system;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.constant.UserConstants;
 import com.ozs.common.core.controller.BaseController;
@@ -16,20 +32,10 @@ import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysPostService;
 import com.ozs.system.service.ISysRoleService;
 import com.ozs.system.service.ISysUserService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 用户信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

admin/src/main/java/com/ozs/admin/web/controller/tool/TestController.java

@@ -1,19 +1,30 @@
-package com.ozs.admin.web.controller.tool;
-
-import com.ozs.common.core.controller.BaseController;
-import com.ozs.common.core.domain.R;
-import com.ozs.common.utils.StringUtils;
-import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
+package com.ozs.web.controller.tool;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ozs.common.core.controller.BaseController;
+import com.ozs.common.core.domain.R;
+import com.ozs.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * swagger 用户测试方法
- * 
+ *
  * @author ruoyi
  */
 @Api("用户信息管理")

admin/src/main/java/com/ozs/admin/web/core/config/SwaggerConfig.java

@@ -1,26 +1,30 @@
-package com.ozs.admin.web.core.config;
+package com.ozs.web.core.config;
 
-import com.ozs.common.config.RuoYiConfig;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
+import java.util.ArrayList;
+import java.util.List;
 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.ozs.common.config.BaseConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Swagger2的接口配置
- * 
+ *
  * @author ruoyi
  */
 @Configuration
@@ -28,7 +32,7 @@ public class SwaggerConfig
 {
     /** 系统基础配置 */
     @Autowired
-    private RuoYiConfig ruoyiConfig;
+    private BaseConfig ruoyiConfig;
 
     /** 是否开启swagger */
     @Value("${swagger.enabled}")

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

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: root
+                url: jdbc:mysql://124.70.58.209:1122/hazard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: admin
+                password: 106aD>>ql95K5S
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

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

@@ -1,25 +1,27 @@
 # 项目相关配置
-monitor:
+base:
   # 名称
-  name: monitor
+  name: base
   # 版本
-  version: 1.0.0
+  version: 3.8.5
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/monitor/uploadPath，Linux配置 /home/monitor/uploadPath）
-  profile: D:/monitor/uploadPath
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: C:/base/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
-  # 全部用户是否开启接口权限校验，排除admin用户
-  permissionsEnable: false
-
 
 # 开发环境配置
 server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -34,10 +36,9 @@ server:
 # 日志配置
 logging:
   level:
-    com.ozs: debug
+    com.ruoyi: debug
     org.springframework: warn
 
-
 # 用户配置
 user:
   password:
@@ -52,13 +53,15 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
+  profiles:
+    active: druid
   # 文件上传
   servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size:  10MB
-      # 设置总上传的文件大小
-      max-request-size:  20MB
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -67,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 124.70.58.209
     # 端口，默认为6379
-    port: 6379
+    port: 7001
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: 106@qwe123
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -89,28 +92,29 @@ spring:
 
 # token配置
 token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 3000
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
 
 # MyBatis配置
 mybatis:
-  # 搜索指定包别名
-  typeAliasesPackage: com.ozs.**.system
-  # 配置mapper的扫描，找到所有的mapper.xml映射文件
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 加载全局的配置文件
-  configLocation: classpath:mybatis/mybatis-config.xml
+    # 搜索指定包别名
+    typeAliasesPackage: com.ozs.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
 
 # MyBatis-plus配置
 mybatis-plus:
   config-location: classpath:mybatis/mybatis-config.xml
-  typeAliasesPackage: com.ozs.**.system
+  typeAliasesPackage: com.ozs.**.domain
   mapperLocations: classpath*:mapper/**/*Mapper.xml
 
+
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
@@ -122,8 +126,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  #  pathMapping: /dev-api
-  pathMapping: /
+  pathMapping: /dev-api
 
 # 防止XSS攻击
 xss:

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

@@ -0,0 +1,24 @@
+Application Version: ${ruoyi.version}
+Spring Boot Version: ${spring-boot.version}
+////////////////////////////////////////////////////////////////////
+//                          _ooOoo_                               //
+//                         o8888888o                              //
+//                         88" . "88                              //
+//                         (| ^_^ |)                              //
+//                         O\  =  /O                              //
+//                      ____/`---'\____                           //
+//                    .'  \\|     |//  `.                         //
+//                   /  \\|||  :  |||//  \                        //
+//                  /  _||||| -:- |||||-  \                       //
+//                  |   | \\\  -  /// |   |                       //
+//                  | \_|  ''\---/''  |   |                       //
+//                  \  .-\__  `-`  ___/-. /                       //
+//                ___`. .'  /--.--\  `. . ___                     //
+//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+//      ========`-.____`-.___\_____/___.-`____.-'========         //
+//                           `=---='                              //
+//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
+//             佛祖保佑       永不宕机      永无BUG               //
+////////////////////////////////////////////////////////////////////

admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/monitor/logs" />
+	<property name="log.path" value="/home/base/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -11,7 +11,7 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -34,7 +34,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -56,7 +56,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -70,24 +70,24 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.monitor" level="info" />
+	<logger name="com.ozs" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

admin/target/classes/application-druid.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: root
+                url: jdbc:mysql://124.70.58.209:1122/hazard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: admin
+                password: 106aD>>ql95K5S
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

admin/target/classes/application-dev.yml

@@ -1,25 +1,27 @@
 # 项目相关配置
-monitor:
+base:
   # 名称
-  name: monitor
+  name: base
   # 版本
-  version: 1.0.0
+  version: 3.8.5
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/monitor/uploadPath，Linux配置 /home/monitor/uploadPath）
-  profile: D:/monitor/uploadPath
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: C:/base/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
-  # 全部用户是否开启接口权限校验，排除admin用户
-  permissionsEnable: false
-
 
 # 开发环境配置
 server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -34,10 +36,9 @@ server:
 # 日志配置
 logging:
   level:
-    com.ozs: debug
+    com.ruoyi: debug
     org.springframework: warn
 
-
 # 用户配置
 user:
   password:
@@ -52,13 +53,15 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
+  profiles:
+    active: druid
   # 文件上传
   servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size:  10MB
-      # 设置总上传的文件大小
-      max-request-size:  20MB
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -67,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 124.70.58.209
     # 端口，默认为6379
-    port: 6379
+    port: 7001
     # 数据库索引
     database: 0
     # 密码
-    password:
+    password: 106@qwe123
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -89,28 +92,29 @@ spring:
 
 # token配置
 token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
-  expireTime: 3000
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 30
 
 # MyBatis配置
 mybatis:
-  # 搜索指定包别名
-  typeAliasesPackage: com.ozs.**.system
-  # 配置mapper的扫描，找到所有的mapper.xml映射文件
-  mapperLocations: classpath*:mapper/**/*Mapper.xml
-  # 加载全局的配置文件
-  configLocation: classpath:mybatis/mybatis-config.xml
+    # 搜索指定包别名
+    typeAliasesPackage: com.ozs.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
 
 # MyBatis-plus配置
 mybatis-plus:
   config-location: classpath:mybatis/mybatis-config.xml
-  typeAliasesPackage: com.ozs.**.system
+  typeAliasesPackage: com.ozs.**.domain
   mapperLocations: classpath*:mapper/**/*Mapper.xml
 
+
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
@@ -122,8 +126,7 @@ swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
-  #  pathMapping: /dev-api
-  pathMapping: /
+  pathMapping: /dev-api
 
 # 防止XSS攻击
 xss:

hazard-admin/target/classes/banner.txt

@@ -0,0 +1,24 @@
+Application Version: ${ruoyi.version}
+Spring Boot Version: ${spring-boot.version}
+////////////////////////////////////////////////////////////////////
+//                          _ooOoo_                               //
+//                         o8888888o                              //
+//                         88" . "88                              //
+//                         (| ^_^ |)                              //
+//                         O\  =  /O                              //
+//                      ____/`---'\____                           //
+//                    .'  \\|     |//  `.                         //
+//                   /  \\|||  :  |||//  \                        //
+//                  /  _||||| -:- |||||-  \                       //
+//                  |   | \\\  -  /// |   |                       //
+//                  | \_|  ''\---/''  |   |                       //
+//                  \  .-\__  `-`  ___/-. /                       //
+//                ___`. .'  /--.--\  `. . ___                     //
+//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
+//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
+//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
+//      ========`-.____`-.___\_____/___.-`____.-'========         //
+//                           `=---='                              //
+//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
+//             佛祖保佑       永不宕机      永无BUG               //
+////////////////////////////////////////////////////////////////////

admin/target/classes/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/monitor/logs" />
+	<property name="log.path" value="/home/base/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -11,7 +11,7 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -34,7 +34,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -56,7 +56,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -70,24 +70,24 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.monitor" level="info" />
+	<logger name="com.ozs" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

hazard-admin/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Tue Feb 07 17:51:48 CST 2023
+version=3.8.5
+groupId=com.ozs
+artifactId=base-admin

hazard-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,25 @@
+com\ozs\web\controller\common\CommonController.class
+com\ozs\web\controller\monitor\SysUserOnlineController.class
+com\ozs\web\controller\common\CaptchaController.class
+com\ozs\web\controller\system\SysNoticeController.class
+com\ozs\web\controller\system\SysRoleController.class
+com\ozs\web\controller\monitor\ServerController.class
+com\ozs\web\controller\tool\UserEntity.class
+com\ozs\web\controller\system\SysDictTypeController.class
+com\ozs\web\controller\monitor\SysLogininforController.class
+com\ozs\web\controller\system\SysMenuController.class
+com\ozs\web\controller\system\SysDictDataController.class
+com\ozs\web\controller\system\SysDeptController.class
+com\ozs\web\controller\system\SysPostController.class
+com\ozs\web\controller\system\SysProfileController.class
+com\ozs\web\controller\system\SysUserController.class
+com\ozs\BaseServletInitializer.class
+com\ozs\web\controller\tool\TestController.class
+com\ozs\web\core\config\SwaggerConfig.class
+com\ozs\web\controller\system\SysLoginController.class
+com\ozs\web\controller\system\SysConfigController.class
+com\ozs\web\controller\system\SysRegisterController.class
+com\ozs\BaseApplication.class
+com\ozs\web\controller\monitor\CacheController.class
+com\ozs\web\controller\monitor\SysOperlogController.class
+com\ozs\web\controller\system\SysIndexController.class

hazard-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,24 @@
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysProfileController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysPostController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysConfigController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysIndexController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysDictDataController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysDictTypeController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\BaseServletInitializer.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\monitor\SysUserOnlineController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysNoticeController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysDeptController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysRoleController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysMenuController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\monitor\ServerController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\BaseApplication.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\common\CommonController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\core\config\SwaggerConfig.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\common\CaptchaController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\monitor\CacheController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysLoginController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysUserController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\monitor\SysLogininforController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\monitor\SysOperlogController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\tool\TestController.java
+C:\workspace\RuoYi-Vue\base-admin\src\main\java\com\ozs\web\controller\system\SysRegisterController.java

pom.xml

@@ -8,34 +8,16 @@
     <artifactId>Hazard</artifactId>
     <packaging>pom</packaging>
     <version>1.0</version>
-    <modules>
-        <module>admin</module>
-        <module>business-service</module>
-    </modules>
 
     <name>hazard</name>
     <url></url>
     <description>地质灾害系统</description>
     <properties>
-        <monitor.version>1.0</monitor.version>
+        <base.version>3.8.5</base.version>
+        <hazard.version>1.0</hazard.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <druid.version>1.2.15</druid.version>
-        <bitwalker.version>1.21</bitwalker.version>
-        <swagger.version>3.0.0</swagger.version>
-        <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
-        <fastjson.version>2.0.23</fastjson.version>
-        <oshi.version>6.4.0</oshi.version>
-        <commons.io.version>2.11.0</commons.io.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
-        <poi.version>4.1.2</poi.version>
-        <velocity.version>2.3</velocity.version>
-        <jwt.version>0.9.1</jwt.version>
-        <mybatis-plus.version>3.5.1</mybatis-plus.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -51,145 +33,48 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- 阿里数据库连接池 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${druid.version}</version>
-            </dependency>
-
-            <!-- 解析客户端操作系统、浏览器等 -->
-            <dependency>
-                <groupId>eu.bitwalker</groupId>
-                <artifactId>UserAgentUtils</artifactId>
-                <version>${bitwalker.version}</version>
-            </dependency>
-
-            <!-- pagehelper 分页插件 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
-
-            <!-- 获取系统信息 -->
-            <dependency>
-                <groupId>com.github.oshi</groupId>
-                <artifactId>oshi-core</artifactId>
-                <version>${oshi.version}</version>
-            </dependency>
-
-            <!-- Swagger3依赖 -->
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-boot-starter</artifactId>
-                <version>${swagger.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-models</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <!-- io常用工具类 -->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-
-            <!-- 文件上传工具类 -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${commons.fileupload.version}</version>
-            </dependency>
-
-            <!-- excel工具 -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <!-- velocity代码生成使用模板 -->
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-
-            <!-- collections工具类 -->
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>${commons.collections.version}</version>
-            </dependency>
-
-            <!-- 阿里JSON解析器 -->
-            <dependency>
-                <groupId>com.alibaba.fastjson2</groupId>
-                <artifactId>fastjson2</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-
-            <!-- Token生成与解析-->
+            <!-- 通用工具-->
             <dependency>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-                <version>${jwt.version}</version>
+                <groupId>com.ozs</groupId>
+                <artifactId>base-common</artifactId>
+                <version>${base.version}</version>
             </dependency>
 
-            <!-- 验证码 -->
             <dependency>
-                <groupId>pro.fessional</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.version}</version>
+                <groupId>com.ozs</groupId>
+                <artifactId>base-framework</artifactId>
+                <version>${base.version}</version>
             </dependency>
 
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ozs</groupId>
-                <artifactId>quartz</artifactId>
-                <version>${monitor.version}</version>
+                <artifactId>base-quartz</artifactId>
+                <version>${base.version}</version>
             </dependency>
 
             <!-- 代码生成-->
             <dependency>
                 <groupId>com.ozs</groupId>
-                <artifactId>generator</artifactId>
-                <version>${monitor.version}</version>
+                <artifactId>base-generator</artifactId>
+                <version>${base.version}</version>
             </dependency>
 
-            <!-- 核心模块-->
             <dependency>
                 <groupId>com.ozs</groupId>
-                <artifactId>framework</artifactId>
-                <version>${monitor.version}</version>
+                <artifactId>business-service</artifactId>
+                <version>${hazard.version}</version>
             </dependency>
 
-            <!-- 系统模块-->
-            <dependency>
-                <groupId>com.ozs</groupId>
-                <artifactId>system</artifactId>
-                <version>${monitor.version}</version>
-            </dependency>
-
-            <!-- 通用工具-->
-            <dependency>
-                <groupId>com.ozs</groupId>
-                <artifactId>common</artifactId>
-                <version>${monitor.version}</version>
-            </dependency>
-            <!-- mybatis-plus -->
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
+
+    <modules>
+        <module>hazard-admin</module>
+        <module>business-service</module>
+    </modules>
+
+
     <build>
         <plugins>
             <plugin>
@@ -229,4 +114,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-</project>
+</project>