Merge remote-tracking branch 'origin/2024-01-16-zy-门口门禁需求' into 2024-01-16-zy-门口门禁需求

src/main/resources/application-dev.properties

@@ -64,18 +64,18 @@ spring.main.banner-mode=off
 preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
 qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
 #?????
-smb.host=39.103.224.166
+smb.host=192.168.192.201
 smb.port=22
 smb.user=root
-smb.password=Zcloud@zcloud88888
-smb.basePath=/mnt/qgfile/file/
+smb.password=SJSKAQHBGLXT@20220311
+smb.basePath=/mnt/qask/file/
 
 #Mq\u914D\u7F6E
 rocketmq.consumer.group2=edu-admin-edit
 rocketmq.consumer.group1=edu-admin-add
 #rocketmq.name-server=10.0.140.141:9876
 #rocketmq.name-server=192.168.0.70:9876
-rocketmq.name-server=192.168.0.31:9876
+rocketmq.name-server=192.168.151.57:9876
 rocketmq.producer.group=libmiddle
 rocketmq.producer.send-message-timeout=3000
 rocketmq.producer.compress-message-body-threshold=4096
@@ -96,5 +96,7 @@ mq.gwj.data.topic=czks_qy_docking
 mq.gwj.file.topic=czks_qy_dockingPicture
 #港务局文件服务器前缀
 baseimgpath=https://qgqy.qhdsafety.com/file/
-
-cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd
+http.file.url=https://qgqy.qhdsafety.com/file/
+corp.default.pic-path=https://qgqy.qhdsafety.com/
+corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
+cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd/

src/main/resources/application.properties

@@ -3,7 +3,7 @@ server.port=8091
 
 #??
 #spring.profiles.active=local
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD>31ʱʹ<EFBFBD><EFBFBD>
+#部署31时使用
 spring.profiles.active=dev
 #??
 #spring.profiles.active=master