From d43eb466917ed9b6e471fd733b72b4036157b0e8 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Sun, 4 Aug 2019 22:53:09 +0800
Subject: [PATCH 1/7] updated Jenkinsfile

---
 Jenkinsfile                | 2 +-
 jenkins/docker-compose.yml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c757366e..5490949a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
                 sh """
                 cd ./jenkins
                 docker-compose stop | true
-                docker-compose up -d
+                docker-compose up -d --scale worker=3
                 """
             }
         }
diff --git a/jenkins/docker-compose.yml b/jenkins/docker-compose.yml
index 924922a0..4f7d1b41 100644
--- a/jenkins/docker-compose.yml
+++ b/jenkins/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       - redis
   worker:
     image: tikazyq/crawlab:latest
-    container_name: worker
     environment:
       CRAWLAB_SERVER_MASTER: "N"
       CRAWLAB_MONGO_HOST: "mongo"
@@ -25,7 +24,6 @@ services:
     depends_on:
       - mongo
       - redis
-    replicas: 3
   mongo:
     image: mongo:latest
     restart: always

From 4efff5656f1552f5bf941e04523b870cbe43af51 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Mon, 5 Aug 2019 20:01:47 +0800
Subject: [PATCH 2/7] enhanced interaction for SpiderList

---
 frontend/src/views/spider/SpiderList.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index e5eb36af..d791b862 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -145,7 +145,9 @@
       <el-table :data="filteredTableData"
                 class="table"
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
-                border>
+                border
+                @row-click="onRowClick"
+      >
         <template v-for="col in columns">
           <el-table-column v-if="col.name === 'type'"
                            :key="col.name"
@@ -494,6 +496,11 @@ export default {
     getTime (str) {
       if (!str || str.match('^0001')) return 'NA'
       return dayjs(str).format('YYYY-MM-DD HH:mm:ss')
+    },
+    onRowClick (row, event, column) {
+      if (column.label !== this.$t('Action')) {
+        this.onView(row)
+      }
     }
   },
   created () {
@@ -584,3 +591,9 @@ export default {
   }
 
 </style>
+
+<style scoped>
+  .el-table >>> tr {
+    cursor: pointer;
+  }
+</style>

From 2d2b744e9ad0a5117e5f3fcb0f1b812ddf14c404 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Mon, 5 Aug 2019 20:06:17 +0800
Subject: [PATCH 3/7] updated stats

---
 .../src/components/InfoView/SpiderInfoView.vue    |  2 +-
 frontend/src/views/spider/SpiderDetail.vue        |  2 +-
 frontend/src/views/task/TaskDetail.vue            |  2 +-
 frontend/src/views/task/TaskList.vue              | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/InfoView/SpiderInfoView.vue b/frontend/src/components/InfoView/SpiderInfoView.vue
index 7bd6b99f..45560c60 100644
--- a/frontend/src/components/InfoView/SpiderInfoView.vue
+++ b/frontend/src/components/InfoView/SpiderInfoView.vue
@@ -29,7 +29,7 @@
           <el-input v-model="spiderForm.col" :placeholder="$t('Results Collection')"
                     :disabled="isView"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('Site')">
+        <el-form-item v-if="false" :label="$t('Site')">
           <el-autocomplete v-model="spiderForm.site"
                            :placeholder="$t('Site')"
                            :fetch-suggestions="fetchSiteSuggestions"
diff --git a/frontend/src/views/spider/SpiderDetail.vue b/frontend/src/views/spider/SpiderDetail.vue
index 0875759e..69fdd770 100644
--- a/frontend/src/views/spider/SpiderDetail.vue
+++ b/frontend/src/views/spider/SpiderDetail.vue
@@ -78,7 +78,7 @@ export default {
           this.$refs['spider-stats'].update()
         }, 0)
       }
