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.GENERAL.log

-{"TIME":"2019-09-19T14:34:07.258576+08:00","GM_LOGGING":{"version":"0.7.4","logger":"GeneralLogger","python_version":"3.6.6","service_name":"gm-logging:log-prefix:geoserver","process":{"hostname":"AppledeMacBook-Pro.local","pid":85689,"process_uptime":0.5544506621081382}},"SYS":{"unique_log_id":"8deebe33fa3149ceb6933a1ad22ddbe3","log_host":"127.0.0.1","hostname":"AppledeMacBook-Pro.local"},"CONTEXT":{"gm_rpcd":{"version":"0.1.3","log_id":null}},"APP":{"content":{"position":"helios:default_invoker:config:__init__","debug":true,"config":{"gaia":{"api_url":"http://127.0.0.1:8001/api/","api_url1":"http://gaia.paas.test/api/"},"rpcd_map":{"passport":{"service_list":["passport"],"url":"http://passport.paas.test/"},"plutus":{"service_list":["plutus"],"url":"http://plutus.paas.test/"},"poll":{"service_list":["poll"],"url":"http://poll-mi.paas.test/"},"zeus":{"service_list":["zeus"],"url":"http://zeus.paas.test/"},"uc-sms":{"url":"http://uc-sms.paas.test/","service_list":["sms_intermediate_endpoint","sms"]},"push2":{"service_list":["push2"],"url1":"http://127.0.0.1:8006","url":"http://push2.paas.test/"},"themis":{"service_list":["themis"],"url":"http://themis.paas.test/"},"doris":{"service_list":["doris"],"url":"http://doris.paas.test/","url1":"http://doris.paas-dev.env/"},"artemis":{"service_list":["artemis"],"url":"http://artemis.paas.test/"},"apollo":{"service_list":["apollo"],"url":"http://apollo.paas.test/"},"gm-face":{"service_list":["face"],"url":"http://gm-face.paas.test/"},"antispam":{"service_list":["antispam"],"url":"http://artispam.paas.test/"},"mimas":{"service_list":["mimas","qa","topic","diary"],"url2":"http://mimas.paas-dev.env/","url":"http://mimas.paas.test/","url1":"http://127.0.0.1:5062"},"cadus":{"service_list":["cadus"],"url":"http://cadus.paas.test/"},"hestia":{"service_list":["hestia"],"url":"http://hestia.paas.test/"},"search_tips":{"service_list":["search_tips"],"url":"http://search-tips.paas.test/"},"geoserver":{"service_list":["geoserver"],"url":"http://127.0.0.1:9090"}}}}},"STACK":[["/Users/apple/projects/geoserver/venv/bin/gm-rpcd",11,"<module>",{"sha224":"cbf0a4048fb8741e6063777306d6ba4a445c4877002069d9b773157e"},80,"__main__"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/commands/run_command.py",55,"entry",{"sha224":"064b906c9fb983a7725f487222f11feba841c68c7e4613c6f90421f3"},18,"gm_rpcd.commands.run_command"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/commands/run_command.py",51,"main",{"sha224":"a1ecba18afaffc8d5bcd7cf88ede9c1eb6d86e0e73e1d514fdf7230b"},188,"gm_rpcd.commands.run_command"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/commands/develop_server.py",27,"main",{"sha224":"e99fc8cded6dd1dbb24f95d222765bf3bc985d9769ef5875582b8646"},138,"gm_rpcd.commands.develop_server"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/utils.py",42,"serve",{"sha224":"98488e3ccc03eb3271a8da028efb3b1743cc0a1c0c8fba834c495317"},26,"gm_rpcd.internals.utils"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/utils.py",80,"wrapped",{"sha224":"cb4e45935b2484be790c46f5a5fcd5b7fea9fbd7e45673b293b27d8d"},80,"gm_rpcd.internals.utils"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/wsgi_app.py",177,"wsgi_app_trunk",{"sha224":"f8a102ff7acd52e467c74fad5dd21eff90dd54a80821eb7e93bb7076"},2,"gm_rpcd.internals.wsgi_app"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/utils.py",80,"wrapped",{"sha224":"cb4e45935b2484be790c46f5a5fcd5b7fea9fbd7e45673b293b27d8d"},80,"gm_rpcd.internals.utils"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/initializations.py",59,"initialize",{"sha224":"0680fa950e6555d98f4840fd27580108cda93d0383b5639f1fbf9429"},260,"gm_rpcd.internals.initializations"],["/Users/apple/projects/geoserver/venv/lib/python3.6/importlib/__init__.py",126,"import_module",{"sha224":"d0d206a16cd632020e4b3069e9e29c671480307b25eb2691fe6bcf67"},86,"importlib"],["<frozen importlib._bootstrap>",994,"_gcd_import",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",971,"_find_and_load",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",955,"_find_and_load_unlocked",null,176,"importlib._bootstrap"],["<frozen importlib._bootstrap>",665,"_load_unlocked",null,92,"importlib._bootstrap"],["<frozen importlib._bootstrap_external>",678,"exec_module",null,48,"importlib._bootstrap_external"],["<frozen importlib._bootstrap>",219,"_call_with_frames_removed",null,6,"importlib._bootstrap"],["/Users/apple/projects/geoserver/geoserver/geoserver/geoserver_injection.py",5,"<module>",{"sha224":"d8f990f47c5268c5743133f041c933e92d6148f9a386b15e87a4d6c9"},34,"geoserver.geoserver_injection"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/__init__.py",19,"setup",{"sha224":"5c85cac21cdc84b1e2a9cacba3b22402408c2dc20ce396d76f403fc7"},52,"django"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/conf/__init__.py",79,"__getattr__",{"sha224":"178db7e17b8819392bc6485f0bc0d7562f954212233d1c28dbb34732"},16,"django.conf"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/conf/__init__.py",66,"_setup",{"sha224":"32b783b1d6dddb98ae9c125a342044cc6cfb7f18ca7dad5e10c3bedd"},52,"django.conf"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/conf/__init__.py",157,"__init__",{"sha224":"061f27e77ab865d6a4fec1157d419b7f9e94f9ce16169d0ced0368b8"},58,"django.conf"],["/Users/apple/projects/geoserver/venv/lib/python3.6/importlib/__init__.py",126,"import_module",{"sha224":"d0d206a16cd632020e4b3069e9e29c671480307b25eb2691fe6bcf67"},86,"importlib"],["<frozen importlib._bootstrap>",994,"_gcd_import",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",971,"_find_and_load",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",955,"_find_and_load_unlocked",null,176,"importlib._bootstrap"],["<frozen importlib._bootstrap>",665,"_load_unlocked",null,92,"importlib._bootstrap"],["<frozen importlib._bootstrap_external>",678,"exec_module",null,48,"importlib._bootstrap_external"],["<frozen importlib._bootstrap>",219,"_call_with_frames_removed",null,6,"importlib._bootstrap"],["/Users/apple/projects/geoserver/geoserver/geoserver/settings.py",32,"<module>",{"sha224":"9db1c56e9425bef3eb0d3e901dce02f98d9e87ab7d177e58e92ba15a"},88,"geoserver.settings"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/helios/rpc/internal/default_invoker.py",184,"create_default_invoker",{"sha224":"3824e4618de3b4bed195e8e0af635b6dc4ebb67604a139c7180f3c18"},156,"helios.rpc.internal.default_invoker"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/helios/rpc/internal/default_invoker.py",156,"get_instance",{"sha224":"afc5e521f61b1440a6ff42dc5ff45b08f0e823a3c4eecebff70829ea"},58,"helios.rpc.internal.default_invoker"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/helios/rpc/internal/default_invoker.py",117,"__init__",{"sha224":"f51927ec94f69ae94f4af2119665cf4f86ff71bc138d0307e769e7c0"},24,"helios.rpc.internal.default_invoker"]]}
-{"TIME":"2019-09-19T14:34:40.814174+08:00","GM_LOGGING":{"version":"0.7.4","logger":"GeneralLogger","python_version":"3.6.6","service_name":"gm-logging:log-prefix:geoserver","process":{"hostname":"AppledeMacBook-Pro.local","pid":85694,"process_uptime":0.6283772559836507}},"SYS":{"unique_log_id":"91f0264d4a2c48a8a60b9db657ad6e77","log_host":"127.0.0.1","hostname":"AppledeMacBook-Pro.local"},"CONTEXT":{"gm_rpcd":{"version":"0.1.3","log_id":null}},"APP":{"content":{"position":"helios:default_invoker:config:__init__","debug":true,"config":{"gaia":{"api_url":"http://127.0.0.1:8001/api/","api_url1":"http://gaia.paas.test/api/"},"rpcd_map":{"passport":{"service_list":["passport"],"url":"http://passport.paas.test/"},"plutus":{"service_list":["plutus"],"url":"http://plutus.paas.test/"},"poll":{"service_list":["poll"],"url":"http://poll-mi.paas.test/"},"zeus":{"service_list":["zeus"],"url":"http://zeus.paas.test/"},"uc-sms":{"url":"http://uc-sms.paas.test/","service_list":["sms_intermediate_endpoint","sms"]},"push2":{"service_list":["push2"],"url1":"http://127.0.0.1:8006","url":"http://push2.paas.test/"},"themis":{"service_list":["themis"],"url":"http://themis.paas.test/"},"doris":{"service_list":["doris"],"url":"http://doris.paas.test/","url1":"http://doris.paas-dev.env/"},"artemis":{"service_list":["artemis"],"url":"http://artemis.paas.test/"},"apollo":{"service_list":["apollo"],"url":"http://apollo.paas.test/"},"gm-face":{"service_list":["face"],"url":"http://gm-face.paas.test/"},"antispam":{"service_list":["antispam"],"url":"http://artispam.paas.test/"},"mimas":{"service_list":["mimas","qa","topic","diary"],"url2":"http://mimas.paas-dev.env/","url":"http://mimas.paas.test/","url1":"http://127.0.0.1:5062"},"cadus":{"service_list":["cadus"],"url":"http://cadus.paas.test/"},"hestia":{"service_list":["hestia"],"url":"http://hestia.paas.test/"},"search_tips":{"service_list":["search_tips"],"url":"http://search-tips.paas.test/"},"geoserver":{"service_list":["geoserver"],"url":"http://127.0.0.1:9090"}}}}},"STACK":[["/Users/apple/projects/geoserver/venv/bin/gm-rpcd",11,"<module>",{"sha224":"cbf0a4048fb8741e6063777306d6ba4a445c4877002069d9b773157e"},80,"__main__"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/commands/run_command.py",55,"entry",{"sha224":"064b906c9fb983a7725f487222f11feba841c68c7e4613c6f90421f3"},18,"gm_rpcd.commands.run_command"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/commands/run_command.py",51,"main",{"sha224":"a1ecba18afaffc8d5bcd7cf88ede9c1eb6d86e0e73e1d514fdf7230b"},188,"gm_rpcd.commands.run_command"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/commands/develop_server.py",27,"main",{"sha224":"e99fc8cded6dd1dbb24f95d222765bf3bc985d9769ef5875582b8646"},138,"gm_rpcd.commands.develop_server"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/utils.py",42,"serve",{"sha224":"98488e3ccc03eb3271a8da028efb3b1743cc0a1c0c8fba834c495317"},26,"gm_rpcd.internals.utils"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/utils.py",80,"wrapped",{"sha224":"cb4e45935b2484be790c46f5a5fcd5b7fea9fbd7e45673b293b27d8d"},80,"gm_rpcd.internals.utils"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/wsgi_app.py",177,"wsgi_app_trunk",{"sha224":"f8a102ff7acd52e467c74fad5dd21eff90dd54a80821eb7e93bb7076"},2,"gm_rpcd.internals.wsgi_app"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/utils.py",80,"wrapped",{"sha224":"cb4e45935b2484be790c46f5a5fcd5b7fea9fbd7e45673b293b27d8d"},80,"gm_rpcd.internals.utils"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/gm_rpcd-0.2.3-py3.6.egg/gm_rpcd/internals/initializations.py",59,"initialize",{"sha224":"0680fa950e6555d98f4840fd27580108cda93d0383b5639f1fbf9429"},260,"gm_rpcd.internals.initializations"],["/Users/apple/projects/geoserver/venv/lib/python3.6/importlib/__init__.py",126,"import_module",{"sha224":"d0d206a16cd632020e4b3069e9e29c671480307b25eb2691fe6bcf67"},86,"importlib"],["<frozen importlib._bootstrap>",994,"_gcd_import",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",971,"_find_and_load",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",955,"_find_and_load_unlocked",null,176,"importlib._bootstrap"],["<frozen importlib._bootstrap>",665,"_load_unlocked",null,92,"importlib._bootstrap"],["<frozen importlib._bootstrap_external>",678,"exec_module",null,48,"importlib._bootstrap_external"],["<frozen importlib._bootstrap>",219,"_call_with_frames_removed",null,6,"importlib._bootstrap"],["/Users/apple/projects/geoserver/geoserver/geoserver/geoserver_injection.py",5,"<module>",{"sha224":"d8f990f47c5268c5743133f041c933e92d6148f9a386b15e87a4d6c9"},34,"geoserver.geoserver_injection"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/__init__.py",19,"setup",{"sha224":"5c85cac21cdc84b1e2a9cacba3b22402408c2dc20ce396d76f403fc7"},52,"django"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/conf/__init__.py",79,"__getattr__",{"sha224":"178db7e17b8819392bc6485f0bc0d7562f954212233d1c28dbb34732"},16,"django.conf"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/conf/__init__.py",66,"_setup",{"sha224":"32b783b1d6dddb98ae9c125a342044cc6cfb7f18ca7dad5e10c3bedd"},52,"django.conf"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/django/conf/__init__.py",157,"__init__",{"sha224":"061f27e77ab865d6a4fec1157d419b7f9e94f9ce16169d0ced0368b8"},58,"django.conf"],["/Users/apple/projects/geoserver/venv/lib/python3.6/importlib/__init__.py",126,"import_module",{"sha224":"d0d206a16cd632020e4b3069e9e29c671480307b25eb2691fe6bcf67"},86,"importlib"],["<frozen importlib._bootstrap>",994,"_gcd_import",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",971,"_find_and_load",null,38,"importlib._bootstrap"],["<frozen importlib._bootstrap>",955,"_find_and_load_unlocked",null,176,"importlib._bootstrap"],["<frozen importlib._bootstrap>",665,"_load_unlocked",null,92,"importlib._bootstrap"],["<frozen importlib._bootstrap_external>",678,"exec_module",null,48,"importlib._bootstrap_external"],["<frozen importlib._bootstrap>",219,"_call_with_frames_removed",null,6,"importlib._bootstrap"],["/Users/apple/projects/geoserver/geoserver/geoserver/settings.py",32,"<module>",{"sha224":"9db1c56e9425bef3eb0d3e901dce02f98d9e87ab7d177e58e92ba15a"},88,"geoserver.settings"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/helios/rpc/internal/default_invoker.py",184,"create_default_invoker",{"sha224":"3824e4618de3b4bed195e8e0af635b6dc4ebb67604a139c7180f3c18"},156,"helios.rpc.internal.default_invoker"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/helios/rpc/internal/default_invoker.py",156,"get_instance",{"sha224":"afc5e521f61b1440a6ff42dc5ff45b08f0e823a3c4eecebff70829ea"},58,"helios.rpc.internal.default_invoker"],["/Users/apple/projects/geoserver/venv/lib/python3.6/site-packages/helios/rpc/internal/default_invoker.py",117,"__init__",{"sha224":"f51927ec94f69ae94f4af2119665cf4f86ff71bc138d0307e769e7c0"},24,"helios.rpc.internal.default_invoker"]]}

.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