~nishiwei/ard-uav-server.git

			@@ -2,10 +2,12 @@
			server:
			# 服务器的HTTP端口，默认为8080
			port: 8080

			# token配置
			token:
			# 是否允许账户多终端同时登录（true允许 false不允许）
			soloLogin: true
			soloLogin: false

			# 日志配置
			logging:
			level:
			@@ -23,26 +25,6 @@
			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: 192.168.1.97:8060 # 哈尔滨环境
			endpoint: 112.98.104.134:8060 # 大庆环境
			accesskeyid: wuwuwu
			accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
			# 六合tcp服务器地址
			# tcpserver: 192.168.1.97 # 哈尔滨环境
			tcpserver: 112.98.104.134 # 大庆环境
			tcpport: 8126

			# 地图资源配置
			geoserver:
			@@ -61,13 +43,6 @@
			#航线KMZ临时存放路径
			waylineSavePath: /home/ard/myworkspace/uav_server/mainserver/waylines

			# MinIO
			minio:
			url: http://192.168.1.3:9001
			accessKey: admin
			secretKey: xzx12345
			bucketName: kmz

			#上云API
			cloud-api:
			app:
			@@ -76,11 +51,12 @@
			license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
			host: 192.168.1.15
			port: 123

			#流媒体
			mediamtx:
			apiHost: 192.168.1.3
			playHost: 192.168.1.3
			https: false
			https: true

			# mqtt配置
			mqtt:
			@@ -90,4 +66,16 @@
			username: admin
			password: public
			client-id: ard-uav
			inbound-topic: sys/product/+/status,thing/product/+/requests
			inbound-topic: sys/product/+/status,thing/product/+/requests

			# oss配置
			oss:
			enable: true
			provider: minio
			endpoint: https://192.168.1.3:9001
			access-key: admin
			secret-key: ard12345
			bucket: cloud-bucket
			expire: 3600
			region: us-east-1
			object-dir-prefix: wayline