server/meeting/meeting_service/src/main/resources/application-pro.yml
@@ -1,23 +1,16 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://localhost:3306/smart_meeting?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: Znhys@168.com password: Atwl@2024 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource # #knife4j: # enable: true # basic: # enable: true # username: admin # password: doumee@168.com debug_model: true captcha_check: false jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss debug_model: false captcha_check: true # Swagger配置 swagger: @@ -27,25 +20,5 @@ enabled: true # 禁用swagger时的重定向地址 redirect-uri: / ########################微信支付相关配置######################## wx: pay: appId: wxfab6da18632e28de appSecret: 4ee3b22afa90287834319fc3c1635271 mchId: 1229817002 mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify keyPath: /usr/local/apiclient_cert.p12 tencent: map: remoteHost: https://apis.map.qq.com appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ ########################定时开启配置######################## timing: true des_pwd: 123456SDFKDJF des_pwd: 123456SDFKDJF server/system_timer/src/main/resources/application-pro.yml
@@ -1,28 +1,21 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/dm_visit?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: doumee password: rtjgfEr@&0c0m url: jdbc:mysql://localhost:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: Atwl@2024 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 #knife4j: # enable: true # basic: # enable: true # username: admin # password: doumee@168.com jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss debug_model: true captcha_check: false debug_model: false captcha_check: true # Swagger配置 swagger: @@ -33,22 +26,6 @@ # 禁用swagger时的重定向地址 redirect-uri: / timing: true ########################微信支付相关配置######################## wx: pay: appId: wxfab6da18632e28de appSecret: 4ee3b22afa90287834319fc3c1635271 mchId: 1229817002 mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM notifyUrl: https://dmtest.ahapp.net/smartmeeting_interface/web/api/wxPayNotify keyPath: /usr/local/apiclient_cert.p12 tencent: map: remoteHost: https://apis.map.qq.com appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ des_pwd: 123456SDFKDJF des_pwd: 123456SDFKDJF server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
@@ -183,7 +183,7 @@ private List<PlatformDevice> getCameraList(List<PlatformCameraInfoResponse> cameras, Platform model) { List<PlatformDevice> list = new ArrayList<>(); if(cameras!=null || cameras.size()>0){ if(cameras!=null && cameras.size()>0){ for(PlatformCameraInfoResponse param :cameras){ PlatformDevice d = new PlatformDevice(); d.setCreateDate(model.getCreateDate());
