From 25f3d1acc02ea4f7a6b295994ada7a842fc82a82 Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 11 Mar 2024 16:32:39 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC-versio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 14 +++++++------- VERSION | 2 +- version_control/APP_VERSION | 2 +- version_control/BUILD | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index dbcc3b0..0f73f43 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: branch: # - develop # - master - - release/S3 + - release/s4 event: - push ### 应用版本控制：检查版本文件，若不存在则自动创建，并自动递增版本号 @@ -38,14 +38,14 @@ steps: - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories - apk add tree --no-cache - tree ./$backendName - - make branch=release/S3 vc + - make branch=release/s4 vc # - make branch=master vc when: status: [ success ] branch: # - develop # - master - - release/S3 + - release/s4 event: - push ### 打包镜像并推送到镜像仓库 @@ -76,27 +76,27 @@ steps: branch: # - develop # - master - - release/S3 + - release/s4 ### 应用版本控制：提交版本文件的修改记录，并为代码分支创建版本号标签 - name: Upload Version image: registry.digiwincloud.com.cn/base/base_vc commands: # - make branch=develop to_git # - make branch=master to_git - - make branch=release/S3 to_git + - make branch=release/s4 to_git when: status: [ success ] branch: # - develop # - master - - release/S3 + - release/s4 event: - push trigger: branch: # - develop # - master - - release/S3 + - release/s4 event: - push volumes: diff --git a/VERSION b/VERSION index e6d5cb8..a6a3a43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.4 \ No newline at end of file diff --git a/version_control/APP_VERSION b/version_control/APP_VERSION index 6d7de6e..ee90284 100644 --- a/version_control/APP_VERSION +++ b/version_control/APP_VERSION @@ -1 +1 @@ -1.0.2 +1.0.4 diff --git a/version_control/BUILD b/version_control/BUILD index d0378c4..a6905f8 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1049 +999 From 710a428a81a172edfd32613f95490006d8a11ad2 Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 11 Mar 2024 16:33:51 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7lcdp1.0.1.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-athenaopt_backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index a5356de..74e7dcb 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -66,7 +66,7 @@ com.digiwin.lcdp lcdp-modeldriven - 1.0.1.2 + 1.0.1.7 From bbce2a8d1159ad0a234f85e67111b02f774beeb3 Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 11 Mar 2024 16:48:13 +0800 Subject: [PATCH 3/7] 1.0.1.17 --- demo-athenaopt_backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index 74e7dcb..256f35c 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -66,7 +66,7 @@ com.digiwin.lcdp lcdp-modeldriven - 1.0.1.7 + 1.0.1.17 From ba04d420faf2e92ab8b41eae5780129f8ae2471c Mon Sep 17 00:00:00 2001 From: dongsk Date: Tue, 12 Mar 2024 12:48:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7DAP=E7=89=88=E6=9C=AC5.2.?= =?UTF-8?q?0.1029=E5=88=B05.2.0.1085?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/infra/common/utils/BeanCopyUtil.java | 66 ------------------- demo-athenaopt_backend/pom.xml | 3 +- 2 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/common/utils/BeanCopyUtil.java diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/common/utils/BeanCopyUtil.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/common/utils/BeanCopyUtil.java deleted file mode 100644 index 52ad492..0000000 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/common/utils/BeanCopyUtil.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.digiwin.athena.app.infra.common.utils; - -import com.digiwin.app.container.exceptions.DWRuntimeException; -import net.sf.cglib.beans.BeanCopier; -import net.sf.cglib.beans.BeanMap; -import org.springframework.objenesis.ObjenesisStd; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -public final class BeanCopyUtil { - private BeanCopyUtil() { - } - - private static ThreadLocal objenesisStdThreadLocal = ThreadLocal.withInitial(ObjenesisStd::new); - private static ConcurrentHashMap, ConcurrentHashMap, BeanCopier>> cache = new ConcurrentHashMap<>(); - - - public static T copy(Object source, Class target) { - return copy(source, objenesisStdThreadLocal.get().newInstance(target)); - } - - public static T copy(Object source, T target) { - BeanCopier beanCopier = getCacheBeanCopier(source.getClass(), target.getClass()); - beanCopier.copy(source, target, null); - return target; - } - - public static List copyList(List sources, Class target) { - if (sources.isEmpty()) { - return Collections.emptyList(); - } - - ArrayList list = new ArrayList<>(sources.size()); - ObjenesisStd objenesisStd = objenesisStdThreadLocal.get(); - for (Object source : sources) { - if (source == null) { - throw new DWRuntimeException("转换异常"); - } - T newInstance = objenesisStd.newInstance(target); - BeanCopier beanCopier = getCacheBeanCopier(source.getClass(), target); - beanCopier.copy(source, newInstance, null); - list.add(newInstance); - } - return list; - } - - public static T mapToBean(Map source, Class target) { - T bean = objenesisStdThreadLocal.get().newInstance(target); - BeanMap beanMap = BeanMap.create(bean); - beanMap.putAll(source); - return bean; - } - - public static Map beanToMap(T source) { - return BeanMap.create(source); - } - - private static BeanCopier getCacheBeanCopier(Class source, Class target) { - ConcurrentHashMap, BeanCopier> copierConcurrentHashMap = cache.computeIfAbsent(source, aClass -> new ConcurrentHashMap<>(16)); - return copierConcurrentHashMap.computeIfAbsent(target, aClass -> BeanCopier.create(source, target, false)); - } -} diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index 256f35c..486bf64 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -32,9 +32,10 @@ https://repo.digiwincloud.com.cn/maven 1.1.0.0 5.0.5.RELEASE - 5.2.0.1029 + 5.2.0.1085 2.8.6 1.05 + 4.1.67.Final From f1e5f63677481de73996fdf399f914c937279d1b Mon Sep 17 00:00:00 2001 From: dongsk Date: Tue, 12 Mar 2024 13:30:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=93=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=8E=A8=E9=80=81=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 4a65f33..41a467b 100644 --- a/Makefile +++ b/Makefile @@ -53,4 +53,3 @@ vc: @make -C version_control branch=$$branch to_git: @make -C version_control branch=$$branch commit_record - @make -C version_control branch=$$branch add_tag From fe03d61fdbc841804368acafff5c0c79225d959e Mon Sep 17 00:00:00 2001 From: dongsk Date: Tue, 12 Mar 2024 14:12:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?common=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-athenaopt_backend/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index 486bf64..22062b5 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -42,7 +42,7 @@ com.digiwin.athena athena-opt-common - 1.0.105-SNAPSHOT + 1.0.107-SNAPSHOT com.digiwin From f2f22929f1747fd9028510a2732f28a675835973 Mon Sep 17 00:00:00 2001 From: dongsk Date: Tue, 12 Mar 2024 14:30:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7API=201086?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- demo-athenaopt_backend/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0f73f43..e85ec32 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: # 应用专案名称（需手动修改） backendName: demo-athenaopt_backend # 平台API版本号（需手动修改） - apiVersion: 5.2.0.1029 + apiVersion: 5.2.0.1086 commands: # 在开发根目录下执行 maven package 指令以构建运行包 - mvn -f $backendName/pom.xml package -Dapi.version=$apiVersion -Dnexus.ip=https://repo.digiwincloud.com.cn/maven diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index 22062b5..7a61d32 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -32,7 +32,7 @@ https://repo.digiwincloud.com.cn/maven 1.1.0.0 5.0.5.RELEASE - 5.2.0.1085 + 5.2.0.1086 2.8.6 1.05 4.1.67.Final