解决冲突

This commit is contained in:
陈景阳
2020-01-23 11:09:35 +08:00
parent efc935f65a
commit 9a748fc5cd
2 changed files with 11 additions and 10 deletions

View File

@@ -1,25 +1,25 @@
api:
address: "localhost:8000"
mongo:
host: localhost
host: "192.168.235.26"
port: 27017
db: crawlab_test
username: ""
password: ""
db: crawlab_local
username: "root"
password: "example"
authSource: "admin"
redis:
address: localhost
password: ""
address: 127.0.0.1
password:
database: 1
port: 6379
log:
level: info
path: "/var/logs/crawlab"
path: "./logs/crawlab"
isDeletePeriodically: "N"
deleteFrequency: "@hourly"
server:
host: 0.0.0.0
port: 8000
port: 8001
master: "Y"
secret: "crawlab"
register:
@@ -30,11 +30,11 @@ server:
python: "Y"
node: "N"
spider:
path: "/app/spiders"
path: "./spiders"
task:
workers: 4
other:
tmppath: "/tmp"
tmppath: "./tmp"
version: 0.4.4
setting:
allowRegister: "N"

View File

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