商户也要可以配置所属apps的api_secret和api_key

This commit is contained in:
lu7213 committed 2026-10-19 01:37:21 -04:00
1 parent bdad69ba77
commit f5b1a9f638
2 files changed
+73 -10

No files matched your search

@@ -58,31 +58,45 @@ public class AppApiKeysServiceImpl extends ServiceImpl<AppApiKeysMapper, AppApiK
} }
private void checkUserPlus(List<AppApiKeysPlus> list) { private void checkUserPlus(List<AppApiKeysPlus> list) {
Long currentUserId = requireCurrentUserId();
for (AppApiKeysPlus item : list) { for (AppApiKeysPlus item : list) {
if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { if (item == null || !Objects.equals(item.getUserId(), currentUserId)) {
throw new RuntimeException("无权限"); throw new CustomException("无权操作该 API Key");
} }
} }
} }
private void checkUser(List<AppApiKeys> list) { private void checkUser(List<AppApiKeys> list) {
Long currentUserId = requireCurrentUserId();
for (AppApiKeys item : list) { for (AppApiKeys item : list) {
if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { if (item == null || !Objects.equals(item.getUserId(), currentUserId)) {
throw new RuntimeException("无权限"); throw new CustomException("无权操作该 API Key");
} }
} }
} }
private void checkUser(AppApiKeysPlus item) { private void checkUser(AppApiKeysPlus item) {
if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { if (item == null) {
throw new RuntimeException("无权限"); throw new CustomException("API Key 不存在或已删除");
}
if (!Objects.equals(item.getUserId(), requireCurrentUserId())) {
throw new CustomException("无权操作该 API Key");
} }
} }
private void checkUser(AppApiKeys item) { private void checkUser(AppApiKeys item) {
if (null != SecurityUtils.getUserId() && item.getUserId().longValue() != SecurityUtils.getUserId()) { if (item == null) {
throw new RuntimeException("无权限"); throw new CustomException("API Key 不存在或已删除");
} }
if (!Objects.equals(item.getUserId(), requireCurrentUserId())) {
throw new CustomException("无权操作该 API Key");
}
}
private Long requireCurrentUserId() {
Long userId = SecurityUtils.getUserId();
if (userId == null) throw new CustomException("无法获取当前用户");
return userId;
} }
@Override @Override
@@ -297,7 +311,7 @@ public class AppApiKeysServiceImpl extends ServiceImpl<AppApiKeysMapper, AppApiK
private Apps requireApp(Long appId, boolean isUser) { private Apps requireApp(Long appId, boolean isUser) {
Apps app = appsMapper.selectAppsById(appId); Apps app = appsMapper.selectAppsById(appId);
if (app == null) throw new CustomException("商户应用不存在或已删除"); if (app == null) throw new CustomException("商户应用不存在或已删除");
if (isUser && !Objects.equals(app.getUserId(), SecurityUtils.getUserId())) throw new CustomException("无权操作该应用"); if (isUser && !Objects.equals(app.getUserId(), requireCurrentUserId())) throw new CustomException("无权操作该应用");
return app; return app;
} }
@@ -305,7 +319,7 @@ public class AppApiKeysServiceImpl extends ServiceImpl<AppApiKeysMapper, AppApiK
if (id == null) throw new CustomException("API Key ID 不能为空"); if (id == null) throw new CustomException("API Key ID 不能为空");
AppApiKeys key = appApiKeysMapper.selectAppApiKeysById(id); AppApiKeys key = appApiKeysMapper.selectAppApiKeysById(id);
if (key == null) throw new CustomException("API Key 不存在或已删除"); if (key == null) throw new CustomException("API Key 不存在或已删除");
if (isUser && !Objects.equals(key.getUserId(), SecurityUtils.getUserId())) throw new CustomException("无权操作该 API Key"); if (isUser && !Objects.equals(key.getUserId(), requireCurrentUserId())) throw new CustomException("无权操作该 API Key");
return key; return key;
} }
+49
View File
@@ -0,0 +1,49 @@
-- 商户应用 API Key 管理权限。
-- 适用于 role_key = 'usdt' 的商户角色,可重复执行。
-- api_key/api_secret 由系统生成;api_secret 只在创建成功响应中展示一次。
INSERT INTO sys_menu
(menu_name, parent_id, order_num, path, component, is_frame, menu_type,
visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
SELECT '商户API Key列表', parent_id, 81, '#', '', 1, 'F', '0', '0',
'system:keys:user-list', '#', 'admin', NOW(), '', NULL, '查询本人应用的API Key'
FROM sys_menu WHERE perms = 'system:apps:user-list'
AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:keys:user-list') LIMIT 1;
INSERT INTO sys_menu
(menu_name, parent_id, order_num, path, component, is_frame, menu_type,
visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
SELECT '商户API Key新增', parent_id, 82, '#', '', 1, 'F', '0', '0',
'system:keys:user-add', '#', 'admin', NOW(), '', NULL, '为本人应用生成API Key和API Secret'
FROM sys_menu WHERE perms = 'system:apps:user-list'
AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:keys:user-add') LIMIT 1;
INSERT INTO sys_menu
(menu_name, parent_id, order_num, path, component, is_frame, menu_type,
visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
SELECT '商户API Key修改', parent_id, 83, '#', '', 1, 'F', '0', '0',
'system:keys:user-edit', '#', 'admin', NOW(), '', NULL, '修改本人API Key状态和有效期'
FROM sys_menu WHERE perms = 'system:apps:user-list'
AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:keys:user-edit') LIMIT 1;
INSERT INTO sys_menu
(menu_name, parent_id, order_num, path, component, is_frame, menu_type,
visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
SELECT '商户API Key删除', parent_id, 84, '#', '', 1, 'F', '0', '0',
'system:keys:user-remove', '#', 'admin', NOW(), '', NULL, '删除本人应用的API Key'
FROM sys_menu WHERE perms = 'system:apps:user-list'
AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:keys:user-remove') LIMIT 1;
-- 将上述按钮权限直接分配给 usdt 商户角色。
INSERT INTO sys_role_menu (role_id, menu_id)
SELECT role.role_id, menu.menu_id
FROM sys_role role
JOIN sys_menu menu ON menu.perms IN (
'system:keys:user-list', 'system:keys:user-add',
'system:keys:user-edit', 'system:keys:user-remove'
)
WHERE role.role_key = 'usdt'
AND NOT EXISTS (
SELECT 1 FROM sys_role_menu relation
WHERE relation.role_id = role.role_id AND relation.menu_id = menu.menu_id
);