gao.qiang 1 yıl önce
ebeveyn
işleme
9de341db9b

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

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

+ 24 - 24
hazard-admin/src/main/resources/application.yml

@@ -20,11 +20,11 @@ base:
   # 摄像头配置
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/record/flv/
-  webUrl: http://183.236.39.220:9080
-  bakUrl: http://183.236.39.220:9080
-  wsUrl: ws://183.236.39.220:9080
+  webUrl: http://183.236.39.220:8083
+  bakUrl: http://183.236.39.220:8083
+  wsUrl: ws://183.236.39.220:8083
   defaultPassword: yn5aq5Mt.106.tky
-  imgUrl: http://183.236.39.220:18801/picbucket
+  imgUrl: http://10.161.12.52:18801/picbucket
   recordUrl: http://183.236.39.220:8083${server.servlet.context-path}
 # 开发环境配置
 server:
@@ -68,11 +68,11 @@ spring:
     active: druid
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  50MB
-       # 设置总上传的文件大小
-       max-request-size:  100MB
+    multipart:
+      # 单个文件大小
+      max-file-size:  50MB
+      # 设置总上传的文件大小
+      max-request-size:  100MB
   # 服务模块
   devtools:
     restart:
@@ -87,7 +87,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: tysfrz123
+    password: +xLHQ73t@q
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -103,12 +103,12 @@ spring:
 
 # token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期(默认30分钟)
-    expireTime: 120
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期(默认30分钟)
+  expireTime: 120
 # app:token配置
 apptoken:
   # 令牌自定义标识
@@ -120,12 +120,12 @@ apptoken:
 
 # MyBatis配置
 mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ozs.**.domain
-    # 配置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:
@@ -156,10 +156,10 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 minio:
-  endpoint: http://${server-ip}:18801 #Minio服务所在地址
+  endpoint: http://10.161.12.52:18801 #Minio服务所在地址
   bucketName: picbucket #存储桶名称
   accessKey: admin #访问的key
-  secretKey: admin123 #访问的秘钥
+  secretKey: jt73W-+xhd5 #访问的秘钥
 
 mqtt:
   host: tcp://${server-ip}:1883

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

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

+ 21 - 21
hazard-sdk/src/main/resources/application.yml

@@ -16,7 +16,7 @@ base:
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   #图片路径前缀
-  imgUrl: http://${server-ip}:18801/picbucket
+  imgUrl: http://10.161.12.52:18801/picbucket
 
 # 开发环境配置
 server:
@@ -60,11 +60,11 @@ spring:
     active: druid
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -79,7 +79,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: tysfrz123
+    password: +xLHQ73t@q
     # 连接超时时间
     timeout: 100s
     lettuce:
@@ -95,12 +95,12 @@ spring:
 
 # web:token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期(默认30分钟)
-    expireTime: 30
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期(默认30分钟)
+  expireTime: 30
 
 # app:token配置
 apptoken:
@@ -113,12 +113,12 @@ apptoken:
 
 # MyBatis配置
 mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ozs.**.domain
-    # 配置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:
@@ -149,10 +149,10 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 minio:
-  endpoint: http://${server-ip}:18801 #Minio服务所在地址
+  endpoint: http://10.161.12.52:18801 #Minio服务所在地址
   bucketName: picbucket #存储桶名称
   accessKey: admin #访问的key
-  secretKey: admin123 #访问的秘钥
+  secretKey: jt73W-+xhd5 #访问的秘钥
 
 sdk:
   publish: http://${server-ip}:8081/hazard/sdk/publish