zoujiajian 1 سال پیش
والد
کامیت
dfc900c521

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/response/claudecode/ClaudeCodeResp.java

@@ -15,4 +15,8 @@ public class ClaudeCodeResp {
 	private Boolean success;
 
 	private Object data;
+
+	private Integer code;
+
+	private String message;
 }

+ 6 - 1
netflix-dao/src/main/java/com/cyksj/model/views/ClaudeCodeUserApiKeysView.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.views;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -33,11 +34,13 @@ public class ClaudeCodeUserApiKeysView {
 	/**
 	 * 最后使用时间
 	 */
+	@JsonProperty("last_used_at")
 	private Date lastUsedAt;
 
 	/**
 	 * 最后使用IP
 	 */
+	@JsonProperty("last_used_ip")
 	private String lastUsedIp;
 
 	/**
@@ -54,15 +57,17 @@ public class ClaudeCodeUserApiKeysView {
 	 * 状态
 	 * active(活跃), inactive(禁用), revoked(已撤销)
 	 */
-	private Boolean status;
+	private String status;
 
 	/**
 	 * 创建时间
 	 */
+	@JsonProperty("created_at")
 	private Date createdAt;
 
 	/**
 	 * 过期时间
 	 */
+	@JsonProperty("expires_at")
 	private Date expiresAt;
 }

+ 7 - 9
netflix-service/src/main/java/com/cyksj/service/claude/impl/ClaudeCodeServiceImpl.java

@@ -215,12 +215,10 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public List<ClaudeCodeUserApiKeysView> getUserApiKeys(long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/keys", userId);
+			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/keys", claudeCodeUserId);
 			String responseBody = executeClaudeCodeGetApi(url);
 			ClaudeCodeResp claudeCodeResp = Jsons.parseObject(responseBody, ClaudeCodeResp.class);
-			if (claudeCodeResp.getSuccess()) {
-				return Jsons.parseList(claudeCodeResp.getData(), ClaudeCodeUserApiKeysView.class);
-			}
+			return Jsons.parseList(claudeCodeResp.getData(), ClaudeCodeUserApiKeysView.class);
 		}
 		return null;
 	}
@@ -229,7 +227,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeUserPackageView getUserPackage(long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/plan", userId);
+			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/plan", claudeCodeUserId);
 			String responseBody = executeClaudeCodeGetApi(url);
 			ClaudeCodeResp claudeCodeResp = Jsons.parseObject(responseBody, ClaudeCodeResp.class);
 			if (claudeCodeResp.getSuccess()) {
@@ -255,7 +253,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeResp getUserPointsStatisticsData(Long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/usage/stats", userId);
+			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/usage/stats", claudeCodeUserId);
 			String responseBody = executeClaudeCodeGetApi(url);
 			ClaudeCodeResp claudeCodeResp = Jsons.parseObject(responseBody, ClaudeCodeResp.class);
 			return claudeCodeResp;
@@ -267,7 +265,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeResp getUserDashboard(Long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/dashboard", userId);
+			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/dashboard", claudeCodeUserId);
 			String responseBody = executeClaudeCodeGetApi(url);
 			ClaudeCodeResp claudeCodeResp = Jsons.parseObject(responseBody, ClaudeCodeResp.class);
 			return claudeCodeResp;
@@ -279,7 +277,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeResp getUserBalance(Long userId) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/balance", userId);
+			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/balance", claudeCodeUserId);
 			String responseBody = executeClaudeCodeGetApi(url);
 			ClaudeCodeResp claudeCodeResp = Jsons.parseObject(responseBody, ClaudeCodeResp.class);
 			return claudeCodeResp;
@@ -291,7 +289,7 @@ public class ClaudeCodeServiceImpl implements ClaudeCodeService {
 	public ClaudeCodeResp getCreditsAnalytics(Long userId, String start, String end, String tz, String page, String limit, String order, String type) throws Exception {
 		Long claudeCodeUserId = getClaudeCodeUserId(userId);
 		if (claudeCodeUserId != null) {
-			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/credits/analytics", userId);
+			String url = String.format(CLAUDE_CODE_API_PREFIX + "api/users/%s/credits/analytics", claudeCodeUserId);
 			String responseBody = executeClaudeCodeGetApi(url);
 			ClaudeCodeResp claudeCodeResp = Jsons.parseObject(responseBody, ClaudeCodeResp.class);
 			return claudeCodeResp;