Merge pull request 'xinwei' (#48) from xinwei into master

Reviewed-on: #48

.drone-datacenter.yml

@@ -7,74 +7,74 @@ name: ludu-system-drone # 定义流水线名称
 
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
-  - name: package # 流水线名称
-
-    image: maven:3-jdk-8 # 定义创建容器的Docker镜像
-
-    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
-
-      - name: maven-cache
-
-        path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
-
-      - name: maven-build
-
-        path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
-
-    commands: # 定义在Docker容器中执行的shell命令
-
-      - mvn package -Dmaven.test.skip=true # 应用打包命令
-      - mkdir -p /app/build/ludu-module-datacenter/target
-      - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target
-      - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter
-      - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter
-
-  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
-
-    image: appleboy/drone-ssh # SSH工具镜像
-
-    settings:
-
-      host: 101.43.112.107 # 远程连接地址
-
-      username: root # 远程连接账号
-
-      password:
-
-        from_secret: ssh_password # 从Secret中读取SSH密码
-
-      port: 22 # 远程连接端口
-
-      command_timeout: 15m # 远程执行命令超时时间
-
-      script:
-
-        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
-        - echo "datacenter done"
-
-  - name: build-old-service
-
-    image: appleboy/drone-ssh # SSH工具镜像
-
-    settings:
-
-      host: 120.46.37.243 # 远程连接地址
-
-      username: root # 远程连接账号
-
-      password:
-
-        from_secret: ssh_password2 # 从Secret中读取SSH密码
-
-      port: 22 # 远程连接端口
-
-      command_timeout: 5m # 远程执行命令超时时间
-
-      script:
-
-        - cd /ludu/maven/build/ludu-module-datacenter/
-        - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+#  - name: package # 流水线名称
+#
+#    image: maven:3-jdk-8 # 定义创建容器的Docker镜像
+#
+#    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+#
+#      - name: maven-cache
+#
+#        path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载
+#
+#      - name: maven-build
+#
+#        path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
+#
+#    commands: # 定义在Docker容器中执行的shell命令
+#
+#      - mvn package -Dmaven.test.skip=true # 应用打包命令
+#      - mkdir -p /app/build/ludu-module-datacenter/target
+#      - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target
+#      - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter
+#      - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter
+#
+#  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
+#
+#    image: appleboy/drone-ssh # SSH工具镜像
+#
+#    settings:
+#
+#      host: 101.43.112.107 # 远程连接地址
+#
+#      username: root # 远程连接账号
+#
+#      password:
+#
+#        from_secret: ssh_password # 从Secret中读取SSH密码
+#
+#      port: 22 # 远程连接端口
+#
+#      command_timeout: 15m # 远程执行命令超时时间
+#
+#      script:
+#
+#        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
+#        - echo "datacenter done"
+#
+#  - name: build-old-service
+#
+#    image: appleboy/drone-ssh # SSH工具镜像
+#
+#    settings:
+#
+#      host: 120.46.37.243 # 远程连接地址
+#
+#      username: root # 远程连接账号
+#
+#      password:
+#
+#        from_secret: ssh_password2 # 从Secret中读取SSH密码
+#
+#      port: 22 # 远程连接端口
+#
+#      command_timeout: 5m # 远程执行命令超时时间
+#
+#      script:
+#
+#        - cd /ludu/maven/build/ludu-module-datacenter/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
 
   - name: build-new-service
 
@@ -99,7 +99,8 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         - cd /root/ludu-cloud
         - git pull origin master
         - rm -f ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/framework/nacos/config/BeanInit.java
-        - mvn package -Dmaven.test.skip=true
+        - chmod +x package.sh
+        - ./package.sh
         - port=48092 # 指定端口号
         - pid=$(lsof -t -i:$port) # 获取占用指定端口的进程号
         - if [[ -n "$pid" ]]; then

package.sh

@@ -0,0 +1 @@
+mvn clean package -Dmaven.test.skip=true