-      this.$st.sendEv('爬虫详情', '切换标签', 'tabName', tab.name)
+      this.$st.sendEv('爬虫详情', '切换标签', tab.name)
     },
     onSpiderChange (id) {
       this.$router.push(`/spiders/${id}`)
diff --git a/frontend/src/views/task/TaskDetail.vue b/frontend/src/views/task/TaskDetail.vue
index 67d4e582..a1edb497 100644
--- a/frontend/src/views/task/TaskDetail.vue
+++ b/frontend/src/views/task/TaskDetail.vue
@@ -83,7 +83,7 @@ export default {
   },
   methods: {
     onTabClick (tab) {
-      this.$st.sendEv('任务详情', '切换标签', 'tabName', tab.name)
+      this.$st.sendEv('任务详情', '切换标签', tab.name)
     },
     onSpiderChange (id) {
       this.$router.push(`/spiders/${id}`)
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index bf011453..e15aa661 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -36,7 +36,9 @@
       <el-table :data="filteredTableData"
                 class="table"
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
-                border>
+                border
+                @row-click="onRowClick"
+      >
         <template v-for="col in columns">
           <el-table-column v-if="col.name === 'spider_name'"
                            :key="col.name"
@@ -295,6 +297,11 @@ export default {
     getTotalDuration (row) {
       if (row.finish_ts.match('^0001')) return 'NA'
       return dayjs(row.finish_ts).diff(row.create_ts, 'second')
+    },
+    onRowClick (row, event, column) {
+      if (column.label !== this.$t('Action')) {
+        this.onView(row)
+      }
     }
   },
   created () {
@@ -362,3 +369,9 @@ export default {
     text-align: right;
   }
 </style>
+
+<style scoped>
+  .el-table >>> tr {
+    cursor: pointer;
+  }
+</style>

From b374518b1146aad9816faad0e5aebe0fa54a475c Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Mon, 5 Aug 2019 20:13:47 +0800
Subject: [PATCH 4/7] split envs

---
 Jenkinsfile                                   |  5 ++-
 jenkins/develop/docker-compose.yaml           | 36 +++++++++++++++++++
 .../docker-compose.yaml}                      |  0
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 jenkins/develop/docker-compose.yaml
 rename jenkins/{docker-compose.yml => master/docker-compose.yaml} (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5490949a..7ceef1c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,10 @@ pipeline {
             steps {
                 echo 'Deploying....'
                 sh """
-                cd ./jenkins
+                echo ${ENV:GIT_BRANCH}
+                """
+                sh """
+                cd ./jenkins/${ENV:GIT_BRANCH}
                 docker-compose stop | true
                 docker-compose up -d --scale worker=3
                 """
diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml
new file mode 100644
index 00000000..1a82e4d4
--- /dev/null
+++ b/jenkins/develop/docker-compose.yaml
@@ -0,0 +1,36 @@
+version: '3.3'
+services:
+  master: 
+    image: tikazyq/crawlab:latest
+    container_name: master
+    environment:
+      CRAWLAB_API_ADDRESS: "crawlab.cn/dev/api"
+      CRAWLAB_SERVER_MASTER: "Y"
+      CRAWLAB_MONGO_HOST: "mongo"
+      CRAWLAB_REDIS_ADDRESS: "redis"
+      CRAWLAB_LOG_PATH: "/var/logs/crawlab"
+    ports:    
+      - "8088:8080" # frontend
+      - "8008:8000" # backend
+    depends_on:
+      - mongo
+      - redis
+  worker:
+    image: tikazyq/crawlab:latest
+    environment:
+      CRAWLAB_SERVER_MASTER: "N"
+      CRAWLAB_MONGO_HOST: "mongo"
+      CRAWLAB_REDIS_ADDRESS: "redis"
+    depends_on:
+      - mongo
+      - redis
+  mongo:
+    image: mongo:latest
+    restart: always
+    ports:
+      - "27019:27017"
+  redis:
+    image: redis:latest
+    restart: always
+    ports:
+      - "6389:6379"
\ No newline at end of file
diff --git a/jenkins/docker-compose.yml b/jenkins/master/docker-compose.yaml
similarity index 100%
rename from jenkins/docker-compose.yml
rename to jenkins/master/docker-compose.yaml

From b5045882b1636076077e87bb05abe85473151414 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Mon, 5 Aug 2019 20:23:20 +0800
Subject: [PATCH 5/7] split envs

---
 jenkins/develop/docker-compose.yaml | 1 -
 jenkins/master/docker-compose.yaml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml
index 1a82e4d4..e0b0d0a4 100644
--- a/jenkins/develop/docker-compose.yaml
+++ b/jenkins/develop/docker-compose.yaml
@@ -2,7 +2,6 @@ version: '3.3'
 services:
   master: 
     image: tikazyq/crawlab:latest
-    container_name: master
     environment:
       CRAWLAB_API_ADDRESS: "crawlab.cn/dev/api"
       CRAWLAB_SERVER_MASTER: "Y"
diff --git a/jenkins/master/docker-compose.yaml b/jenkins/master/docker-compose.yaml
index 4f7d1b41..2869da0e 100644
--- a/jenkins/master/docker-compose.yaml
+++ b/jenkins/master/docker-compose.yaml
@@ -2,7 +2,6 @@ version: '3.3'
 services:
   master: 
     image: tikazyq/crawlab:latest
-    container_name: master
     environment:
       CRAWLAB_API_ADDRESS: "crawlab.cn/api"
       CRAWLAB_SERVER_MASTER: "Y"

From 7f0b47d7e4d71711f88a1031c1b04e38328db5d8 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Mon, 5 Aug 2019 20:45:42 +0800
Subject: [PATCH 6/7] updated Jenkinsfile

---
 Jenkinsfile                         |  6 +++---
 frontend/vue.config.js              |  3 +++
 jenkins/develop/docker-compose.yaml | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 frontend/vue.config.js

diff --git a/Jenkinsfile b/Jenkinsfile
index 7ceef1c0..30f3b99c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,11 +12,11 @@ pipeline {
                 script {
                     if (env.GIT_BRANCH == 'develop') {
                         env.MODE = 'develop'
+                        env.BASE_URL = '/dev'
                     } else if (env.GIT_BRANCH == 'master') {
                         env.MODE = 'production'
-                    } else {
-                        env.MODE = 'test'
-                    }
+                        env.BASE_URL = '/demo'
+                    } 
                 }
             }
         }
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
new file mode 100644
index 00000000..c867140e
--- /dev/null
+++ b/frontend/vue.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  publicPath: process.env.BASE_URL || '/'
+}
diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml
index e0b0d0a4..2869da0e 100644
--- a/jenkins/develop/docker-compose.yaml
+++ b/jenkins/develop/docker-compose.yaml
@@ -3,14 +3,14 @@ services:
   master: 
     image: tikazyq/crawlab:latest
     environment:
-      CRAWLAB_API_ADDRESS: "crawlab.cn/dev/api"
+      CRAWLAB_API_ADDRESS: "crawlab.cn/api"
       CRAWLAB_SERVER_MASTER: "Y"
       CRAWLAB_MONGO_HOST: "mongo"
       CRAWLAB_REDIS_ADDRESS: "redis"
       CRAWLAB_LOG_PATH: "/var/logs/crawlab"
     ports:    
-      - "8088:8080" # frontend
-      - "8008:8000" # backend
+      - "8080:8080" # frontend
+      - "8000:8000" # backend
     depends_on:
       - mongo
       - redis
@@ -27,9 +27,9 @@ services:
     image: mongo:latest
     restart: always
     ports:
-      - "27019:27017"
+      - "27017:27017"
   redis:
     image: redis:latest
     restart: always
     ports:
-      - "6389:6379"
\ No newline at end of file
+      - "6379:6379"
\ No newline at end of file

From d5bb59c1b6bc17be671f7425dde44f0771549921 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Wed, 7 Aug 2019 12:02:33 +0800
Subject: [PATCH 7/7] updated Jenkinsfile

---
 Jenkinsfile                         |  4 +++-
 jenkins/develop/docker-compose.yaml | 16 ++++++++--------
 jenkins/master/docker-compose.yaml  |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 30f3b99c..7a46844b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,9 +12,11 @@ pipeline {
                 script {
                     if (env.GIT_BRANCH == 'develop') {
                         env.MODE = 'develop'
+                        env.TAG = 'develop'
                         env.BASE_URL = '/dev'
                     } else if (env.GIT_BRANCH == 'master') {
                         env.MODE = 'production'
+                        env.TAG = 'master'
                         env.BASE_URL = '/demo'
                     } 
                 }
@@ -24,7 +26,7 @@ pipeline {
             steps {
                 echo "Building..."
                 sh """
-                docker build -t tikazyq/crawlab:latest -f Dockerfile.local .
+                docker build -t tikazyq/crawlab:${ENV:TAG} -f Dockerfile.local .
                 """
             }
         }
diff --git a/jenkins/develop/docker-compose.yaml b/jenkins/develop/docker-compose.yaml
index 2869da0e..cf466671 100644
--- a/jenkins/develop/docker-compose.yaml
+++ b/jenkins/develop/docker-compose.yaml
@@ -1,21 +1,21 @@
 version: '3.3'
 services:
   master: 
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:develop"
     environment:
-      CRAWLAB_API_ADDRESS: "crawlab.cn/api"
+      CRAWLAB_API_ADDRESS: "crawlab.cn/dev/api"
       CRAWLAB_SERVER_MASTER: "Y"
       CRAWLAB_MONGO_HOST: "mongo"
       CRAWLAB_REDIS_ADDRESS: "redis"
       CRAWLAB_LOG_PATH: "/var/logs/crawlab"
-    ports:    
-      - "8080:8080" # frontend
-      - "8000:8000" # backend
+    ports:
+      - "8090:8080" # frontend
+      - "8010:8000" # backend
     depends_on:
       - mongo
       - redis
   worker:
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:develop"
     environment:
       CRAWLAB_SERVER_MASTER: "N"
       CRAWLAB_MONGO_HOST: "mongo"
@@ -27,9 +27,9 @@ services:
     image: mongo:latest
     restart: always
     ports:
-      - "27017:27017"
+      - "27027:27017"
   redis:
     image: redis:latest
     restart: always
     ports:
-      - "6379:6379"
\ No newline at end of file
+      - "6389:6379"
\ No newline at end of file
diff --git a/jenkins/master/docker-compose.yaml b/jenkins/master/docker-compose.yaml
index 2869da0e..0bcaee3a 100644
--- a/jenkins/master/docker-compose.yaml
+++ b/jenkins/master/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   master: 
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:master"
     environment:
       CRAWLAB_API_ADDRESS: "crawlab.cn/api"
       CRAWLAB_SERVER_MASTER: "Y"
@@ -15,7 +15,7 @@ services:
       - mongo
       - redis
   worker:
-    image: tikazyq/crawlab:latest
+    image: "tikazyq/crawlab:master"
     environment:
       CRAWLAB_SERVER_MASTER: "N"
       CRAWLAB_MONGO_HOST: "mongo"