zoujiajian 11 месяцев назад
Родитель
Сommit
1a6d91250b

+ 0 - 15
netflix-service/src/main/java/com/cyksj/service/codex/CodexService.java

@@ -37,21 +37,6 @@ public interface CodexService {
      * 获取系统OpenAI指标统计
      * 获取系统OpenAI指标统计
      */
      */
     ClaudeCodeResp getSystemMetrics(String period, String metric);
     ClaudeCodeResp getSystemMetrics(String period, String metric);
-
-    /**
-     * 获取用户密钥列表
-     */
-    ClaudeCodeResp getUserKeys(Long userId);
-    
-    /**
-     * 创建用户密钥
-     */
-    ClaudeCodeResp createUserKey(Long userId, String keyName);
-    
-    /**
-     * 删除用户密钥
-     */
-    ClaudeCodeResp deleteUserKey(Long userId, String keyId);
     
     
     /**
     /**
      * 获取用户仪表盘数据
      * 获取用户仪表盘数据

+ 1 - 88
netflix-service/src/main/java/com/cyksj/service/codex/impl/CodexServiceImpl.java

@@ -216,7 +216,7 @@ public class CodexServiceImpl implements CodexService {
 			return null;
 			return null;
 		}
 		}
 		// 调用Codex API获取实时使用统计
 		// 调用Codex API获取实时使用统计
-		String usageUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/usage?period=%s", userId, period);
+		String usageUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/openai/users/%s/usage?period=%s", userId, period);
 		ClaudeCodeResp codexResp = executeCodexGetApi(usageUrl);
 		ClaudeCodeResp codexResp = executeCodexGetApi(usageUrl);
 		return codexResp;
 		return codexResp;
 	}
 	}
@@ -309,93 +309,6 @@ public class CodexServiceImpl implements CodexService {
 		}
 		}
 	}
 	}
 
 
-	@Override
-	public ClaudeCodeResp getUserKeys(Long userId) {
-		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).in(CodexUser::getUserId, userIdList).last("limit 1"));
-
-		if (codexUser == null) {
-			return null;
-		}
-		
-		try {
-			// 调用Codex API获取用户密钥列表
-			String keysUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/keys", userId);
-			ClaudeCodeResp codexResp = executeCodexGetApi(keysUrl);
-			
-			if (codexResp == null) {
-				log.error("获取用户{}密钥列表失败: API返回null", userId);
-				throw new BusinessRuntimeException("获取用户密钥列表失败");
-			}
-			
-			log.info("成功获取用户{}密钥列表", userId);
-			return codexResp;
-			
-		} catch (Exception e) {
-			log.error("获取用户{}密钥列表异常, error={}", userId, StringUtil.getErrorText(e));
-			throw new BusinessRuntimeException("获取用户密钥列表失败");
-		}
-	}
-
-	@Override
-	public ClaudeCodeResp createUserKey(Long userId, String keyName) {
-		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).in(CodexUser::getUserId, userIdList).last("limit 1"));
-
-		if (codexUser == null) {
-			throw new BusinessRuntimeException("用户未开通Codex服务");
-		}
-		
-		try {
-			// 调用Codex API创建用户密钥
-			String createKeyUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/keys", userId);
-			Map<String, Object> params = new HashMap<>();
-			params.put("name", keyName);
-			
-			ClaudeCodeResp codexResp = executeCodexPostApi(createKeyUrl, Jsons.toJson(params));
-			
-			if (!"success".equals(codexResp.getMessage())) {
-				log.error("创建用户{}密钥失败: {}", userId, codexResp.getMessage());
-				throw new BusinessRuntimeException("创建用户密钥失败");
-			}
-			
-			log.info("成功创建用户{}密钥, keyName={}", userId, keyName);
-			return codexResp;
-			
-		} catch (Exception e) {
-			log.error("创建用户{}密钥异常, keyName={}, error={}", userId, keyName, StringUtil.getErrorText(e));
-			throw new BusinessRuntimeException("创建用户密钥失败");
-		}
-	}
-
-	@Override
-	public ClaudeCodeResp deleteUserKey(Long userId, String keyId) {
-		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		CodexUser codexUser = codexUserMapper.selectOne(Wrappers.lambdaQuery(CodexUser.class).in(CodexUser::getUserId, userIdList).last("limit 1"));
-
-		if (codexUser == null) {
-			throw new BusinessRuntimeException("用户未开通Codex服务");
-		}
-		
-		try {
-			// 调用Codex API删除用户密钥
-			String deleteKeyUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/keys/%s", userId, keyId);
-			ClaudeCodeResp codexResp = executeCodexDeleteApi(deleteKeyUrl);
-			
-			if (!"success".equals(codexResp.getMessage())) {
-				log.error("删除用户{}密钥{}失败: {}", userId, keyId, codexResp.getMessage());
-				throw new BusinessRuntimeException("删除用户密钥失败");
-			}
-			
-			log.info("成功删除用户{}密钥{}", userId, keyId);
-			return codexResp;
-			
-		} catch (Exception e) {
-			log.error("删除用户{}密钥{}异常, error={}", userId, keyId, StringUtil.getErrorText(e));
-			throw new BusinessRuntimeException("删除用户密钥失败");
-		}
-	}
-
 	@Override
 	@Override
 	public ClaudeCodeResp getUserDashboard(Long userId) {
 	public ClaudeCodeResp getUserDashboard(Long userId) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);

+ 0 - 33
netflix-web/src/main/java/com/cyksj/web/controller/codex/CodexController.java

@@ -3,7 +3,6 @@ package com.cyksj.web.controller.codex;
 import com.cyksj.dto.Result;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.request.UpdateDailyLimitRequest;
 import com.cyksj.model.request.UpdateDailyLimitRequest;
-import com.cyksj.model.request.codex.CreateKeyRequest;
 import com.cyksj.model.response.claudecode.ClaudeCodeResp;
 import com.cyksj.model.response.claudecode.ClaudeCodeResp;
 import com.cyksj.model.views.CodexUserInfoView;
 import com.cyksj.model.views.CodexUserInfoView;
 import com.cyksj.service.codex.CodexService;
 import com.cyksj.service.codex.CodexService;
@@ -59,38 +58,6 @@ public class CodexController {
         return GatewayResponse.SUCCESS.newBuilder().toResult(response);
         return GatewayResponse.SUCCESS.newBuilder().toResult(response);
     }
     }
     
     
-    /**
-     * 获取用户密钥列表
-     */
-    @GetMapping("/users/keys")
-    public Result<ClaudeCodeResp> getUserKeys() {
-        long userId = StpUserUtil.getLoginIdAsLong();
-        
-        ClaudeCodeResp response = codexService.getUserKeys(userId);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(response);
-    }
-    
-    /**
-     * 创建用户密钥
-     */
-    @PostMapping("/users/keys")
-    public Result<ClaudeCodeResp> createUserKey(@RequestBody CreateKeyRequest request) {
-        // 权限检查:只允许用户创建自己的密钥
-        long userId = StpUserUtil.getLoginIdAsLong();
-        ClaudeCodeResp response = codexService.createUserKey(userId, request.getKeyName());
-        return GatewayResponse.SUCCESS.newBuilder().toResult(response);
-    }
-    
-    /**
-     * 删除用户密钥
-     */
-    @DeleteMapping("/users/keys/{keyId}")
-    public Result<ClaudeCodeResp> deleteUserKey(@PathVariable String keyId) {
-        long userId = StpUserUtil.getLoginIdAsLong();
-        ClaudeCodeResp response = codexService.deleteUserKey(userId, keyId);
-        return GatewayResponse.SUCCESS.newBuilder().toResult(response);
-    }
-    
     /**
     /**
      * 用户OpenAI控制台数据 (Java系统专用接口)
      * 用户OpenAI控制台数据 (Java系统专用接口)
      */
      */