修改

2021-05-12 09:21:10 +08:00
parent ac3446f881
commit e8bbf08b8d
30 changed files with 1553 additions and 184 deletions
--- a/cloudfunctions/getbushu/config.json
+++ b/cloudfunctions/getbushu/config.json
@@ -0,0 +1,6 @@
+{
+  "permissions": {
+    "openapi": [
+    ]
+  }
+}
--- a/cloudfunctions/getbushu/index.js
+++ b/cloudfunctions/getbushu/index.js
@@ -0,0 +1,16 @@
+// 云函数入口文件
+const cloud = require('wx-server-sdk')
+
+cloud.init()
+
+// 云函数入口函数
+exports.main = async (event, context) => {
+  const wxContext = cloud.getWXContext()
+
+  return {
+    event,
+    openid: wxContext.OPENID,
+    appid: wxContext.APPID,
+    unionid: wxContext.UNIONID,
+  }
+}
--- a/cloudfunctions/getbushu/package.json
+++ b/cloudfunctions/getbushu/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "getbushu",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "wx-server-sdk": "~2.4.0"
+  }
+}
--- a/cloudfunctions/proxy/config.json
+++ b/cloudfunctions/proxy/config.json
@@ -0,0 +1,6 @@
+{
+  "permissions": {
+    "openapi": [
+    ]
+  }
+}
--- a/cloudfunctions/proxy/index.js
+++ b/cloudfunctions/proxy/index.js
@@ -0,0 +1,19 @@
+// 云函数入口文件
+const cloud = require('wx-server-sdk')
+const axios = require("axios")
+cloud.init()
+
+// 云函数入口函数
+exports.main = async (event, context) => {
+  return await axios({
+      method: event.method,
+      url: event.url,
+      headers: event.headers ? event.headers : {},
+      data: event.body,
+      params: event.params
+  }).then(body => {
+      return body.data;
+  }).catch(err => {
+      return err;
+  })
+}
--- a/cloudfunctions/proxy/package-lock.json
+++ b/cloudfunctions/proxy/package-lock.json
@@ -0,0 +1,900 @@
+{
+  "name": "proxy",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@cloudbase/database": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@cloudbase/database/-/database-1.2.2.tgz",
+      "integrity": "sha512-14GPoD0vdVnfdN+4rHlMmpkxAekFklt4X2gi33iCuoZUDC62p5LWS7OuTjoronnZ4QPsZPCKm+WsjE8mVD+Hmw==",
+      "requires": {
+        "bson": "^4.0.3",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.set": "4.3.2",
+        "lodash.unset": "4.5.2"
+      }
+    },
+    "@cloudbase/node-sdk": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@cloudbase/node-sdk/-/node-sdk-2.4.7.tgz",
+      "integrity": "sha512-gMtp+25nAJzpXTxpZzN7PTtsTdv6m7SNRszMwPpWB3pwAYyefbuOkR505iv+kYugsX6MkbgKjcCQ/F5dpNMMYw==",
+      "requires": {
+        "@cloudbase/database": "1.2.2",
+        "@cloudbase/signature-nodejs": "1.0.0-beta.0",
+        "@types/retry": "^0.12.0",
+        "agentkeepalive": "^4.1.3",
+        "is-regex": "^1.0.4",
+        "jsonwebtoken": "^8.5.1",
+        "lodash.merge": "^4.6.1",
+        "request": "^2.87.0",
+        "request-promise": "^4.2.5",
+        "retry": "^0.12.0",
+        "ts-node": "^8.10.2",
+        "xml2js": "^0.4.19"
+      }
+    },
+    "@cloudbase/signature-nodejs": {
+      "version": "1.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/@cloudbase/signature-nodejs/-/signature-nodejs-1.0.0-beta.0.tgz",
+      "integrity": "sha512-gpKqwsVk/D2PzvFamYNReymXSdvRSY90eZ1ARf+1wZ8oT6OpK9kr6nmevGykMxN1n17Gn92hBbWqAxU9o3+kAQ==",
+      "requires": {
+        "@types/clone": "^0.1.30",
+        "clone": "^2.1.2",
+        "is-stream": "^2.0.0",
+        "url": "^0.11.0"
+      }
+    },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha1-m4sMxmPWaafY9vXQiToU00jzD78="
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha1-NVy8mLr61ZePntCV85diHx0Ga3A="
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E="
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik="
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha1-bMKyDFya1q0NzP0hynZz2Nf79o0="
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
+    },
+    "@types/clone": {
+      "version": "0.1.30",
+      "resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz",
+      "integrity": "sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ="
+    },
+    "@types/long": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
+      "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
+    },
+    "@types/node": {
+      "version": "10.17.56",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.56.tgz",
+      "integrity": "sha512-LuAa6t1t0Bfw4CuSR0UITsm1hP17YL+u82kfHGrHUWdhlBtH7sa7jGY5z7glGaIj/WDYDkRtgGd+KCjCzxBW1w=="
+    },
+    "@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
+    },
+    "agentkeepalive": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
+      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "requires": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      }
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+    },
+    "axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "bson": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-4.3.0.tgz",
+      "integrity": "sha512-LkKKeFJx5D6RRCRvLE+fDs40M2ZQNuk7W7tFXmKd7OOcQQ+BHdzCgRdL4XEGjc1UEGtiYuMvIVk91Bv8qsI50A==",
+      "requires": {
+        "buffer": "^5.6.0"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "follow-redirects": {
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
+      "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "requires": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+      "requires": {
+        "ms": "^2.0.0"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "is-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "jsonwebtoken": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "requires": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^5.6.0"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "requires": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "requires": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+    },
+    "lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+    },
+    "lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+    },
+    "lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+    },
+    "lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    },
+    "lodash.set": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz",
+      "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM="
+    },
+    "lodash.unset": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz",
+      "integrity": "sha1-Nw0dPoW3Kn4bDN8tJyEhMG8j5O0="
+    },
+    "long": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+    },
+    "mime-db": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
+      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="
+    },
+    "mime-types": {
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
+      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "requires": {
+        "mime-db": "1.47.0"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "protobufjs": {
+      "version": "6.8.8",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz",
+      "integrity": "sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw==",
+      "requires": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/long": "^4.0.0",
+        "@types/node": "^10.1.0",
+        "long": "^4.0.0"
+      }
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "request-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz",
+      "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==",
+      "requires": {
+        "bluebird": "^3.5.0",
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
+    "tcb-admin-node": {
+      "version": "1.23.0",
+      "resolved": "https://registry.npmjs.org/tcb-admin-node/-/tcb-admin-node-1.23.0.tgz",
+      "integrity": "sha512-SAbjTqMsSi63SId1BJ4kWdyGJzhxh9Tjvy3YXxcsoaAC2PtASn4UIYsBsiNEUfcn58QEn2tdvCvvf69WLLjjrg==",
+      "requires": {
+        "@cloudbase/database": "0.9.15",
+        "@cloudbase/signature-nodejs": "^1.0.0-beta.0",
+        "is-regex": "^1.0.4",
+        "jsonwebtoken": "^8.5.1",
+        "lodash.merge": "^4.6.1",
+        "request": "^2.87.0",
+        "xml2js": "^0.4.19"
+      },
+      "dependencies": {
+        "@cloudbase/database": {
+          "version": "0.9.15",
+          "resolved": "https://registry.npmjs.org/@cloudbase/database/-/database-0.9.15.tgz",
+          "integrity": "sha512-63e7iIl+van41B39Tw4ScNe9TRCt+5GHjc7q6i8NzkWBLC3U3KlbWo79YHsUHUPI79POpQ8UMlMVo7HXIAO3dg==",
+          "requires": {
+            "bson": "^4.0.2",
+            "lodash.clonedeep": "4.5.0",
+            "lodash.set": "4.3.2",
+            "lodash.unset": "4.5.2"
+          }
+        }
+      }
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "ts-node": {
+      "version": "8.10.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz",
+      "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==",
+      "requires": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      }
+    },
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "wx-server-sdk": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/wx-server-sdk/-/wx-server-sdk-2.4.0.tgz",
+      "integrity": "sha512-+d/OAUgt3LVlIwC/EEd9oHK2VltMqvoSa3Z797sgZ/hBm/Z+bhYBX3PfrRgn41fprzNk49jdbmw8Rkwa4JryIQ==",
+      "requires": {
+        "@cloudbase/node-sdk": "2.4.7",
+        "protobufjs": "6.8.8",
+        "tcb-admin-node": "^1.23.0",
+        "tslib": "^1.9.3"
+      }
+    },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
+    "yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+    }
+  }
+}
--- a/cloudfunctions/proxy/package.json
+++ b/cloudfunctions/proxy/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "proxy",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "axios": "^0.21.1",
+    "wx-server-sdk": "~2.4.0"
+  }
+}
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -1,8 +1,12 @@
 // app.js
 import GoEasyIM from './static/lib/goeasy-im-1.5.1.js';
