diff --git a/lzbi-admin/src/main/resources/application-test.yml b/lzbi-admin/src/main/resources/application-test.yml index 059b2e5..2e56abc 100644 --- a/lzbi-admin/src/main/resources/application-test.yml +++ b/lzbi-admin/src/main/resources/application-test.yml @@ -129,3 +129,28 @@ target-model: outputOfPlant: TM000FDL # 发电量 provideWaterAverageTemperature: TM000GSJW # 供水均温 answerWaterAverageTemperature: TM000HSJW # 回水均温 + +# 微信相关配置 +wechat: + # 小程序ID + appId: wx4c96b81e6331fefa + # 小程序密钥 + appSecret: b7258ba1e7db304d086cb83f034b3b60 + # 小程序登录接口 + code2Session: https://api.weixin.qq.com/sns/jscode2session?appid={appid}&secret={secret}&js_code={js_code}&grant_type={grant_type} + # 获取接口调用凭据 + accessToken: https://api.weixin.qq.com/cgi-bin/token?appid={appid}&secret={secret}&grant_type={grant_type} + # 获取手机号 + phoneNumber: https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={access_token} + +# 外部服务 +goal-server: + # iot平台服务地址 + iot: http://127.0.0.1:9010 + +# 外部服务接口 +goal-server-api: + # 获取组织资产参数树形结构 + getOrgAssetParamsTree: ${goal-server.iot}/biz/common/orgAssetParamsTree + # 获取组织资产参数树形结构 + getParamsValue: ${goal-server.iot}/biz/common/paramsValue diff --git a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java index 9ba13dd..c0811a1 100644 --- a/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java +++ b/lzbi-module/src/main/java/com/lzbi/bill/service/DcBusiTargetInputMasterService.java @@ -180,7 +180,8 @@ public class DcBusiTargetInputMasterService extends ServiceImpl