Merge remote-tracking branch 'origin/master'

vehicle-admin/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8
+ADD target/vehicle-admin.jar app.jar
+EXPOSE 8080
+VOLUME ["/data/service/vehicle-admin/logs","/logs"]
+ENTRYPOINT java -jar /app.jar >/logs/app.log

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

@@ -9,7 +9,7 @@ base:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: C:/base/uploadPath
+  profile: /data/service/vehicle-admin/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -19,7 +19,7 @@ base:
 
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8082
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /
@@ -76,7 +76,7 @@ spring:
     # 端口，默认为6379
     port: 7001
     # 数据库索引
-    database: 0
+    database: 1
     # 密码
     password: 106@qwe123
     # 连接超时时间