From 390090537de2142e022f2e0c52825f2257bcb677 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 28 九月 2023 18:22:38 +0800
Subject: [PATCH] 贝博粮情解析
---
igds-web/src/main/resources/application-pro5329.yml | 8 ++++----
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java | 4 ++--
igds-web/pom.xml | 8 ++++----
igds-web/src/main/resources/application-uat.yml | 34 ++++++++++++++++++++--------------
4 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
index f130495..176e119 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
+++ b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
@@ -82,11 +82,11 @@
}
//灏佽鏁版嵁
- ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(hexStr);
+ ReMessage reMessage = ReMessageBuilder.getInstance().buildMessage(result);
reMessage.setIp(ip);
reMessage.setPort(port);
log.info("鍒嗘満------->>骞冲彴锛氱伯鎯呭畬鏁存姤鏂囦俊鎭�={}", reMessage);
-
+ result = "";
if (!BeiboGrainServerUtils.MSG_START.startsWith(reMessage.getStartStr())) {
log.error("鍒嗘満------->>骞冲彴锛岃В鏋愮伯鎯呭け璐ワ細鎶ユ枃璧峰绗�={}閿欒锛屼笉瑙ｆ瀽", reMessage.getStartStr());
return;
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 7af5246..7c4af0a 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -153,7 +153,7 @@
</dependency>
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-fzzy3</artifactId>
@@ -168,7 +168,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- MODBUS-TCP
<dependency>
@@ -188,7 +188,7 @@
</dependency>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-iot</artifactId>
@@ -203,7 +203,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
diff --git a/igds-web/src/main/resources/application-pro5329.yml b/igds-web/src/main/resources/application-pro5329.yml
index 220bdc0..2883971 100644
--- a/igds-web/src/main/resources/application-pro5329.yml
+++ b/igds-web/src/main/resources/application-pro5329.yml
@@ -5,7 +5,7 @@
connection-timeout: 5000
tomcat:
uri-encoding: UTF-8
-
+#######绮儏,鑳借��,閫氶,姘旇皟,瀹夐槻,缁煎悎绠＄悊,鏅鸿兘棰勮,鏁伴噺妫�娴�,鍑哄叆搴�,涓夌淮,璐濆崥绮儏,DLT645鐢佃〃鍗忚########
########################## datasourcec ##########################
spring:
datasource:
@@ -18,9 +18,9 @@
password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
public-key:
config-decrypt: true
- initial-size: 5
- min-idle: 5
- max-active: 50
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
max-wait: 60000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
diff --git a/igds-web/src/main/resources/application-uat.yml b/igds-web/src/main/resources/application-uat.yml
index cb80b4b..220bdc0 100644
--- a/igds-web/src/main/resources/application-uat.yml
+++ b/igds-web/src/main/resources/application-uat.yml
@@ -1,5 +1,6 @@
+########################## 骞夸笢浣涘北绂呭煄鍖� ##########################
server:
- port: 8202
+ port: 8888
context-path: /
connection-timeout: 5000
tomcat:
@@ -11,15 +12,15 @@
db-base:
name: db-base
type: com.alibaba.druid.pool.DruidDataSource
- url: jdbc:mysql://127.0.0.1:3306/igds_uat?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: Abc123..
- publicKey:
- config-decrypt: false
+ password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ public-key:
+ config-decrypt: true
initial-size: 5
min-idle: 5
- max-active: 30
+ max-active: 50
max-wait: 60000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
@@ -35,6 +36,8 @@
removeAbandoned: true
removeAbandonedTimeout: 90
logAbandoned: true
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
db-sqlite:
name: db-sqlite
url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
@@ -45,7 +48,7 @@
# Redis鐩稿叧閰嶇疆
redis:
- database: 3
+ database: 0
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -57,18 +60,21 @@
min-idle: 0
timeout: 6000
-#License 閰嶇疆绀轰緥
license:
subject: ld_license
publicAlias: publicCert
storePass: PUBLICFZZYXXJSGFYXGS888888
- licensePath: C:/license/license.lic
- publicKeysStorePath: C:/license/publicCerts.keystore
+ licensePath: C:/IGDS/license/license.lic
+ publicKeysStorePath: C:/IGDS/license/publicCerts.keystore
-
-########################## IBMS ##########################
+########################## IGDS ##########################
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5000
- file-path: D:/IGDS-UAT/
\ No newline at end of file
+ companyId: 5329
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ grian-add-point: N
+ file-path: C:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3