config

.drone.yml

@@ -34,7 +34,7 @@ steps:
       - name: docker
         path: /var/run/docker.sock
     commands:
-      - docker-compose --compatibility -f docker-compose.yml up -d
+      - docker-compose --compatibility -f docker-compose-dev.yml up -d
 
 trigger:
   branch:
@@ -50,6 +50,59 @@ volumes:
     host:
       path: /data/cache/tl/api
 
+---
+kind: pipeline
+type: docker
+name: pre
+
+node:
+  mode: local_pre
+
+steps:
+  - name: maven
+    image: maven:3.6.3-jdk-11
+    volumes:
+      - name: maven-cache
+        path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
+    commands:
+      - mvn -Dmaven.test.skip=true -P dev clean package
+
+  - name: build
+    image: docker:20.10.7
+    depends_on: [maven]
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    environment:
+      IMAGE: registry.yingcaibx.com/tl/api:latest
+    commands:
+      # 清理 docker 服务中不再使用的镜像、挂载、网络等资源
+      - docker system prune --force --volumes || true
+      - docker build -f ./Dockerfile -t $IMAGE ./
+
+  - name: run
+    image: docker/compose
+    depends_on: [build]
+    volumes:
+      - name: docker
+        path: /var/run/docker.sock
+    commands:
+      - docker-compose --compatibility -f docker-compose-pre.yml up -d
+
+trigger:
+  branch:
+    - pre
+  event:
+    - push
+
+volumes:
+  - name: docker
+    host:
+      path: /var/run/docker.sock
+  - name: maven-cache
+    host:
+      path: /data/cache/tl/api
+
 ---
 kind: pipeline
 type: docker

Makefile

@@ -1,5 +1,8 @@
-merge:
-	git checkout master;git merge dev;git push;git checkout dev;
+merge-master:
+	git checkout master;git merge pre;git push;git checkout dev;
+
+merge-pre:
+	git checkout pre;git merge dev;git push;git checkout dev;
 
 create-tag:
 	git checkout master;git tag v1.4.0;git push origin --tags;git checkout dev;

docker-compose-pre.yml

@@ -0,0 +1,33 @@
+version: '3'
+
+services:
+  tl_api:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    image: registry.yingcaibx.com/tl/api:latest
+    restart: always
+    container_name: tl_api
+    environment:
+      - SPRING_PROFILES_ACTIVE=pre
+      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://mysql:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
+#      - MQTT-SERVER=tcp://172.28.175.70:1883
+    ports:
+      - 8080:8080
+    networks:
+      - dockertest_bx_default
+#    deploy: #限制资源使用
+#      resources:
+#        limits:
+#          cpus: '0.50'
+#          memory: 2048M
+    labels:
+      - "traefik.http.routers.tl_api.rule=Host(`test.tl.web.yingcaibx.com`) && PathPrefix(`/api`)"
+      - "traefik.http.routers.tl_api.middlewares=tl_api-stripprefix"
+      - "traefik.http.middlewares.tl_api-stripprefix.stripprefix.prefixes=/api"
+      - "traefik.http.routers.tl_api.entrypoints=websecure"
+      - "traefik.http.routers.tl_api.tls.certresolver=yxt"
+
+networks:
+  dockertest_bx_default:
+    external: true

src/main/resources/application-test.yml → src/main/resources/application-pre.yml

@@ -9,16 +9,16 @@ spring:
       datasource:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://10.150.10.137:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: qwe123QWE
+          password: Zwr~-f6H,u6QE^]C-AD_
 
 
 
 
   redis:
     database: 10
-    host: 10.150.10.139
+    host: 10.150.10.137
     port: 6379
     password: wa3re~86Hu&ifniyM   # 密码（默认为空）
     timeout: 36000ms  # 连接超时时长（毫秒）

src/main/resources/application.yml

@@ -3,9 +3,9 @@ server:
 
 
 spring:
-  # 环境 dev|test|prod
+  # 环境 dev|pre|prod
   profiles:
-    active: dev
+    active: pre
   # jackson时间格式化
   jackson:
     time-zone: GMT+8