From bc772b8b15bdbbb6a5165a0f740451219eaa36ae Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Fri, 9 Oct 2026 03:12:37 -0400 Subject: [PATCH] =?UTF-8?q?api=20key=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppApiKeysController.java | 10 ++- .../com/ruoyi/system/domain/AppApiKeys.java | 5 +- .../ruoyi/system/domain/AppApiKeysPlus.java | 5 +- .../domain/vo/AppApiKeyCreateResult.java | 17 ++++ .../ruoyi/system/mapper/AppApiKeysMapper.java | 1 + .../system/service/IAppApiKeysService.java | 3 +- .../service/impl/AppApiKeysServiceImpl.java | 89 ++++++++++++++----- .../mapper/system/AppApiKeysMapper.xml | 16 +++- 8 files changed, 109 insertions(+), 37 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppApiKeyCreateResult.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppApiKeysController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppApiKeysController.java index a2e6771..e38cbc6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppApiKeysController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppApiKeysController.java @@ -113,20 +113,22 @@ public class AppApiKeysController extends BaseController { * 新增应用密钥 */ @PreAuthorize("@ss.hasPermi('system:keys:add')" ) - @Log(title = "应用密钥" , businessType = BusinessType.INSERT) + @Log(title = "应用密钥" , businessType = BusinessType.INSERT, + isSaveRequestData = false, isSaveResponseData = false) @PostMapping public AjaxResult add(@RequestBody AppApiKeys appApiKeys) { - return toAjax(appApiKeysService.insertAppApiKeys(appApiKeys, false)); + return AjaxResult.success(appApiKeysService.insertAppApiKeys(appApiKeys, false)); } /** * 新增应用密钥 */ @PreAuthorize("@ss.hasPermi('system:keys:user-add')" ) - @Log(title = "应用密钥" , businessType = BusinessType.INSERT) + @Log(title = "应用密钥" , businessType = BusinessType.INSERT, + isSaveRequestData = false, isSaveResponseData = false) @PostMapping("/user" ) public AjaxResult userAdd(@RequestBody AppApiKeys appApiKeys) { - return toAjax(appApiKeysService.insertAppApiKeys(appApiKeys, true)); + return AjaxResult.success(appApiKeysService.insertAppApiKeys(appApiKeys, true)); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeys.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeys.java index faff2ec..8717361 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeys.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeys.java @@ -2,6 +2,7 @@ package com.ruoyi.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -29,7 +30,7 @@ public class AppApiKeys extends BaseEntity private Long userId; /** 密钥 */ - @Excel(name = "密钥") + @JsonIgnore private String apiSecret; /** 状态 */ @@ -142,7 +143,7 @@ public class AppApiKeys extends BaseEntity .append("id", getId()) .append("appId", getAppId()) .append("userId", getUserId()) - .append("apiSecret", getApiSecret()) + .append("apiSecret", "") .append("status", getStatus()) .append("expiredAt", getExpiredAt()) .append("createdAt", getCreatedAt()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeysPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeysPlus.java index e7448fe..c9211c6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeysPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/AppApiKeysPlus.java @@ -5,6 +5,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -33,7 +34,7 @@ public class AppApiKeysPlus implements Serializable @Excel(name = "用户") private Long userId; /** 密钥 */ - @Excel(name = "密钥") + @JsonIgnore private String apiSecret; /** 状态 */ @Excel(name = "状态") @@ -140,7 +141,7 @@ public class AppApiKeysPlus implements Serializable .append("id", getId()) .append("appId", getAppId()) .append("userId", getUserId()) - .append("apiSecret", getApiSecret()) + .append("apiSecret", "") .append("status", getStatus()) .append("expiredAt", getExpiredAt()) .append("createdAt", getCreatedAt()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppApiKeyCreateResult.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppApiKeyCreateResult.java new file mode 100644 index 0000000..9907e7f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppApiKeyCreateResult.java @@ -0,0 +1,17 @@ +package com.ruoyi.system.domain.vo; + +/** API Key 创建结果。apiSecret 只在创建成功响应中返回一次。 */ +public class AppApiKeyCreateResult { + private final Long id; + private final Long appId; + private final String apiSecret; + + public AppApiKeyCreateResult(Long id, Long appId, String apiSecret) { + this.id = id; + this.appId = appId; + this.apiSecret = apiSecret; + } + public Long getId() { return id; } + public Long getAppId() { return appId; } + public String getApiSecret() { return apiSecret; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppApiKeysMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppApiKeysMapper.java index f6c6a29..fc8aaca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppApiKeysMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppApiKeysMapper.java @@ -15,6 +15,7 @@ import com.ruoyi.system.domain.AppApiKeysPlus; */ public interface AppApiKeysMapper extends BaseMapper { + int softDeleteByIds(@Param("ids") Long[] ids, @Param("deletedAt") java.util.Date deletedAt); /** * 查询【请填写功能名称】 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppApiKeysService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppApiKeysService.java index e698f11..c2a53a0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppApiKeysService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppApiKeysService.java @@ -6,6 +6,7 @@ import com.ruoyi.system.domain.AppApiKeysPlus; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.system.domain.vo.AppApiKeyCreateResult; /** * 应用密钥Service接口 * @@ -38,7 +39,7 @@ public interface IAppApiKeysService extends IService * @param appApiKeys 应用密钥 * @return 结果 */ - public int insertAppApiKeys(AppApiKeys appApiKeys,boolean isUser); + public AppApiKeyCreateResult insertAppApiKeys(AppApiKeys appApiKeys,boolean isUser); /** * 修改应用密钥 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppApiKeysServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppApiKeysServiceImpl.java index 9e69caa..95a1aa0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppApiKeysServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppApiKeysServiceImpl.java @@ -5,18 +5,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.AppApiKeys; import com.ruoyi.system.domain.AppApiKeysPlus; import com.ruoyi.system.mapper.AppApiKeysMapper; +import com.ruoyi.system.mapper.AppsMapper; +import com.ruoyi.system.domain.Apps; +import com.ruoyi.system.domain.vo.AppApiKeyCreateResult; import com.ruoyi.system.service.IAppApiKeysService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import java.util.*; +import java.security.SecureRandom; +import java.util.Base64; +import org.springframework.transaction.annotation.Transactional; /** * 应用密钥Service业务层处理 @@ -29,12 +36,14 @@ public class AppApiKeysServiceImpl extends ServiceImpl getByIds(List ids, boolean isUser, SFunction... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() - .select(columns).in(AppApiKeysPlus::getId, ids); + .select(columns).in(AppApiKeysPlus::getId, ids).isNull(AppApiKeysPlus::getDeletedAt); if (isUser) { lambdaQueryWrapper.eq(AppApiKeysPlus::getUserId, SecurityUtils.getUserId()); } @@ -76,8 +85,8 @@ public class AppApiKeysServiceImpl extends ServiceImpl select(String keyword, boolean isUser) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() - .select(AppApiKeysPlus::getId, AppApiKeysPlus::getUserId, AppApiKeysPlus::getApiSecret) - .like(AppApiKeysPlus::getApiSecret, keyword); + .select(AppApiKeysPlus::getId, AppApiKeysPlus::getUserId) + .isNull(AppApiKeysPlus::getDeletedAt); if (isUser) { lambdaQueryWrapper.eq(AppApiKeysPlus::getUserId, SecurityUtils.getUserId()); } @@ -88,7 +97,7 @@ public class AppApiKeysServiceImpl extends ServiceImpl result = new ArrayList<>(); for (AppApiKeysPlus item : list) { SelectItem selectItem = new SelectItem(); - selectItem.setName(item.getApiSecret()); + selectItem.setName("Key #" + item.getId()); selectItem.setId(item.getId()); result.add(selectItem); } @@ -215,13 +224,23 @@ public class AppApiKeysServiceImpl extends ServiceImpl list = getByIds(Arrays.asList(ids), false, AppApiKeysPlus::getUserId, AppApiKeysPlus::getId); - checkUserPlus(list); - } - return appApiKeysMapper.deleteAppApiKeysByIds(ids); + if (ids == null || ids.length == 0) throw new CustomException("请选择要删除的 API Key"); + for (Long id : ids) requireKey(id, isUser); + return appApiKeysMapper.softDeleteByIds(ids, DateUtils.getNowDate()); } /** @@ -262,10 +284,29 @@ public class AppApiKeysServiceImpl extends ServiceImpl - + + and deleted_at is null and app_id = #{appId} and user_id = #{userId} and api_secret = #{apiSecret} @@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -72,7 +73,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" deleted_at = #{deletedAt}, updated_at = #{updatedAt}, - where id = #{id} + where id = #{id} and deleted_at is null + + + + update app_api_keys + set status = 0, deleted_at = #{deletedAt}, updated_at = #{deletedAt} + where deleted_at is null and id in + #{id} @@ -85,4 +93,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file +