From 694f142b3fa44c13b103d8a1f4a9b03b4e42237a Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Wed, 21 May 2025 09:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=AF=E5=88=86=E6=89=A3?=
 =?UTF-8?q?=E9=99=A4,=E4=BC=98=E5=8C=96dvc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/ResourceOccupyTask.java        |  4 +--
 .../impl/ResourceOccupyServiceImpl.java       |  1 +
 .../com/ruoyi/platform/utils/DVCUtils.java    | 28 ++++++++++---------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java
index b835daa8..acf2f191 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ResourceOccupyTask.java
@@ -40,7 +40,7 @@ public class ResourceOccupyTask {
     private JupyterService jupyterService;
 
     // 开发环境功能扣除积分
-    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?") // 每1分钟执行一次
     public void devDeduceCredit() throws Exception {
         List<DevEnvironment> devEnvironments = devEnvironmentDao.getRunning();
         for (DevEnvironment devEnv : devEnvironments) {
@@ -60,7 +60,7 @@ public class ResourceOccupyTask {
     }
 
     // 服务功能扣除积分
-    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?") // 每1分钟执行一次
     public void serviceDeduceCredit() {
         List<ServiceVersion> serviceVersions = serviceDao.getRunning();
         List<String> deploymentNames = serviceVersions.stream().map(ServiceVersion::getDeploymentName).collect(Collectors.toList());
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
index 23a2c84b..1620e960 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ResourceOccupyServiceImpl.java
@@ -114,6 +114,7 @@ public class ResourceOccupyServiceImpl implements ResourceOccupyService {
             }
             Double hours = (double) timeDifferenceMillis / (1000 * 60 * 60);
             Double deduceCredit = resourceOccupy.getCreditPerHour() * hours;
+            deduceCredit = deduceCredit > 0 ? deduceCredit : 0.01;
             double deduceCreditTrun = new BigDecimal(deduceCredit).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
             deduceCreditTrun = deduceCreditTrun > 0 ? deduceCreditTrun : 0.01;
             resourceOccupyDao.deduceCredit(deduceCreditTrun, resourceOccupy.getUserId());
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
index 5be79efa..64a4b5f0 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
@@ -39,6 +39,7 @@ public class DVCUtils {
 
     @Value("${proxy.port}")
     private Integer port;
+
     private class ProxyConfigCallback implements TransportConfigCallback {
         @Override
         public void configure(Transport transport) {
@@ -259,6 +260,7 @@ public class DVCUtils {
             log.error("Error occurred while creating local branch", e);
         }
     }
+
     /**
      * 删除本地分支
      *
@@ -440,17 +442,19 @@ public class DVCUtils {
                     .forEach(ref -> {
                         String fullBranchName = ref.getName();
                         String branchName = fullBranchName.replace("refs/remotes/origin/", "");
-                        try {
-                            completionService.submit(() -> {
-                                try {
-                                    processBranch(git, repository, credentialsProvider, fullBranchName, branchName);
-                                } catch (Exception e) {
-                                    log.error("Failed to process branch: " + branchName, e);
-                                }
-                                return null;
-                            });
-                        } catch (Exception e) {
-                            log.error("Task submission rejected", e);
+                        if ("master".equals(branchName)) {
+                            try {
+                                completionService.submit(() -> {
+                                    try {
+                                        processBranch(git, repository, credentialsProvider, fullBranchName, branchName);
+                                    } catch (Exception e) {
+                                        log.error("Failed to process branch: " + branchName, e);
+                                    }
+                                    return null;
+                                });
+                            } catch (Exception e) {
+                                log.error("Task submission rejected", e);
+                            }
                         }
                     });
 
@@ -523,8 +527,6 @@ public class DVCUtils {
     }
 
 
-
-
     public void gitFetch(String localPath, String username, String password) throws IOException, GitAPIException {
         FileRepositoryBuilder builder = new FileRepositoryBuilder();
         Repository repository = builder.setGitDir(new File(localPath, ".git"))