水产舆情采集海报生成背景图修改

@@ -189,6 +189,19 @@ public class MpWeixinQqCom extends AquaticPublicOpinionBase{
 
     private String getFakeid(String name)
     {
+        String str = searchbiz(name);
+        JSONObject jsonObject = JSONObject.parseObject(str);
+        JSONArray jsonArray = jsonObject.getJSONArray("list");
+        if(null != jsonArray && jsonArray.size()!=0)
+        {
+            return jsonArray.getJSONObject(0).getString("fakeid");
+        }
+        logger.error("获取公众号fakeid失败：>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+name);
+        return null;
+    }
+
+    public String searchbiz(String name)
+    {
         String str = null;
         try {
             str = HttpRequest.get("https://mp.weixin.qq.com/cgi-bin/searchbiz?action=search_biz&begin=0&count=5&query="+ URLEncoder.encode(name, StandardCharsets.UTF_8.toString())+"&token="+token+"&lang=zh_CN&f=json&ajax=1")
@@ -198,14 +211,7 @@ public class MpWeixinQqCom extends AquaticPublicOpinionBase{
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e)   ;
         }
-        JSONObject jsonObject = JSONObject.parseObject(str);
-        JSONArray jsonArray = jsonObject.getJSONArray("list");
-        if(null != jsonArray && jsonArray.size()!=0)
-        {
-            return jsonArray.getJSONObject(0).getString("fakeid");
-        }
-        logger.error("获取公众号fakeid失败：>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+name);
-        return null;
+        return str;
     }
 
     private List<FishAquaticPublicOpinion> getPublishList(String day,String name,Integer aquaticType,Set<String> dedupMap)

@@ -16,10 +16,7 @@ import com.ruoyi.quartz.util.FishPriceTableWithLogo;
 import com.ruoyi.quartz.util.MultiTextImageGenerator;
 import com.ruoyi.quartz.util.StyleConfig;
 import com.ruoyi.system.domain.fish.FishAquaticPublicOpinion;
-import com.ruoyi.system.domain.sys.SysMonitorApplication;
-import com.ruoyi.system.domain.sys.SysMonitorApplicationLog;
-import com.ruoyi.system.domain.sys.SysMonitorServer;
-import com.ruoyi.system.domain.sys.SysMonitorServerLog;
+import com.ruoyi.system.domain.sys.*;
 import com.zhonglai.luhui.action.BaseController;
 import com.zhonglai.luhui.admin.dto.GenerateAquaticPublicOpinionPosterDto;
 import com.zhonglai.luhui.admin.dto.MonitorServerUploadApplicationDto;
@@ -481,10 +478,26 @@ public class ServerController extends BaseController
     @GetMapping("/mpWeixinQqComGetInfo")
     public String mpWeixinQqComGetInfo(String info_url)
     {
+        String cookie = publicService.getObject(SysConfig.class,"config_key","task.wx.cookie").getConfigValue();
+        String token = publicService.getObject(SysConfig.class,"config_key","task.wx.token").getConfigValue();
+        String user_agent =  publicService.getObject(SysConfig.class,"config_key","task.wx.user_agent").getConfigValue();
+        mpWeixinQqCom.init(cookie,token,user_agent);
         String str = mpWeixinQqCom.getInfo(info_url);
         return str;
     }
 
+    @ApiOperation("获取微信公众号")
+    @GetMapping("/getWeixinGongzhonghao")
+    public String getWeixinGongzhonghao(String name)
+    {
+        String cookie = publicService.getObject(SysConfig.class,"config_key","task.wx.cookie").getConfigValue();
+        String token = publicService.getObject(SysConfig.class,"config_key","task.wx.token").getConfigValue();
+        String user_agent =  publicService.getObject(SysConfig.class,"config_key","task.wx.user_agent").getConfigValue();
+        mpWeixinQqCom.init(cookie,token,user_agent);
+        String str = mpWeixinQqCom.searchbiz(name);
+        return str;
+    }
+
     @ApiOperation("采集微信公众账号详情")
     @GetMapping("/updateFishAquaticPublicOpinion")
     public AjaxResult updateFishAquaticPublicOpinion(String id)
@@ -492,6 +505,10 @@ public class ServerController extends BaseController
         AsyncManager.me().execute(new TimerTask() {
             @Override
             public void run() {
+                String cookie = publicService.getObject(SysConfig.class,"config_key","task.wx.cookie").getConfigValue();
+                String token = publicService.getObject(SysConfig.class,"config_key","task.wx.token").getConfigValue();
+                String user_agent =  publicService.getObject(SysConfig.class,"config_key","task.wx.user_agent").getConfigValue();
+                mpWeixinQqCom.init(cookie,token,user_agent);
                 FishAquaticPublicOpinion aquaticPublicOpinion = publicService.getObject(FishAquaticPublicOpinion.class,"id",id);
                 Map<String,Object> map = publicService.getObjectList(aquaticPublicOpinion,"id,info_url",null,null,0,0).get(0);
                 String text = mpWeixinQqCom.getInfo((String) map.get("info_url"));