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

Reviewed-on: #14

.drone.yml

@@ -81,27 +81,39 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       script:
 
 
-        - echo "start run.sh"
-        - cd /ludu/maven/build/yudao-gateway/
-        - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行
+#        - echo "start run.sh"
+#        - cd /ludu/maven/build/yudao-gateway/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行
 
         - cd /ludu/maven/build/yudao-module-system/
         - chmod +x ./run.sh # 更改为可执行脚本
         - ./run.sh || echo "yudao-module-system build failed" # 运行脚本打包应用镜像并运行
 
-        - cd /ludu/maven/build/yudao-module-infra/
-        - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
-
-        - cd /ludu/maven/build/ludu-job-admin/
-        - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
+#        - cd /ludu/maven/build/yudao-module-infra/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
+#
+#        - cd /ludu/maven/build/ludu-job-admin/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
 
         - cd /ludu/maven/build/ludu-module-datacenter/
         - chmod +x ./run.sh # 更改为可执行脚本
         - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
 
+        - cd /ludu/maven/build/ludu-module-ticketing/
+        - chmod +x ./run.sh # 更改为可执行脚本
+        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+
+        - cd /ludu/maven/build/ludu-module-parking/
+        - chmod +x ./run.sh # 更改为可执行脚本
+        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+
+        - echo "start copy"
+        - scp -r /ludu/maven/build/yudao-gateway root@120.46.37.243:/ludu/maven/build
+        - echo "gateway done"
+
 #        - echo "start copy"
 #        - scp -r /ludu/maven/build/ludu-module-ticketing root@120.46.37.243:/ludu/maven/build
 #        - echo "ticket done"
@@ -110,25 +122,29 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 #        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
 #        - echo "datecenter done"
  
-#  - name: build-other-service
+  - name: build-other-service
  
-#    image: appleboy/drone-ssh # SSH工具镜像
+    image: appleboy/drone-ssh # SSH工具镜像
  
-#    settings:
+    settings:
  
-#      host: 120.46.37.243 # 远程连接地址
+      host: 120.46.37.243 # 远程连接地址
  
-#      username: root # 远程连接账号
+      username: root # 远程连接账号
  
-#      password: 
+      password:
  
-#        from_secret: ssh_password2 # 从Secret中读取SSH密码
+        from_secret: ssh_password2 # 从Secret中读取SSH密码
 
-#      port: 22 # 远程连接端口
+      port: 22 # 远程连接端口
 
-#      command_timeout: 5m # 远程执行命令超时时间
+      command_timeout: 5m # 远程执行命令超时时间
  
-#      script:
+      script:
+        - cd /ludu/maven/build/yudao-gateway/
+        - chmod +x ./run.sh # 更改为可执行脚本
+        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
+
 #        - cd /ludu/maven/build/ludu-module-ticketing/
 #        - chmod +x ./run.sh # 更改为可执行脚本
 #        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行

yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml

@@ -66,7 +66,7 @@ spring:
           username: root
           password: 123456
         ticketing:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: xpower1234
 

yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml

@@ -66,7 +66,7 @@ spring:
           username: root
           password: 123456
         ticketing:
-          url: jdbc:mysql://120.46.37.243:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://101.43.112.107:3306/ludu_ticketing?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: xpower1234