From 318847278787aca773ccbee2b7748c9005941691 Mon Sep 17 00:00:00 2001 From: mi9688 Date: Fri, 20 Dec 2024 13:36:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 31 ++++++++++--------- .../domain/NgWaterPumpUsageRecords.java | 4 +-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/fastbee-admin/src/main/resources/application-prod.yml b/fastbee-admin/src/main/resources/application-prod.yml index 76eb1c9..ec96ba3 100644 --- a/fastbee-admin/src/main/resources/application-prod.yml +++ b/fastbee-admin/src/main/resources/application-prod.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://w.hanzhenyun.com/wumei2.4?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://w.hanzhenyun.com:3306/wumei2.4?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: wumei2.4 password: rtB8EhbRRYSGyxHw # 从库数据源 @@ -17,7 +17,7 @@ spring: password: # TDengine数据库 tdengine-server: - enabled: false # 默认不启用TDengine，true=启用，false=不启用 + enabled: false # 默认不启用TDengine，true=启用，false=不启用 driverClassName: com.taosdata.jdbc.TSDBDriver url: jdbc:TAOS://fastbee:6030/fastbee_log?timezone=UTC-8&charset=utf-8 username: root @@ -57,10 +57,11 @@ spring: multi-statement-allow: true # redis 配置 redis: - host: localhost # 地址 + + host: localhost # 地址 port: 6379 # 端口，默认为6379 - database: 0 # 数据库索引 - password: hzwl_123 # 密码 + database: 1 # 数据库索引 + # password: fastbee # 密码 timeout: 10s # 连接超时时间 lettuce: pool: @@ -70,11 +71,11 @@ spring: max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） # mqtt 配置 mqtt: - username: fastbee # 账号（仅用于后端自认证） - password: fastbee # 密码（仅用于后端自认证） - host-url: tcp://w.hanzhenyun.com:13087 # 连接 Emqx 消息服务器地址 - # host-url: tcp://177.7.0.13:1883 # 内置netty mqtt broker地址 + username: fastbee # 账号 + password: fastbee # 密码 + host-url: tcp://localhost:1883 # mqtt连接tcp地址 client-id: ${random.int} # 客户端Id，不能相同，采用随机数 ${random.value} + # client-id: mqttx_22ee8d0f # 客户端Id，不能相同，采用随机数 ${random.value} default-topic: test # 默认主题 timeout: 30 # 超时时间 keepalive: 30 # 保持连接 @@ -102,9 +103,10 @@ redisson: timeout: 3000 # 发布和订阅连接池大小 subscriptionConnectionPoolSize: 50 + # sip 配置 sip: - enabled: false # 是否启用视频监控SIP，true为启用 + enabled: false # 是否启用视频监控SIP，true为启用 ## 本地调试时，绑定网卡局域网IP，设备在同一局域网，设备接入IP填写绑定IP ## 部署服务端时，默认绑定容器IP，设备接入IP填写服务器公网IP ip: 127.0.0.1 @@ -117,19 +119,18 @@ sip: logging: level: com.fastbee: debug - com.yomahub: warn + com.yomahub: debug org.dromara: warn org.springframework: warn # Swagger配置 swagger: enabled: true # 是否开启swagger - pathMapping: /prod-api # 请求前缀 - + pathMapping: /dev-api # 请求前缀 liteflow: - #FlowExecutor的execute2Future的线程数 - main-executor-works: 128 + #FlowExecutor的execute2Future的线程数，默认为64 + main-executor-works: 64 #FlowExecutor的execute2Future的自定义线程池Builder main-executor-class: com.fastbee.ruleEngine.config.MainExecutorBuilder #并行节点的线程池Builder diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java index 0e1cde6..eaa8ce8 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java @@ -32,8 +32,8 @@ private static final long serialVersionUID = 1L; private Date pumpStartTime; /** 关泵时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "关泵时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("关泵时间") private Date pumpStopTime;