diff --git a/.drone.yml b/.drone.yml
index b33384a..d608371 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
@@ -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
- docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}')
- name: deploy
diff --git a/Dockerfile b/Dockerfile
index 7f2357c..8da31a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-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
+ENV PROFILES=test
RUN mkdir -p /app/
WORKDIR /app
# 定义时区参数并设置时区
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/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
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
diff --git a/pom.xml b/pom.xml
index c880708..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,21 +97,46 @@
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
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
17
17
+ UTF-8
-parameters
+
+
org.mapstruct
mapstruct-processor
@@ -125,5 +156,6 @@
+
\ No newline at end of file
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-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
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4f78bf9..57c0935 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