springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -83,4 +83,15 @@ @ApiModelProperty("是否已经点赞 1 是 2 否") private Integer haveSign; /** * 发布类型（1.小程序发布 2.后台发布） */ @ApiModelProperty("发布类型（1.小程序发布 2.后台发布）") private Integer type; /** * 社区id */ @ApiModelProperty("社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -61,4 +61,16 @@ @ApiModelProperty("是否已经点赞 1 是 2 否") private Integer haveSign; /** * 发布类型（1.小程序发布 2.后台发布） */ @ApiModelProperty("发布类型（1.小程序发布 2.后台发布）") private Integer type; /** * 社区id */ @ApiModelProperty("社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleCommentDAO.java
@@ -38,7 +38,7 @@ IPage<ComActNeighborCircleCommentAppVO> pageNeighborCommentByApp(Page page, @Param("neighborCircleAppDTO") ComActNeighborCircleDetailAppDTO neighborCircleAppDTO); @Select("<script> " + "select nc.*,u.name as userName from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " + "select nc.*,u.nick_name as userName,u.phone as userPhone from com_act_neighbor_circle_comment nc left join sys_user u on nc.user_id=u.user_id " + "<where>"+ "<if test='dto.id != null and dto.id!= 0l'>" + "nc.circle_id = #{dto.id}"+ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -39,7 +39,9 @@ "canc.last_comment_num," + "canc.last_fabulous_num," + "canc.last_views_num," + "canc.type," + "su.nick_name as name," + "su.community_id," + "su.image_url as headUrl " + " FROM " + " com_act_neighbor_circle AS canc" + @@ -60,19 +62,18 @@ @Select("<script> " + "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " + ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num " + ",canc.is_boutique,canc.create_at,canc.reply_at from com_act_neighbor_circle as canc " + ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " + " left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+ " </script>") ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId); @Select("<script> \n"+ "SELECT\n" + "nc.*,\n" + "u.`name` AS releaseName,u.`type` as userType\n" + ",ca.name as communityName\n" + "u.`nick_name` AS releaseName,u.`type` as userType\n" + ",u.name as communityName\n" + "FROM\n" + "com_act_neighbor_circle nc\n" + "LEFT JOIN sys_user u ON nc.release_id = u.user_id\n" + "left join com_act ca on u.community_id=ca.community_id \n" + "LEFT JOIN sys_user u ON nc.release_id = u.user_id \n" + "<where>"+ "nc.community_id = #{neighborCircleAdminDTO.communityId} \n"+ "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != ""'>" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleDO.java
@@ -112,6 +112,11 @@ private Integer lastViewsNum; /** * 发布类型（1.小程序发布 2.后台发布） */ private Integer type; /** * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回) */ public interface status{ @@ -121,6 +126,14 @@ int bh = 4; } /** * 发布类型（1.小程序发布 2.后台发布） */ public interface type{ int mini = 1; int admin = 2; } @Override public String toString() { return "ComActNeighborCircleDO{" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -69,6 +69,8 @@ private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO; @Resource private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO; @Resource private ComActDAO comActDAO; /** * 分页查询邻里圈列表 @@ -92,6 +94,14 @@ }else{ circleAppVO.setHaveSign(2); } if(circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){ ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId()); if(actDO != null){ circleAppVO.setName(actDO.getName()); } } } } return R.ok(doPager); @@ -135,6 +145,13 @@ ComActNeighborCircleDetailAppVO circleDetailAppVO = this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId()); if(circleDetailAppVO == null){ return R.fail("未找到邻里圈信息"); } if(circleDetailAppVO.getType() != null && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){ ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId()); if(actDO != null){ circleDetailAppVO.setName(actDO.getName()); } } //查询邻里圈点赞信息 @@ -221,7 +238,8 @@ comActNeighborCircleDO.setCommunityId(adminUser.getCommunityId()); comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent()); comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages()); comActNeighborCircleDO.setStatus(1); comActNeighborCircleDO.setType(2); comActNeighborCircleDO.setStatus(2); comActNeighborCircleDO.setCommentNum(0); comActNeighborCircleDO.setFabulousNum(0); comActNeighborCircleDO.setForwardNum(0); springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -80,8 +80,13 @@ boolean wxCgi = requestURI.contains("cgi"); boolean isShop = requestURI.contains("isShop"); boolean listadvertisement = requestURI.contains("listadvertisement"); boolean pageworkguide = !requestURI.contains("workguide/pageworkguide"); boolean detailworkguide = !requestURI.contains("workguide/detailworkguide"); boolean pagedynamic = !requestURI.contains("partybuilding/pagedynamic"); boolean infodynamic = !requestURI.contains("partybuilding/infodynamic"); SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request); if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay||wxCgi||isShop||listadvertisement) { if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken||useragreement||wxPay ||wxCgi||isShop||listadvertisement||pageworkguide||detailworkguide||pagedynamic||infodynamic) { //什么也不做 } else { // 获取请求头中JWT的Token springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java
@@ -81,7 +81,12 @@ boolean refreshToken = !requestUrl.contains("refreshToken"); boolean useragreement = !requestUrl.contains("useragreement"); boolean listadvertisement = !requestUrl.contains("listadvertisement"); if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop&&listadvertisement) { boolean pageworkguide = !requestUrl.contains("workguide/pageworkguide"); boolean detailworkguide = !requestUrl.contains("workguide/detailworkguide"); boolean pagedynamic = !requestUrl.contains("partybuilding/pagedynamic"); boolean infodynamic = !requestUrl.contains("partybuilding/infodynamic"); if (contains&&docs&&login&&refreshToken&&useragreement&&wxNotify&&wxCgi&&isShop&&listadvertisement &&pageworkguide&&detailworkguide&&pagedynamic&&infodynamic) { configAttributes.add(new SecurityConfig(SecurityConstants.ROLE_APPLETS)); } return configAttributes;
