Merge branch 'dev' of trick9191/wlyy2.0 into dev

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -61,7 +61,7 @@ public class BasicZuulFilter extends ZuulFilter {
        String url = request.getRequestURI();
        //内部微服务有不需要认证的地址请在URL上追加/open/来进行过滤，如/api/v1.0/open/**，不要在此继续追加！！！
        if (url.contains("/auth/")//验证服务
                || url.contains("/wechat/")//微信
                || url.contains("/wechat")//微信
                || url.contains("/open/")) {//开发接口
            return true;
        }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WechatController.java

@@ -99,11 +99,13 @@ public class WechatController extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取图文素材分组", notes = "获取图文素材分组")
    public MixEnvelop<WxGraphicSceneVO,WxGraphicSceneVO> findWechatImgGroup(@ApiParam(name = "wechatId", value = "微信ID")
                                                                            @RequestParam(value = "wechatId", required = true)String wechatId,
                                                                            @ApiParam(name = "scene", value = "分组名称（场景值）")
                                                                            @RequestParam(value = "scene", required = false)String scene,
                                                                            @ApiParam(name = "page", value = "第几页")
                                                                            @RequestParam(value = "page", required = false)Integer page,
                                                                            @ApiParam(name = "size", value = "每页条数")
                                                                            @RequestParam(value = "size", required = false)Integer size) {
        return wechatService.findWechatImgGroup(wechatId,page,size);
        return wechatService.findWechatImgGroup(wechatId,scene,page,size);
    }
    @PostMapping(value = BaseRequestMapping.WeChat.createImgGroup)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WechatCoreController.java

@@ -116,9 +116,20 @@ public class WechatCoreController extends EnvelopRestEndpoint {
     */
    private boolean validate(String signature, String timestamp, String nonce) throws NoSuchAlgorithmException {
        logger.info("validate:");
        logger.info("signature:"+signature);
        logger.info("timestamp:"+timestamp);
        logger.info("nonce:"+nonce);
        //查询平台所有微信token
        List<WxWechatDO> wxs =  wechatCoreService.findAll();
        try{
            logger.info("validate:wxs.size:"+wxs.size());
        }catch (Exception e){
            e.printStackTrace();
        }
        if(wxs!=null&&wxs.size()>0){
            for(WxWechatDO wx :wxs){
@@ -137,6 +148,8 @@ public class WechatCoreController extends EnvelopRestEndpoint {
                String decodeStr = "";
                byte[] bytes = md.digest(content.getBytes());
                decodeStr = byteToStr(bytes);
                logger.info("decodeStr:"+decodeStr);
                //验证
                if (StringUtils.isNotEmpty(decodeStr) && decodeStr.equals(signature.toUpperCase())) {
                    return true;

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -122,7 +122,7 @@ public class WechatService {
                " bs.id AS saasid" +
                " FROM " +
                " wx_wechat_saas s " +
                " JOIN base_saas bs ON s.saas_id = s.saas_id " +
                " JOIN base_saas bs ON bs.id = s.saas_id " +
                " WHERE " +
                " s.wechat_id = '"+id+"'";
        List<WxSaasVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WxSaasVO.class));
@@ -130,13 +130,12 @@ public class WechatService {
    }
    public Envelop saveWxAndSaas(WxWechatDO wxWechatDO, List<WxWechatSaasDO> wxWechatSaasDOs){
        String uuid = UUID.randomUUID().toString();
        wxWechatDO.setId(uuid);
        wechatDao.save(wxWechatDO);
        WxWechatDO wechat = wechatDao.save(wxWechatDO);
        if(wxWechatSaasDOs!=null&&wxWechatSaasDOs.size()>0){
            for(WxWechatSaasDO wxs:wxWechatSaasDOs){
                wxs.setWechatId(uuid);
                wxs.setWechatId(wechat.getId());
            }
            wxWechatSaasDao.save(wxWechatSaasDOs);
        }
@@ -183,21 +182,33 @@ public class WechatService {
        return MixEnvelop.getSuccessList(BaseRequestMapping.WeChat.api_success,list);
    }
    public MixEnvelop findWechatImgGroup(String wechatId,Integer page,Integer size){
    public MixEnvelop findWechatImgGroup(String wechatId,String scene,Integer page,Integer size){
        String totalSql ="SELECT COUNT(1) AS total from wx_graphic_scene g WHERE g.wechat_id ='"+wechatId+"'";
        if(StringUtils.isNotBlank(scene)){
            totalSql+=" AND g.scene ='"+scene+"' ";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        Long count = 0L;
        if (rstotal != null && rstotal.size() > 0) {
            count = (Long) rstotal.get(0).get("total");
        }
        String sql = "SELECT " +
                " g.id,g.wechat_id AS wechatId,g.scene " +
                " FROM " +
                " wx_graphic_scene g " +
                " WHERE " +
                " g.wechat_id = '"+wechatId+"' " +
                " LIMIT  " + (page - 1) * size + "," + size + "";
                " g.wechat_id = '"+wechatId+"' ";
        if(StringUtils.isNotBlank(scene)){
            sql+= " AND g.scene='"+scene+"'" ;
        }
        sql+= " LIMIT  " + (page - 1) * size + "," + size + "";
        List<WxGraphicSceneVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WxGraphicSceneVO.class));
        return MixEnvelop.getSuccessListWithPage(BaseRequestMapping.WeChat.api_success, list, page, size, count);