+import IMService from './static/lib/imservice.js';
+import {getbuddyList} from "./utils/api"
+import restapi from "./static/lib/restapi";

 App({
  onLaunch: function () {
+    this.globalData.restapi = restapi
    wx.im = GoEasyIM.getInstance({
      host: 'hangzhou.goeasy.io',
      appkey: 'BC-5d0a3ae138494c93869320535ee155fc'
@@ -20,6 +24,18 @@ App({
        traceUser: true,
      })
    }
+    let currentUser = wx.getStorageSync("currentUser");
+		if(currentUser){
+      if(wx.im.getStatus() === 'disconnected') {
+        this.globalData.imService= new IMService(wx.im);
+        this.globalData.imService.connectIM(currentUser);
+      }
+    }
+    getbuddyList().then((res)=>{
+      console.log(res)
+      restapi.setUserList(res.data)
+    })
+    
  },
  formatDate: function (time) {
    const date = new Date(time);
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -12,19 +12,28 @@
 		"pages/chat/groupMember/groupMember"
  ],
  "tabBar":{
-    "color": "#f00",
-    "selectedColor": "#0f0",
+    "color": "#DCDCDC",
+    "selectedColor": "#D02129",
    "backgroundColor": "#fff",
    "list":[{
      "pagePath": "pages/index/index",
-      "text": "首页"
+      "text": "首页",
+      "iconPath": "/static/images/zyh.png",
+      "selectedIconPath":"/static/images/zy.png"
    },{
      "pagePath" : "pages/conversations/conversations",
-      "text":"信息"
+      "text":"信息",
+      "iconPath": "/static/images/xxh.png",
+      "selectedIconPath":"/static/images/xx.png"
+
    },
    {
      "pagePath" : "pages/contacts/contacts",
-      "text" : "通讯录"
+      "text" : "通讯录",
+      "iconPath": "/static/images/lxrh.png",
+      "selectedIconPath":"/static/images/lxr.png"
+
+
    }]
  },
  "window":{
@@ -33,5 +42,10 @@
    "navigationBarTitleText": "Weixin",
    "navigationBarTextStyle":"black"
  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "你的位置信息将用于在地图显示您的信息" 
+    }
+  },
  "sitemapLocation": "sitemap.json"
 }
--- a/miniprogram/images/定位.png
+++ b/miniprogram/images/定位.png
--- a/miniprogram/images/定位back.png
+++ b/miniprogram/images/定位back.png
--- a/miniprogram/pages/chat/privateChat/privateChat.wxml
+++ b/miniprogram/pages/chat/privateChat/privateChat.wxml
@@ -49,10 +49,10 @@
 		<!--发送消息，视频，语音，自定义消息操作-->
 		<view class="action-box">
 			<view class="action-top">
-				<view bindtap="switchAudioKeyboard" class="action-icon">
+				<!-- <view bindtap="switchAudioKeyboard" class="action-icon">
 					<image wx:if="{{!recordVisible}}" class="microphone-icon" src="/static/images/record-appearance-icon.png"></image>
 					<image wx:else class="keyboard-icon" src="/static/images/jianpan.png"></image>
-				</view>
+				</view> -->
 				<!-- 录音 -->
 				<GoEasyRecorder style="flex: 1;" wx:if="{{recordVisible}}" bind:onStop="onRecordStop"></GoEasyRecorder>
 				<!-- GoEasyIM最大支持3k的文本消息，如需发送长文本，需调整输入框maxlength值 -->
@@ -61,9 +61,9 @@
 				<view class="action-icon">
 					<image src="/static/images/emoji.png" class="emoji-icon" bindtap="showEmoji"></image>
 				</view>
-				<view class="action-icon">
+				<!-- <view class="action-icon">
 					<image src="/static/images/more.png" class="more-icon" bindtap="showMore"></image>
-				</view>
+				</view> -->
 				<view class="send-btn-box" bindtap="sendTextMessage">发送</view>
 			</view>
 			<!--展示表情列表-->
--- a/miniprogram/pages/contacts/contacts.js
+++ b/miniprogram/pages/contacts/contacts.js
@@ -1,7 +1,6 @@
 /* contacts.js */
-
-import restapi from "../../static/lib/restapi";
-
+const restapi = getApp().globalData.restapi
+import IMService from '../../static/lib/imservice.js';
 const app = getApp()

 Page({
@@ -10,9 +9,21 @@ Page({
 		friends:[],
 	},
 	onShow () {
-		let currentUser = app.globalData.imService.currentUser;
-		let groups = restapi.findGroups(currentUser);
-		let friends = restapi.findFriends(currentUser);
+		let currentUser = wx.getStorageSync("currentUser");
+		if(!currentUser){
+			wx.redirectTo({
+				url : '../login/login'
+			});
+			return;
+		}
+
+		if(wx.im.getStatus() === 'disconnected') {
+			app.globalData.imService= new IMService(wx.im);
+			app.globalData.imService.connectIM(currentUser);
+		}
+		let currentUsers = app.globalData.imService.currentUser;
+		let groups = restapi.findGroups(currentUsers);
+		let friends = restapi.findFriends(currentUsers);
 		this.setData({
 			groups:	groups,
 			friends: friends,
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -1,68 +1,247 @@
 // index.js
 // 获取应用实例
+import {
+    getbuddyList
+} from "../../utils/api"
 const app = getApp()
+import {
+    getindex,
+    submitAddr,
+    getAround,
+    addFirends,
+    getUserByOpenid
+} from "../../utils/api"
+const restapi = getApp().globalData.restapi
 Page({
    data: {
-        longitude: "117.85",
-        latitude: "36.3950",
+        longitude: "117.1200",
+        latitude: "36.65184",
        map: '',
-        markes: [{
-            id: 1,
-            longitude: "117.85",
-            latitude: "36.3950",
-            iconPath: "../../images/定位.png",
-            width:50,
-            height: 50
+        markes: [
+            {
+                id: 'a789',
+                longitude: "117.85",
+                latitude: "36.3850",
+                iconPath: "../../images/定位.png",
+                width:50,
+                height: 60

-        },
-        {
-            id: 1,
-            longitude: "117.86",
-            latitude: "36.3950",
-            iconPath: "../../images/定位.png",
-            width:50,
-            height: 50,
-            callout:{
-                content:"添加好友",
-                color: "#fff",
-                bgColor: "#f00",
-                padding:5,
-                display: 'ALWAYS'
            }
-
-        },
-        {
-            id: 1,
-            longitude: "117.85",
-            latitude: "36.3850",
-            iconPath: "../../images/定位.png",
-            width:50,
-            height: 50
-
-        }]
+        ],
+        show: false
    },
-    onLoad() {
+    showPopup() {
+        this.setData({
+            show: true
+        });
+    },
+
+    onClose() {
+        this.setData({
+            show: false
+        });
+    },
+    onShow() {
        // console.log("load")
        // this.setData({
        //     map: wx.createMapContext('map')
        // })
        // console.log(this.data.map)
-        wx.cloud.callFunction({
-            name: 'login',
-            data: {},
-            success: res => {
-              console.log('[云函数] [login] user openid: ', res.result.openid)
-            //   app.globalData.openid = res.result.openid
-            //   wx.navigateTo({
-            //     url: '../userConsole/userConsole',
-            //   })
+        // getindex().then((res)=>{
+        //     console.log(res)
+        // })
+
+        // restapi.setUserList([{
+        //     "uuid": "08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a",
+        //     "name": "Mattie",
+        //     "avatar": '/static/images/Avatar-1.png'
+        // },
+        // {
+        //     "uuid": "3bb179af-bcc5-4fe0-9dac-c05688484649",
+        //     "name": "Wallace",
+        //     "avatar": '/static/images/Avatar-2.png'
+        // },
+        // {
+        //     "uuid": "fdee46b0-4b01-4590-bdba-6586d7617f95",
+        //     "name": "Tracy",
+        //     "avatar": '/static/images/Avatar-3.png'
+        // },
+        // {
+        //     "uuid": "33c3693b-dbb0-4bc9-99c6-fa77b9eb763f",
+        //     "name": "Juanita",
+        //     "avatar": '/static/images/Avatar-4.png'
+        // }])
+        let that = this
+        // let openid =  wx.getStorageSync('currentUser').openid
+        // if(!openid){
+        //     return ;
+        // }
+        this.init()
+        // wx.getSetting({
+        //     success(res) {
+        //         console.log(res)
+        //         if (!res.authSetting['scope.userLocation']) {
+
+        //             wx.authorize({
+        //                 scope: 'scope.userLocation',
+        //                 success() {
+        //                     that.init()
+        //                 },
+        //                 fail() {
+
+        //                     that.setData({
+        //                         show: true
+        //                     })
+        //                 }
+        //             })
+        //         } else {
+        //             that.init()
+        //         }
+        //     }
+        // })
+        // this.init()
+
+
+    },
+    shouquan() {
+        console.log("diaoyong")
+        wx.openSetting({
+            success (res) {
+              console.log(res.authSetting)
+              // res.authSetting = {
+              //   "scope.userInfo": true,
+              //   "scope.userLocation": true
+              // }
            },
-            fail: err => {
-              console.error('[云函数] [login] 调用失败', err)
-            //   wx.navigateTo({
-            //     url: '../deployFunctions/deployFunctions',
-            //   })
+            fail(err){
+                console.log(err)
            }
          })
+    },
+    init() {
+        let that = this
+        wx.getLocation({
+            success(loacl) {
+                console.log(loacl)
+                that.setData({
+                    longitude: loacl.longitude,
+                    latitude: loacl.latitude
+                })
+                submitAddr({
+                    longitude: loacl.longitude,
+                    latitude: loacl.latitude
+                }).then((res) => {
+                    console.log(res)
+                    let list = []
+                    getAround({
+                        longitude: loacl.longitude,
+                        latitude: loacl.latitude
+                    }).then((res) => {
+                        console.log(res)
+
+                        for (let i of res.data) {
+                            // {
+                            //     id: 1,
+                            //     longitude: "117.85",
+                            //     latitude: "36.3850",
+                            //     iconPath: "../../images/定位.png",
+                            //     width:50,
+                            //     height: 60
+
+                            // }
+
+                            let info = {
+                                id: 1,
+                                longitude: "117.85",
+                                latitude: "36.3850",
+                                iconPath: "../../images/定位.png",
+                                width: 50,
+                                height: 60
+
+                            }
+                            info.id = i.openid;
+                            info.longitude = i.longitude;
+                            info.latitude = i.latitude;
+                            list.push(info)
+                        }
+                        // that.setData({
+                        //     markes: list
+                        // })
+                        console.log(that.data.markes)
+                    })
+
+                })
+
+
+            }
+        })
+    },
+    addf(data) {
+        let openid =  wx.getStorageSync('currentUser').openid
+        if(!openid){
+            wx.navigateTo({
+                url:"/pages/login/login"
+            })
+            return ;
+        }
+        console.log(data.markerId)
+        getUserByOpenid({
+            openid: data.markerId
+        }).then((res) => {
+            console.log(res)
+            if (res.code == 1) {
+                wx.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                    duration: 2000
+                })
+                return;
+            }
+            this.setData({
+                show: true
+            })
+            // wx.showModal({
+            //     title: '添加好友',
+            //     content: '是否添加' + res.data.name + '为好友？',
+            //     success(res) {
+            //         if (res.confirm) {
+            //             addFirends({
+            //                 friend_openid: data.markerId
+            //             }).then((res) => {
+            //                 console.log(res)
+            //                 if (res.code == 1) {
+            //                     wx.showToast({
+            //                         title: res.msg,
+            //                         icon: 'none',
+            //                         duration: 2000
+            //                     })
+            //                 } else {
+            //                     getbuddyList().then((res) => {
+            //                         console.log(res)
+            //                         app.globalData.restapi.setUserList(res.data)
+            //                         if (res.code == 0) {
+            //                             wx.showToast({
+            //                                 title: "添加成功",
+            //                                 icon: 'none',
+            //                                 duration: 2000
+            //                             })
+            //                         } else {
+            //                             wx.showToast({
+            //                                 title: res.msg,
+            //                                 icon: 'none',
+            //                                 duration: 2000
+            //                             })
+            //                         }
+            //                     })
+            //                 }
+
+            //             })
+            //         } else if (res.cancel) {
+            //             console.log('用户点击取消')
+            //         }
+            //     }
+            // })
+        })
+
    }
-})
+})
--- a/miniprogram/pages/index/index.json
+++ b/miniprogram/pages/index/index.json
@@ -1,4 +1,7 @@
 {
-  "usingComponents": {},
+  "usingComponents": {
+    "van-popup": "../../miniprogram_npm/@vant/weapp/popup/index",
+    "van-dialog": "../../miniprogram_npm/@vant/weapp/dialog/index"
+  },
  "navigationBarTitleText":"首页"
 }
--- a/miniprogram/pages/index/index.scss
+++ b/miniprogram/pages/index/index.scss
@@ -9,4 +9,10 @@ page{
        width: 750rpx;
        height: 100vh;
    }
+}
+
+.box{
+    width: 548rpx;
+    height: 520rpx;
+    background-color: #fff;
 }
--- a/miniprogram/pages/index/index.wxml
+++ b/miniprogram/pages/index/index.wxml
@@ -1,4 +1,14 @@
 <!-- index.wxml -->
 <view class="container">
-    <map name="" id="map" class="map" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markes}}"></map>
+    <map name="" id="map" class="map" longitude="{{longitude}}" latitude="{{latitude}}" markers="{{markes}}"
+        bindmarkertap="addf" show-location="{{true}}"></map>
+    <!-- <van-dialog use-slot title="提示" show="{{ show }}" open-type="openSetting" bindopensetting="shouquan"
+        bind:close="onClose">
+        请给予定位权限以显示地图
+    </van-dialog> -->
+    <van-popup  show="{{ show }}" bind:close="onClose">
+        <view class="box">
+        
+        </view>
+    </van-popup>
 </view>
--- a/miniprogram/pages/index/index.wxss
+++ b/miniprogram/pages/index/index.wxss
@@ -1,14 +1,20 @@
-page {
-  width: 100%;
-  height: 100%;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-}
-
-.container .map {
-  width: 750rpx;
-  height: 100vh;
-}
+page {
+  width: 100%;
+  height: 100%;
+}
+
+.container {
+  width: 100%;
+  height: 100%;
+}
+
+.container .map {
+  width: 750rpx;
+  height: 100vh;
+}
+
+.box {
+  width: 548rpx;
+  height: 520rpx;
+  background-color: #fff;
+}
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -1,27 +1,79 @@
 /* login.js */
-import restapi from "../../static/lib/restapi";
+import {
+	login
+} from "../../utils/api"
+import {
+	getbuddyList
+} from "../../utils/api"
+const app = getApp()
 Page({
 	data: {
-		username:"",
-		password:"",
-		showError:false,
+		username: "",
+		password: "",
+		showError: false,
+		canIUseGetUserProfile: false,
 	},
-	login: function(e) {
-		let username = e.detail.value.username;
-		let password = e.detail.value.password;
-		if (username.trim() !== "" && password.trim() !== "") {
-			let user = restapi.findUser(username,password);
-			if (user) {
-				wx.setStorageSync('currentUser',user);
-				// 页面跳转
-				wx.switchTab({
-					url:'../conversations/conversations'
-				});
-				return;
+	sing(info) {
+		console.log(1)
+		wx.login({
+			success(res) {
+				console.log(res)
+				login({
+					code: res.code,
+					nickName: info.nickName,
+					avatarUrl: info.avatarUrl,
+				}).then((res) => {
+					console.log(res)
+					wx.setStorageSync('currentUser', res.data);
+					getbuddyList().then((res) => {
+						console.log(res)
+						app.globalData.restapi.setUserList(res.data)
+					
+				})
+					// 页面跳转
+					wx.switchTab({
+						url: '../conversations/conversations'
+					});
+				})
 			}
+		})
+	},
+	loging() {
+		let that = this
+		wx.getUserProfile({
+			desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+			success: (res) => {
+				console.log(res.userInfo)
+				that.sing(res.userInfo)
+			}
+		})
+	},
+	login: function (info) {
+		console.log(info)
+		this.sing()
+
+		// let username = e.detail.value.username;
+		// let password = e.detail.value.password;
+		// if (username.trim() !== "" && password.trim() !== "") {
+		// 	let user = restapi.findUser(username,password);
+		// 	if (user) {
+		// 		wx.setStorageSync('currentUser',user);
+		// 		// 页面跳转
+		// 		wx.switchTab({
+		// 			url:'../conversations/conversations'
+		// 		});
+		// 		return;
+		// 	}
+		// }
+		// this.setData({
+		// 	showError:true
+		// });
+	},
+	onLoad() {
+		if (wx.getUserProfile) {
+			this.setData({
+				canIUseGetUserProfile: true
+			})
 		}
-		this.setData({
-			showError:true
-		});
 	}
 })
--- a/miniprogram/pages/login/login.wxml
+++ b/miniprogram/pages/login/login.wxml
@@ -1,17 +1,18 @@
 <!--login.wxml-->
 <view class="container">
 	<view class="login">
-		<form bindsubmit="login">
+		<form>
 			<view class="title">用户登录</view>
-			<input class="input-box" type="text" placeholder="请输入账号" name="username" confirm-hold hold-keyboard="{{true}}" adjust-position="{{true}}"/>
-			<input class="input-box" type="password" placeholder="请输入密码" name= "password" />
-			<view wx:if="{{showError}}" class="error">请输入正确的用户名和密码</view>
-			<button class="login-btn" form-type="submit">登录</button>
-			<view class="login-tips">后台没有上线，上线之后直接用微信登录，下面用户随机选一个都行</view>
+			<!-- <input class="input-box" type="text" placeholder="请输入账号" name="username" confirm-hold hold-keyboard="{{true}}" adjust-position="{{true}}"/> -->
+			<!-- <input class="input-box" type="password" placeholder="请输入密码" name= "password" /> -->
+			<!-- <view wx:if="{{showError}}" class="error">请输入正确的用户名和密码</view> -->
+			<button  wx:if="{{canIUseGetUserProfile}}" bindtap="loging" class="login-btn">登录</button>
+			<button  wx:else class="login-btn" open-type="getUserInfo" bindgetuserinfo="login">登录</button>
+			<!-- <view class="login-tips">后台没有上线，上线之后直接用微信登录，下面用户随机选一个都行</view>
 			<view class="login-tips">用户名 Mattie 密码 123</view>
 			<view class="login-tips">用户名 Wallace 密码 123</view>
 			<view class="login-tips">用户名 Tracy 密码 123</view>
-			<view class="login-tips">用户名 Juanita 密码 123</view>
+			<view class="login-tips">用户名 Juanita 密码 123</view> -->
 		</form>
 	</view>
 </view>
--- a/miniprogram/static/images/lxr.png
+++ b/miniprogram/static/images/lxr.png
--- a/miniprogram/static/images/lxrh.png
+++ b/miniprogram/static/images/lxrh.png
--- a/miniprogram/static/images/xx.png
+++ b/miniprogram/static/images/xx.png
--- a/miniprogram/static/images/xxh.png
+++ b/miniprogram/static/images/xxh.png
--- a/miniprogram/static/images/zy.png
+++ b/miniprogram/static/images/zy.png
--- a/miniprogram/static/images/zyh.png
+++ b/miniprogram/static/images/zyh.png
--- a/miniprogram/static/lib/restapi.js
+++ b/miniprogram/static/lib/restapi.js
@@ -1,51 +1,47 @@
 //用户数据示例
 let users = [
-    {
-        "uuid": "08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a",
-        "name": "Mattie",
-        "password": "123",
-        "avatar": '/static/images/Avatar-1.png'
-    },
-    {
-        "uuid": "3bb179af-bcc5-4fe0-9dac-c05688484649",
-        "name": "Wallace",
-        "password": "123",
-        "avatar": '/static/images/Avatar-2.png'
-    },
-    {
-        "uuid": "fdee46b0-4b01-4590-bdba-6586d7617f95",
-        "name": "Tracy",
-        "password": "123",
-        "avatar": '/static/images/Avatar-3.png'
-    },
-    {
-        "uuid": "33c3693b-dbb0-4bc9-99c6-fa77b9eb763f",
-        "name": "Juanita",
-        "password": "123",
-        "avatar": '/static/images/Avatar-4.png'
-    }
+    // {
+    //     "uuid": "08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a",
+    //     "name": "Mattie",
+    //     "avatar": '/static/images/Avatar-1.png'
+    // },
+    // {
+    //     "uuid": "3bb179af-bcc5-4fe0-9dac-c05688484649",
+    //     "name": "Wallace",
+    //     "avatar": '/static/images/Avatar-2.png'
+    // },
+    // {
+    //     "uuid": "fdee46b0-4b01-4590-bdba-6586d7617f95",
+    //     "name": "Tracy",
+    //     "avatar": '/static/images/Avatar-3.png'
+    // },
+    // {
+    //     "uuid": "33c3693b-dbb0-4bc9-99c6-fa77b9eb763f",
+    //     "name": "Juanita",
+    //     "avatar": '/static/images/Avatar-4.png'
+    // }
 ];

 //群数据示例
 let groups = [
-    {
-        "uuid": "group-a42b-47b2-bb1e-15e0f5f9a19a",
-        "name": "小程序交流群",
-        "avatar" : '/static/images/wx.png',
-        "userList": ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', '3bb179af-bcc5-4fe0-9dac-c05688484649', 'fdee46b0-4b01-4590-bdba-6586d7617f95', '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f']
-    },
-    {
-        "uuid": "group-4b01-4590-bdba-6586d7617f95",
-        "name": "UniApp交流群",
-        "avatar" : '/static/images/uniapp.png',
-        "userList": ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', 'fdee46b0-4b01-4590-bdba-6586d7617f95', '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f']
-    },
-    {
-        "uuid": "group-dbb0-4bc9-99c6-fa77b9eb763f",
-        "name": "GoEasy交流群",
-        "avatar" : '/static/images/goeasy.jpeg',
-        "userList": ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', '3bb179af-bcc5-4fe0-9dac-c05688484649']
-    }
+    // {
+    //     "uuid": "group-a42b-47b2-bb1e-15e0f5f9a19a",
+    //     "name": "小程序交流群",
+    //     "avatar" : '/static/images/wx.png',
+    //     "userList": ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', '3bb179af-bcc5-4fe0-9dac-c05688484649', 'fdee46b0-4b01-4590-bdba-6586d7617f95', '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f']
+    // },
+    // {
+    //     "uuid": "group-4b01-4590-bdba-6586d7617f95",
+    //     "name": "UniApp交流群",
+    //     "avatar" : '/static/images/uniapp.png',
+    //     "userList": ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', 'fdee46b0-4b01-4590-bdba-6586d7617f95', '33c3693b-dbb0-4bc9-99c6-fa77b9eb763f']
+    // },
+    // {
+    //     "uuid": "group-dbb0-4bc9-99c6-fa77b9eb763f",
+    //     "name": "GoEasy交流群",
+    //     "avatar" : '/static/images/goeasy.jpeg',
+    //     "userList": ['08c0a6ec-a42b-47b2-bb1e-15e0f5f9a19a', '3bb179af-bcc5-4fe0-9dac-c05688484649']
+    // }
 ];


@@ -91,4 +87,10 @@ RestApi.prototype.findGroupMembers = function (groupId) {
    return members;
 };

-export default new RestApi();
+RestApi.prototype.setUserList = function (list) {
+    console.log(list)
+    users = list
+}
+
+let restapi = new RestApi();
+export default restapi
--- a/miniprogram/utils/api.js
+++ b/miniprogram/utils/api.js
@@ -2,4 +2,35 @@ import {get,post} from "./request"

 export function login(data){
    return get('/login/login',data)
+}
+
+export function getindex(){
+    return get("/")
+}
+export function getbuddyList(){
+    return get("/buddyList/getBuddyList")
+}
+
+export function submitAddr({longitude,latitude}){
+    return get("/submitAddr",{
+        longitude:longitude,
+        latitude:latitude
+    })
+}
+
+export function getAround({longitude,latitude}){
+    return get("/getAround",{
+        longitude:longitude,
+        latitude:latitude
+    })
+}
+
+export function addFirends({friend_openid}){
+    return get("/buddyList/addFirends",{
+        friend_openid
+    })
+}
+
+export function getUserByOpenid({openid}){
+    return get("/getUserByOpenid",{openid})
 }
--- a/miniprogram/utils/request.js
+++ b/miniprogram/utils/request.js
@@ -1,40 +1,102 @@
-const BASEURL = "http://192.168.3.122:8080";
-export function get(url,data, baseurl = BASEURL){
+const BASEURL = "http://127.0.0.1:8080";
+const APIURL = "http://kaoshi-shangpin.theluyuan.com"
+const type = true; // true 走request false 走云函数
+export function get(url,data = {}, baseurl = BASEURL){
    return new Promise((res,err)=>{
-        let d = "?";
-        for(let i in data){
-            d += i + '=' + data[i] + "&";
+       console.time(url)
+        let openid =  wx.getStorageSync('currentUser').openid
+        if(!data.openid){
+            data.openid = openid
        }
-        if(d == "?"){
-            d = ""
-        }
-        wx.request({
-            url: baseurl + url + d,
-            success(r){
-                try {
-                    r.data.data = JSON.parse(r.data.data)
-                    res(r)
-                } catch (error) {
-                    res(r)
-                }
-            },
-            error(e){
-                err(e)
+        if(type){
+            let d = "?";
+            for(let i in data){
+                d += i + '=' + data[i] + "&";
            }
-        })
+            if(d == "?"){
+                d = ""
+            }
+            wx.request({
+                url: baseurl + url + d,
+                success(r){
+                    try {
+                        r.data.data = JSON.parse(r.data.data)
+                        res(r.data)
+                    } catch (error) {
+                        res(r.data)
+                    }
+                    console.timeEnd(url)
+                },
+                error(e){
+                    err(e)
+                    console.timeEnd(url)
+                }
+            })
+        }else{
+            wx.cloud.callFunction({
+                name: 'proxy',
+                data: {
+                    url: APIURL + url,
+                    method:"GET",
+                    params:data
+                },
+                success: r => {
+                  res(r.result)
+                  console.timeEnd(url)
+                },
+                error(e){
+                    err(e)
+                    console.timeEnd(url)
+                }
+              })
+        }
+       
    })
 }
-export function post(url,data, baseurl = BASEURL){
+export function post(url,data = {}, baseurl = BASEURL){
    return new Promise((res,err)=>{
-        wx.request({
-            url: baseurl + url,
-            data,
-            success(r){
-                res(r)
-            },
-            error(e){
-                err(e)
-            }
-        })
+       console.time(url)
+       let openid =  wx.getStorageSync('currentUser').openid
+       if(!data.openid){
+           data.openid = openid
+       }
+        if(type){
+            wx.request({
+                url: baseurl + url,
+                data,
+                method:"POST",
+                success(r){
+                    try {
+                        r.data.data = JSON.parse(r.data.data)
+                        res(r.data)
+                    } catch (error) {
+                        res(r.data)
+                    }
+                    console.timeEnd(url)
+                },
+                error(e){
+                    err(e)
+                    console.timeEnd(url)
+                }
+            })
+        }else{
+            wx.cloud.callFunction({
+                name: 'proxy',
+                data: {
+                    url: APIURL + url + d,
+                    method:"POST",
+                    params:data
+                },
+                success: r => {
+                  res(r.result)
+                  console.timeEnd(url)
+                },
+                error(e){
+                    err(e)
+                    console.timeEnd(url)
+                }
+              })
+        }
+       
    })
 }
--- a/project.config.json
+++ b/project.config.json
@@ -2,7 +2,7 @@
  "miniprogramRoot": "miniprogram/",
  "cloudfunctionRoot": "cloudfunctions/",
  "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
    "es6": true,
    "enhance": true,
    "postcss": true,
@@ -28,7 +28,6 @@
      "outputPath": ""
    },
    "enableEngineNative": false,
-    "bundle": false,
    "useIsolateContext": true,
    "useCompilerModule": true,
    "userConfirmedUseCompilerModuleSwitch": false,
@@ -40,6 +39,7 @@
  "appid": "wx0ae1f549a7384633",
  "projectname": "fangcheyun",
  "libVersion": "2.11.2",
+  "cloudfunctionTemplateRoot": "cloudfunctionTemplate",
  "condition": {
    "search": {
      "list": []