Merge branch 'dev' into test

# Conflicts:
#	intc-modules/intc-iot/src/main/resources/application.yml
#	intc-modules/intc-tdengine/src/main/resources/mapper/tdengine/DeviceSensorDataMapper.xml
#	intc-modules/intc-weixin/src/main/resources/application.yml
This commit is contained in:
tianyongbao
2025-11-19 18:46:33 +08:00
4 changed files with 26 additions and 22 deletions

View File

@@ -182,10 +182,10 @@ sms:
# 框架定义的厂商名称标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分
supplier: alibaba
# 有些称为accessKey有些称之为apiKey也有称为sdkKey或者appId。
access-key-id: 您的accessKey
access-key-id: LTAI5tRnPowmTLjH181nSbsR
# 称为accessSecret有些称之为apiSecret
access-key-secret: 您的accessKeySecret
signature: 您的短信签名
access-key-secret: Vh2LoAM1t3XuMUVy2wTWSACJ97kOUW
signature: 【鱼测云】
sdk-app-id: 您的sdkAppId
config2:
# 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分