From 58a7f6b707b891d9e5a3da1565ee93405f2c60fc Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Mon, 1 Sep 2025 10:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=BC=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E8=B7=AF=E5=BE=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/service/impl/ModelsServiceImpl.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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 5d9c5d58..53a2fa01 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
@@ -580,7 +580,7 @@ public class ModelsServiceImpl implements ModelsService {
             String decryptGitLinkPassword = decrypt(gitLinkPassword);
             Integer userId = (Integer) userInfo.get("user_id");
 
-            ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : ci4sUsername;
+//            ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : ci4sUsername;
             String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
             ModelDependency1 modelDependency = new ModelDependency1();
             List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), null, gitLinkUsername);
@@ -704,7 +704,7 @@ public class ModelsServiceImpl implements ModelsService {
             String nextVersion = incrementVersion(versionList);
             modelsVo.setVersion(nextVersion);
         }
-        ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
+//        ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
         ModelDependency1 modelDependency = new ModelDependency1();
         List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), modelsVo.getId(), gitLinkUsername);
@@ -871,7 +871,8 @@ public class ModelsServiceImpl implements ModelsService {
     @Override
     public String updateVersionDesc(ModelsVo modelsVo) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
+        String ci4sUsername = loginUser.getUsername();
+//        String ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String gitLinkUsername = loginUser.getSysUser().getUserName();
         String gitLinkPassword = decrypt(loginUser.getSysUser().getOriginPassword());
         String repositoryName = modelsVo.getIdentifier();
@@ -915,7 +916,8 @@ public class ModelsServiceImpl implements ModelsService {
     @Override
     public ResponseEntity<InputStreamResource> downloadAllModelFilesNew(String name, String identifier, Integer id, String version, Boolean isPublic) throws Exception {
         // 命令行操作 git clone 项目地址
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
+        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
+//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
 
         String localPath1 = localPath + ci4sUsername + "/model/" + id + "/" + identifier + "/" + version;
         // 打包 data 文件夹
@@ -1116,7 +1118,8 @@ public class ModelsServiceImpl implements ModelsService {
 
     @Override
     public ModelsVo getModelDetail(Integer id, String identifier, String owner, String version, Boolean isPublic) throws Exception {
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
+        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();;
+//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
 
         if (StringUtils.isEmpty(version)) {
             version = "origin";
@@ -1213,7 +1216,8 @@ public class ModelsServiceImpl implements ModelsService {
         String parentModel = JSON.toJSONString(map);
         modelDependency1Dao.deleteModelDependency(parentModel);
 
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
+        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
+//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
         dvcUtils.deleteDirectory(localPath + "/" + ci4sUsername + "/model/" + repoId + "/" + identifier);
     }