Merge branch 'v0.0.1-day-subject' into 'dev'

早报 访问链接修改3

See merge request !12

src/main/java/com/tanpu/feo/feojob/jobs/DaySubJob.java

@@ -108,9 +108,6 @@ public class DaySubJob {
                     daySubjectEntities.forEach(daySubjectEntity -> {
                         HashMap<String, String> parmMap = new HashMap<>();
                         parmMap.put("type", "text");
-                        StringBuilder sb = new StringBuilder();
-                        sb.append(mainTitle).append("\n\n")
-                                .append(morningPaperProperties.getSubTitle()).append("\n\n");
 
                         String wxOpenId = userInfoEntity.getUiOpenid();
                         String wxcpUId = userInfoEntity.getWxcpUid();
@@ -119,6 +116,9 @@ public class DaySubJob {
                             String agentId = jsonKeyInfo.getStr("agentId");
                             String corpId = jsonKeyInfo.getStr("corpId");
                             // ww=corpId&orgCode=orgId
+                            StringBuilder sb = new StringBuilder();
+                            sb.append(mainTitle).append("\n\n")
+                                    .append(morningPaperProperties.getSubTitle()).append("\n\n");
                             sb.append("<a href=\"").append(String.format(daySubjectUrl, corpId, orgId, daySubjectEntity.getId())).append("\">").append("快去转发获客吧").append("</a>\n\n");
                             parmMap.put("content", sb.toString());
                             log.info("===企业微信 推送===userID:{} agentId:{} corpId:{} wxcpUId:{} parmMap:{}",userInfoEntity.getId() , agentId, corpId, wxcpUId, JSONUtil.toJsonStr(parmMap));
@@ -130,7 +130,10 @@ public class DaySubJob {
                             // 2 公众号推送
                             String wxAppID = jsonKeyInfo.getStr("sendMessageAppId");
                             // ww=wxAppID&orgCode=orgId
-                            sb.append("<a href=\"").append("<a href=\"").append(String.format(daySubjectUrl, wxAppID, orgId, daySubjectEntity.getId())).append("\">").append("快去转发获客吧").append("</a>\n\n");
+                            StringBuilder sb = new StringBuilder();
+                            sb.append(mainTitle).append("\n\n")
+                                    .append(morningPaperProperties.getSubTitle()).append("\n\n");
+                            sb.append("<a href=\"").append(String.format(daySubjectUrl, wxAppID, orgId, daySubjectEntity.getId())).append("\">").append("快去转发获客吧").append("</a>\n\n");
                             parmMap.put("content", sb.toString());
                             log.info("===公众号 推送=== userID:{} wxAppID:{} wxOpenId:{} parmMap:{}",userInfoEntity.getId() , wxAppID, wxOpenId, JSONUtil.toJsonStr(parmMap));
                             if (StrUtil.isNotBlank(wxAppID) && StrUtil.isNotBlank(wxOpenId) && StrUtil.isNotBlank(JSONUtil.toJsonStr(parmMap))) {