Merge branch 'dev' into dev-minio

.drone.yml

@@ -2,6 +2,10 @@ kind: pipeline
 type: docker
 name: ds-cloud
 
+#分支触发
+trigger:
+  branch:
+    - dev
 steps:
   - name: build-jar # 流水线名称
     image: maven:3.8.5-openjdk-17 # 定义创建容器的Docker镜像

.idea/compiler.xml

@@ -22,6 +22,7 @@
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="ds-mybatisplus-generator-config" target="17" />
+      <module name="ds-oss-config" target="17" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">

docker/deploy.sh

@@ -51,6 +51,7 @@ stop(){
 # 删除module环境/模块
 rm(){
 	docker-compose rm ds-gateway ds-miniapps -f
+	docker rmi docker-ds-gateway docker-ds-miniapps
 }
 
 build(){