添加api用户接口

api-server/src/main/java/com/zq/api/entity/ApiUser.java

+package com.zq.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * api用户表(TApiUser)实体类
+ *
+ * @author makejava
+ * @since 2021-09-26 10:12:59
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@TableName(value = "t_api_user")
+public class ApiUser {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 名字
+     */
+    @ApiModelProperty("名字")
+    private String name;
+
+    /**
+     * appId
+     */
+    @ApiModelProperty("appId")
+    private String appId;
+
+    /**
+     * app密钥
+     */
+    @ApiModelProperty("app密钥")
+    private String appSecret;
+
+    /**
+     * 权限等级
+     */
+    @ApiModelProperty("权限等级")
+    private Integer roleLevel;
+
+    /**
+     * 状态：0正常 1冻结 2删除
+     */
+    @ApiModelProperty("状态：0正常 1冻结 2删除")
+    private Integer state;
+
+    /**
+     * 到期时间
+     */
+    @ApiModelProperty("到期时间")
+    private Date expiryTime;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty("地址")
+    private String address;
+
+    /**
+     * 最后登录访问IP
+     */
+    @ApiModelProperty("最后登录访问IP")
+    private String accessIp;
+
+    /**
+     * 最后登录时间
+     */
+    @ApiModelProperty("最后登录时间")
+    private Date lastLoginTime;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}
\ No newline at end of file

api-server/src/main/java/com/zq/api/service/ApiService.java

 package com.zq.api.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.zq.api.config.ConfigCache;
 import com.zq.api.constant.ApiCodeEnum;
 import com.zq.api.dao.ApiLogDao;
+import com.zq.api.entity.ApiUser;
 import com.zq.api.feign.SysFeign;
 import com.zq.api.form.ApiForm;
 import com.zq.api.form.ApiResp;
@@ -99,15 +99,15 @@ public class ApiService {
                 return ApiUtils.getLoginValidError(form);
             }
 
-            JSONObject obj = JSONUtil.parseObj(resultVo.getData());
+            ApiUser apiUser = BeanUtil.copyProperties(resultVo.getData(), ApiUser.class);
             ApiTokenVo apiTokenVo = ApiTokenVo.builder()
-                    .userId(obj.getLong("id"))
-                    .name(obj.getStr("name"))
-                    .roleLevel(obj.getInt("roleLevel"))
+                    .userId(apiUser.getId())
+                    .name(apiUser.getName())
+                    .roleLevel(apiUser.getRoleLevel())
                     .build();
 
