Merge branch 'master' into 'test'

Master

See merge request !4

.gitignore

+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*~
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+.vscode
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+.idea/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Rope
+.ropeproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
+
+
+# config
+fabfile.py
+settings.online.py
+/gaia/settings.py
+settings_local.py
+media/
+log/
+crawldata/
+conf/
+/static
+.vagrant/
+Vagrantfile
+
+*.DS_Store
+dump.rdb
+# .gitignore for yangchuncheng
+api/management/commands/ycc*
+settings_override*
+.script/
+.tmp.sql
+.env
+*.pem
+/gaia/hospital_list_settings.py
+coverage_html/
+gaia/rpcd.json
+*.swp
+
+dbmw_deploy/config.dir/

.gm_rpcd.log/geoserver.AppledeMacBook-Pro.local.log

-{"SYS":{"entry_user_id":null,"cl_type":null,"cl_id":null,"entry_person_id":null,"cl_latitude":null,"user_id":null,"hostname":"AppledeMacBook-Pro.local","action":"geoserver/home/nearly_hospitals","channel":null,"cl_longitude":null,"cl_os_ver":null,"http_verb":"gm-rpcd","cl_city_id":null,"cl_ver":null,"user_ip":null,"cl_ios_idfv":null,"session_id":null,"log_host":"127.0.0.1","errno":0},"MODULE":"geoserver","LOGID":"geoserver.z1lwbscade7d70385cf41d2a4ef789cd","SPAN_ID":"z1lwbscb9bc1572980846d48c40e4b47","PARENT_SPAN_ID":null,"GM_LOGGING":{"version":"0.7.4","logger":"RequestLogger","python_version":"3.6.6","service_name":"gm-logging:log-prefix:geoserver","process":{"hostname":"AppledeMacBook-Pro.local","pid":85689,"process_uptime":14.292521168943495}},"TIMER":{"total":0.006389749003574252,"total_cpu":0.0013339999999999463},"APP":{},"TIME":"2019-09-19T14:34:20.989877+08:00"}

.gm_rpcd.log/gm_rpcd_request.log

-{"timestamp": "2019-09-19T14:34:20.989721+08:00", "gm_request_id": "", "log_locating_info": "log_id=None span_id=None parent_span_id=None", "request_json_value": "187:{\"request_id\": null, \"method\": \"geoserver/home/nearly_hospitals\", \"params\": {\"q_lng\": 116.4871782825871, \"q_lat\": 40.00190355103977}, \"environment\": {\"l5d_path\": \"\", \"client_info\": null}}", "response_json_value": "629:{\"error\": 0, \"message\": \"\", \"data\": {\"result\": true, \"data\": [[\"bjjyylmr\", 0.0354], [\"newhos11161908\", 0.0365], [\"wanmeizhensuo\", 0.0365], [\"BJWJSY\", 0.0864], [\"96df7a86789b11e6903d0242c0a8020b\", 0.1151], [\"11\", 0.1334], [\"f605f1acc97311e5903d0242c0a82a2d\", 0.1393], [\"wuwuwuwu\", 0.1393], [\"bjmyfylzxyy116\", 1.0012], [\" BJTSMYYLMRZS\", 1.0043], [\"d0aeff66c97311e5903d0242c0a82a2d\", 1.053], [\"bjysylmrzs606\", 1.1175], [\"BJJEYY\", 1.3658], [\"6e622cfe480b11e6903d0242c0a8020b\", 1.6031], [\"HZCK\", 1.6058], [\"bjzyzs\", 2.1563], [\"BJDTLGZXYY\", 3.0452], [\" BJCCZS\", 4.2953], [\"bjmylgylmryy\", 4.3565], [\"JYLGZXZS\", 4.7794]], \"message\": \"\"}}"}

geoserver/settings.py

@@ -25,7 +25,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 't&@8d5g(i!ka$7*r=&e@#lfv@wi-q0xawn^#_f^q0w$ly)tcnm'
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ["*"]
 
@@ -155,6 +155,4 @@ STATIC_URL = '/static/'
 
 
 #如果是我的电脑就加载本地配置文件
-import socket
-if socket.gethostname()=="AppledeMacBook-Pro.local":
-    from .settings_local import *
\ No newline at end of file
+from .settings_local import *
\ No newline at end of file