lcl 2 meses atrás
pai
commit
b5dc67f9c8
4 arquivos alterados com 66 adições e 20 exclusões
  1. 62 16
      .drone.yml
  2. 1 1
      Program.cs
  3. 1 1
      Properties/launchSettings.json
  4. 2 2
      Startup.cs

+ 62 - 16
.drone.yml

@@ -1,11 +1,11 @@
 kind: pipeline
 type: docker
-name: kxs-miniprogram-test
+name: miniprogram-manager-prod
 
 volumes: # 声明数据卷
   - name: targetDir
     host:
-      path: /kxs_miniprogram_com
+      path: /miniprogram-manager
 
 clone:
   disable: false # 启用代码拉取
@@ -19,10 +19,11 @@ steps:
       - name: targetDir
         path: /drone/src/dist/
     commands: # 执行命令
+      - echo '' > ~/.nuget/NuGet/NuGet.Config
+      - echo '<?xml version="1.0" encoding="utf-8"?><configuration><packageSources><add key="nuget.org" value="https://nuget.cdn.azure.cn/v3/index.json" protocolVersion="3" /></packageSources></configuration>' > ~/.nuget/NuGet/NuGet.Config
+      - rm -rf /drone/src/dist/*
       - dotnet publish -c release -o ./publish
-      - ls ./publish
       - cp -r ./publish/* /drone/src/dist # 复制文件
-      - ls /drone/src/dist
     when:
       status:
         - success # 当前步骤成功时执行
@@ -32,10 +33,10 @@ steps:
     depends_on: [build-project] # 依赖的步骤
     volumes: # 挂载数据卷
       - name: targetDir # 数据卷名称
-        path: /kxs_miniprogram_com # 容器内目录 绝对路径
+        path: /miniprogram-manager # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: host
+        from_secret: miniprogram-manager-host-a
       username:
         from_secret: username
       password:
@@ -45,7 +46,7 @@ steps:
       target: /home/ABServer/deploy-ready/
       source:
         - echo ====开始拷贝=======
-        - /kxs_miniprogram_com/*
+        - /miniprogram-manager/*
         - echo ====结束拷贝=======
       when:
         status:
@@ -57,7 +58,7 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: miniprogram-manager-host-a
       username:
         from_secret: username
       password:
@@ -67,16 +68,61 @@ steps:
       script:
         - echo ====开始部署=======
         - cd /home/ABServer/
-        - cp -r /home/ABServer/deploy-ready/kxs_miniprogram_com /home/ABServer/webroot/
-        # - docker stop kxs_miniprogram_com && docker rm kxs_miniprogram_com && docker-compose up -d kxs_miniprogram_com
-        - docker restart kxs_miniprogram_com
+        - cp -r /home/ABServer/deploy-ready/miniprogram-manager /home/ABServer/webroot/
+        - docker restart miniprogram-manager
+        # - docker restart nodeServer1
+        - echo ====部署成功=======
+  - name: scp-project-b
+    image: appleboy/drone-scp
+    pull: if-not-exists
+    depends_on: [build-project] # 依赖的步骤
+    volumes: # 挂载数据卷
+      - name: targetDir # 数据卷名称
+        path: /miniprogram-manager # 容器内目录 绝对路径
+    settings:
+      host:
+        from_secret: miniprogram-manager-host-b
+      username:
+        from_secret: username
+      password:
+        from_secret: userpwd
+      port: 22
+      command_timeout: 2m
+      target: /home/ABServer/deploy-ready/
+      source:
+        - echo ====开始拷贝=======
+        - /miniprogram-manager/*
+        - echo ====结束拷贝=======
+      when:
+        status:
+          - success # 当前步骤成功时执行
+
+  - name: deploy-project-b
+    image: appleboy/drone-ssh
+    pull: if-not-exists
+    depends_on: [scp-project] # 依赖的步骤
+    settings:
+      host:
+        from_secret: miniprogram-manager-host-b
+      username:
+        from_secret: username
+      password:
+        from_secret: userpwd
+      port: 22
+      command_timeout: 2m
+      script:
+        - echo ====开始部署=======
+        - cd /home/ABServer/
+        - cp -r /home/ABServer/deploy-ready/miniprogram-manager /home/ABServer/webroot/
+        - docker restart miniprogram-manager
+        # - docker restart nodeServer1
         - echo ====部署成功=======
 
 trigger:
   branch:
-    include:
-      - test-miniprogram
+    - release-miniprogram-manager
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*

+ 1 - 1
Program.cs

@@ -22,7 +22,7 @@ namespace MySystem
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder
-                    .UseUrls("http://*:5062")
+                    .UseUrls("http://*:6003")
                     .UseKestrel()
                     .UseContentRoot(Directory.GetCurrentDirectory())
                     .UseIISIntegration()

+ 1 - 1
Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://127.0.0.1:5062"
+      "applicationUrl": "http://127.0.0.1:6003"
     }
   }
 }

+ 2 - 2
Startup.cs

@@ -147,11 +147,11 @@ namespace MySystem
         {
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Library.OtherMySqlConn.connstr = Configuration["Setting:SqlConnStr"];
-            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'MiniProgram'");
+            System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = 'miniprogram_manager'");
             foreach (System.Data.DataRow subtable in tablecollection.Rows)
             {
                 Dictionary<string, string> Columns = new Dictionary<string, string>();
-                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'MiniProgram' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
+                System.Data.DataTable columncollection = Library.OtherMySqlConn.dtable("select COLUMN_NAME,DATA_TYPE from information_schema.columns where table_schema = 'miniprogram_manager' and TABLE_NAME='" + subtable["TABLE_NAME"].ToString() + "'");
                 foreach (System.Data.DataRow column in columncollection.Rows)
                 {
                     string datatype = column["DATA_TYPE"].ToString();