Browse Source

Merge branch 'sprint/S2' into release/S2

develop
董书康 1 year ago
parent
commit
d2a4155e86
5 changed files with 11 additions and 11 deletions
  1. +5
    -5
      .drone.yml
  2. +1
    -1
      VERSION
  3. +3
    -3
      demo-athenaopt_backend/develop/conf/application.properties
  4. +1
    -1
      version_control/APP_VERSION
  5. +1
    -1
      version_control/BUILD

+ 5
- 5
.drone.yml View File

@ -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:


+ 1
- 1
VERSION View File

@ -1 +1 @@
1.0.0
1.0.1

+ 3
- 3
demo-athenaopt_backend/develop/conf/application.properties View File

@ -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@


+ 1
- 1
version_control/APP_VERSION View File

@ -1 +1 @@
1.0.0
1.0.1

+ 1
- 1
version_control/BUILD View File

@ -1 +1 @@
1046
999

Loading…
Cancel
Save