feats

src/main/java/com/huiju/estateagents/common/WxUtils.java

@@ -5,28 +5,49 @@ import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.third.entity.TaMpInfo;
+import com.huiju.estateagents.third.service.ITaMpInfoService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.config.WxMpConfigStorage;
+import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Component
 public class WxUtils {
+    // 小程序
     private ConcurrentHashMap<String, WxMaService> serives = new ConcurrentHashMap();
 
+    // 公众号
+    private WxMpService mpServices = new WxMpServiceImpl();
+
     @Autowired
     IMiniAppService iMiniAppService;
 
+    @Autowired
+    ITaMpInfoService iTaMpInfoService;
+
     public WxMaService getMiniApp(String appid) {
         return serives.get(appid);
     }
 
+    public WxMpService getMpService() { return mpServices; }
+    public WxMpService getMpService(Integer orgId) {
+        TaMpInfo mpInfo = iTaMpInfoService.getByOrgId(orgId);
+        return mpServices.switchoverTo(mpInfo.getAppid());
+    }
+
     @PostConstruct
     public void init() {
-        System.out.println("-------------PostConstruct----------------");
 
+        // 初始化小程序
         List<TaMiniapp> taMiniappList = iMiniAppService.getAllAvaliableMiniapps();
         if (null == taMiniappList) {
             return;
@@ -36,6 +57,27 @@ public class WxUtils {
             WxMaService service = newService(taMiniapp);
             serives.put(taMiniapp.getMiniappId(), service);
         }
+
+        // 初始化公众号
+        try {
+            List<TaMpInfo> mpInfoList = iTaMpInfoService.getAllAvaliable();
+            if (null != mpInfoList && mpInfoList.size() > 0) {
+                Map<String, WxMpConfigStorage> configStorages = new HashMap<>();
+                for (TaMpInfo mpInfo: mpInfoList) {
+                    WxMpDefaultConfigImpl wxMpDefaultConfig = new WxMpDefaultConfigImpl();
+                    wxMpDefaultConfig.setAppId(mpInfo.getAppid());
+                    wxMpDefaultConfig.setSecret(mpInfo.getSecret());
+                    wxMpDefaultConfig.setToken(mpInfo.getToken());
+                    wxMpDefaultConfig.setAesKey(mpInfo.getAesKey());
+                    configStorages.put(mpInfo.getAppid(), wxMpDefaultConfig);
+                }
+                mpServices.setMultiConfigStorages(configStorages);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+
     }
 
     public WxMaService newService(TaMiniapp taMiniapp, boolean ...changeServices) {

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -22,6 +22,7 @@ import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.property.model.TaUserVerify;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
+import com.huiju.estateagents.redpack.service.ITaMpMiniappService;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.annotations.Api;
@@ -129,6 +130,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     private ITaUserVerifyService taUserVerifyService;
 
+    @Autowired
+    private ITaMpMiniappService iTaMpMiniappService;
+
     /**
      * 验证接入
      */
@@ -197,6 +201,7 @@ public class MiniAppController extends BaseController {
             String code,
             @RequestParam(required = false) String from,
             @RequestParam(required = false) String recommender,
+            @RequestParam(required = false) String mpOpenId,
             @RequestParam(required = false) String targetId,
             @RequestParam(required = false) Integer scene,
             HttpServletRequest request) {
@@ -250,6 +255,10 @@ public class MiniAppController extends BaseController {
             }
             taPersonService.updateById(taPerson);
 
+            if (StringUtils.isEmpty(mpOpenId)) {
+                iTaMpMiniappService.mpPerson(taPerson, mpOpenId);
+            }
+
             Map<Object, Object> map = new HashMap<>();
             map.put("openId", session.getOpenid());
             map.put("orgId", orgId);

src/main/java/com/huiju/estateagents/controller/WxPortalController.java

@@ -0,0 +1,136 @@
+package com.huiju.estateagents.controller;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.redpack.entity.TaMpPerson;
+import com.huiju.estateagents.redpack.service.ITaMpPersonService;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.third.entity.TaMpInfo;
+import com.huiju.estateagents.third.service.ITaMpInfoService;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpKefuService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/mp/portal/{appid}")
+public class WxPortalController extends BaseController {
+
+    @Autowired
+    ITaMpInfoService iTaMpInfoService;
+
+    @Autowired
+    ITaMpPersonService iTaMpPersonService;
+
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Value("${wx.miniapp.index}")
+    String miniAppIndex;
+
+    /**
+     * 微信公众号接入
+     * @param appid
+     * @param signature
+     * @param timestamp
+     * @param nonce
+     * @param echostr
+     * @return
+     */
+    @GetMapping(produces = "text/plain;charset=utf-8")
+    public String authGet(@PathVariable String appid,
+                          @RequestParam(name = "signature", required = false) String signature,
+                          @RequestParam(name = "timestamp", required = false) String timestamp,
+                          @RequestParam(name = "nonce", required = false) String nonce,
+                          @RequestParam(name = "echostr", required = false) String echostr) {
+        return echostr;
+    }
+
+    @PostMapping(produces = "application/xml; charset=UTF-8")
+    public String post(@PathVariable String appid,
+                       @RequestBody String requestBody,
+                       @RequestParam("signature") String signature,
+                       @RequestParam("timestamp") String timestamp,
+                       @RequestParam("nonce") String nonce,
+                       @RequestParam("openid") String openid,
+                       @RequestParam(name = "encrypt_type", required = false) String encType,
+                       @RequestParam(name = "msg_signature", required = false) String msgSignature) {
+
+        log.info("\n接收微信请求：[openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}],"
+                        + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
+                openid, signature, encType, msgSignature, timestamp, nonce, requestBody);
+
+        WxMpService mpService = wxUtils.getMpService().switchoverTo(appid);
+        if (null == mpService) {
+            throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+        }
+
+        if (!mpService.checkSignature(timestamp, nonce, signature)) {
+            throw new IllegalArgumentException("非法请求，可能属于伪造的请求！");
+        }
+
+        // 对应表数据
+        TaMpInfo mpInfo = iTaMpInfoService.getById(appid);
+
+        WxMpXmlMessage inMessage = null;
+        WxMpXmlOutMessage outMessage = null;
+        if (encType == null) {
+            // 明文传输的消息
+            inMessage = WxMpXmlMessage.fromXml(requestBody);
+        } else if ("aes".equalsIgnoreCase(encType)) {
+            // aes加密的消息
+            inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, mpService.getWxMpConfigStorage(),
+                    timestamp, nonce, msgSignature);
+            log.debug("\n消息解密后内容为：\n{} ", inMessage.toString());
+        }
+
+        // 关注公众号
+        if (inMessage.getMsgType().equals(WxConsts.XmlMsgType.EVENT) && inMessage.getEvent().equals(WxConsts.EventType.SUBSCRIBE)) {
+            // 新增人员
+            TaMpPerson taMpPerson = new TaMpPerson();
+            taMpPerson.setAppid(appid);
+            taMpPerson.setMpOpenid(openid);
+            taMpPerson.setOrgId(mpInfo.getOrgId());
+            taMpPerson.setCreateDate(LocalDateTime.now());
+            taMpPerson.setStatus(CommConstant.STATUS_NORMAL);
+            TaMpPerson person = iTaMpPersonService.newPerson(taMpPerson);
+
+            // 发送客服消息
+            sendMiniAppKefuMessage(mpService, encType, mpInfo, inMessage, person);
+        }
+
+        return "";
+    }
+
+    private void sendMiniAppKefuMessage(WxMpService mpService, String encType, TaMpInfo mpInfo, WxMpXmlMessage message, TaMpPerson person) {
+
+        TaMiniapp taMiniapp = iMiniAppService.getAppByOrg(mpInfo.getOrgId());
+
+        WxMpKefuMessage kefuMessage = WxMpKefuMessage.MINIPROGRAMPAGE().appId(taMiniapp.getMiniappId())
+                .title(taMiniapp.getName() + "欢迎您!")
+                .pagePath(miniAppIndex + "?mpOpenId=" + message.getOpenId())
+                .thumbMediaId(mpInfo.getMiniappThumb())
+                .build();
+
+        try {
+            mpService.getKefuService().sendKefuMessage(kefuMessage);
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/com/huiju/estateagents/redpack/entity/TaMpPerson.java

@@ -85,5 +85,5 @@ public class TaMpPerson implements Serializable {
      */
     private Integer status;
 
-
+    private Integer orgId;
 }

src/main/java/com/huiju/estateagents/redpack/mapper/TaMpPersonMapper.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface TaMpPersonMapper extends BaseMapper<TaMpPerson> {
 
+    TaMpPerson getByMiniAppPerson(@Param("orgId") Integer orgId, @Param("miniAppPersonId") String miniAppPersonId);
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaMpMiniappService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.redpack.service;
 
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMpMiniappService extends IService<TaMpMiniapp> {
 
+    void mpPerson(TaPerson taPerson, String mpOpenId);
+
+    TaMpMiniapp getByMiniAppPerson(String miniAppPersonId);
 }

src/main/java/com/huiju/estateagents/redpack/service/ITaMpPersonService.java

@@ -13,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMpPersonService extends IService<TaMpPerson> {
 
+    TaMpPerson newPerson(TaMpPerson taMpPerson);
+
+    TaMpPerson getByOpenId(Integer orgId, String appid, String openid);
+
+    TaMpPerson getByMiniAppPerson(Integer orgId, String miniAppPersonId);
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaMpMiniappServiceImpl.java

@@ -1,9 +1,17 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
+import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.huiju.estateagents.redpack.mapper.TaMpMiniappMapper;
+import com.huiju.estateagents.redpack.mapper.TaMpPersonMapper;
 import com.huiju.estateagents.redpack.service.ITaMpMiniappService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.redpack.service.ITaMpPersonService;
+import com.huiju.estateagents.third.entity.TaMpInfo;
+import com.huiju.estateagents.third.service.ITaMpInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +24,43 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaMpMiniappServiceImpl extends ServiceImpl<TaMpMiniappMapper, TaMpMiniapp> implements ITaMpMiniappService {
+    @Autowired
+    ITaMpPersonService iTaMpPersonService;
 
+    @Autowired
+    ITaMpInfoService iTaMpInfoService;
+
+    @Override
+    public void mpPerson(TaPerson taPerson, String mpOpenId) {
+        TaMpInfo mpInfo = iTaMpInfoService.getByOrgId(taPerson.getOrgId());
+
+        TaMpPerson mpPerson = iTaMpPersonService.getByOpenId(taPerson.getOrgId(), mpInfo.getAppid(), mpOpenId);
+        if (null == mpPerson) {
+            return;
+        }
+
+        TaMpMiniapp origin = getByPrimaryKey(taPerson.getPersonId(), mpPerson.getMpPersonId());
+        if (null == origin) {
+            TaMpMiniapp mpMiniapp = new TaMpMiniapp();
+            mpMiniapp.setMiniappPersonId(taPerson.getPersonId());
+            mpMiniapp.setMpPersonId(mpPerson.getMpPersonId());
+            save(mpMiniapp);
+        }
+    }
+
+    @Override
+    public TaMpMiniapp getByMiniAppPerson(String miniAppPersonId) {
+        QueryWrapper<TaMpMiniapp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("miniapp_person_id", miniAppPersonId);
+
+        return getOne(queryWrapper);
+    }
+
+    private TaMpMiniapp getByPrimaryKey(String miniPersonId, String mpPersonId) {
+        QueryWrapper<TaMpMiniapp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("miniapp_person_id", miniPersonId);
+        queryWrapper.eq("mp_person_id", mpPersonId);
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaMpPersonServiceImpl.java

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.redpack.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.redpack.entity.TaMpPerson;
 import com.huiju.estateagents.redpack.mapper.TaMpPersonMapper;
+import com.huiju.estateagents.redpack.service.ITaMpMiniappService;
 import com.huiju.estateagents.redpack.service.ITaMpPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,35 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMpPersonServiceImpl extends ServiceImpl<TaMpPersonMapper, TaMpPerson> implements ITaMpPersonService {
 
+    @Autowired
+    ITaMpMiniappService iTaMpMiniappService;
+
+    @Autowired
+    TaMpPersonMapper taMpPersonMapper;
+
+    @Override
+    public TaMpPerson newPerson(TaMpPerson taMpPerson) {
+        TaMpPerson origin = getByOpenId(taMpPerson.getOrgId(), taMpPerson.getAppid(), taMpPerson.getMpOpenid());
+        if (null != origin) {
+            return origin;
+        }
+
+        save(taMpPerson);
+        return getByOpenId(taMpPerson.getOrgId(), taMpPerson.getAppid(), taMpPerson.getMpOpenid());
+    }
+
+    @Override
+    public TaMpPerson getByOpenId(Integer orgId, String appid, String openid) {
+        QueryWrapper<TaMpPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("appid", appid);
+        queryWrapper.eq("mp_openid", openid);
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public TaMpPerson getByMiniAppPerson(Integer orgId, String miniAppPersonId) {
+        return taMpPersonMapper.getByMiniAppPerson(orgId, miniAppPersonId);
+    }
 }

src/main/java/com/huiju/estateagents/service/IMiniAppService.java

@@ -45,4 +45,6 @@ public interface IMiniAppService {
     List<TaMiniappTemplate> getTpls(String appid);
 
     ResponseBean getOrgQrCode(String paramsStr, Integer orgId);
+
+    TaMiniapp getAppByOrg(Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -551,6 +551,15 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return this.getQrCode(paramsStr, taMiniapp.getMiniappId());
     }
 
+    @Override
+    public TaMiniapp getAppByOrg(Integer orgId) {
+        QueryWrapper<TaMiniapp> query = new QueryWrapper<>();
+        query.eq("org_id", orgId);
+        query.last("limit 1");
+
+        return taMiniappMapper.selectOne(query);
+    }
+
     public TaMiniapp getMinappByOrg(Integer org) {
         QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", org);

src/main/java/com/huiju/estateagents/third/entity/TaMpInfo.java

@@ -66,5 +66,8 @@ public class TaMpInfo implements Serializable {
      */
     private Integer status;
 
-
+    /**
+     * 对应小程序的封面 mediaId
+     */
+    private String miniappThumb;
 }

src/main/java/com/huiju/estateagents/third/service/ITaMpInfoService.java

@@ -3,6 +3,8 @@ package com.huiju.estateagents.third.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.third.entity.TaMpInfo;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务类
@@ -13,4 +15,7 @@ import com.huiju.estateagents.third.entity.TaMpInfo;
  */
 public interface ITaMpInfoService extends IService<TaMpInfo> {
 
+    List<TaMpInfo> getAllAvaliable();
+
+    TaMpInfo getByOrgId(Integer orgId);
 }

src/main/java/com/huiju/estateagents/third/service/impl/TaMpInfoServiceImpl.java

@@ -1,11 +1,15 @@
 package com.huiju.estateagents.third.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.third.entity.TaMpInfo;
 import com.huiju.estateagents.third.mapper.TaMpInfoMapper;
 import com.huiju.estateagents.third.service.ITaMpInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务实现类
@@ -17,4 +21,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMpInfoServiceImpl extends ServiceImpl<TaMpInfoMapper, TaMpInfo> implements ITaMpInfoService {
 
+    @Override
+    public List<TaMpInfo> getAllAvaliable() {
+        QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+
+        return list(queryWrapper);
+    }
+
+    @Override
+    public TaMpInfo getByOrgId(Integer orgId) {
+        QueryWrapper<TaMpInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+
+        return getOne(queryWrapper);
+    }
 }

src/main/resources/application.yml

@@ -10,3 +10,7 @@ sms-service:
     code: SMS_27440200
     product: 【远道荟】
     sign: 身份验证
+
+wx:
+  miniapp:
+    index: /pages/ShouYe/index

src/main/resources/mapper/redpack/TaMpPersonMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.redpack.mapper.TaMpPersonMapper">
 
+    <select id="getByMiniAppPerson" resultType="com.huiju.estateagents.redpack.entity.TaMpPerson">
+        SELECT
+            t.*
+        FROM
+            ta_mp_person t
+        INNER JOIN ta_mp_miniapp s ON t.mp_person_id = s.mp_person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND s.miniapp_person_id = #{miniAppPersonId}
+    </select>
 </mapper>