社区动态社区活动微心愿随手拍部分接口测试完成

huanghongfa

2020-12-11 beacd47b5a174b52602a7c4e4ee431aef4ab48b2

社区动态社区活动微心愿随手拍部分接口测试完成

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
@@ -10,6 +11,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -45,6 +47,8 @@
    @ApiOperation(value = "分页查询社区活动",response = ComActActivityVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO){
        Long communityId = this.getCommunityId();
        comActActivityVO.setCommunityId(communityId);
        return communityService.pageActivity(comActActivityVO);
    }

@@ -73,6 +77,16 @@
        return communityService.listActivitySign(activitySignVO);
    }

    @ApiOperation(value = "新增社区动态浏览记录")
    @PostMapping("dynamicuser")
    public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
        Long id = comActDynVO.getId();
        if (ObjectUtils.isEmpty(id)||id==0) {
            return R.fail("社区动态不存在");
        }
        Long userId = this.getUserId();
        return communityService.addDynamicUser(id,userId);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -122,4 +122,6 @@
     * 防重提交 redis key
     */
    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";

    public static final String AES_KEY="35^*M@dp$5xDB&P@";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java

@@ -11,10 +11,11 @@
    public static  final String TOKEN_HEADER="Authorization";
    public static  final String TOKEN_LOGOUT="token_logout";
    public static  final String TOKEN_PRE="Bearer ";
    public static  final String TOKEN_USERINFO="token_userinfo";
    /**
     * 30分钟
     */
    public static  final int EXPIRETIME=30;
    public static  final int EXPIRETIME=300;
    public static  final String SECRET="UTivpbn%n9O!KnnL";
    /**
     * 24小时

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java

@@ -11,6 +11,5 @@
    public static final String PASSWORD = "y5g9w8*0TTWV4UgJ";
    public static final String USER_ID = "user_id";
    public static final String LOGOUT_TOKEN = "logout:";
    public static final String COMMUNITY_ID = "community_id";
    public static final String LOGIN_USER_INFO = "login_user_info:";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -1,14 +1,18 @@
package com.panzhihua.common.controller;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.AES;
import io.swagger.models.auth.In;
import lombok.SneakyThrows;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import sun.security.krb5.internal.crypto.Aes256;

import javax.servlet.http.HttpServletRequest;

@@ -60,13 +64,17 @@
     * 获取登录对象所有信息
     * @return 所有信息
     */
    @SneakyThrows
    public LoginUserInfoVO getLoginUserInfo(){
        HttpServletRequest request = this.getRequest();
        String userInfo = request.getHeader(UserConstants.LOGIN_USER_INFO);
        String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO);
        boolean empty = ObjectUtils.isEmpty(userInfo);
        if (empty) {
            throw new UnAuthenticationException("获取登录人信息失败");
        }
        byte[] bytes = AES.parseHexStr2Byte(userInfo);
        byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY);
        userInfo=new String(decrypt);
        LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(userInfo,LoginUserInfoVO.class);
        return loginUserInfoVO;
    }

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/R.java

