~nishiwei/ard-uav-server.git

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

			# 日志配置
			logging:
			@@ -43,13 +43,6 @@
			#航线KMZ临时存放路径
			waylineSavePath: /home/ard/myworkspace/uav_server/mainserver/waylines

			# MinIO
			minio:
			url: https://192.168.1.3:9001
			accessKey: admin
			secretKey: ard12345
			bucketName: kmz

			#上云API
			cloud-api:
			app:
			@@ -64,6 +57,10 @@
			apiHost: 192.168.1.3
			playHost: 192.168.1.3
			https: true
			pushHost: 192.168.10.73
			rtmpPort: 1935
			rtspPort: 8554
			webrtcPort: 8889

			# mqtt配置
			mqtt:
			@@ -75,7 +72,7 @@
			client-id: ard-uav
			inbound-topic: sys/product/+/status,thing/product/+/requests

			# oss配置
			# oss配置 https://192.168.1.3:9001
			oss:
			enable: true
			provider: minio
			@@ -86,3 +83,15 @@
			expire: 3600
			region: us-east-1
			object-dir-prefix: wayline

			# 机场单独用的oss配置，要http地址 http://192.168.1.3:9011
			ossdock:
			enable: true
			provider: minio
			endpoint: http://111.40.46.199:9011
			access-key: admin2
			secret-key: ard123456
			bucket: cloud-bucket
			expire: 3600
			region: us-east-1
			object-dir-prefix: wayline