From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml index de87bf5..addc58c 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml @@ -1,18 +1,20 @@ spring: profiles: - include: global, database + include: global, database, database-ym, database-pj, database-test +user: + defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜 + defaultPassword: "abc_123" +# defaultPassword: "admin" #actutor鐨剋eb绔彛 management: server: - port: 9080 + port: ${pipIrr.base.actutorPort} #web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080 server: - port: 8080 + port: ${pipIrr.base.webPort} servlet: context-path: /base #web璁块棶涓婁笅鏂囪矾寰� context-parameters: #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99 - idSuffix: 1 - #ConfigListener涓簲鐢� - #configFileNames: config-global.xml,config-demo.xml + idSuffix: ${pipIrr.base.idSuffix} -- Gitblit v1.8.0