From ad9ae2ceb6c0ece37f173581e59caa3b2bc63157 Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 19:58:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=99=A8runner?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=88=90=20+=20dr?= =?UTF-8?q?one=20ci/cd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b33384a..f455d56 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: build-jar - image: maven:3.8.5-openjdk-11 + image: 10.7.127.190:38080/maven:3.8.5-openjdk-17 volumes: - name: maven-cache path: /root/.m2 diff --git a/Dockerfile b/Dockerfile index 7f2357c..e7aec6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM 10.7.127.190:38080/openjdk:11.0.10-jre +FROM 10.7.127.190:38080/openjdk:17.0.2-slim ENV SERVICE_PORTS=8080 ENV PROFILES=pro RUN mkdir -p /app/ From 5cbf2314348f0ed8d8be39b764c96c5506e86f05 Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 20:01:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=99=A8runner?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=88=90=20+=20dr?= =?UTF-8?q?one=20ci/cd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- docker.sh | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index f455d56..a5d7908 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,7 @@ steps: - sed -i 's/$DRONE_COMMIT/${DRONE_COMMIT}/' deployment.yml - sed -i 's/$DRONE_REPO_NAME/${DRONE_REPO_NAME}/' deployment.yml - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - - sh docker_pro.sh + - sh docker.sh.sh - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - name: deploy diff --git a/docker.sh b/docker.sh index 52dfe16..e8ac9c2 100644 --- a/docker.sh +++ b/docker.sh @@ -1,17 +1,15 @@ #!/bin/sh # 定义应用组名 -group_name='lan' +group_name='clay' # 定义应用名称 app_name=${DRONE_REPO_NAME} # 定义应用版本 app_version=${DRONE_COMMIT} echo ${app_version} -echo ${app_name} -docker rm -f ${app_name} -dockr rmi ${group_name}/${app_name}:${app_version} # 打包编译docker镜像 echo '----build image start----' -docker build -t ${group_name}/${app_name}:${app_version} . +docker build -t ${group_name}/${app_name} . echo '----build image success----' -docker run -d -p 8080:8080 --name ${app_name} ${group_name}/${app_name}:${app_version} -echo 'push success' +docker tag ${group_name}/${app_name} ${REGISTRY}/${REGISTRY_NAMESPACE}/${app_name}:${app_version} +docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/${app_name}:${app_version} +echo 'push success' \ No newline at end of file From ed642b775221787987757eeaf159ddbe695073d0 Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 20:01:53 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=99=A8runner?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=88=90=20+=20dr?= =?UTF-8?q?one=20ci/cd?= 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 a5d7908..d608371 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,7 @@ steps: - sed -i 's/$DRONE_COMMIT/${DRONE_COMMIT}/' deployment.yml - sed -i 's/$DRONE_REPO_NAME/${DRONE_REPO_NAME}/' deployment.yml - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - - sh docker.sh.sh + - sh docker.sh - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - name: deploy From 617999375007becf77c3409daffe01761bd6e31f Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 20:03:02 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=99=A8runner?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=88=90=20+=20dr?= =?UTF-8?q?one=20ci/cd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yml b/deployment.yml index a39bdc2..38270e9 100644 --- a/deployment.yml +++ b/deployment.yml @@ -8,7 +8,7 @@ spec: - protocol: TCP port: 8080 targetPort: 8080 - nodePort: 48081 + nodePort: 48090 selector: app: $DRONE_REPO_NAME From 14cb9cd3cbb0e67e972777b16c9054b0afa0d827 Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 20:17:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?build:=20maven=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 35 +++++++++++++++++++------ src/main/resources/application-test.yml | 20 ++++++++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/application-test.yml diff --git a/pom.xml b/pom.xml index c880708..42f8bcd 100644 --- a/pom.xml +++ b/pom.xml @@ -94,18 +94,23 @@ + - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 + org.springframework.boot + spring-boot-maven-plugin + 3.3.4 + + + + repackage + + + - 17 - 17 - - -parameters - + + org.mapstruct mapstruct-processor @@ -124,6 +129,20 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + + 17 + 17 + UTF-8 + + -parameters + + + + \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..65b0e09 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,20 @@ +# Spring配置 +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://10.7.127.190:3306/metis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: yyz@2024 + data: + redis: + host: 10.7.127.190 + port: 6379 + password: yyz@2024 + database: 13 + timeout: 10s + lettuce: + pool: + min-idle: 0 + max-idle: 8 + max-active: 8 + max-wait: -1ms \ No newline at end of file From fedaf3ae04907c281011fbb2526948fc5cbc5848 Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 20:21:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?build:=20maven=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e7aec6d..8da31a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM 10.7.127.190:38080/openjdk:17.0.2-slim ENV SERVICE_PORTS=8080 -ENV PROFILES=pro +ENV PROFILES=test RUN mkdir -p /app/ WORKDIR /app # 定义时区参数并设置时区 From 7cf545bf447dab80f85c472472d45b119188d15e Mon Sep 17 00:00:00 2001 From: clay Date: Mon, 7 Apr 2025 21:16:24 +0800 Subject: [PATCH 7/8] build: swagger --- pom.xml | 41 ++++++++++++------- .../java/com/metis/config/SwaggerConfig.java | 31 ++++++++++++++ src/main/resources/application.yml | 28 ++++++++++++- 3 files changed, 85 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/metis/config/SwaggerConfig.java diff --git a/pom.xml b/pom.xml index 42f8bcd..dbb661b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,12 @@ metis 1.0.0-SNAPSHOT + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + + 17 17 @@ -91,6 +97,16 @@ lombok-mapstruct-binding 0.2.0 + + org.springdoc + springdoc-openapi-starter-webmvc-api + 2.2.0 + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + 4.4.0 + @@ -99,7 +115,6 @@ org.springframework.boot spring-boot-maven-plugin - 3.3.4 @@ -107,7 +122,18 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 17 + 17 + UTF-8 + + -parameters + @@ -129,19 +155,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - UTF-8 - - -parameters - - - diff --git a/src/main/java/com/metis/config/SwaggerConfig.java b/src/main/java/com/metis/config/SwaggerConfig.java new file mode 100644 index 0000000..77c541f --- /dev/null +++ b/src/main/java/com/metis/config/SwaggerConfig.java @@ -0,0 +1,31 @@ +package com.metis.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Contact; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public OpenAPI customOpenAPI() { + Contact contact = new Contact(); + contact.setEmail("wlddhj@163.com"); + contact.setName("huangjian"); + contact.setUrl("http://doc.xiaominfo.com"); + return new OpenAPI() + // 增加swagger授权请求头配置 +// .components(new Components().addSecuritySchemes(CommonConstant.X_ACCESS_TOKEN, +// new SecurityScheme().type(SecurityScheme.Type.HTTP).scheme(CommonConstant.X_ACCESS_TOKEN))) + .info(new Info() + .title("Shi9 后台服务API接口文档") + .version("1.0") + .contact(contact) + .description("Knife4j集成springdoc-openapi示例") + .termsOfService("http://doc.xiaominfo.com") + .license(new License().name("Apache 2.0") + .url("http://www.apache.org/licenses/LICENSE-2.0.html"))); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4f78bf9..6a91192 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,4 +28,30 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true cache-enabled: false - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +springdoc: + swagger-ui: + tags-sorter: alpha + group-configs: + - group: bis + display-name: "业务接口文档" + paths-to-match: '/**' + packages-to-scan: org.shi9.module.bis + - group: system + display-name: "业务接口文档" + paths-to-match: '/**' + packages-to-scan: com.metis.controller + default-flat-param-object: true +knife4j: + # 开启增强配置 + enable: true + # 开启生产环境屏蔽（如果是生产环境，需要把下面配置设置true） + # production: true + setting: + language: zh_cn + swagger-model-name: 实体类列表 + basic: # 开始授权认证 + enable: true + username: admin + password: 123456 From b65a431d712abdd5ca9038d876b59151b4c5f082 Mon Sep 17 00:00:00 2001 From: zhangkaihuai <1942223609@qq.com> Date: Mon, 7 Apr 2025 21:42:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E6=A1=A3=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将系统接口文档的显示名称从"业务接口文档"修改为"系统接口文档" - 更新 README 文件标题为"项目名称: metis" --- README.md | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 146d7be..077b7e9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# metis +# 项目名称: metis diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6a91192..57c0935 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -39,7 +39,7 @@ springdoc: paths-to-match: '/**' packages-to-scan: org.shi9.module.bis - group: system - display-name: "业务接口文档" + display-name: "系统接口文档" paths-to-match: '/**' packages-to-scan: com.metis.controller default-flat-param-object: true