-            form.setUserId(obj.getStr("id"));
-            form.setAppId(obj.getStr("appId"));
+            form.setUserId(apiUser.getId() == null ? null : apiUser.getId().toString());
+            form.setAppId(apiUser.getAppId());
             form.setApiTokenVo(apiTokenVo);
         } else {
             if (StrUtil.isBlank(form.getToken())) {

resource-server/src/main/java/com/zq/resource/entity/CategoryInterface.java

@@ -106,7 +106,7 @@ public class CategoryInterface {
      * 数据字典：响应类型
      */
     @ApiModelProperty("数据字典：响应类型")
-    private Integer responseType;
+    private String responseType;
 
     /**
      * 技术支持联系人

resource-server/src/main/java/com/zq/resource/vo/CategoryInterfaceFindVo.java

@@ -103,7 +103,7 @@ public class CategoryInterfaceFindVo extends PageReqVo {
      * 数据字典：响应类型
      */
     @ApiModelProperty("数据字典：响应类型")
-    private Integer responseType;
+    private String responseType;
 
     /**
      * 技术支持联系人

sys-server/src/main/java/com/zq/system/modules/system/domain/vo/ApiUserFindVo.java

+package com.zq.system.modules.system.domain.vo;
+
+import com.zq.common.vo.PageReqVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * api用户表(TApiUser)实体类
+ *
+ * @author makejava
+ * @since 2021-09-26 10:12:59
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ApiUserFindVo extends PageReqVo {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /**
+     * 名字
+     */
+    @ApiModelProperty("名字")
+    private String name;
+
+    /**
+     * appId
+     */
+    @ApiModelProperty("appId")
+    private String appId;
+
+    /**
+     * app密钥
+     */
+    @ApiModelProperty("app密钥")
+    private String appSecret;
+
+    /**
+     * 权限等级
+     */
+    @ApiModelProperty("权限等级")
+    private Integer roleLevel;
+
+    /**
+     * 状态：0正常 1冻结 2删除
+     */
+    @ApiModelProperty("状态：0正常 1冻结 2删除")
+    private Integer state;
+
+    /**
+     * 到期时间
+     */
+    @ApiModelProperty("到期时间")
+    private Date expiryTime;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty("地址")
+    private String address;
+
+    /**
+     * 最后登录访问IP
+     */
+    @ApiModelProperty("最后登录访问IP")
+    private String accessIp;
+
+    /**
+     * 最后登录时间
+     */
+    @ApiModelProperty("最后登录时间")
+    private Date lastLoginTime;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+}
\ No newline at end of file

sys-server/src/main/java/com/zq/system/modules/system/entity/ApiUser.java

 package com.zq.system.modules.system.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -26,6 +28,7 @@ public class ApiUser {
      * 主键
      */
     @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

sys-server/src/main/java/com/zq/system/modules/system/rest/ApiUserController.java

+package com.zq.system.modules.system.rest;
+
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.vo.PageVo;
+import com.zq.common.vo.ResultVo;
+import com.zq.system.modules.system.domain.vo.ApiUserFindVo;
+import com.zq.system.modules.system.entity.ApiUser;
+import com.zq.system.modules.system.service.ApiUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wilmiam
+ * @since 2021/9/26 10:26
+ */
+@Api(tags = "Api用户相关接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(value = "/sys/apiUser")
+public class ApiUserController {
+
+    private final ApiUserService apiUserService;
+
+    @ApiOperation("获取api用户列表")
+    @PostMapping(value = "/getApiUserList")
+    public ResultVo<PageVo<ApiUser>> getApiUserList(@RequestBody ApiUserFindVo vo) {
+        return ResultVo.success(apiUserService.getApiUserList(vo));
+    }
+
+    @ApiOperation("添加api用户")
+    @PostMapping(value = "/addApiUser")
+    public ResultVo addApiUser(@RequestBody ApiUser vo) {
+        AssertUtils.hasText(vo.getName(), "缺少姓名");
+
+        apiUserService.addApiUser(vo);
+        return ResultVo.success();
+    }
+
+    @ApiOperation("修改api用户")
+    @PostMapping(value = "/updateApiUser")
+    public ResultVo updateApiUser(@RequestBody ApiUser vo) {
+        AssertUtils.notNull(vo.getId(), "缺少ID");
+
+        apiUserService.updateApiUser(vo);
+        return ResultVo.success();
+    }
+
+}

sys-server/src/main/java/com/zq/system/modules/system/rest/api/ApiUserApi.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wilmiam
  * @since 2021/9/26 10:26
  */
-@Api(tags = "Api用户版本相关接口")
+@Api(tags = "Api用户相关接口")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping(value = "/sys/api")

sys-server/src/main/java/com/zq/system/modules/system/service/ApiUserService.java

 package com.zq.system.modules.system.service;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zq.common.utils.AssertUtils;
+import com.zq.common.utils.PagingUtils;
+import com.zq.common.vo.PageVo;
 import com.zq.system.modules.system.dao.ApiUserDao;
+import com.zq.system.modules.system.domain.vo.ApiUserFindVo;
 import com.zq.system.modules.system.entity.ApiUser;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,4 +27,36 @@ public class ApiUserService {
     public ApiUser getApiUserByAppId(String appId, String appSecret) {
         return apiUserDao.selectOne(Wrappers.lambdaQuery(ApiUser.builder().appId(appId).appSecret(appSecret).build()));
     }
+
+    public PageVo<ApiUser> getApiUserList(ApiUserFindVo vo) {
+        LambdaQueryWrapper<ApiUser> lambdaQuery = Wrappers.lambdaQuery(ApiUser.class);
+
+        if (StringUtils.isNotBlank(vo.getName())) {
+            lambdaQuery.like(ApiUser::getName, vo.getName());
+            vo.setName(null);
+        }
+
+        return PagingUtils.paging(vo, apiUserDao, ApiUser.class, lambdaQuery);
+    }
+
+    public void addApiUser(ApiUser vo) {
+        vo.setAppId(IdUtil.simpleUUID());
+        vo.setAppSecret(IdUtil.simpleUUID());
+        vo.setCreateTime(DateUtil.date());
+        vo.setUpdateTime(DateUtil.date());
+
+        apiUserDao.insert(vo);
+    }
+
+    public void updateApiUser(ApiUser vo) {
+        ApiUser apiUser = apiUserDao.selectById(vo.getId());
+        AssertUtils.notNull(apiUser, "用户不存在");
+
+        apiUser.setName(vo.getName());
+        apiUser.setState(vo.getState());
+        apiUser.setExpiryTime(vo.getExpiryTime());
+        apiUser.setUpdateTime(DateUtil.date());
+
+        apiUserDao.updateById(apiUser);
+    }
 }