diff --git a/.drone.yml b/.drone.yml
index 232147c..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
@@ -25,7 +25,7 @@ steps:
branch:
# - develop
# - master
- - develop
+ - release/S2
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=develop vc
+ - make branch=release/S2 vc
# - make branch=master vc
when:
status: [ success ]
branch:
# - develop
# - master
- - develop
+ - release/S2
event:
- push
### 打包镜像并推送到镜像仓库
@@ -76,27 +76,27 @@ steps:
branch:
# - develop
# - master
- - develop
+ - release/S2
### 应用版本控制:提交版本文件的修改记录,并为代码分支创建版本号标签
- name: Upload Version
image: registry.digiwincloud.com.cn/base/base_vc
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:
# - develop
# - master
- - develop
+ - release/S2
event:
- push
trigger:
branch:
# - develop
# - master
- - develop
+ - release/S2
event:
- push
volumes:
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
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/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@
diff --git a/demo-athenaopt_backend/pom.xml b/demo-athenaopt_backend/pom.xml
index 3c111e3..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
@@ -56,6 +56,12 @@
${api.version}
+
+ com.digiwin.lcdp
+ lcdp-modeldriven
+ 1.0.0.3
+
+
junit
junit
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 4ac943d..7d802a3 100644
--- a/version_control/BUILD
+++ b/version_control/BUILD
@@ -1 +1 @@
-1032
+1002