Browse Source

修改路径

hexiao 1 year ago
parent
commit
2a9ebd7ef5

+ 0 - 4
hazard-admin/src/main/java/com/ozs/web/controller/app/GeoHazardMineController.java

@@ -55,10 +55,6 @@ public class GeoHazardMineController extends BaseController {
     private ISysUserService userService;
     @Autowired
     private TokenService tokenService;
-    @Value("${file.avatarUrl:#{null}}")
-    private String avatarURL;
-    @Value("${file.filreUrl:#{null}}")
-    private String fileUrl;
     @Autowired
     private ISysUserService sysUserService;
     @Autowired

+ 1 - 1
hazard-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://124.70.58.209:18806/hazard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://${server-ip}:3306/hazard?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: 123.asd
             # 从库数据源

+ 11 - 15
hazard-admin/src/main/resources/application.yml

@@ -1,4 +1,5 @@
 # 项目相关配置
+server-ip: 192.168.2.102
 base:
   # 名称
   name: base
@@ -18,16 +19,16 @@ base:
   # 摄像头配置
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/record/flv/
-  webUrl: http://124.70.58.209:18812
-  bakUrl: http://124.70.58.209:18891
-  wsUrl: ws://124.70.58.209:9080
+  webUrl: http://${server-ip}:18812
+  bakUrl: http://${server-ip}:18891
+  wsUrl: ws://${server-ip}:9080
   defaultPassword: yn5aq5Mt.106.tky
-  imgUrl: http://124.71.171.71:18801/picbucket
+  imgUrl: http://${server-ip}:18801/picbucket
 
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 18819
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /hazard
@@ -79,9 +80,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 124.71.171.71
+    host: ${server-ip}
     # 端口,默认为6379
-    port: 18879
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
@@ -154,20 +155,15 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 minio:
-  endpoint: http://124.71.171.71:18801 #Minio服务所在地址
+  endpoint: http://${server-ip}:18801 #Minio服务所在地址
   bucketName: picbucket #存储桶名称
   accessKey: admin #访问的key
   secretKey: admin123 #访问的秘钥
-file:
-  #头像存储目录
-  avatarUrl: /data/service/avatar/
-  #文件访问前缀
-  filreUrl: http://124.71.171.71:18878
 
 mqtt:
-  host: tcp://124.70.58.209:1883
+  host: tcp://${server-ip}:1883
   userName: guest
   passWord: guest
 
 shot:
-  urlAddress: http://124.70.58.209:18891/snap/
+  urlAddress: http://${server-ip}:9080/snap/

+ 8 - 7
hazard-sdk/src/main/resources/application.yml

@@ -1,4 +1,5 @@
 # 项目相关配置
+server-ip: 192.168.2.102
 base:
   # 名称
   name: base
@@ -9,18 +10,18 @@ base:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
-  profile: C:/base/uploadPath
+  profile: /opt/streams/record/flv
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   #图片路径前缀
-  imgUrl: http://124.71.171.71:18801/picbucket
+  imgUrl: http://${server-ip}:18801/picbucket
 
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 18818
+  port: 80
   servlet:
     # 应用的访问路径
     context-path: /
@@ -72,9 +73,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 124.71.171.71
+    host: ${server-ip}
     # 端口,默认为6379
-    port: 18879
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
@@ -148,10 +149,10 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 minio:
-  endpoint: http://124.71.171.71:18801 #Minio服务所在地址
+  endpoint: http://${server-ip}:18801 #Minio服务所在地址
   bucketName: picbucket #存储桶名称
   accessKey: admin #访问的key
   secretKey: admin123 #访问的秘钥
 
 sdk:
-  publish: http://124.70.58.209:18819/hazard/sdk/publish
+  publish: http://${server-ip}:8080/hazard/sdk/publish