From 08bae4808c1cc00ab4ef1bf5254b3d712228be4d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 12 Oct 2024 09:27:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/resources/config/application-test.yml | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
index 5ea88a9..e4b18d2 100644
--- a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml
@@ -10,7 +10,7 @@
name: dyh-sys
#数据源配置
datasource:
- url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
+ url: jdbc:dm://192.168.234.57:9016?schema=gzdyh_test
username: SYSDBA
password: SYSDBA
driver-class-name: dm.jdbc.driver.DmDriver
@@ -49,7 +49,7 @@
client:
service-url:
#注册中心单机
- defaultZone: http://localhost:9001/eureka
+ defaultZone: http://localhost:9011/eureka
#注册中心集群
#defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
#是否注册到注册中心
@@ -93,4 +93,29 @@
servlet:
context-path: /
ssl:
- enabled: false
\ No newline at end of file
+ enabled: false
+
+#ftp服务配置
+ftp:
+ #服务器ip地址
+ hostname: 192.168.234.34
+ #端口
+ port: 21
+ #用户名
+ username: hugeinfo
+ #密码
+ password: hugeinfo123
+ #附件存储根目录
+ rootdir: /deploy/ftp/gzdyh
+
+xfyun:
+ host_url: https://iat-api.xfyun.cn/v2/iat
+ appid: 5c7b00be
+ api_secret: MGM5Mjg2ODQzYWZmNGE2YjlhOGZlMTJj
+ api_key: 9e0a80ed995daf5b194f06ca336080c1
+
+grid:
+ url: http://219.137.166.84:8061
+ username: mtxt001
+ password: aek8CdcaM
+ syscode: sub-mtxt
\ No newline at end of file
--
Gitblit v1.8.0