fix

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -150,7 +150,7 @@ handouts:
 
 Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
-    APPkey: 39149760
+    APPkey: SD39149760
     APPSecret: 07168A248B2844E0
 
 oldOrder:

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxTokenService.java

@@ -11,12 +11,14 @@ import com.zhongzheng.common.exception.user.UserPasswordNotMatchException;
 import com.zhongzheng.common.utils.MessageUtils;
 import com.zhongzheng.framework.manager.AsyncManager;
 import com.zhongzheng.framework.manager.factory.AsyncFactory;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.AddressUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
+import com.zhongzheng.modules.user.service.IUserLoginKeyService;
 import com.zhongzheng.modules.user.service.IUserService;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
@@ -67,6 +69,9 @@ public class WxTokenService
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private IUserLoginKeyService iUserLoginKeyService;
+
     @Resource
     private AuthenticationManager authenticationManager;
 
@@ -172,6 +177,11 @@ public class WxTokenService
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
+        UserLoginKeyAddBo addBo = new UserLoginKeyAddBo();
+        addBo.setUserId(loginUser.getUser().getUserId());
+        addBo.setUserKey(userKey);
+        addBo.setIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        iUserLoginKeyService.insertByAddBo(addBo);
         redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginKeyAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户登录KEY添加对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@ApiModel("用户登录KEY添加对象")
+public class UserLoginKeyAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String userKey;
+    /** 状态 1正常 0禁止使用 */
+    @ApiModelProperty("状态 1正常 0禁止使用")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String ip;
+    /** 浏览器 */
+    @ApiModelProperty("浏览器")
+    private String browser;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginKeyEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户登录KEY编辑对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@ApiModel("用户登录KEY编辑对象")
+public class UserLoginKeyEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long userId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String userKey;
+
+    /** 状态 1正常 0禁止使用 */
+    @ApiModelProperty("状态 1正常 0禁止使用")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private String ip;
+
+    /** 浏览器 */
+    @ApiModelProperty("浏览器")
+    private String browser;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginKeyQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户登录KEY分页查询对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户登录KEY分页查询对象")
+public class UserLoginKeyQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private String userKey;
+	/** 状态 1正常 0禁止使用 */
+	@ApiModelProperty("状态 1正常 0禁止使用")
+	private Integer status;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private String ip;
+	/** 浏览器 */
+	@ApiModelProperty("浏览器")
+	private String browser;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserLoginKey.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户登录KEY对象 user_login_key
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_login_key")
+public class UserLoginKey implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private Long userId;
+    /** $column.columnComment */
+    private String userKey;
+    /** 状态 1正常 0禁止使用 */
+    private Integer status;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private String ip;
+    /** 浏览器 */
+    private String browser;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserLoginKeyMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserLoginKey;
+
+/**
+ * 用户登录KEYMapper接口
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+public interface UserLoginKeyMapper extends BaseMapper<UserLoginKey> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserLoginKeyService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyEditBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyQueryBo;
+import com.zhongzheng.modules.user.domain.UserLoginKey;
+import com.zhongzheng.modules.user.vo.UserLoginKeyVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户登录KEYService接口
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+public interface IUserLoginKeyService extends IService<UserLoginKey> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserLoginKeyVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserLoginKeyVo> queryList(UserLoginKeyQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户登录KEY
+	 * @param bo 用户登录KEY新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserLoginKeyAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户登录KEY
+	 * @param bo 用户登录KEY编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserLoginKeyEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserLoginKeyServiceImpl.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.UserLoginKeyAddBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyEditBo;
+import com.zhongzheng.modules.user.bo.UserLoginKeyQueryBo;
+import com.zhongzheng.modules.user.domain.UserLoginKey;
+import com.zhongzheng.modules.user.mapper.UserLoginKeyMapper;
+import com.zhongzheng.modules.user.service.IUserLoginKeyService;
+import com.zhongzheng.modules.user.vo.UserLoginKeyVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户登录KEYService业务层处理
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Service
+public class UserLoginKeyServiceImpl extends ServiceImpl<UserLoginKeyMapper, UserLoginKey> implements IUserLoginKeyService {
+
+    @Override
+    public UserLoginKeyVo queryById(Long id){
+        UserLoginKey db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, UserLoginKeyVo.class);
+    }
+
+    @Override
+    public List<UserLoginKeyVo> queryList(UserLoginKeyQueryBo bo) {
+        LambdaQueryWrapper<UserLoginKey> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserLoginKey::getUserId, bo.getUserId());
+        lqw.eq(StrUtil.isNotBlank(bo.getUserKey()), UserLoginKey::getUserKey, bo.getUserKey());
+        lqw.eq(bo.getStatus() != null, UserLoginKey::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getIp()), UserLoginKey::getIp, bo.getIp());
+        lqw.eq(StrUtil.isNotBlank(bo.getBrowser()), UserLoginKey::getBrowser, bo.getBrowser());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserLoginKeyVo> entity2Vo(Collection<UserLoginKey> collection) {
+        List<UserLoginKeyVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserLoginKeyVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserLoginKey> page = (Page<UserLoginKey>)collection;
+            Page<UserLoginKeyVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserLoginKeyAddBo bo) {
+        UserLoginKey add = BeanUtil.toBean(bo, UserLoginKey.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserLoginKeyEditBo bo) {
+        UserLoginKey update = BeanUtil.toBean(bo, UserLoginKey.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserLoginKey entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserLoginKeyVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户登录KEY视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-06-14
+ */
+@Data
+@ApiModel("用户登录KEY视图对象")
+public class UserLoginKeyVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long userId;
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private String userKey;
+	/** 状态 1正常 0禁止使用 */
+	@Excel(name = "状态 1正常 0禁止使用")
+	@ApiModelProperty("状态 1正常 0禁止使用")
+	private Integer status;
+	/** $column.columnComment */
+	@Excel(name = "状态 1正常 0禁止使用")
+	@ApiModelProperty("$column.columnComment")
+	private String ip;
+	/** 浏览器 */
+	@Excel(name = "浏览器")
+	@ApiModelProperty("浏览器")
+	private String browser;
+}