From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 12 六月 2024 15:01:56 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/resources/application-test.yml | 53 +++++++++++++---------------------------------------- 1 files changed, 13 insertions(+), 40 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/resources/application-test.yml b/server/visits/dmvisit_service/src/main/resources/application-test.yml index 03700b7..2371a18 100644 --- a/server/visits/dmvisit_service/src/main/resources/application-test.yml +++ b/server/visits/dmvisit_service/src/main/resources/application-test.yml @@ -1,52 +1,40 @@ spring: # 鏁版嵁婧愰厤缃� datasource: - url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai + url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: doumee password: rtjgfEr@&0c0m driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - - jackson: - time-zone: GMT+8 - date-format: yyyy-MM-dd HH:mm:ss redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺� -#rocketmq: -# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080 -# groupId: GID-wakatest -# topic: waka-test -# username: 4derRb4Sw5EkqUMI -# password: v50N97wf4av8Q8I4 + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss -#knife4j: -# enable: true -# basic: -# enable: true -# username: admin -# password: 111111 debug_model: true +########################鍚屾鏁版嵁妯″紡 ######################## +data-sync: + org-user-data-origin: 0 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 + visitor-data-origin: 0 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 + need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹� + + # Swagger閰嶇疆 swagger: - host: dmtest.ahapp.net + host: 127.0.0.1 title: ${project.name}鎺ュ彛鏂囨。 description: ${project.name}鎺ュ彛鏂囨。 enabled: true - context-path: /erp_api + context-path: # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧� redirect-uri: / - -########################鍚屾鏁版嵁妯″紡 ######################## -data-sync: - org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 - visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 - need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹� ########################寰俊鏀粯鐩稿叧閰嶇疆######################## wx: @@ -63,19 +51,4 @@ remoteHost: https://apis.map.qq.com appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ - des_pwd: 123456SDFKDJF - -## MQTT## -mqtt: - host: tcp://192.168.10.198:1883 - userName: root - passWord: 123456 - qos: 1 - clientId: ClientId_local #ClientId_local蹇呴』鍞竴 姣斿浣犲凡缁忓畾浜嗗彨ABC 閭d綘灏变竴鐩村彨ABC 鍏朵粬鍦版柟灏变笉瑕佷娇鐢ˋBC浜� - timeout: 10 - keepalive: 20 - topic1: A/pick/warn/# #绗﹀彿鏄唬琛ㄦ暣涓獁arn涓嬮潰鐨勫叏閮ㄥ瓙涓婚 娌℃湁鐞嗚В鐨勮瘽 鍙互鐧惧害浠旂粏鐞嗚В涓�涓� - topic2: A/cmd/resp - topic3: ABCF - topic4: ABCH -- Gitblit v1.9.3