99

.idea/compiler.xml

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

.idea/encodings.xml

@@ -5,5 +5,7 @@
     <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" />
+    <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hazard-sdk/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -11,6 +11,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://124.71.171.71:18881/repository/custom_group/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="nexus" />
       <option name="name" value="Nexus Repository" />
@@ -31,5 +36,15 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="custom_group" />
+      <option name="name" value="Nexus Repository" />
+      <option name="url" value="http://124.71.171.71:18881/repository/custom_group/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

business-service/pom.xml

@@ -5,11 +5,12 @@
     <parent>
         <artifactId>GeoHazardMonitor</artifactId>
         <groupId>com.ozs</groupId>
-        <version>1.0</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <version>1.0-SNAPSHOT</version>
     <artifactId>business-service</artifactId>
     <dependencies>
 

hazard-admin/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>GeoHazardMonitor</artifactId>
         <groupId>com.ozs</groupId>
-        <version>1.0</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
     <artifactId>hazard-admin</artifactId>
 
     <description>

hazard-admin/target/classes/application.yml

@@ -18,7 +18,7 @@ base:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 18819
   servlet:
     # 应用的访问路径
     context-path: /
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 124.70.58.209
+    host: 124.71.171.71
     # 端口，默认为6379
-    port: 7001
+    port: 18879
     # 数据库索引
     database: 0
     # 密码
-    password: 106@qwe123
+    password: tysfrz123
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -98,6 +98,14 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
     expireTime: 30
+# app:token配置
+apptoken:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: qwertyuiopasdfghjklzxcvbnm
+  # 令牌有效期（默认15天）
+  expireTime: 21600
 
 # MyBatis配置
 mybatis:
@@ -136,3 +144,8 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+minio:
+  endpoint: http://124.71.171.71:18801 #Minio服务所在地址
+  bucketName: picbucket #存储桶名称
+  accessKey: admin #访问的key
+  secretKey: admin123 #访问的秘钥 

hazard-admin/target/classes/mybatis/mybatis-config.xml

@@ -16,5 +16,12 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
         <!-- 使用驼峰命名法转换字段 -->
 		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
 	</settings>
-	
+
+    <plugins>
+        <!--        配置分页插件-->
+        <plugin interceptor="com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor">
+            <property name="@page" value="com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor"/>
+            <property name="page:dbType" value="MYSQL"/>
+        </plugin>
+    </plugins>
 </configuration>

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Feb 07 17:51:48 CST 2023
-version=3.8.5
+#Wed Mar 01 22:24:58 CST 2023
+version=1.0-SNAPSHOT
 groupId=com.ozs
-artifactId=base-admin
+artifactId=hazard-admin

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

@@ -1,4 +1,5 @@
 com\ozs\web\controller\common\CommonController.class
+com\ozs\web\controller\accountmanagment\BaseCameraManagementController.class
 com\ozs\web\controller\monitor\SysUserOnlineController.class
 com\ozs\web\controller\common\CaptchaController.class
 com\ozs\web\controller\system\SysNoticeController.class
@@ -6,20 +7,24 @@ 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\accountmanagment\MsgAlarmController.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\accountmanagment\BaseLineManagementController.class
 com\ozs\web\controller\system\SysDeptController.class
 com\ozs\web\controller\system\SysPostController.class
+com\ozs\web\controller\upload\UploadController.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\HazardApplication.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\accountmanagment\SvcAddressController.class
+com\ozs\HazardServletInitializer.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

@@ -1,24 +1,29 @@
-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
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\monitor\SysOperlogController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysLoginController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysUserController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\monitor\ServerController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysRoleController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\monitor\CacheController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysNoticeController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysPostController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysProfileController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysConfigController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\core\config\SwaggerConfig.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysDictDataController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysIndexController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysRegisterController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\accountmanagment\BaseCameraManagementController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\monitor\SysUserOnlineController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\accountmanagment\MsgAlarmController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\HazardServletInitializer.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\accountmanagment\SvcAddressController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\upload\UploadController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysDeptController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\common\CaptchaController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\monitor\SysLogininforController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysDictTypeController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\tool\TestController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\system\SysMenuController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\HazardApplication.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\accountmanagment\BaseLineManagementController.java
+C:\workspace\GeoHazardMonitor\hazard-admin\src\main\java\com\ozs\web\controller\common\CommonController.java

hazard-sdk/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>GeoHazardMonitor</artifactId>
         <groupId>com.ozs</groupId>
-        <version>1.0</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
     <artifactId>hazard-sdk</artifactId>
 
     <dependencies>

pom.xml

@@ -7,14 +7,13 @@
     <groupId>com.ozs</groupId>
     <artifactId>GeoHazardMonitor</artifactId>
     <packaging>pom</packaging>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
 
     <name>hazard</name>
-    <url></url>
     <description>地质灾害系统</description>
     <properties>
-        <base.version>3.8.5</base.version>
-        <hazard.version>1.0</hazard.version>
+        <base.version>3.8.5-SNAPSHOT</base.version>
+        <hazard.version>1.0-SNAPSHOT</hazard.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -91,28 +90,68 @@
         </plugins>
     </build>
 
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>public</id>-->
+<!--            <name>aliyun nexus</name>-->
+<!--            <url>https://maven.aliyun.com/repository/public</url>-->
+<!--            <releases>-->
+<!--                <enabled>true</enabled>-->
+<!--            </releases>-->
+<!--        </repository>-->
+<!--    </repositories>-->
+
+<!--    <pluginRepositories>-->
+<!--        <pluginRepository>-->
+<!--            <id>public</id>-->
+<!--            <name>aliyun nexus</name>-->
+<!--            <url>https://maven.aliyun.com/repository/public</url>-->
+<!--            <releases>-->
+<!--                <enabled>true</enabled>-->
+<!--            </releases>-->
+<!--            <snapshots>-->
+<!--                <enabled>false</enabled>-->
+<!--            </snapshots>-->
+<!--        </pluginRepository>-->
+<!--    </pluginRepositories>-->
+
     <repositories>
         <repository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
+            <id>custom_group</id>
+            <name>Nexus Repository</name>
+            <url>http://124.71.171.71:18881/repository/custom_group/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
             <releases>
                 <enabled>true</enabled>
             </releases>
         </repository>
     </repositories>
-
     <pluginRepositories>
         <pluginRepository>
-            <id>public</id>
-            <name>aliyun nexus</name>
-            <url>https://maven.aliyun.com/repository/public</url>
+            <id>custom_group</id>
+            <name>Nexus Plugin Repository</name>
+            <url>http://124.71.171.71:18881/repository/custom_group/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
             <releases>
                 <enabled>true</enabled>
             </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
         </pluginRepository>
     </pluginRepositories>
+    <!--项目分发信息，在执行mvn deploy后表示要发布的位置。有了这些信息就可以把网站部署到远程服务器或者把构件jar等部署到远程仓库。 -->
+    <distributionManagement>
+        <repository><!--部署项目产生的构件到远程仓库需要的信息 -->
+            <id>custom_releases</id><!-- 此处id和settings.xml的id保持一致 -->
+            <name>Nexus Release Repository</name>
+            <url>http://124.71.171.71:18881/repository/custom_releases/</url>
+        </repository>
+        <snapshotRepository><!--构件的快照部署到哪里？如果没有配置该元素，默认部署到repository元素配置的仓库，参见distributionManagement/repository元素 -->
+            <id>custom_snapshots</id><!-- 此处id和settings.xml的id保持一致 -->
+            <name>Nexus Snapshot Repository</name>
+            <url>http://124.71.171.71:18881/repository/custom_snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>