zoujiajian 11 月之前
父节点
当前提交
c1e3ca6acd

+ 4 - 2
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeCodeServiceImpl.java

@@ -260,7 +260,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeResp getUserDashboard(Long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/dashboard", claudeCodeUserId);
+			String url = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/claude/users/%s/dashboard?service_type=%s", claudeCodeUserId, "claude");
 			ClaudeCodeResp claudeCodeResp = executeClaudeCodeGetApi(url);
 			return claudeCodeResp;
 		}
@@ -287,7 +287,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 			end = now.toString();
 		}
 		if (claudeCodeUserId != null) {
-			String url = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/credits/analytics?start=%s&end=%s&tz=%s&page=%s&limit=%s&order=%s&type=%s", claudeCodeUserId, start, end, tz, page, limit, order, type);
+			String url = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/claude/users/{userId}/analytics?start=%s&end=%s&tz=%s&page=%s&limit=%s&order=%s&type=%s", claudeCodeUserId, start, end, tz, page, limit, order, type);
 			ClaudeCodeResp claudeCodeResp = executeClaudeCodeGetApi(url);
 			return claudeCodeResp;
 		}
@@ -430,6 +430,8 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 		parmas.put("plan_name", planName.replaceAll(";", ""));
 		parmas.put("claude_daily_limit", claudeDailyLimit);
 		parmas.put("claude_quota", claudeQuota);
+		//服务类型
+		parmas.put("service_type", "claude");
 		if (sku.getIsCodex()) {
 			parmas.put("openai_daily_limit", sku.getOpenaiDailyLimit());
 			parmas.put("openai_quota", sku.getOpenaiQuota());

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

@@ -217,6 +217,8 @@ public class CodexServiceImpl implements CodexService {
 		params.put("openai_daily_limit", openaiDailyLimit);
 		params.put("openai_quota", openaiQuota);
 		params.put("expire_time", DateUtil.format(expiryTime, "yyyy-MM-dd HH:mm:ss"));
+		//claude 类型
+		params.put("service_type", "openai");
 
 		String planUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/users/%s/plan", userId);
 		ClaudeCodeResp codexResp = executeCodexPostApi(planUrl, Jsons.toJson(params));
@@ -636,7 +638,7 @@ public class CodexServiceImpl implements CodexService {
 		}
 
 		// 调用Codex API获取用户控制台数据
-		String dashboardUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/openai/users/%s/dashboard", codexUser.getUserId());
+		String dashboardUrl = String.format(Constant.CLAUDE_CODE_API_PREFIX + "api/claude/users/%s/dashboard?service_type=%s", codexUser.getUserId(), "openai");
 		ClaudeCodeResp codexResp = executeCodexGetApi(dashboardUrl);
 		return codexResp;
 	}

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/claude/ClaudeCodeController.java

@@ -174,7 +174,7 @@ public class ClaudeCodeController {
 	}
 
 	/**
-	 * 仪表盘聚合
+	 * claude 仪表盘聚合
 	 * 返回 当前订阅/余额卡片 + 今日汇总 + 今日请求列表
 	 */
 	@GetMapping("/get/dashboard")

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

@@ -82,6 +82,7 @@ public class CodexController {
     }
     
     /**
+     * codex 仪表盘
      * 用户OpenAI控制台数据 (Java系统专用接口)
      */
     @GetMapping("/openai/users/dashboard")