@@ -91,9 +91,10 @@
     * 请求是否成功
     * @return
     */
    public boolean isOk(){
        return this.code==Constants.SUCCESS.intValue();
    public static boolean isOk(R r){
        return r.code==Constants.SUCCESS.intValue();
    }



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -25,18 +25,15 @@
    private Long id;

    @ApiModelProperty("活动名称")
    @NotBlank
    private String activityName;

    @ApiModelProperty("负责人userID")
    @NotNull
    private Long sponsorId;

    @ApiModelProperty("负责人名字")
    private String sponsorName;

    @ApiModelProperty("活动地址")
    @NotBlank
    private String activityAddr;

    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
@@ -48,22 +45,18 @@

    @ApiModelProperty("活动结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull
    private Date endAt;

    @ApiModelProperty("活动开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull
    private Date beginAt;

    @ApiModelProperty("报名开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull
    private Date signUpBegin;

    @ApiModelProperty("报名结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @NotNull
    private Date signUpEnd;

    @ApiModelProperty("志愿者人数下线")
@@ -85,7 +78,6 @@
    private Integer participantNow;

    @ApiModelProperty("活动封面")
    @NotNull
    private String cover;

    @ApiModelProperty("是否有奖品 1 有 0  无")
@@ -95,11 +87,9 @@
    private String prizeRemark;

    @ApiModelProperty("奖励说明")
    @NotBlank
    private String rewardDesc;

    @ApiModelProperty("活动内容")
    @NotBlank
    private String content;

    @ApiModelProperty("活动奖品集合")
@@ -115,7 +105,7 @@
    private Long pageSize;

    @ApiModelProperty(value = "取消原因")
    private String cancelRenson;
    private String cancelReason;

    @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
    private Integer isSign;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@@ -32,8 +33,8 @@
    @ApiModelProperty("是否置顶 0 否 1 是")
    private Integer isTopping;

    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date publishAt;

    @ApiModelProperty("创建时间")
@@ -47,10 +48,10 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty("当前页数")
    @ApiModelProperty(value = "当前页数",example = "1")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    @ApiModelProperty(value = "每页记录数",example = "10")
    private Long pageSize;

    @ApiModelProperty("发布搜索开始时间")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -25,7 +25,7 @@
    private Long sponsorId;

    @ApiModelProperty("发起人名字")
    private Long sponsorName;
    private String sponsorName;

    @ApiModelProperty("发生地址")
    private String happenAddr;
@@ -40,7 +40,7 @@
    private Long handlerId;

    @ApiModelProperty("处理人名字")
    private Long handlerName;
    private String handlerName;

    @ApiModelProperty("查询-创建开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -209,4 +209,13 @@
     */
    @PostMapping("putmicrowish")
    R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 新增社区动态浏览记录
     * @param id 动态主键
     * @param userId 登录用户id
     * @return 新增结果
     */
    @PostMapping("adddynamicuser")
    R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId")Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -94,7 +94,7 @@
     * @param changePasswordVO 新密码
     * @return 修改结果
     */
    @PostMapping("/user/changepassword")
    @PostMapping("changepassword")
    R changePassword(@RequestBody ChangePasswordVO changePasswordVO);

    /**
@@ -103,6 +103,6 @@
     * @param communityId 社区id
     * @return 人员集合
     */
    @PostMapping("/user/listactivitymanager")
    @PostMapping("listactivitymanager")
    R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AES.java

New file
@@ -0,0 +1,174 @@
package com.panzhihua.common.utlis;


import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;

import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.KeyGenerator;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;

public class AES {
    /**
     * 加密
     *
     * @param content
     *            需要加密的内容
     * @param password
     *            加密密码
     * @return
     */
    public static byte[] encrypt(String content, String password) {
        try {
            KeyGenerator kgen = KeyGenerator.getInstance("AES");
            kgen.init(128, new SecureRandom(password.getBytes()));
            SecretKey secretKey = kgen.generateKey();
            byte[] enCodeFormat = secretKey.getEncoded();
            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
            Cipher cipher = Cipher.getInstance("AES");// 创建密码器
            byte[] byteContent = content.getBytes("utf-8");
            cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化
            byte[] result = cipher.doFinal(byteContent);
            return result; // 加密
        } catch (NoSuchAlgorithmException e) {
            e.printStackTrace();
        } catch (NoSuchPaddingException e) {
            e.printStackTrace();
        } catch (InvalidKeyException e) {
            e.printStackTrace();
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        } catch (IllegalBlockSizeException e) {
            e.printStackTrace();
        } catch (BadPaddingException e) {
            e.printStackTrace();
        }
        return null;
    }

    /**
     * 解密
     *
     * @param content
     *            待解密内容
     * @param password
     *            解密密钥
     * @return
     */
    public static byte[] decrypt(byte[] content, String password) {
        try {
            KeyGenerator kgen = KeyGenerator.getInstance("AES");
            kgen.init(128, new SecureRandom(password.getBytes()));
            SecretKey secretKey = kgen.generateKey();
            byte[] enCodeFormat = secretKey.getEncoded();
            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
            Cipher cipher = Cipher.getInstance("AES");// 创建密码器
            cipher.init(Cipher.DECRYPT_MODE, key);// 初始化
            byte[] result = cipher.doFinal(content);
            return result; // 加密
        } catch (NoSuchAlgorithmException e) {
            e.printStackTrace();
        } catch (NoSuchPaddingException e) {
            e.printStackTrace();
        } catch (InvalidKeyException e) {
            e.printStackTrace();
        } catch (IllegalBlockSizeException e) {
            e.printStackTrace();
        } catch (BadPaddingException e) {
            e.printStackTrace();
        }
        return null;
    }

    /**
     * 将二进制转换成16进制
     *
     * @param buf
     * @return
     */
    public static String parseByte2HexStr(byte buf[]) {
        StringBuffer sb = new StringBuffer();
        for (int i = 0; i < buf.length; i++) {
            String hex = Integer.toHexString(buf[i] & 0xFF);
            if (hex.length() == 1) {
                hex = '0' + hex;
            }
            sb.append(hex.toUpperCase());
        }
        return sb.toString();
    }

    /**
     * 将16进制转换为二进制
     *
     * @param hexStr
     * @return
     */
    public static byte[] parseHexStr2Byte(String hexStr) {
        if (hexStr.length() < 1)
            return null;
        byte[] result = new byte[hexStr.length() / 2];
        for (int i = 0; i < hexStr.length() / 2; i++) {
            int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);
            int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16);
            result[i] = (byte) (high * 16 + low);
        }
        return result;
    }

    /**
     * 加密
     *
     * @param content
     *            需要加密的内容
     * @param password
     *            加密密码
     * @return
     */
    public static byte[] encrypt2(String content, String password) {
        try {
            SecretKeySpec key = new SecretKeySpec(password.getBytes(), "AES");
            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
            byte[] byteContent = content.getBytes("utf-8");
            cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化
            byte[] result = cipher.doFinal(byteContent);
            return result; // 加密
        } catch (NoSuchAlgorithmException e) {
            e.printStackTrace();
        } catch (NoSuchPaddingException e) {
            e.printStackTrace();
        } catch (InvalidKeyException e) {
            e.printStackTrace();
        } catch (UnsupportedEncodingException e) {
            e.printStackTrace();
        } catch (IllegalBlockSizeException e) {
            e.printStackTrace();
        } catch (BadPaddingException e) {
            e.printStackTrace();
        }
        return null;
    }

    public static void main(String[] args) throws UnsupportedEncodingException {
        String content = "我是shoneworn";
        String password = "12345678";
        // 加密
        System.out.println("加密前：" + content);
        byte[] encode = encrypt(content, password);

        //传输过程,不转成16进制的字符串，就等着程序崩溃掉吧
        String code = parseByte2HexStr(encode);
        System.out.println("密文字符串：" + code);
        byte[] decode = parseHexStr2Byte(code);
        // 解密
        byte[] decryptResult = decrypt(decode, password);
        System.out.println("解密后：" + new String(decryptResult, "UTF-8")); //不转码会乱码

    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/constants/Constants.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/constants/TokenConstant.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/constants/UserConstants.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/controller/BaseController.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/R.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/AES.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/JWTTokenUtil.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityAPI.java

@@ -26,7 +26,7 @@
@Slf4j
@Api(tags = {"社区动态/随手拍/微心愿/社区活动"})
@RestController
@RequestMapping("/communityactivityapi/")
@RequestMapping("/communityactivity/")
public class CommunityActivityAPI extends BaseController {
    @Resource
    private UserService userService;
@@ -34,7 +34,7 @@
    private CommunityService communityService;

    @ApiOperation(value = "活动负责人下拉选择",response = ActivityManagerVO.class)
    @GetMapping("activitymanager")
    @GetMapping("listactivitymanager")
    @ApiImplicitParam(name = "param",value = "搜索参数【不传返回所有后台人员】",required = false)
    public R listActivityManager(String param) {
        Long communityId = this.getCommunityId();
@@ -105,7 +105,7 @@
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody @Validated ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
        if (ObjectUtils.isEmpty(id)&&id!=0) {
            return R.fail("活动id主键不能为空");
        }
        ComActActivityVO.setStatus(6);
@@ -139,8 +139,15 @@
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        Date publishAt = comActDynVO.getPublishAt();
        long time = publishAt.getTime();
        long l = System.currentTimeMillis();
        if (l>=time) {
            comActDynVO.setStatus(1);
        }
        R r = communityService.addDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        //todo 发布时间到了直接修改状态为已发布
        return r;
    }

@@ -151,6 +158,14 @@
        Long id = comActDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        Date publishAt = comActDynVO.getPublishAt();
        if (!ObjectUtils.isEmpty(publishAt)) {
            long time = publishAt.getTime();
            long l = System.currentTimeMillis();
            if (l>=time) {
                comActDynVO.setStatus(1);
            }
        }
        comActDynVO.setCommunityId(communityId);
        R r = communityService.putDynamic(comActDynVO);
@@ -173,6 +188,8 @@
    @ApiOperation(value = "分页查询社区动态")
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        R r = communityService.pageDynamic(comActDynVO);
        return r;
    }
@@ -233,6 +250,7 @@

    @ApiOperation(value = "微心愿人员下拉搜索")
    @GetMapping("listmanagers")
    @ApiImplicitParam(name = "param",value = "搜索参数【不传返回所有后台人员】",required = false)
    public R listManagers(String param) {
        Long communityId = this.getCommunityId();
        if (ObjectUtils.isEmpty(param)) {

 springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml

@@ -17,7 +17,7 @@
    config:
      server:
        git:
          uri: https://github.com/wooddeep/springcloud_demo_on_k8s.git
          search-paths: adminConfig
          username: wooddeep
          password: Iamlihan(you guess)
          uri: http://gitlab.nhys.cdnhxx.com/root/zhihuishequ.git
#          search-paths: adminConfig
          username: huanghongfa
          password: huanghongfa123456

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.api;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
@@ -9,7 +10,6 @@
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -51,7 +51,7 @@
    @Transactional(rollbackFor = Exception.class)
    public R addActivity(@RequestBody ComActActivityVO comActActivityVO) {
        R r = comActActivityService.addActivity(comActActivityVO);
        boolean ok = r.isOk();
        boolean ok = R.isOk(r);
        if (ok) {
            Long activityId = (Long) r.getData();
            Integer hasPrize = comActActivityVO.getHasPrize();
@@ -72,8 +72,10 @@
                }

            }
        }else {
            return R.fail();
        }
        return R.fail();
        return R.ok();
    }

    /**
@@ -87,9 +89,10 @@
    public R putActivity(@RequestBody ComActActivityVO comActActivityVO) {
        R r = comActActivityService.putActivity(comActActivityVO);
        List<ComActActPrizeVO> comActActPrizeVOList = comActActivityVO.getComActActPrizeVOList();
        boolean ok = r.isOk();
        boolean ok = R.isOk(r);
        if (ok) {
            if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
            Integer hasPrize = comActActivityVO.getHasPrize();
            if (!ObjectUtils.isEmpty(comActActPrizeVOList)&&hasPrize.intValue()==1) {
                Long actActivityVOId = comActActivityVO.getId();
                comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
                if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
@@ -120,6 +123,7 @@
    public R deleteActivity(@RequestBody ComActActivityVO comActActivityVO) {
        boolean remove = comActActivityService.removeById(comActActivityVO.getId());
        if (remove) {
            comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId,comActActivityVO.getId()));
            return R.ok();
        }
        return R.fail();
@@ -131,12 +135,12 @@
     * @param comActActivityVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pageActivity")
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        R r = comActActivityService.pageActivity(comActActivityVO);
        if (r.isOk()) {
        if (R.isOk(r)) {
            Page<ComActActivityVO> page = (Page<ComActActivityVO>)r.getData();
            List<ComActActivityVO> content = page.getContent();
            List<ComActActivityVO> content = page.getRecords();
            if (!ObjectUtils.isEmpty(content)) {
                List<ComActActPrizeVO> comActActPrizeVOList=new ArrayList<>();
                content.forEach(comActActivityVO1 -> {
@@ -202,7 +206,7 @@
        ActivitySignVO activitySignVO=new ActivitySignVO();
        activitySignVO.setActivityId(id);
        R r = comActActivityService.listActivitySign(activitySignVO);
        if (r.isOk()) {
        if (R.isOk(r)) {
            List<ActivitySignVO> activitySignVOS=(List<ActivitySignVO>)r.getData();
            comActActivityVO.setActivitySignVOList(activitySignVOS);
        }
@@ -272,7 +276,7 @@
                if (!ObjectUtils.isEmpty(list)) {
                    int size = list.size();
                    if (size==4) {
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)).collect(Collectors.toList());
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getUpdateAt)).collect(Collectors.toList());
                        ComActDynDO comActDynDO1 = collect.get(0);
                        comActDynDO1.setIsTopping(0);
                        boolean updateById = comActDynService.updateById(comActDynDO1);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MyMetaObjectHandler.java

New file
@@ -0,0 +1,40 @@
package com.panzhihua.service_community.config;

import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 自动填充
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-11 14:23
 **/
@Slf4j
@Component
public class MyMetaObjectHandler implements MetaObjectHandler {
    @Override
    public void insertFill(MetaObject metaObject) {
        log.info("start insert fill ....");
//        this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); // 起始版本 3.3.0(推荐使用)
        // 或者
        this.strictInsertFill(metaObject, "createAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        this.strictInsertFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        // 或者
//        this.fillStrategy(metaObject, "createTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
    }

    @Override
    public void updateFill(MetaObject metaObject) {
        log.info("start update fill ....");
//        this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); // 起始版本 3.3.0(推荐)
        // 或者
        this.strictUpdateFill(metaObject, "updateAt", () -> new Date(), Date.class); // 起始版本 3.3.3(推荐)
        // 或者
//        this.fillStrategy(metaObject, "updateTime", LocalDateTime.now()); // 也可以使用(3.3.0 该方法有bug)
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/MybatisPlusConfig.java

New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.config;

import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 分页
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 16:26
 **/
@Configuration
public class MybatisPlusConfig {

    /**
     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
     */
    @Bean
    public MybatisPlusInterceptor mybatisPlusInterceptor() {
        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.H2));
        return interceptor;
    }

    @Bean
    public ConfigurationCustomizer configurationCustomizer() {
        return configuration -> configuration.setUseDeprecatedExecutor(false);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java

@@ -19,14 +19,9 @@
    @Select("<script> " +
            "SELECT\n" +
            "a.id,\n" +
            "u.NAME,\n" +
            "CASE\n" +
            "\n" +
            "WHEN u.is_partymember = 1 THEN\n" +
            "'党员' \n" +
            "WHEN u.is_volunteer = 1 THEN\n" +
            "'支援者' ELSE '居民' \n" +
            "END identity,\n" +
            "u.image_url,\n" +
            "u.name,\n" +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,\n" +
            "u.phone,\n" +
            "a.create_at \n" +
            "FROM\n" +
@@ -40,13 +35,13 @@
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{name} \n" +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=党员'>" +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==党员.toString()'>" +
            "AND is_partymember = 1 \n" +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=志愿者'>" +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==志愿者.toString()'>" +
            "AND is_partymember = 2 and is_volunteer=1  \n" +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=居民'>" +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==居民.toString()'>" +
            "AND is_partymember = 2 and is_volunteer=2  \n" +
            " </if> " +
            " order by a.create_at desc "+

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -55,7 +55,7 @@
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0'>" +
            "AND a.`status` = #{comActActivityVO.status} \n" +
            " </if> " +
            "<if test='comActActivityVO.beginAt != null and comActActivityVO.beginAt.trim() != &quot;&quot;'>" +
            "<if test='comActActivityVO.beginAt != null '>" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
            " </if> " +
            " group by a.id "+

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java

@@ -33,7 +33,7 @@
            "WHERE\n" +
            "d.community_id=#{comActDynVO.communityId}\n" +
            "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
            "d.title = #{comActDynVO.title} \n" +
            "AND d.title = #{comActDynVO.title} \n" +
            " </if> " +
            "<if test='comActDynVO.isTopping != null '>" +
            "AND d.is_topping = #{comActDynVO.isTopping} \n" +
@@ -41,7 +41,7 @@
            "<if test='comActDynVO.status != null '>" +
            "AND d.`status` = #{comActDynVO.status} \n" +
            " </if> " +
            "<if test='comActDynVO.publishAtBegin != null and comActDynVO.publishAtBegin.trim() != &quot;&quot;'>" +
            "<if test='comActDynVO.publishAtBegin != null '>" +
            "AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} \n" +
            "AND #{comActDynVO.publishAtEnd}" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -47,7 +47,7 @@
            "<if test='comActEasyPhotoVO.status != null '>" +
            "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.createBegin != null and comActEasyPhotoVO.createBegin.trim() != &quot;&quot;'>" +
            "<if test='comActEasyPhotoVO.createBegin != null '>" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
            "AND #{comActEasyPhotoVO.createEnd}" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -28,7 +28,6 @@
            "w.`status`,\n" +
            "count(wu.id)start_num,\n" +
            "w.`detail`,\n" +
            "w.start_num,\n" +
            "w.form,\n" +
            "su.`name` responsible_name,\n" +
            "w.score,\n" +
@@ -52,7 +51,7 @@
            "<if test='comActMicroWishVO.status != null '>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.createBegin != null and comActMicroWishVO.createBegin.trim() != &quot;&quot;'>" +
            "<if test='comActMicroWishVO.createBegin != null '>" +
            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
            "AND #{comActMicroWishVO.createEnd}" +
            " </if> " +
@@ -65,7 +64,6 @@
    IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
    @Select("SELECT\n" +
            "w.id,\n" +
            "w.start_num,\n" +
            "u.name sponsor_name,\n" +
            "w.create_at,\n" +
            "u.image_url,\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActPrizeDO.java

@@ -1,11 +1,10 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -43,5 +42,10 @@
     * 是否报名既有 1 是  0 不是
     */
    private Integer type;
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -38,6 +36,7 @@
    /**
     * 报名时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 是否是志愿者

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -117,6 +115,7 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 取消原因

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -48,5 +46,6 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -47,11 +45,13 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date updateAt;
    /**
     * 社区id

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynUserDO.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -35,5 +37,6 @@
    /**
     * 阅读时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -48,6 +46,7 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoUserDO.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -35,5 +37,6 @@
    /**
     * 点赞时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java

@@ -1,8 +1,6 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
@@ -59,6 +57,7 @@
    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishUserDO.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -35,5 +37,6 @@
    /**
     * 点赞时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -126,7 +126,7 @@
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        comActActivityDO.setId(comActActivityVO.getId());
        comActActivityDO.setStatus(comActActivityVO.getStatus());
        comActActivityDO.setCancelReason(comActActivityVO.getCancelRenson());
        comActActivityDO.setCancelReason(comActActivityVO.getCancelReason());
        int update = comActActivityDAO.updateById(comActActivityDO);
        if (update>0) {
            return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -78,7 +78,7 @@
    public R detailEasyPhoto(Long id, Long userId) {
        ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
        if (ObjectUtils.isEmpty(comActEasyPhotoVO)) {
            return R.fail();
            return R.fail("随手拍不存在");
        }
        ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java

@@ -79,7 +79,7 @@
    public R detailMicroWish(Long id, Long userId) {
        ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
        if (ObjectUtils.isEmpty(comActMicroWishVO)) {
            return R.fail();
            return R.fail("心愿不存在");
        }
        ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
        if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java

@@ -40,11 +40,11 @@
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND a.`name` = #{name} \n" +
            " </if> " +
            "<if test='releaseTimeBegin != null and releaseTimeBegin.trim() != &quot;&quot;'>" +
            "<if test='releaseTimeBegin != null '>" +
            "AND a.create_at BETWEEN #{releaseTimeBegin} \n" +
            "AND #{releaseTimeEnd} \n" +
            " </if> " +
            "<if test='activityTimeBegin != null and activityTimeBegin.trim() != &quot;&quot;'>" +
            "<if test='activityTimeBegin != null '>" +
            "AND a.activity_time_begin BETWEEN #{activityTimeBegin} \n" +
            "AND #{activityTimeEnd}" +
            " </if> " +
@@ -72,11 +72,11 @@
            "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0'>" +
            "AND `status` = #{partyBuildingActivityVO.status} \n" +
            " </if> " +
            "<if test='partyBuildingActivityVO.releaseTimeBegin != null and partyBuildingActivityVO.releaseTimeBegin.trim() != &quot;&quot;'>" +
            "<if test='partyBuildingActivityVO.releaseTimeBegin != null '>" +
            "AND release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n" +
            "AND #{partyBuildingActivityVO.releaseTimeEnd} \n" +
            " </if> " +
            "<if test='partyBuildingActivityVO.activityTimeBegin != null and partyBuildingActivityVO.activityTimeBegin.trim() != &quot;&quot;'>" +
            "<if test='partyBuildingActivityVO.activityTimeBegin != null '>" +
            "AND activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n" +
            "AND #{partyBuildingActivityVO.activityTimeEnd}" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java

@@ -41,7 +41,7 @@
            "<if test='partyBuildingComPbDynVO.status != null and partyBuildingComPbDynVO.status != 0'>" +
            "AND d.`status` = #{partyBuildingComPbDynVO.status} \n" +
            " </if> " +
            "<if test='partyBuildingComPbDynVO.publishAtBegin != null and partyBuildingComPbDynVO.publishAtBegin.trim() != &quot;&quot;'>" +
            "<if test='partyBuildingComPbDynVO.publishAtBegin != null '>" +
            "AND d.publish_at BETWEEN #{partyBuildingComPbDynVO.publishAtBegin} \n" +
            "AND #{partyBuildingComPbDynVO.publishAtEnd} \n" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -97,6 +97,7 @@
     * @param communityId 社区id
     * @return 人员集合
     */
    @PostMapping("listactivitymanager")
    public R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId){
        return userService.listActivityManager(param,communityId);
    }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -12,6 +12,7 @@
import com.panzhihua.service_user.model.dos.SysRoleDO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.service.UserService;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -168,13 +169,7 @@
            return R.fail();
        }
        LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
        loginUserInfoVO.setUserId(sysUserDO.getUserId());
        loginUserInfoVO.setName(sysUserDO.getName());
        loginUserInfoVO.setPassword(sysUserDO.getPassword());
        loginUserInfoVO.setStatus(sysUserDO.getStatus());
        loginUserInfoVO.setAccount(sysUserDO.getAccount());
        loginUserInfoVO.setType(sysUserDO.getType());
        loginUserInfoVO.setOpenid(sysUserDO.getOpenid());
        BeanUtils.copyProperties(sysUserDO,loginUserInfoVO);
        List<SysRoleDO> roleDOList=roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set=new HashSet<>();
        if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -218,7 +213,7 @@
    public R listActivityManager(String param, Long communityId) {
        LambdaQueryWrapper<SysUserDO> queryWrapper=new LambdaQueryWrapper<>();
        List<ActivityManagerVO> activityManagerVOS=new ArrayList<>();
        queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1);
        queryWrapper = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getCommunityId, communityId).eq(SysUserDO::getStatus, 1).eq(SysUserDO::getType,3);
        if (!ObjectUtils.isEmpty(param)) {
            queryWrapper = queryWrapper.eq(SysUserDO::getName, param);
        }

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -2,13 +2,11 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.constants.SecurityConstants;
import com.panzhihua.common.constants.TokenConstant;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.constants.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AES;
import com.panzhihua.common.utlis.JWTTokenUtil;
import com.panzhihua.common.utlis.ResultUtil;
import io.jsonwebtoken.Claims;
@@ -66,7 +64,7 @@
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        userService=ctx.getBean(UserService.class);
        String requestURI = request.getRequestURI();
        boolean contains = requestURI.contains("login");
        boolean login = requestURI.contains("login");
        boolean doc = requestURI.contains("doc.html");
        boolean css = requestURI.contains(".css");
        boolean js = requestURI.contains(".js");
@@ -78,7 +76,7 @@
        boolean refreshToken = requestURI.contains("refreshToken");
        boolean logout = requestURI.contains("logout");
        SafeboxRequestWrapper safeboxRequestWrapper = new SafeboxRequestWrapper(request);
        if (contains||doc||css||js||ui||swagger||ico||docs||error||refreshToken) {
        if (login||doc||css||js||ui||swagger||ico||docs||error||refreshToken) {
            //什么也不做
        } else {
            // 获取请求头中JWT的Token
@@ -142,15 +140,18 @@
                Boolean hasKeyLoginUserInfo = stringRedisTemplate.hasKey(userKey);
                if(hasKeyLoginUserInfo){
                    String userInfo = valueOperations.get(userKey);
                    safeboxRequestWrapper.addHeader(UserConstants.LOGIN_USER_INFO,userInfo);
                    byte[] encrypt = AES.encrypt(userInfo, Constants.AES_KEY);
                    String hexStr = AES.parseByte2HexStr(encrypt);
                    safeboxRequestWrapper.addHeader(TokenConstant.TOKEN_USERINFO, hexStr);
                }else{
                    R<LoginUserInfoVO> userInfoByUserId = userService.getUserInfoByUserId(username);
                    LoginUserInfoVO data = userInfoByUserId.getData();
                    String userInfo = JSONObject.toJSONString(data);
                    valueOperations.set(userKey,userInfo,24,TimeUnit.HOURS);
                    safeboxRequestWrapper.addHeader(UserConstants.LOGIN_USER_INFO,userInfo);
                    byte[] encrypt = AES.encrypt(userInfo, Constants.AES_KEY);
                    String hexStr = AES.parseByte2HexStr(encrypt);
                    safeboxRequestWrapper.addHeader(TokenConstant.TOKEN_USERINFO,hexStr );
                }

            } else {
                ResultUtil.responseJson(response, R.fail(HttpStatus.UNAUTHORIZED, "token校验失败"));
                return;

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/manager/RoleAccessDecisionManager.java

@@ -24,7 +24,7 @@
     * @param authentication 当前用户的信息
     * @param o 包含客户端发起的请求的requset信息
     * @param collection  当前路径对应的权限
     * @throws UnAuthorizationException 无权限
     * @throws AccessDeniedException 无权限
     * @throws InsufficientAuthenticationException
     */
    @Override