zoujiajian 1 jaar geleden
bovenliggende
commit
88a571463e

+ 5 - 28
netflix-web/src/main/java/com/cyksj/web/controller/recharge/GptRechargeController.java

@@ -4,13 +4,9 @@ import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.request.GroupsRelationRechargeReq;
 import com.cyksj.server.recharge.GptProxyRechargeService;
-import com.cyksj.server.recharge.dto.CardKeyValidationResult;
 import com.cyksj.server.recharge.dto.TaskResult;
-import com.cyksj.server.recharge.dto.TaskSubmitResult;
 import com.cyksj.server.recharge.dto.TokenParseResult;
 import com.cyksj.web.controller.recharge.req.ParseTokenRequest;
-import com.cyksj.web.controller.recharge.req.SubmitTaskRequest;
-import com.cyksj.web.controller.recharge.req.ValidateCardRequest;
 import com.cyksj.web.util.StpUserUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -27,20 +23,13 @@ public class GptRechargeController {
 
     private final GptProxyRechargeService gptProxyRechargeService;
 
-    /**
-     * 验证卡密
-     */
-    @PostMapping("/validate-card")
-    public CardKeyValidationResult validateCard(@RequestBody ValidateCardRequest request) {
-        return gptProxyRechargeService.validateCardKey(request.getCardKey());
-    }
-
     /**
      * 验证凭证
      */
     @PostMapping("/parse-token")
-    public TokenParseResult parseToken(@RequestBody ParseTokenRequest request) {
-        return gptProxyRechargeService.parseToken(request.getAccessToken());
+    public Result<TokenParseResult> parseToken(@RequestBody ParseTokenRequest request) {
+        TokenParseResult tokenParseResult = gptProxyRechargeService.parseToken(request.getAccessToken());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(tokenParseResult);
     }
 
     /**
@@ -55,23 +44,11 @@ public class GptRechargeController {
     }
 
 
-    /**
-     * 提交任务
-     */
-    @PostMapping("/submit-task")
-    public TaskSubmitResult submitTask(@RequestBody SubmitTaskRequest request) {
-        return gptProxyRechargeService.submitTask(
-            request.getCardKey(), 
-            request.getAccessToken(),
-            request.getIdp()
-        );
-    }
-
     /**
      * 查询任务状态
      */
     @GetMapping("/task-status/{taskId}")
-    public TaskResult getTaskStatus(@PathVariable String taskId) {
-        return gptProxyRechargeService.getTaskResult(taskId);
+    public Result<TaskResult> getTaskStatus(@PathVariable String taskId) {
+        return GatewayResponse.SUCCESS.newBuilder().toResult(gptProxyRechargeService.getTaskResult(taskId));
     }
 }