Explorar o código

修改 依赖 base分支

hexiao %!s(int64=2) %!d(string=hai) anos
pai
achega
bde0df5a51

+ 2 - 0
.idea/VehicleMonitor.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />

+ 1 - 0
.idea/compiler.xml

@@ -7,6 +7,7 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="vehicle-admin" />
         <module name="business-service" />
         <module name="hazard-admin" />
       </profile>

+ 0 - 2
.idea/encodings.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <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$/vehicle-admin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/vehicle-admin/src/main/resources" charset="UTF-8" />
   </component>

+ 10 - 0
.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,10 @@
       <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>
   </component>
 </project>

+ 1 - 1
business-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>VehicleMonitor</artifactId>
         <groupId>com.ozs</groupId>
-        <version>1.0</version>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

+ 54 - 13
pom.xml

@@ -7,14 +7,14 @@
     <groupId>com.ozs</groupId>
     <artifactId>VehicleMonitor</artifactId>
     <packaging>pom</packaging>
-    <version>1.0</version>
+    <version>1.0-SNAPSHOT</version>
 
     <description>地系统</description>
 
 
     <properties>
-        <base.version>3.8.5</base.version>
-        <vehicle.version>1.0</vehicle.version>
+        <base.version>1.0-SNAPSHOT</base.version>
+        <vehicle.version>1.0-SNAPSHOT</vehicle.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -88,28 +88,69 @@
         </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>

+ 1 - 2
vehicle-admin/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>VehicleMonitor</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>
     <artifactId>vehicle-admin</artifactId>
     <name>vehicle-admin</name>
 

+ 13 - 0
vehicle-admin/src/main/resources/application.yml

@@ -98,6 +98,13 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期(默认30分钟)
     expireTime: 30
+apptoken:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: qwertyuiopasdfghjklzxcvbnm
+  # 令牌有效期(默认15天)
+  expireTime: 21600
 
 # MyBatis配置
 mybatis:
@@ -136,3 +143,9 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+minio:
+  endpoint: http://124.71.171.71:18801 #Minio服务所在地址
+  bucketName: picbucket #存储桶名称
+  accessKey: admin #访问的key
+  secretKey: admin123 #访问的秘钥