Merge remote-tracking branch 'origin/master'

# Conflicts:
#	example/config/configNote.json
#	var.go
This commit is contained in:
hoteas 2022-07-18 19:44:52 +08:00
commit b015e78fa0

View File

@ -18,9 +18,9 @@
], ],
"db": { "db": {
"mysql": { "mysql": {
"host": "127.0.0.1", "host": "192.168.6.253",
"name": "gov_crawler", "name": "gov_crawler",
"password": "root", "password": "dasda8454456",
"port": "3306", "port": "3306",
"user": "root" "user": "root"
} }