增加makefile快速打包插件 (flipped-aurora#1173)

tscuite · web-flow · commit 19d77f377315 · 2022-07-19T18:47:29.000+08:00
* 更新插件快捷打包

使用方法：make plugin PLUGIN="这里是插件文件夹名称,默认为email"
diff --git a/.github/workflows/docker-cicd.yaml b/.github/workflows/docker-cicd.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: Sed Config
         shell: bash
         run: |
-          sed  -i 51c"\        && yarn install && yarn build" Makefile
+          sed  -i 56c"\        && yarn install && yarn build" Makefile
           make image TAGS_OPT="latest"
           sed -i 's#./entrypoint.sh"#./entrypoint.sh","actions"#g' deploy/docker/Dockerfile
           sed -i "s#COPY build/ /usr/share/nginx/html/#COPY . /opt/gva#g" deploy/docker/Dockerfile
diff --git a/Makefile b/Makefile
@@ -19,6 +19,11 @@ TAGS_OPT            = latest
 else
 endif
 
+ifeq ($(PLUGIN),)
+PLUGIN            = email
+else
+endif
+
 #容器环境前后端共同打包
 build: build-web build-server
 	docker run --name build-local --rm -v $(shell pwd):/go/src/${PROJECT_NAME} -w /go/src/${PROJECT_NAME} ${BUILD_IMAGE_SERVER} make build-local
@@ -63,4 +68,11 @@ image: build
 
 #尝鲜版
 images: build build-image-web build-image-server
-	docker build -t ${REPOSITORY}/all:${TAGS_OPT} -f deploy/docker/Dockerfile .
+	docker build -t ${REPOSITORY}/all:${TAGS_OPT} -f deploy/docker/Dockerfile .
+	
+#插件快捷打包： make plugin PLUGIN="这里是插件文件夹名称,默认为email"
+plugin:
+	if [ -d ".plugin" ];then rm -rf .plugin ; else echo "OK!"; fi && mkdir -p .plugin/${PLUGIN}/{server/plugin,web/plugin} \
+	&& if [ -d "server/plugin/${PLUGIN}" ];then cp -r server/plugin/${PLUGIN} .plugin/${PLUGIN}/server/plugin/ ; else echo "OK!"; fi \
+	&& if [ -d "web/src/plugin/${PLUGIN}" ];then cp -r web/src/plugin/${PLUGIN} .plugin/${PLUGIN}/web/plugin/ ; else echo "OK!"; fi \
+	&& cd .plugin && zip -r ${PLUGIN}.zip ${PLUGIN} && mv ${PLUGIN}.zip ../ && cd ..
diff --git a/README-en.md b/README-en.md
@@ -25,7 +25,7 @@ English | [简体中文](./README.md)
 
 [From the environment to the deployment of teaching videos](https://www.bilibili.com/video/BV1fV411y7dT)
 
-[Development Steps](https://www.gin-vue-admin.com/docs/help) (Contributor:  <a href="https://github.com/LLemonGreen">LLemonGreen</a> And <a href="https://github.com/fkk0509">Fann</a>)
+[Development Steps](https://www.gin-vue-admin.com/guide/start-quickly/env.html) (Contributor:  <a href="https://github.com/LLemonGreen">LLemonGreen</a> And <a href="https://github.com/fkk0509">Fann</a>)
 
 ## 1. Basic Introduction
 
@@ -297,7 +297,7 @@ swag init
 |  :---:  | 
 | <img width="150" src="http://qmplusimg.henrongyi.top/qrjjz.png"> 
 
-#### [About Us](https://www.gin-vue-admin.com/about/)
+#### [About Us](https://www.gin-vue-admin.com/about/join.html)
 
 ## 8. Contributors
 
@@ -309,7 +309,7 @@ Thank you for considering your contribution to gin-vue-admin!
 
 ## 9. Donate
 
-If you find this project useful, you can buy author a glass of juice :tropical_drink: [here](https://www.gin-vue-admin.com/docs/coffee)
+If you find this project useful, you can buy author a glass of juice :tropical_drink: [here](https://www.gin-vue-admin.com/coffee/index.html)
 
 ## 10. Commercial considerations
 
diff --git a/README.md b/README.md
@@ -370,7 +370,7 @@ swag init
 
 添加微信，备注"加入gin-vue-admin交流群"
 
-### [关于我们](https://www.gin-vue-admin.com/about/)
+### [关于我们](https://www.gin-vue-admin.com/about/join.html)
 
 ## 8. 贡献者
 
@@ -382,7 +382,7 @@ swag init
 
 ## 9. 捐赠
 
-如果你觉得这个项目对你有帮助，你可以请作者喝饮料 :tropical_drink: [点我](https://www.gin-vue-admin.com/docs/coffee)
+如果你觉得这个项目对你有帮助，你可以请作者喝饮料 :tropical_drink: [点我](https://www.gin-vue-admin.com/coffee/index.html)
 
 ## 10. 友情链接
 
diff --git a/deploy/docker-compose/docker-compose-dev.yaml b/deploy/docker-compose/docker-compose-dev.yaml
@@ -28,7 +28,7 @@ services:
     #command: bash -c "yarn config set registry https://registry.npm.taobao.org --global && yarn install && yarn serve"
     command: bash -c "yarn install && yarn serve"
     volumes:
-      - ./web:/web
+      - ../../web:/web
     networks:
       network:
         ipv4_address: 177.7.0.11
@@ -44,7 +44,7 @@ services:
       - mysql
       - redis
     volumes:
-      - ./server:/server
+      - ../../server:/server
     working_dir: /server    # 如果docker 设置了workdir 则此处不需要设置 
     command: bash -c "go env -w GOPROXY=https://goproxy.cn,direct && go mod tidy && go run main.go"
     links:
diff --git a/deploy/docker-compose/docker-compose.yaml b/deploy/docker-compose/docker-compose.yaml
@@ -16,7 +16,7 @@ volumes:
 services:
   web:
     build:
-      context: ./web
+      context: ../../web
       dockerfile: ./Dockerfile
     container_name: gva-web
     restart: always
@@ -31,7 +31,7 @@ services:
 
   server:
     build:
-      context: ./server
+      context: ../../server
       dockerfile: ./Dockerfile
     container_name: gva-server
     restart: always
