diff --git a/.drone.yml b/.drone.yml index 83048ab..232147c 100644 --- a/.drone.yml +++ b/.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: diff --git a/Dockerfile b/Dockerfile index dc063fc..10dd850 100644 --- a/Dockerfile +++ b/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"] \ No newline at end of file +ENTRYPOINT ["/demo-athenaopt_backend/platform/bin/docker/dockerRun.sh"] \ No newline at end of file diff --git a/Makefile b/Makefile index 7a4e7d7..4a65f33 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index 4f87ebe..05eb304 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# app-code +# demo-athenaopt diff --git a/app-code_backend/.gitignore b/demo-athenaopt_backend/.gitignore similarity index 100% rename from app-code_backend/.gitignore rename to demo-athenaopt_backend/.gitignore diff --git a/app-code_backend/develop/conf/application.properties b/demo-athenaopt_backend/develop/conf/application.properties similarity index 99% rename from app-code_backend/develop/conf/application.properties rename to demo-athenaopt_backend/develop/conf/application.properties index ac0597d..408b0b5 100644 --- a/app-code_backend/develop/conf/application.properties +++ b/demo-athenaopt_backend/develop/conf/application.properties @@ -1,4 +1,4 @@ -appId=app-code +appId=athena configCenterUrl=@configCenterUrl@ configPolicy=@configPolicy@ isRemoteConfigOn=@isRemoteConfigOn@ diff --git a/app-code_backend/develop/conf/log4j2.xml b/demo-athenaopt_backend/develop/conf/log4j2.xml similarity index 100% rename from app-code_backend/develop/conf/log4j2.xml rename to demo-athenaopt_backend/develop/conf/log4j2.xml diff --git a/app-code_backend/develop/conf/platform.properties b/demo-athenaopt_backend/develop/conf/platform.properties similarity index 100% rename from app-code_backend/develop/conf/platform.properties rename to demo-athenaopt_backend/develop/conf/platform.properties diff --git a/app-code_backend/develop/conf/readme.md b/demo-athenaopt_backend/develop/conf/readme.md similarity index 100% rename from app-code_backend/develop/conf/readme.md rename to demo-athenaopt_backend/develop/conf/readme.md diff --git a/app-code_backend/develop/conf/service-retry-config-platform.json b/demo-athenaopt_backend/develop/conf/service-retry-config-platform.json similarity index 100% rename from app-code_backend/develop/conf/service-retry-config-platform.json rename to demo-athenaopt_backend/develop/conf/service-retry-config-platform.json diff --git a/app-code_backend/develop/conf/spring-application.xml b/demo-athenaopt_backend/develop/conf/spring-application.xml similarity index 100% rename from app-code_backend/develop/conf/spring-application.xml rename to demo-athenaopt_backend/develop/conf/spring-application.xml diff --git a/app-code_backend/develop/lang/message-application.properties b/demo-athenaopt_backend/develop/lang/message-application.properties similarity index 100% rename from app-code_backend/develop/lang/message-application.properties rename to demo-athenaopt_backend/develop/lang/message-application.properties diff --git a/app-code_backend/develop/lang/message-application_zh.properties b/demo-athenaopt_backend/develop/lang/message-application_zh.properties similarity index 100% rename from app-code_backend/develop/lang/message-application_zh.properties rename to demo-athenaopt_backend/develop/lang/message-application_zh.properties diff --git a/app-code_backend/develop/lang/message-application_zh_CN.properties b/demo-athenaopt_backend/develop/lang/message-application_zh_CN.properties similarity index 100% rename from app-code_backend/develop/lang/message-application_zh_CN.properties rename to demo-athenaopt_backend/develop/lang/message-application_zh_CN.properties diff --git a/app-code_backend/develop/lang/message-application_zh_TW.properties b/demo-athenaopt_backend/develop/lang/message-application_zh_TW.properties similarity index 100% rename from app-code_backend/develop/lang/message-application_zh_TW.properties rename to demo-athenaopt_backend/develop/lang/message-application_zh_TW.properties diff --git a/app-code_backend/develop/lib/readme.md b/demo-athenaopt_backend/develop/lib/readme.md similarity index 100% rename from app-code_backend/develop/lib/readme.md rename to demo-athenaopt_backend/develop/lib/readme.md diff --git a/app-code_backend/develop/platform/bin/docker/dap-config-value-replacer.jar b/demo-athenaopt_backend/develop/platform/bin/docker/dap-config-value-replacer.jar similarity index 100% rename from app-code_backend/develop/platform/bin/docker/dap-config-value-replacer.jar rename to demo-athenaopt_backend/develop/platform/bin/docker/dap-config-value-replacer.jar diff --git a/app-code_backend/develop/platform/bin/docker/dockerEnv.sh b/demo-athenaopt_backend/develop/platform/bin/docker/dockerEnv.sh similarity index 100% rename from app-code_backend/develop/platform/bin/docker/dockerEnv.sh rename to demo-athenaopt_backend/develop/platform/bin/docker/dockerEnv.sh diff --git a/app-code_backend/develop/platform/bin/docker/dockerEnvReplace.sh b/demo-athenaopt_backend/develop/platform/bin/docker/dockerEnvReplace.sh similarity index 100% rename from app-code_backend/develop/platform/bin/docker/dockerEnvReplace.sh rename to demo-athenaopt_backend/develop/platform/bin/docker/dockerEnvReplace.sh diff --git a/app-code_backend/develop/platform/bin/docker/dockerRun.sh b/demo-athenaopt_backend/develop/platform/bin/docker/dockerRun.sh similarity index 100% rename from app-code_backend/develop/platform/bin/docker/dockerRun.sh rename to demo-athenaopt_backend/develop/platform/bin/docker/dockerRun.sh diff --git a/app-code_backend/develop/platform/bin/run.bat b/demo-athenaopt_backend/develop/platform/bin/run.bat similarity index 100% rename from app-code_backend/develop/platform/bin/run.bat rename to demo-athenaopt_backend/develop/platform/bin/run.bat diff --git a/app-code_backend/develop/platform/bin/run.sh b/demo-athenaopt_backend/develop/platform/bin/run.sh similarity index 100% rename from app-code_backend/develop/platform/bin/run.sh rename to demo-athenaopt_backend/develop/platform/bin/run.sh diff --git a/app-code_backend/develop/platform/bin/runEncrypt.bat b/demo-athenaopt_backend/develop/platform/bin/runEncrypt.bat similarity index 100% rename from app-code_backend/develop/platform/bin/runEncrypt.bat rename to demo-athenaopt_backend/develop/platform/bin/runEncrypt.bat diff --git a/app-code_backend/develop/platform/bin/runEncrypt.sh b/demo-athenaopt_backend/develop/platform/bin/runEncrypt.sh similarity index 100% rename from app-code_backend/develop/platform/bin/runEncrypt.sh rename to demo-athenaopt_backend/develop/platform/bin/runEncrypt.sh diff --git a/app-code_backend/develop/platform/bin/stop.bat b/demo-athenaopt_backend/develop/platform/bin/stop.bat similarity index 100% rename from app-code_backend/develop/platform/bin/stop.bat rename to demo-athenaopt_backend/develop/platform/bin/stop.bat diff --git a/app-code_backend/develop/platform/bin/stop.sh b/demo-athenaopt_backend/develop/platform/bin/stop.sh similarity index 100% rename from app-code_backend/develop/platform/bin/stop.sh rename to demo-athenaopt_backend/develop/platform/bin/stop.sh diff --git a/app-code_backend/develop/pom.xml b/demo-athenaopt_backend/develop/pom.xml similarity index 98% rename from app-code_backend/develop/pom.xml rename to demo-athenaopt_backend/develop/pom.xml index ec5fa4e..7690458 100644 --- a/app-code_backend/develop/pom.xml +++ b/demo-athenaopt_backend/develop/pom.xml @@ -8,7 +8,7 @@ athena_parent 1.0.0.1000 - app-code_backend + demo-athenaopt_backend ${project.build.directory}/${project.name} diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/ApplicationStartBoot.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ApplicationStartBoot.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/ApplicationStartBoot.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ApplicationStartBoot.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/package-info.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/package-info.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/package-info.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/entity/package-info.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/mapper/package-info.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/mapper/package-info.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/mapper/package-info.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/mapper/package-info.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/package-info.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/package-info.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/package-info.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/package-info.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/repository/package-info.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/repository/package-info.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/infra/repository/package-info.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/infra/repository/package-info.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicApiService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicApiService.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicApiService.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicApiService.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicEAIService.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicEAIService.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/BasicEAIService.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicApiServiceImpl.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicEAIServiceImpl.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicEAIServiceImpl.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicEAIServiceImpl.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/provider/impl/BasicEAIServiceImpl.java diff --git a/app-code_backend/develop/src/main/java/com/digiwin/athena/app/service/package-info.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/package-info.java similarity index 100% rename from app-code_backend/develop/src/main/java/com/digiwin/athena/app/service/package-info.java rename to demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/service/package-info.java diff --git a/app-code_backend/develop/src/main/resources/META-INF/dap.info b/demo-athenaopt_backend/develop/src/main/resources/META-INF/dap.info similarity index 100% rename from app-code_backend/develop/src/main/resources/META-INF/dap.info rename to demo-athenaopt_backend/develop/src/main/resources/META-INF/dap.info diff --git a/app-code_backend/develop/src/test/java/com/digiwin/athena/app/provider/impl/temp.txt b/demo-athenaopt_backend/develop/src/test/java/com/digiwin/athena/app/provider/impl/temp.txt similarity index 100% rename from app-code_backend/develop/src/test/java/com/digiwin/athena/app/provider/impl/temp.txt rename to demo-athenaopt_backend/develop/src/test/java/com/digiwin/athena/app/provider/impl/temp.txt diff --git a/app-code_backend/develop/src/test/java/com/digiwin/athena/app/provider/temp.txt b/demo-athenaopt_backend/develop/src/test/java/com/digiwin/athena/app/provider/temp.txt similarity index 100% rename from app-code_backend/develop/src/test/java/com/digiwin/athena/app/provider/temp.txt rename to demo-athenaopt_backend/develop/src/test/java/com/digiwin/athena/app/provider/temp.txt diff --git a/app-code_backend/develop/src/test/resources/temp.txt b/demo-athenaopt_backend/develop/src/test/resources/temp.txt similarity index 100% rename from app-code_backend/develop/src/test/resources/temp.txt rename to demo-athenaopt_backend/develop/src/test/resources/temp.txt diff --git a/app-code_backend/pom.xml b/demo-athenaopt_backend/pom.xml similarity index 100% rename from app-code_backend/pom.xml rename to demo-athenaopt_backend/pom.xml diff --git a/doc/conf_dev/application.properties b/doc/conf_dev/application.properties index 9198223..ed236cb 100644 --- a/doc/conf_dev/application.properties +++ b/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= diff --git a/version_control/BUILD b/version_control/BUILD index 5ed13cb..cf5106d 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1002 \ No newline at end of file +999 \ No newline at end of file