初始化调整工程

.drone.yml

@@ -7,7 +7,7 @@ steps:
     image: maven:3.5.3-jdk-8
     environment:
       # 应用专案名称（需手动修改）
-      backendName: app-code_backend
+      backendName: demo-athenaopt_backend
       # 平台API版本号（需手动修改）
       apiVersion: 5.2.0.1005
     commands:
@@ -25,7 +25,7 @@ steps:
       branch:
         # - develop
         # - master
-        - release/S1
+        - develop
       event:
         - push
   ### 应用版本控制：检查版本文件，若不存在则自动创建，并自动递增版本号
@@ -33,19 +33,19 @@ steps:
     image: registry.digiwincloud.com.cn/base/base_vc
     environment:
       # 应用专案名称（需手动修改）
-      backendName: app-code_backend
+      backendName: demo-athenaopt_backend
     commands:
       - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
       - apk add tree --no-cache
       - tree ./$backendName
-      - make branch=release/S1  vc
+      - make branch=develop  vc
       # - make branch=master  vc
     when:
       status: [ success ]
       branch:
         # - develop
         # - master
-        - release/S1
+        - develop
       event:
         - push
   ### 打包镜像并推送到镜像仓库
@@ -53,7 +53,7 @@ steps:
     image: plugins/docker:20.10.9
     environment:
       # 应用专案名称（需手动修改）
-      backendName: app-code_backend
+      backendName: demo-athenaopt_backend
     ## Docker 插件的设置
     settings:
       insecure: true
@@ -64,7 +64,7 @@ steps:
       # 注意：此处不支持用取值符号获取参数，需要手动修改。${appId} 表示应用ID，${projectName} 表示仓库项目名称，${platformVersion} 表示平台版本号
       # 例如：registry.digiwincloud.com.cn/sampleapp1/sampleapp1backend-5.0.1 注意APPID和backend中间没有下划线
       # repo: registry.digiwincloud.com.cn/${projectName}/${appId}backend-${platformVersion}
-      repo: registry.digiwincloud.com.cn/athenaopt/app-codebackend-5.2.0
+      repo: registry.digiwincloud.com.cn/athenaopt/demo-athenaoptbackend-5.2.0
       registry: registry.digiwincloud.com.cn
       experimental: true
       # 打包镜像时会用到的 Dockerfile 文件（此处使用自定义 Dockerfile 文件名，避免跟其他 Dockerfile 冲突）
@@ -76,27 +76,27 @@ steps:
       branch:
         # - develop
         # - master
-        - release/S1
+        - develop
   ### 应用版本控制：提交版本文件的修改记录，并为代码分支创建版本号标签
   - 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/S1 to_git
+      - make branch=develop to_git
     when:
       status: [ success ]
       branch:
         # - develop
         # - master
-        - release/S1
+        - develop
       event:
         - push
 trigger:
   branch:
     # - develop
     # - master
-    - release/S1
+    - develop
   event:
     - push
 volumes:

Dockerfile

@@ -3,7 +3,7 @@
 #ENV     WORKSPACE=TheValueWillPassFromJenkinsDockerBuild
 # 从 Drone 传递过来即可，不需要手动修改
 # backendName對應到POM中的artifactId
-ARG	    backendName=app-code_backend
+ARG	    backendName=demo-athenaopt_backend
 ARG	    runningPath=${backendName}/running
 # ***** 打包docker image *****
 FROM registry.digiwincloud.com.cn/dwsidecar/dwsidecar-1.0.0.0:1.0.0.33
@@ -21,4 +21,4 @@ RUN         chmod +x ./platform/bin/run.sh \
             && chmod +x ./platform/bin/docker/dockerEnvReplace.sh \
             && chmod +x ./platform/bin/docker/dockerRun.sh
 EXPOSE 22620
-ENTRYPOINT ["/app-code_backend/platform/bin/docker/dockerRun.sh"]
+ENTRYPOINT ["/demo-athenaopt_backend/platform/bin/docker/dockerRun.sh"]

Makefile

@@ -2,9 +2,9 @@
 # registry group 名稱
 GROUP_ID=athenaopt
 ## app id
-APP_ID=app-code
+APP_ID=demo-athenaopt
 ## app 名稱
-APP_NAME=app-code
+APP_NAME=demo-athenaopt
 ## 平台版本
 PLATFORM_VERSION=5.2.0
 ## dap 平台類別，前端就是 frontend, 後端就是 backend

README.md

@@ -1,2 +1,2 @@
-# app-code
+# demo-athenaopt
 

app-code_backend/develop/conf/application.properties → demo-athenaopt_backend/develop/conf/application.properties

@@ -1,4 +1,4 @@
-appId=app-code
+appId=athena
 configCenterUrl=@configCenterUrl@
 configPolicy=@configPolicy@
 isRemoteConfigOn=@isRemoteConfigOn@

app-code_backend/develop/pom.xml → demo-athenaopt_backend/develop/pom.xml

@@ -8,7 +8,7 @@
         <artifactId>athena_parent</artifactId>
         <version>1.0.0.1000</version>
     </parent>
-    <artifactId>app-code_backend</artifactId>
+    <artifactId>demo-athenaopt_backend</artifactId>
     <properties>
         <backend.output.path>${project.build.directory}/${project.name}</backend.output.path>
     </properties>

doc/conf_dev/application.properties

@@ -1,4 +1,4 @@
-appId=app-code
+appId=Athena
 configCenterUrl=@configCenterUrl@
 configPolicy=@configPolicy@
 isRemoteConfigOn=@isRemoteConfigOn@
@@ -23,7 +23,7 @@ eaiHostProd=ca-cim-ap
 eaiHostId=ca-cim-ap
 eaiRestfulCustomId=cim
 
-dbUrl=jdbc:mariadb://172.16.102.34:3306/app-code?allowMultiQueries=true
+dbUrl=jdbc:mariadb://172.16.102.34:3306/demo-athenaopt?allowMultiQueries=true
 dbUsername=root
 dbPassword=123456
 scheduleEmailUsername=

version_control/BUILD

@@ -1 +1 @@
-1002
+999