Merge pull request #483 from crawlab-team/develop

Develop

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
 
 ---
@@ -22,17 +22,3 @@ A clear and concise description of what you expected to happen.
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report_zh.md

@@ -0,0 +1,23 @@
+---
+name: Bug 报告
+about: 创建一份 Bug 报告帮助我们优化产品
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+**Bug 描述**
+例如，当 xxx 时，xxx 功能不工作。
+
+**复现步骤**
+该 Bug 复现步骤如下
+1. 
+2. 
+3. 
+
+**期望结果**
+xxx 能工作。
+
+**截屏**
+![截屏1](http://static-docs.crawlab.cn/login.png)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: 'enhancement'
 assignees: ''
 
 ---
@@ -15,6 +15,3 @@ A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request_zh.md

@@ -0,0 +1,17 @@
+---
+name: 功能需求
+about: 优化和功能需求建议
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**请描述该需求尝试解决的问题**
+例如，当 xxx 时，我总是被当前 xxx 的设计所困扰。
+
+**请描述您认为可行的解决方案**
+例如，添加 xxx 功能能够解决问题。
+
+**考虑过的替代方案**
+例如，如果用 xxx，也能解决该问题。

docker-compose.yml

@@ -27,7 +27,7 @@ services:
       # CRAWLAB_NOTIFICATION_MAIL_SERVER: smtp.exmaple.com  # STMP server address STMP 服务器地址
       # CRAWLAB_NOTIFICATION_MAIL_PORT: 465  # STMP server port STMP 服务器端口
       # CRAWLAB_NOTIFICATION_MAIL_SENDEREMAIL: admin@exmaple.com  # sender email 发送者邮箱
-      # CRAWLAB_NOTIFICATION_MAIL_SENDEREIDENTITY: admin@exmaple.com  # sender ID 发送者 ID
+      # CRAWLAB_NOTIFICATION_MAIL_SENDERIDENTITY: admin@exmaple.com  # sender ID 发送者 ID
       # CRAWLAB_NOTIFICATION_MAIL_SMTP_USER: username  # SMTP username SMTP 用户名
       # CRAWLAB_NOTIFICATION_MAIL_SMTP_PASSWORD: password  # SMTP password SMTP 密码
     ports:    

frontend/.env.development

@@ -1,3 +1,3 @@
 NODE_ENV='development'
 VUE_APP_BASE_URL=http://localhost:8000
-VUE_APP_CRAWLAB_BASE_URL=http://api.crawlab.cn
+VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn

frontend/.env.production

@@ -1,3 +1,3 @@
 NODE_ENV='production'
 VUE_APP_BASE_URL=/api
-VUE_APP_CRAWLAB_BASE_URL=http://api.crawlab.cn
+VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn

frontend/.env.test

@@ -1,3 +1,3 @@
 NODE_ENV='test'
 VUE_APP_BASE_URL='http://localhost:8000'
-VUE_APP_CRAWLAB_BASE_URL=http://api.crawlab.cn
+VUE_APP_CRAWLAB_BASE_URL=https://api.crawlab.cn

frontend/src/views/spider/SpiderDetail.vue

@@ -118,9 +118,9 @@ export default {
     await this.$store.dispatch('spider/getSpiderList')
 
     // if spider is configurable spider, set to config tab by default
-    if (this.spiderForm.type === 'configurable') {
-      this.activeTabName = 'config'
-    }
+    // if (this.spiderForm.type === 'configurable') {
+    // this.activeTabName = 'config'
+    // }
   }
 }
 </script>

jenkins/master/docker-compose.yaml

@@ -3,7 +3,7 @@ services:
   master: 
     image: "tikazyq/crawlab:master"
     environment:
-      CRAWLAB_API_ADDRESS: "http://crawlab.cn/api"
+      CRAWLAB_API_ADDRESS: "https://crawlab.cn/api"
       CRAWLAB_BASE_URL: "/demo"
       CRAWLAB_SERVER_MASTER: "Y"
       CRAWLAB_MONGO_HOST: "mongo"