From c07aeace15bd4265bd34fd4d0afbd1d13603032d Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 11 Oct 2025 14:13:06 +0800
Subject: [PATCH] 1.修改名称(天宇 ——》六合)。

---
 ard-admin/src/main/resources/application-dev.yml |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/ard-admin/src/main/resources/application-dev.yml b/ard-admin/src/main/resources/application-dev.yml
index 9889498..a70eda9 100644
--- a/ard-admin/src/main/resources/application-dev.yml
+++ b/ard-admin/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
 # token配置
 token:
   # 是否允许账户多终端同时登录(true允许 false不允许)
-  soloLogin: false
+  soloLogin: true
 # 日志配置
 logging:
   level:
@@ -23,24 +23,23 @@
     enable: false
     username: admin
     password: ardkj12345
+# MyBatis Plus配置
+mybatis-plus:
+  # 搜索指定包别名
+  typeAliasesPackage: com.ard.**.domain
+  # 配置mapper的扫描,找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
 
-# 天宇服务器配置
-#tianyu:
-#  # 天宇http服务器地址
-#  endpoint: 112.98.106.22:12000
-#  accesskeyid: qmfmd3Ws7M4dMcylnrTU
-#  accesskeysecret: 5WBU2uEhHZaVefpZdaxpFh4LJW9fZZaa
-#  # 天宇tcp服务器地址
-#  tcpserver: 123.56.170.94
-#  tcpport: 12345
-
-# 天宇服务器配置
+# 六合服务器配置
 tianyu:
- # 天宇http服务器地址
- endpoint: 192.168.1.97:8060
+ # 六合http服务器地址
+ # endpoint: 192.168.1.97:8060  # 哈尔滨环境
+ endpoint: 112.98.104.134:8060  # 哈尔滨环境
  accesskeyid: wuwuwu
  accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
- # 天宇tcp服务器地址
+ # 六合tcp服务器地址
  tcpserver: 192.168.1.97
  tcpport: 8126
 
@@ -48,6 +47,7 @@
 geoserver:
   deviceCoordinateType: WGS84
   tifPath: H:\map\hlj.tif
+
 wayline:
   #可理解为100米大小占图像的比例
   targetRatio: 0.5
@@ -66,7 +66,27 @@
   accessKey: admin
   secretKey: xzx12345
   bucketName: kmz
-#流媒体配置
+
+#上云API
+cloud-api:
+  app:
+    id: 143640
+    key: da5babf38a5d05b0f46a7d82910da1b
+    license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
+    host: 192.168.1.15
+    port: 123
+#流媒体
 mediamtx:
-  # 流媒体服务器地址
-  host: 192.168.1.15
\ No newline at end of file
+  apiHost: 192.168.1.15
+  playHost: 192.168.1.15
+  https: false
+
+# mqtt配置
+mqtt:
+  protocol: tcp
+  host: 192.168.1.15
+  port: 1883
+  username: admin
+  password: public
+  client-id: liusuyi
+  inbound-topic: sys/product/+/status,thing/product/+/requests
\ No newline at end of file

--
Gitblit v1.9.3