From db9d95db6f25f95cbc614525adef7dbdeae6478c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 16:58:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
index c078ab3..3ee65a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java
@@ -93,7 +93,7 @@
int len = -1;
StringBuffer sb = new StringBuffer();
while((len = in.read(b)) != -1) {
- sb.append(new String(b,0,len));
+ sb.append(new String(b,0,len,"UTF-8"));
}
in.close();
@@ -161,18 +161,19 @@
List<JSONObject> itemList = JSON.parseArray(resultJson.getString("item"),JSONObject.class);
if(!itemList.isEmpty()){
for (JSONObject object : itemList) {
- String mediaId = object.getString("media_id");
+ String newsId = object.getString("media_id");
JSONObject contentJson = JSON.parseObject(object.getString("content"));
List<JSONObject> newsItemList = JSON.parseArray(contentJson.getString("news_item"),JSONObject.class);
String newsUrl = newsItemList.get(0).getString("url");
- log.info("对象信息设置前:" + newsItemList.get(0));
- newsItemList.get(0).put("news_id",mediaId);
- log.info("对象信息设置后:" + newsItemList.get(0));
+ newsItemList.get(0).put("news_id",newsId);
+ contentJson.put("news_item",newsItemList);
+ object.put("content",contentJson);
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- valueOperations.set(UserConstants.NEWS_ID + mediaId, newsUrl + "", 2, TimeUnit.DAYS);
+ valueOperations.set(UserConstants.NEWS_ID + newsId, newsUrl + "", 2, TimeUnit.DAYS);
}
}
+ resultJson.put("item",itemList);
}
resultList.add(resultJson);
}catch (Exception e){
@@ -185,7 +186,7 @@
@ApiOperation(value = "获取公众号文章链接")
@GetMapping(value = "/get/noToken")
- public R getDiscuss(@RequestParam("mediaId") Long mediaId){
+ public R getDiscuss(@RequestParam("mediaId") String mediaId){
String key = UserConstants.NEWS_ID + mediaId;
Boolean hasKey = stringRedisTemplate.hasKey(key);
--
Gitblit v1.7.1