From 6132af0c373d579b477689be233048132e3b008f Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 12 Jun 2023 03:39:15 +0000 Subject: [PATCH 01/27] auto increment build version 1033 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 4ac943d..0ff3e5b 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1032 +1033 From 8ecdb383a96c2566591486bfe03b93d25834bfa7 Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 13:21:24 +0000 Subject: [PATCH 02/27] auto increment build version 1034 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 0ff3e5b..da44b0c 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1033 +1034 From ed5ae479c579fe0a901e5a4aee60c22de3edb4af Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 14:55:09 +0000 Subject: [PATCH 03/27] auto increment build version 1035 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index da44b0c..95e145d 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1034 +1035 From 51bd5be061330fa3051c11c7dd780688811ba89e Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 15:10:10 +0000 Subject: [PATCH 04/27] auto increment build version 1036 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 95e145d..b633d3d 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1035 +1036 From d65c459a37cfa4f9de80325f9cba39ef825080ba Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 15:13:39 +0000 Subject: [PATCH 05/27] auto increment build version 1037 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index b633d3d..4fba33e 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1036 +1037 From 62b9885c019032afc1938206647bc07aa749ae17 Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 15:29:28 +0000 Subject: [PATCH 06/27] auto increment build version 1038 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 4fba33e..d7f2bc9 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1037 +1038 From 0a7f2e04548896035be5f2e32c0085f4c54942b2 Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 15:47:13 +0000 Subject: [PATCH 07/27] auto increment build version 1039 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index d7f2bc9..89a4137 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1038 +1039 From 209d82ced05460ef30919404eadc23e72cd62e49 Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 16:23:54 +0000 Subject: [PATCH 08/27] auto increment build version 1040 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 89a4137..5e73659 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1039 +1040 From 5e67e0db94ec56e0a74d0052772969147473df5c Mon Sep 17 00:00:00 2001 From: robot Date: Fri, 30 Jun 2023 16:46:46 +0000 Subject: [PATCH 09/27] auto increment build version 1041 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 5e73659..6aaa249 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1040 +1041 From 012d914114f20d47ebc68224b41fa5abbbb884a5 Mon Sep 17 00:00:00 2001 From: robot Date: Sat, 1 Jul 2023 14:45:41 +0000 Subject: [PATCH 10/27] auto increment build version 1042 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 6aaa249..e3c00fd 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1041 +1042 From 7b60b38b79f698a58f700a42220f287fd54a80d7 Mon Sep 17 00:00:00 2001 From: robot Date: Sun, 2 Jul 2023 04:57:09 +0000 Subject: [PATCH 11/27] auto increment build version 1043 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index e3c00fd..34d9aae 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1042 +1043 From ca7fb2086ae462b400925ebc131736bf168cd952 Mon Sep 17 00:00:00 2001 From: dongsk Date: Sun, 2 Jul 2023 12:58:40 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../digiwin/athena/app/service/cps/CpsQuestionGetService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/cps/CpsQuestionGetService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/cps/CpsQuestionGetService.java index ad318ca..d8a475d 100644 --- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/cps/CpsQuestionGetService.java +++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/cps/CpsQuestionGetService.java @@ -96,6 +96,10 @@ public class CpsQuestionGetService extends AbsEAIService { break; }*/ + if (StringUtils.isBlank(status)) { + status = "1"; + } + switch (option) { case "1": lambdaQuery.eq(CpsQuestionInfo::getStatus1, status); From af4c08bf4e9ff0988fd18dfc1fec603ac7130b08 Mon Sep 17 00:00:00 2001 From: robot Date: Sun, 2 Jul 2023 04:59:43 +0000 Subject: [PATCH 13/27] auto increment build version 1044 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 34d9aae..408adce 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1043 +1044 From cd9e4fa9139906606ff0a8732fbf31886af1bf3e Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 3 Jul 2023 02:30:23 +0000 Subject: [PATCH 14/27] auto increment build version 1045 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 408adce..026c5e4 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1044 +1045 From ed96004e1f4ccb03ca20041cdafd793589786a3f Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 3 Jul 2023 03:05:52 +0000 Subject: [PATCH 15/27] auto increment build version 1046 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 026c5e4..0d38a9b 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1045 +1046 From 9ed4983c7b20c632519c55346d814fd8714a5970 Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 14 Aug 2023 14:23:42 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=A9=B1=E5=8A=A8jar?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-athenaopt_backend/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml index 3c111e3..5516bc2 100644 --- a/demo-athenaopt_backend/pom.xml +++ b/demo-athenaopt_backend/pom.xml @@ -56,6 +56,12 @@ ${api.version} + + com.digiwin.lcdp + lcdp-modeldriven + 1.0.0.3 + + junit junit From b9d7c96a80211f2db97122f2510f493a97bf0ff5 Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 14 Aug 2023 06:25:13 +0000 Subject: [PATCH 17/27] auto increment build version 1047 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 0d38a9b..0eb5aea 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1046 +1047 From c9e27818260002108fdac4a913deb729917847ed Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 14 Aug 2023 14:39:14 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E5=BC=80=E5=90=AFDWDAO=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=20for=20=20=E6=A8=A1=E5=9E=8B=E9=A9=B1=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo-athenaopt_backend/develop/conf/application.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demo-athenaopt_backend/develop/conf/application.properties b/demo-athenaopt_backend/develop/conf/application.properties index 408b0b5..9756e34 100644 --- a/demo-athenaopt_backend/develop/conf/application.properties +++ b/demo-athenaopt_backend/develop/conf/application.properties @@ -44,13 +44,13 @@ dwdaoSelectVersionFieldEnabled=@dwdaoSelectVersionFieldEnabled@ #example - false:com.digiwin.app.dao.filter.DWSQLManagementFieldFilter, dwsqlFilterChianCustom=@dwsqlFilterChianCustom@ #management field enabled -mgmtFieldEnabled=false +mgmtFieldEnabled=true #management field resolver class name #dap default resolver = com.digiwin.app.dao.filter.DWProfileManagementFieldResolver mgmtFieldResolver=com.digiwin.app.dao.filter.DWProfileManagementFieldResolver #management fields mappings #example - DATA_CREATED_BY:userId,DATA_MODIFY_BY:userId -mgmtFieldInsertMappings=create_by:userId,create_date:$DATETIME +mgmtFieldInsertMappings=create_by:userId,modified_by:userId,create_date:$DATETIME mgmtFieldUpdateMappings=modified_by:userId,modified_date:$DATETIME mgmtFieldIgnoreCustomValue=false #Log file name id: Ex. Windows:_${env:COMPUTERNAME} Linux:_${env:HOSTNAME} @@ -66,7 +66,7 @@ dwServiceChainReceivedPrinterType=@dwServiceChainReceivedPrinterType@ #DWJson enable empty string to null dwJsonEmptyStrToNullEnabled=@dwJsonEmptyStrToNullEnabled@ #DWDao underscore-to-camel-case setting -dwDaoUnderScoreToCamelCase=@dwDaoUnderScoreToCamelCase@ +dwDaoUnderScoreToCamelCase=true #DWMq dwMqEnabled=@dwMqEnabled@ dwMqProtocol=@dwMqProtocol@ From 1e48e8d3ceb693b3853197925b39bba6267d63c4 Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 14 Aug 2023 14:42:45 +0800 Subject: [PATCH 19/27] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8D=87=E7=BA=A7=201.?= =?UTF-8?q?0.0=3D>1.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 10 +++++----- VERSION | 2 +- version_control/APP_VERSION | 2 +- version_control/BUILD | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 232147c..5d03979 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: branch: # - develop # - master - - develop + - release/S2 event: - push ### 应用版本控制：检查版本文件，若不存在则自动创建，并自动递增版本号 @@ -45,7 +45,7 @@ steps: branch: # - develop # - master - - develop + - release/S2 event: - push ### 打包镜像并推送到镜像仓库 @@ -76,7 +76,7 @@ steps: branch: # - develop # - master - - develop + - release/S2 ### 应用版本控制：提交版本文件的修改记录，并为代码分支创建版本号标签 - name: Upload Version image: registry.digiwincloud.com.cn/base/base_vc @@ -89,14 +89,14 @@ steps: branch: # - develop # - master - - develop + - release/S2 event: - push trigger: branch: # - develop # - master - - develop + - release/S2 event: - push volumes: diff --git a/VERSION b/VERSION index afaf360..7f20734 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file diff --git a/version_control/APP_VERSION b/version_control/APP_VERSION index 3eefcb9..7dea76e 100644 --- a/version_control/APP_VERSION +++ b/version_control/APP_VERSION @@ -1 +1 @@ -1.0.0 +1.0.1 diff --git a/version_control/BUILD b/version_control/BUILD index 0eb5aea..a6905f8 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1047 +999 From d5422a485f7a1e76d92af43074285d9924660d39 Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 14 Aug 2023 19:52:27 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20release/S2=20?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 05eb304..7455420 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # demo-athenaopt +测试 release/S2 打包 \ No newline at end of file From 821e9efca694a74bc02db58997a30660c9b95714 Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 14 Aug 2023 11:53:31 +0000 Subject: [PATCH 21/27] auto increment build version 1000 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index a6905f8..83b33d2 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -999 +1000 From b50a9f25efd885dfcbdee53fa7c02fc93d8d32cd Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 14 Aug 2023 20:23:35 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5d03979..66b8b88 100644 --- a/.drone.yml +++ b/.drone.yml @@ -83,7 +83,7 @@ steps: commands: # - make branch=develop to_git # - make branch=master to_git - - make branch=develop to_git + - make branch=release/S2 to_git when: status: [ success ] branch: From 1a174aa24572b6fecd10ab6187d7d3c6fdd968f9 Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 14 Aug 2023 12:24:38 +0000 Subject: [PATCH 23/27] auto increment build version 1000 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index a6905f8..83b33d2 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -999 +1000 From 81b3db3acc2bf1016af92d06bd30f58c3d75778c Mon Sep 17 00:00:00 2001 From: dongsk Date: Mon, 14 Aug 2023 20:27:42 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 66b8b88..13df833 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,7 @@ steps: - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories - apk add tree --no-cache - tree ./$backendName - - make branch=develop vc + - make branch=release/S2 vc # - make branch=master vc when: status: [ success ] From 09d6041db28753dd2b48a79aab18bb0f0d47e505 Mon Sep 17 00:00:00 2001 From: robot Date: Mon, 14 Aug 2023 12:28:45 +0000 Subject: [PATCH 25/27] auto increment build version 1001 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index 83b33d2..dd11724 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1000 +1001 From 3d23723428f1d52730cad4b66426bd1615adff16 Mon Sep 17 00:00:00 2001 From: dongsk Date: Tue, 15 Aug 2023 15:17:16 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E5=8D=87=E7=BA=A7DAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- demo-athenaopt_backend/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 13df833..1bd3647 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: # 应用专案名称（需手动修改） backendName: demo-athenaopt_backend # 平台API版本号（需手动修改） - apiVersion: 5.2.0.1005 + apiVersion: 5.2.0.1029 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 5516bc2..35a6d75 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.1005 + 5.2.0.1029 2.8.6 1.05 @@ -41,7 +41,7 @@ com.digiwin.athena athena-opt-common - 1.0.103-SNAPSHOT + 1.0.105-SNAPSHOT com.digiwin From a8aa2fd92b24ee63d5defa342844a4f8517aad6b Mon Sep 17 00:00:00 2001 From: robot Date: Tue, 15 Aug 2023 07:21:28 +0000 Subject: [PATCH 27/27] auto increment build version 1002 [CI SKIP] --- version_control/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_control/BUILD b/version_control/BUILD index dd11724..7d802a3 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1001 +1002