From 1c8be875296fc401c46c87998eb317138d7162ad Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Sat, 12 Oct 2024 15:56:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95maven?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/management-platform/pom.xml | 10 +++++----- .../platform/service/impl/ModelsServiceImpl.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/management-platform/pom.xml b/ruoyi-modules/management-platform/pom.xml index 528501b0..cee6c681 100644 --- a/ruoyi-modules/management-platform/pom.xml +++ b/ruoyi-modules/management-platform/pom.xml @@ -243,11 +243,11 @@ 3.6.0 - - - - - + + cn.hutool + hutool-all + 5.8.5 + 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 8f0eecbb..b34af361 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 @@ -1,6 +1,6 @@ package com.ruoyi.platform.service.impl; -//import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -1216,9 +1216,9 @@ public class ModelsServiceImpl implements ModelsService { modelMetaVo.setMetrics(result); } -// void test(){ -// String str = "Hello, Hutool!"; -// System.out.println(StrUtil.isEmpty(str)); // 判断字符串是否为空 -// System.out.println(StrUtil.sub(str, 0, 5)); -// } + void test(){ + String str = "Hello, Hutool!"; + System.out.println(StrUtil.isEmpty(str)); // 判断字符串是否为空 + System.out.println(StrUtil.sub(str, 0, 5)); + } } From 443e3deb9fc23a6a079e1f6f48c687422d0c228b Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 14 Oct 2024 09:40:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95maven=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/build.sh b/k8s/build.sh index a0a3adee..9769dc0f 100755 --- a/k8s/build.sh +++ b/k8s/build.sh @@ -92,7 +92,7 @@ compile_java() { # 编译java docker run -v ${baseDir}:${baseDir} -v /home/maven:/home/maven \ -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \ - 172.20.32.187/ci4s/build:v1 ${baseDir}/k8s/build-java.sh $param + 172.20.32.187/ci4s/build:v3 ${baseDir}/k8s/build-java.sh $param if [ $? -ne 0 ]; then echo "编译失败，请检查代码！" exit 1 From 8449b9256ee7dc5b8e2f031f946d0cbeb5d89eaa Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 14 Oct 2024 09:49:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95maven=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/management-platform/pom.xml | 6 ------ .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/ruoyi-modules/management-platform/pom.xml b/ruoyi-modules/management-platform/pom.xml index cee6c681..ba689d0e 100644 --- a/ruoyi-modules/management-platform/pom.xml +++ b/ruoyi-modules/management-platform/pom.xml @@ -242,12 +242,6 @@ jedis 3.6.0 - - - cn.hutool - hutool-all - 5.8.5 - 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 b34af361..9a09ab84 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 @@ -1,6 +1,5 @@ package com.ruoyi.platform.service.impl; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -1216,9 +1215,4 @@ public class ModelsServiceImpl implements ModelsService { modelMetaVo.setMetrics(result); } - void test(){ - String str = "Hello, Hutool!"; - System.out.println(StrUtil.isEmpty(str)); // 判断字符串是否为空 - System.out.println(StrUtil.sub(str, 0, 5)); - } } From e2e359ee9cf9c624a5774fd8718a95441bc4f3b7 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 14 Oct 2024 10:03:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=83=A8=E7=BD=B2nacos=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/deploy.sh | 2 +- k8s/template-yaml/k8s-3nacos.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/deploy.sh b/k8s/deploy.sh index 06d4b5bd..36036fe0 100755 --- a/k8s/deploy.sh +++ b/k8s/deploy.sh @@ -115,7 +115,7 @@ deploy_service() { deploy_nacos() { local yaml_file=$1 - scp ${baseDir}/k8s/${yaml_file} root@$remote_ip:${remote_deploy_dir}/${yaml_file} + scp ${baseDir}/k8s/template-yaml/${yaml_file} root@$remote_ip:${remote_deploy_dir}/${yaml_file} deploy_service ${yaml_file} } diff --git a/k8s/template-yaml/k8s-3nacos.yaml b/k8s/template-yaml/k8s-3nacos.yaml index c022fec9..607ceac5 100644 --- a/k8s/template-yaml/k8s-3nacos.yaml +++ b/k8s/template-yaml/k8s-3nacos.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: nacos-ci4s - image: ${k8s-3nacos-image} + image: nacos/nacos-server:v2.2.0 env: - name: SPRING_DATASOURCE_PLATFORM value: mysql From baf17f2cada1706056014eab44aed693f5ccf595 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Mon, 14 Oct 2024 10:17:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=83=A8=E7=BD=B2nacos=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/template-yaml/k8s-3nacos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/template-yaml/k8s-3nacos.yaml b/k8s/template-yaml/k8s-3nacos.yaml index 607ceac5..c21d6cf5 100644 --- a/k8s/template-yaml/k8s-3nacos.yaml +++ b/k8s/template-yaml/k8s-3nacos.yaml @@ -24,7 +24,7 @@ spec: - name: MODE value: standalone - name: MYSQL_SERVICE_HOST - value: mysql2.argo.svc + value: mysql.argo.svc - name: MYSQL_SERVICE_PORT value: "3306" - name: MYSQL_SERVICE_DB_NAME