Merge branch 'master' into 'test'

Master

See merge request !1

.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\": \"\"}}"}

README.MD

+准备依赖

requirements.txt

@@ -9,15 +9,8 @@ decorator==4.4.0
 Django==2.2.4
 falcon==1.1.0
 gevent==1.4.0
-gm-config==0.1.3
-gm-logging==0.7.4
-gm-protocol==7.10.25
-gm-rpcd==0.2.2
-gm-tracer==0.1.2
-gm-types==7.70.65
 greenlet==0.4.15
 gunicorn==19.9.0
-helios==0.7.0
 idna==2.8
 ipdb==0.12.2
 ipython==7.8.0
@@ -50,3 +43,12 @@ urllib3==1.25.3
 verlib==0.1
 wcwidth==0.1.7
 wrapt==1.11.2
+
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.7.4#egg=gm-logging==0.7.5
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3#egg=gm-config==0.1.3
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-protocol.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-types.git@master
+git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@v0.7.0
+git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.2
+

start.sh

+gunicorn gm_rpcd.wsgi:application -w 5 -k gevent -b 0.0.0.0:8000 --access-logfile /data/log/geoserver/app/gunicorn_access.log --error-logfile /data/log/geoserver/app/gunicorn_error.log