From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
index ae78be9..6c23e28 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-pj
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
@@ -14,5 +14,22 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.sell.idSuffix}
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
+
+#闃块噷鐭俊鏈嶅姟
+aliyun:
+ sms:
+ sms-access-key-id: LTAI5tPCmHqfyJ9YnoPorEwt
+ sms-access-key-secret: sU2CoLdNgcjnf5uPPU2dY7NNGNvOIX
+ sms-template-code: SMS_460776024
+ sms-sign-name: 澶х鑺傛按
+ #redis
+ redis:
+ host: localhost
+ #password:鎴戞槸娌￠厤缃瘑鐮佺殑
+ port: 6379
+ database: 6 #鎿嶄綔鐨勬槸6鍙锋暟鎹簱
+ pool:
+ max-active: 8 #鏈�澶ц繛鎺ユ暟
+ max-wait: -1 #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂� -1琛ㄧず鏃犻檺
+ max-idle: 4 #杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ min-idle: 0 #杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
\ No newline at end of file
--
Gitblit v1.8.0