From 26b29049d6b754c77ed22bcee439ee2b4bc2ad45 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 18 Jun 2025 08:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/controller/WeixinController.java | 48 +++++++++---------- .../service/impl/TqDeviceInfoServiceImpl.java | 8 ++-- .../mapper/ElectricityMeterMapper.java | 6 ++- .../mapper/xml/ElectricityMeterMapper.xml | 6 +-- .../tq/water/mapper/WaterMeterMapper.java | 6 ++- .../tq/water/mapper/xml/WaterMeterMapper.xml | 4 +- .../src/main/resources/application-dev.yml | 8 ++-- .../src/main/resources/application-uat.yml | 8 ++-- 8 files changed, 49 insertions(+), 45 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/weixin/controller/WeixinController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/weixin/controller/WeixinController.java index a2907db..0e4d311 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/weixin/controller/WeixinController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/weixin/controller/WeixinController.java @@ -118,13 +118,13 @@ public class WeixinController { @GetMapping("/wechat/callback") public Map callback(@RequestParam("code") String code, Model model) { String tokenUrl = String.format( - "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code", + "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code", wechatpayConfig.getAppid(), wechatpayConfig.getAppsecret(), code ); System.out.println(tokenUrl); RestTemplate restTemplate = new RestTemplate(); - System.out.println("-------------------11111111111111111----------"); + System.out.println("-------------------11111111111111111----------"+tokenUrl); String tokenResponse = restTemplate.getForObject(tokenUrl, String.class); System.out.println("-------------------22222222222222222----------"+tokenResponse); @@ -135,28 +135,28 @@ public class WeixinController { System.out.println("-------------------33333333333333----------"); JsonNode tokenNode = objectMapper.readTree(tokenResponse); System.out.println("-------------------444444444444444----------"+tokenNode); - accessToken = tokenNode.get("access_token").asText(); - System.out.println("-------------------55555555555555----------"+accessToken); - String openId = tokenNode.get("openid").asText(); - System.out.println("-------------------666666666666666----------"+openId); - - String userInfoUrl = String.format( - "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN", - accessToken, openId - ); - System.out.println("-------------------777777777777777----------"+userInfoUrl); - - String userInfoResponse = restTemplate.getForObject(userInfoUrl, String.class); - System.out.println("-------------------888888888888888----------"+userInfoResponse); - JsonNode userInfoNode = objectMapper.readTree(userInfoResponse); - System.out.println("-------------------999999999999999----------"+userInfoNode); - - model.addAttribute("openid", openId); - System.out.println("-------------------999999999999999----------"+openId); - model.addAttribute("nickname", userInfoNode.get("nickname").asText()); - model.addAttribute("headimgurl", userInfoNode.get("headimgurl").asText()); - model.addAttribute("code", code); - retJson = userInfoNode; +// accessToken = tokenNode.get("session_key").asText(); +// System.out.println("-------------------55555555555555----------"+accessToken); +// String openId = tokenNode.get("openid").asText(); +// System.out.println("-------------------666666666666666----------"+openId); +// +// String userInfoUrl = String.format( +// "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN", +// accessToken, openId +// ); +// System.out.println("-------------------777777777777777----------"+userInfoUrl); +// +// String userInfoResponse = restTemplate.getForObject(userInfoUrl, String.class); +// System.out.println("-------------------888888888888888----------"+userInfoResponse); +// JsonNode userInfoNode = objectMapper.readTree(userInfoResponse); +// System.out.println("-------------------999999999999999----------"+userInfoNode); +// +// model.addAttribute("openid", openId); +// System.out.println("-------------------999999999999999----------"+openId); +// model.addAttribute("nickname", userInfoNode.get("nickname").asText()); +// model.addAttribute("headimgurl", userInfoNode.get("headimgurl").asText()); +// model.addAttribute("code", code); + retJson = tokenNode; } catch (IOException e) { e.printStackTrace(); model.addAttribute("openid", "Error parsing JSON response"); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java index 6200852..06fbbbc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/service/impl/TqDeviceInfoServiceImpl.java @@ -66,10 +66,10 @@ public class TqDeviceInfoServiceImpl extends ServiceImpl { IPage findPage(Page page, @Param("params") ElectricityMeter electricityMeter); List findAllList(); ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter); - int insert(ElectricityMeter electricityMeter); - int update(ElectricityMeter electricityMeter); int updateValue(ElectricityMeter electricityMeter); int updateRelayState(ElectricityMeter electricityMeter); + + int insertElectricty(ElectricityMeter electricityMeter); + + int updateElectricty(ElectricityMeter electricityMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 853338c..f076793 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -89,8 +89,8 @@ and address = #{address} - - insert into nu_iot_tq_water_meter( + + insert into nu_iot_tq_electricity_meter( cid, address, relay_state, @@ -106,7 +106,7 @@ ) - + update nu_iot_tq_electricity_meter set relay_state = #{relayState}, diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java index ae33632..fece42d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java @@ -12,8 +12,10 @@ public interface WaterMeterMapper extends BaseMapper { IPage findPage(Page page, @Param("params") WaterMeter waterMeter); List findAllList(); WaterMeter getWaterMeter(WaterMeter waterMeter); - int insert(WaterMeter waterMeter); - int update(WaterMeter waterMeter); int updateValue(WaterMeter waterMeter); int updateRelayState(WaterMeter waterMeter); + + int insertWater(WaterMeter waterMeter); + + int updateWater(WaterMeter waterMeter); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 394ba3f..d88b985 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -78,7 +78,7 @@ and address = #{address} - + insert into nu_iot_tq_water_meter( cid, address, @@ -97,7 +97,7 @@ ) - + update nu_iot_tq_water_meter set relay_state = #{relayState}, diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index 51c3f56..22e7735 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -379,10 +379,10 @@ downloadkey: hP2K9Z!WLuj"M#8, wxpay: # APIv3密钥 api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E - # APPID - appid: wx8fc3e4305d2fbf0b - # appsecret - appsecret: 3bf3dd4ec72f591432db6b28c2c044e5 + # APPID(小程序) + appid: wx53bc8a44e780d26a + # appsecret(小程序) + appsecret: 7dfcbf80cb4ff379454a3d6b1f8bd61f # 商户ID mch-id: 1717618860 # 商户API证书序列号 diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml index 3ffe67f..02801e0 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml @@ -376,10 +376,10 @@ downloadkey: hP2K9Z!WLuj"M#8, wxpay: # APIv3密钥 api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E - # APPID - appid: wx8fc3e4305d2fbf0b - # appsecret - appsecret: 3bf3dd4ec72f591432db6b28c2c044e5 + # APPID(小程序) + appid: wx53bc8a44e780d26a + # appsecret(小程序) + appsecret: 7dfcbf80cb4ff379454a3d6b1f8bd61f # 商户ID mch-id: 1717618860 # 商户API证书序列号