Merge branch 'test' into 'master'

罗元桥

2021-07-21 c62a0fd9f7cf7c5a8d7e9ac1fb935a2a60f230cb

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java

@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
@@ -72,7 +73,7 @@
        Map<String, Object> map = new HashMap<>();
        map.put("type", "news"); // news表示图文类型的素材，具体看API文档
        map.put("offset", 0);
        map.put("count", 1);
        map.put("count", 10);
        // 将map转换成json字符串
        String paramBody = JSON.toJSONString(map); // 这里用了Alibaba的fastjson

@@ -104,19 +105,20 @@
            for (int i = 0; i < appidList.size(); i++) {
                String token = officialApi.getToken(appidList.get(i),secretList.get(i));
                log.info("通过appid:"+appidList.get(i)+"获取token返回参数：" + token);
                if(StringUtils.isNotEmpty(token)){
                    tokenList.add(token);
                JSONObject tokenJson = JSON.parseObject(token);
                if(StringUtils.isNotEmpty(tokenJson)){
                    tokenList.add(tokenJson.getString("access_token"));
                }
            }
        }

        List<String> resultList = new ArrayList<>();
        List<JSONObject> resultList = new ArrayList<>();
        if(!tokenList.isEmpty()){
            tokenList.forEach(token -> {
                try {
                    String result = officialApi.getContentList(token);
                    log.info("通过token获取文章列表成功,返回结果：" + result);
                    resultList.add(result);
                    resultList.add(JSON.parseObject(result));
                }catch (Exception e){
                    log.error("通过token获取文章列表失败，错误原因：" + e.getMessage());
                }