hexiao 1 ano atrás
pai
commit
ebac899149

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

@@ -6,9 +6,9 @@ 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
+                password: UTA1hcycRtgD0c7Y
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 1 - 1
hazard-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/data/service/hazard-admin/logs"/>
+    <property name="log.path" value="/opt/service/hazard-admin/logs"/>
 <!--      <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>

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

@@ -6,9 +6,9 @@ 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
+        password: UTA1hcycRtgD0c7Y
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

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

@@ -1,4 +1,5 @@
 # 项目相关配置
+server-ip: 10.161.12.50
 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}:8081/hazard/sdk/publish

+ 10 - 10
hazard-sdk/src/main/resources/logback.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/base/logs" />
-<!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/project/logs"/>-->
+    <!--	<property name="log.path" value="/home/base/logs" />-->
+    <property name="log.path" value="/opt/service/hazard-sdk/logs"/>
     <!-- 日志输出格式 -->
-	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 
-	<!-- 控制台输出 -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${log.pattern}</pattern>
-		</encoder>
-	</appender>
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
 
-	<!-- 系统日志输出 -->
+    <!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
         <!-- 循环政策:基于时间创建日志文件 -->