首页接口

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workspace/WorkspaceController.java

@@ -3,6 +3,7 @@ package com.ruoyi.platform.controller.workspace;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.CodeConfig;
 import com.ruoyi.platform.domain.Dataset;
 import com.ruoyi.platform.domain.Image;
@@ -12,6 +13,7 @@ import com.ruoyi.platform.vo.ModelsVo;
 import com.ruoyi.system.api.constant.Constant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +38,13 @@ public class WorkspaceController extends BaseController {
     private ServiceService serviceService;
     @Resource
     private ImageService imageService;
+    @Resource
+    private GitService gitService;
+
+    @Value("${git.publicUserName}")
+    private String publicUserName;
+    @Value("${git.publicUserPwd}")
+    private String publicUserPwd;
 
     @GetMapping("/overview")
     @ApiOperation("得到运行概览")
@@ -61,7 +70,8 @@ public class WorkspaceController extends BaseController {
     public AjaxResult getPublicDatasets() throws Exception {
         PageRequest pageRequest = PageRequest.of(0, 6);
         Dataset dataset = new Dataset();
-        return AjaxResult.success(this.newDatasetService.newPubilcQueryByPage(dataset, pageRequest, null));
+        String accessToken = gitService.login(publicUserName, SecurityUtils.encrypt(publicUserPwd));
+        return AjaxResult.success(this.newDatasetService.newPubilcQueryByPage(dataset, pageRequest, accessToken));
     }
 
     @GetMapping("/getPublicModels")
@@ -69,7 +79,8 @@ public class WorkspaceController extends BaseController {
     public AjaxResult getPublicModels() throws Exception {
         PageRequest pageRequest = PageRequest.of(0, 6);
         ModelsVo modelsVo = new ModelsVo();
-        return AjaxResult.success(this.modelsService.newPubilcQueryByPage(modelsVo, pageRequest, null));
+        String accessToken = gitService.login(publicUserName, SecurityUtils.encrypt(publicUserPwd));
+        return AjaxResult.success(this.modelsService.newPubilcQueryByPage(modelsVo, pageRequest, accessToken));
     }
 
     @GetMapping("/getPublicCodeConfigs")
@@ -90,7 +101,7 @@ public class WorkspaceController extends BaseController {
 
     @GetMapping("/getPublicImages")
     @ApiOperation("前6个镜像")
-    public GenericsAjaxResult<Page<Image>> getPublicImages() throws Exception {
+    public GenericsAjaxResult<Page<Image>> getPublicImages() {
         PageRequest pageRequest = PageRequest.of(0, 6);
         Image image = new Image();
         image.setImageType(Constant.Image_Type_Pub);