From 65687f3fb02b4861f7434177f668dd55829d7e91 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 25 Aug 2025 14:36:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/10nexus3/nexus-deploy.yaml | 4 ++-- k8s/build-node.sh | 4 ++-- k8s/build.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/k8s/10nexus3/nexus-deploy.yaml b/k8s/10nexus3/nexus-deploy.yaml index 7eb064aa..1ab363c5 100644 --- a/k8s/10nexus3/nexus-deploy.yaml +++ b/k8s/10nexus3/nexus-deploy.yaml @@ -24,9 +24,9 @@ spec: imagePullPolicy: IfNotPresent env: - name: http_proxy - value: http://172.20.32.253:3128 + value: http://172.20.32.233:3128 - name: https_proxy - value: http://172.20.32.253:3128 + value: http://172.20.32.233:3128 ports: - containerPort: 8081 name: web diff --git a/k8s/build-node.sh b/k8s/build-node.sh index df353aa4..67cfae0b 100644 --- a/k8s/build-node.sh +++ b/k8s/build-node.sh @@ -4,8 +4,8 @@ baseDir="/home/somuns/ci4s" cd ${baseDir}/react-ui npm config set registry https://registry.npmmirror.com/ -npm config set proxy http://172.20.32.253:3128 -npm config set https-proxy http://172.20.32.253:3128 +npm config set proxy http://172.20.32.233:3128 +npm config set https-proxy http://172.20.32.233:3128 npm install --force diff --git a/k8s/build.sh b/k8s/build.sh index 5e77bdf9..0bd246d7 100644 --- a/k8s/build.sh +++ b/k8s/build.sh @@ -53,7 +53,7 @@ compile_front() { # 编译前端 docker run -v ${baseDir}:${baseDir} \ - -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \ + -e http_proxy=http://172.20.32.233:3128 -e https_proxy=http://172.20.32.233:3128 \ 172.20.32.187/tempimagefile/node:18.16.0 ${baseDir}/k8s/build-node.sh if [ $? -ne 0 ]; then echo "编译失败，请检查代码！" From d51cd143e2e89f11aa6e2e6e99402e91802fce62 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Tue, 26 Aug 2025 09:49:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=A8=A1=E5=9E=8B=E4=BF=9D=E5=AD=98=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 2 +- .../com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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..4067791c 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 @@ -698,7 +698,7 @@ public class ModelsServiceImpl implements ModelsService { Map userInfo = getUserInfo(ci4sUsername, gitLinkPassword); gitLinkPassword = decrypt(gitLinkPassword); - if (modelsVo.getVersion() == null) { + if (StringUtils.isEmpty(modelsVo.getVersion())) { List> versionList = getVersionList(modelsVo.getIdentifier(), modelsVo.getOwner()); //自动填充版本 String nextVersion = incrementVersion(versionList); 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 27182155..a32f95b6 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 @@ -182,7 +182,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { } public String newCreateVersion(NewDatasetVo datasetVo) throws Exception { - if (datasetVo.getVersion() == null) { + if (StringUtils.isEmpty(datasetVo.getVersion())) { List> versionList = getVersionList(datasetVo.getIdentifier(), datasetVo.getOwner()); //自动填充版本 String nextVersion = incrementVersion(versionList); From 11411403a23262ac6418fa06163c0ea76ceb51f0 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Tue, 26 Aug 2025 13:55:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF-=E6=A8=A1=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/service/impl/WorkflowServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java index 0b39e5f6..b69f50c4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java @@ -385,7 +385,7 @@ public class WorkflowServiceImpl implements WorkflowService { try { Map dataset = (Map) inParameters.get("--dataset"); Object value = dataset.get("value"); - if (value instanceof String) { + if (value instanceof String || value == null) { return; } LinkedHashMap valueMap = (LinkedHashMap) dataset.get("value"); @@ -409,7 +409,7 @@ public class WorkflowServiceImpl implements WorkflowService { try { Map model = (Map) inParameters.get("--model_name"); Object value = model.get("value"); - if (value instanceof String) { + if (value instanceof String || value == null) { return; } LinkedHashMap valueMap = (LinkedHashMap) model.get("value");