Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-05-09 41ecbff2b97d26ce821edf6d4cb050e8f9fdf6f3

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
package com.xiaopeng.pushMessage.controller;
 
 
import cn.hutool.core.util.StrUtil;
import com.xiaopeng.api.feignClient.account.UserSubscribeMessageClient;
import com.xiaopeng.api.vo.pushMessage.SendSubscribeMessageVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.pushMessage.utils.SubscribeMessageUtil;
import org.springframework.web.bind.annotation.*;
 
import javax.annotation.Resource;
import java.util.Map;
 
@RestController
@RequestMapping("")
public class SubscribeMessageController {
 
 
    @Resource
    private SubscribeMessageUtil subscribeMessageUtil;
 
    @Resource
    private UserSubscribeMessageClient userSubscribeMessageClient;
 
 
    /**
     * 根据微信jscode获取openid
     * @param code
     * @return
     */
    @GetMapping("/logan/inner/v1/subscribeMessage/getOpenId/{code}")
    public R<String> getOpenId(@PathVariable("code") String code){
        Map<String, Object> map = subscribeMessageUtil.code2Session(code);
        if(null != map){
            return R.ok(map.get("openid").toString());
        }
        return R.fail("获取openid失败");
    }
 
 
    /**
     * 发送订阅消息
     * @param vo
     * @return
     */
    @PostMapping("/logan/inner/v1/subscribeMessage/sendSubscribeMessage")
    public R<?> sendSubscribeMessage(@RequestBody SendSubscribeMessageVo vo){
        String openid = userSubscribeMessageClient.getUserOpenId(vo.getUserId().intValue()).getData();
        if(StrUtil.isEmpty(openid)){
            return R.ok();
        }
        return subscribeMessageUtil.send(vo.getTemplateId(), vo.getPage(), openid, vo.getJson(), "developer", "zh_CN");
    }
}