From aba0396e063c5bc856915b2eca8010021d141be5 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Fri, 13 Sep 2024 15:37:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/GitServiceImpl.java | 7 ++-- .../service/impl/ModelsServiceImpl.java | 4 ++- .../service/impl/NewDatasetServiceImpl.java | 34 ++++++------------- 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java index e3bf9e8d..f5b4333f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java @@ -28,7 +28,8 @@ public class GitServiceImpl implements GitService { @Value("${spring.redis.host}") private String redisHost; - + @Value("${spring.redis.port}") + private Integer redisPort; private static final Logger log = LoggerFactory.getLogger(GitServiceImpl.class); @Override @@ -61,7 +62,7 @@ public class GitServiceImpl implements GitService { LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); // 将access_token存入Redis - Jedis jedis = new Jedis(redisHost); + Jedis jedis = new Jedis(redisHost,redisPort); jedis.set(ci4sUsername + "_gitToken", accessToken); jedis.set(ci4sUsername + "_gitUserInfo", userReq); return accessToken; @@ -72,7 +73,7 @@ public class GitServiceImpl implements GitService { } public String checkoutToken() { - Jedis jedis = new Jedis(redisHost); + Jedis jedis = new Jedis(redisHost,redisPort); LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); String token = jedis.get(ci4sUsername + "_gitToken"); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index 5759a18b..c352fe21 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -86,6 +86,8 @@ public class ModelsServiceImpl implements ModelsService { @Value("${spring.redis.host}") private String redisHost; + @Value("${spring.redis.port}") + private Integer redisPort; @Value("${git.endpoint}") String gitendpoint; @Value("${git.localPath}") @@ -1048,7 +1050,7 @@ public class ModelsServiceImpl implements ModelsService { } Map getUserInfo(String ci4sUsername, String gitLinkUsername, String gitLinkPassword) throws IOException { - Jedis jedis = new Jedis(redisHost); + Jedis jedis = new Jedis(redisHost,redisPort); String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); if (userReq == null) { gitService.login(gitLinkUsername, gitLinkPassword); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index f1efd2e2..806ee48a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -50,6 +50,8 @@ public class NewDatasetServiceImpl implements NewDatasetService { private DvcService dvcService; @Value("${spring.redis.host}") private String redisHost; + @Value("${spring.redis.port}") + private Integer redisPort; @Value("${minio.accessKey}") String accessKeyId; @Value("${minio.secretKey}") @@ -65,7 +67,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { @Override public String newCreateDataset(NewDatasetVo datasetVo) throws Exception { String token = gitService.checkoutToken(); - Jedis jedis = new Jedis(redisHost); + Jedis jedis = new Jedis(redisHost,redisPort); LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); @@ -146,11 +148,10 @@ public class NewDatasetServiceImpl implements NewDatasetService { } public String newCreateVersion(NewDatasetVo datasetVo) throws Exception { - gitService.checkoutToken(); - Jedis jedis = new Jedis(redisHost); + String token = gitService.checkoutToken(); + Jedis jedis = new Jedis(redisHost,redisPort); LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); - String token = jedis.get(ci4sUsername + "_gitToken"); String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); @@ -217,11 +218,10 @@ public class NewDatasetServiceImpl implements NewDatasetService { @Override public Page newPersonalQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception { - gitService.checkoutToken(); - Jedis jedis = new Jedis(redisHost); + String token = gitService.checkoutToken(); + Jedis jedis = new Jedis(redisHost,redisPort); LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); - String token = jedis.get(ci4sUsername + "_gitToken"); String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); Map userInfo = JsonUtils.jsonToMap(userReq); // 拼接查询url @@ -245,11 +245,10 @@ public class NewDatasetServiceImpl implements NewDatasetService { @Override public Page newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception { - gitService.checkoutToken(); - Jedis jedis = new Jedis(redisHost); + String token = gitService.checkoutToken(); + Jedis jedis = new Jedis(redisHost,redisPort); LoginUser loginUser = SecurityUtils.getLoginUser(); String ci4sUsername = loginUser.getUsername(); - String token = jedis.get(ci4sUsername + "_gitToken"); String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); Map userInfo = JsonUtils.jsonToMap(userReq); Integer userId = (Integer) userInfo.get("user_id"); @@ -381,24 +380,11 @@ public class NewDatasetServiceImpl implements NewDatasetService { public ResponseEntity downloadAllDatasetFilesNew(String name,Integer id, String version) throws Exception { // 命令行操作 git clone 项目地址 LoginUser loginUser = SecurityUtils.getLoginUser(); - String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); - String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); String ci4sUsername = loginUser.getUsername(); - Jedis jedis = new Jedis(redisHost); + Jedis jedis = new Jedis(redisHost,redisPort); String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); Map userInfo = JsonUtils.jsonToMap(userReq); String localPath = localPathlocal+ loginUser.getUsername()+"/datasets/"+id+"/"+name; - //不需要，没意义，我查看详情已经是最新的了 -// if(folder.exists() && folder.isDirectory()){ -// //切换分支 -// DVCUtils.gitCheckoutBranch(localPath, version); -// //pull -// DVCUtils.gitPull(localPath,gitLinkUsername, gitLinkPassword); -// //dvc pull -// DVCUtils.dvcPull(localPath); -// }else { -// DVCUtils.gitClone(localPath, projectUrl, version, gitLinkUsername, gitLinkPassword); -// } // 打包 data 文件夹 String dataFolderPath = localPath + "/data";