Merge branch 'develop'

csf-common/csf-common-model/pom.xml

@@ -41,7 +41,11 @@
             <artifactId>commons-lang</artifactId>
             <version>2.6</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.29</version>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>

csf-common/csf-common-model/src/main/java/com/mmc/csf/user/vo/WxMsgVO.java

+package com.mmc.csf.user.vo;
+
+import com.alibaba.fastjson2.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author: zj
+ * @Date: 2023/5/23 19:24
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WxMsgVO implements Serializable {
+    private static final long serialVersionUID = 107288179600606045L;
+    @ApiModelProperty(value = "用户id-仅适用云享飞客户端")
+    private Integer userAccountId;
+    @ApiModelProperty(value = "公众号的openId")
+    private String touser;
+    @ApiModelProperty(value = "unionId-全局通用")
+    private String unionId;
+    @ApiModelProperty(value = "模板id")
+    @NotNull(message = "模板id不能为空")
+    private String templateId;
+    @ApiModelProperty(value = "网页跳转连接")
+    private String url;
+    @ApiModelProperty(value = "小程序APPID")
+    private String wxAppletAppId;
+    @ApiModelProperty(value = "小程序跳转连接")
+    private String appletPath;
+    @ApiModelProperty(value = "按照接口文档传数据")
+    private JSONObject dataObject;
+
+    public String buildTemplateMsg() {
+        JSONObject msg = new JSONObject();
+        msg.put("touser", this.touser);
+        msg.put("template_id", this.templateId);
+        // 跳转页面
+        if (!StringUtils.isBlank(this.url)) {
+            msg.put("url", this.url);
+        }
+        // 跳转小程序页面设置
+        if (!StringUtils.isBlank(this.wxAppletAppId) && !StringUtils.isBlank(this.appletPath)) {
+            JSONObject mini = new JSONObject();
+            mini.put("appid", this.wxAppletAppId);
+            mini.put("pagepath", this.appletPath);
+            msg.put("miniprogram", mini);
+        }
+        msg.put("data", this.dataObject);
+        return msg.toString();
+    }
+}

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: abcf97d96ffa41aa0f7f3ca83c5e6e6c700708b8
+  newTag: da7a362b93628d503ae6873ee076f5687a6b5044

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

@@ -10,6 +10,7 @@ import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.feign.hystrix.UserAppApiHystrix;
 import com.mmc.csf.release.flyer.vo.CurriculumOrderLogVO;
 import com.mmc.csf.user.vo.ChangeUserPointVO;
+import com.mmc.csf.user.vo.WxMsgVO;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -89,4 +90,7 @@ public interface UserAppApi {
 
     @PostMapping("/userapp/pay/feignCurriculumOrderLog")
     ResultBody feignCurriculumOrderLog(@RequestHeader("token") String token,@RequestHeader HttpServletRequest request,@RequestBody CurriculumOrderLogVO curriculumOrderLogVO);
+
+    @PostMapping("/userapp/wx/send")
+    ResultBody feignSendWxMsg(@RequestHeader("token") String token,@RequestBody WxMsgVO ws);
 }

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/UserAppApiHystrix.java

@@ -11,10 +11,10 @@ import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.flyer.vo.CurriculumOrderLogVO;
 import com.mmc.csf.user.vo.ChangeUserPointVO;
+import com.mmc.csf.user.vo.WxMsgVO;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -83,4 +83,11 @@ public class UserAppApiHystrix implements UserAppApi {
     }
 
 
+    @Override
+    public ResultBody feignSendWxMsg(String token, WxMsgVO ws) {
+        log.error("发送消息 熔断：feignCurriculumOrderLog：{}", ws);
+        return null;
+    }
+
+
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

 package com.mmc.csf.release.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.DynamicAuditSumDTO;
@@ -21,15 +22,14 @@ import com.mmc.csf.release.forum.qo.DynamicQO;
 import com.mmc.csf.release.forum.vo.UserBaseInfoVO;
 import com.mmc.csf.release.service.BackstageForumService;
 import com.mmc.csf.user.vo.ChangeUserPointVO;
+import com.mmc.csf.user.vo.WxMsgVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -218,6 +218,12 @@ public class BackstageForumServiceImpl implements BackstageForumService {
             changePoint.setChangeType(3);
             changePoint.setChangePoint(5);
             userAppApi.changeUserPoint(changePoint, token);
+            // 微信公众号发送通知
+            WxMsgVO ws = new WxMsgVO();
+            ws.setDataObject(spellMsg("帖子审核","审核通过"));
+            ws.setUserAccountId(dynamicDO.getUserAccountId());
+            ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
+            userAppApi.feignSendWxMsg(token, ws);
         } else {
             dynamicDao.updateCheckDynamic(dynamicId, 2);
             List<DynamicGambitDO> gambitDOList=  gambitDao.selectGambitDynamic(dynamicId);
@@ -237,4 +243,26 @@ public class BackstageForumServiceImpl implements BackstageForumService {
     public ResultBody getNotCheckDynamicSum() {
         return ResultBody.success(backstageForumDao.getDynamicAuditSum(0));
     }
+
+
+    public JSONObject spellMsg(String name, String result){
+        JSONObject data=new JSONObject();
+
+        //申请项目{{thing3.DATA}}
+        JSONObject thing3=new JSONObject();
+        thing3.put("value",name);
+        data.put("thing3",thing3);
+
+        //审核时间{{time6.DATA}}
+        JSONObject time6=new JSONObject();
+        time6.put("value",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        data.put("time6",time6);
+
+        //审核结果{{thing5.DATA}}
+        JSONObject thing5=new JSONObject();
+        thing5.put("value",result);
+        data.put("thing5",thing5);
+
+        return data;
+    }
 }