From e8bbf08b8d4ad8957b1b6299843a712a132cb112 Mon Sep 17 00:00:00 2001 From: theluyuan <1162963624@qq.com> Date: Wed, 12 May 2021 09:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloudfunctions/getbushu/config.json | 6 + cloudfunctions/getbushu/index.js | 16 + cloudfunctions/getbushu/package.json | 14 + cloudfunctions/proxy/config.json | 6 + cloudfunctions/proxy/index.js | 19 + cloudfunctions/proxy/package-lock.json | 900 ++++++++++++++++++ cloudfunctions/proxy/package.json | 15 + miniprogram/app.js | 16 + miniprogram/app.json | 24 +- miniprogram/images/定位.png | Bin 5973 -> 2358 bytes miniprogram/images/定位back.png | Bin 0 -> 5973 bytes .../pages/chat/privateChat/privateChat.wxml | 8 +- miniprogram/pages/contacts/contacts.js | 23 +- miniprogram/pages/index/index.js | 279 +++++- miniprogram/pages/index/index.json | 5 +- miniprogram/pages/index/index.scss | 6 + miniprogram/pages/index/index.wxml | 12 +- miniprogram/pages/index/index.wxss | 34 +- miniprogram/pages/login/login.js | 90 +- miniprogram/pages/login/login.wxml | 15 +- miniprogram/static/images/lxr.png | Bin 0 -> 6262 bytes miniprogram/static/images/lxrh.png | Bin 0 -> 6033 bytes miniprogram/static/images/xx.png | Bin 0 -> 7334 bytes miniprogram/static/images/xxh.png | Bin 0 -> 7023 bytes miniprogram/static/images/zy.png | Bin 0 -> 5409 bytes miniprogram/static/images/zyh.png | Bin 0 -> 5258 bytes miniprogram/static/lib/restapi.js | 88 +- miniprogram/utils/api.js | 31 + miniprogram/utils/request.js | 126 ++- project.config.json | 4 +- 30 files changed, 1553 insertions(+), 184 deletions(-) create mode 100644 cloudfunctions/getbushu/config.json create mode 100644 cloudfunctions/getbushu/index.js create mode 100644 cloudfunctions/getbushu/package.json create mode 100644 cloudfunctions/proxy/config.json create mode 100644 cloudfunctions/proxy/index.js create mode 100644 cloudfunctions/proxy/package-lock.json create mode 100644 cloudfunctions/proxy/package.json create mode 100644 miniprogram/images/定位back.png create mode 100644 miniprogram/static/images/lxr.png create mode 100644 miniprogram/static/images/lxrh.png create mode 100644 miniprogram/static/images/xx.png create mode 100644 miniprogram/static/images/xxh.png create mode 100644 miniprogram/static/images/zy.png create mode 100644 miniprogram/static/images/zyh.png diff --git a/cloudfunctions/getbushu/config.json b/cloudfunctions/getbushu/config.json new file mode 100644 index 0000000..5ecc33e --- /dev/null +++ b/cloudfunctions/getbushu/config.json @@ -0,0 +1,6 @@ +{ + "permissions": { + "openapi": [ + ] + } +} \ No newline at end of file diff --git a/cloudfunctions/getbushu/index.js b/cloudfunctions/getbushu/index.js new file mode 100644 index 0000000..ba95da2 --- /dev/null +++ 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, + } +} \ No newline at end of file diff --git a/cloudfunctions/getbushu/package.json b/cloudfunctions/getbushu/package.json new file mode 100644 index 0000000..0c53006 --- /dev/null +++ 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" + } +} \ No newline at end of file diff --git a/cloudfunctions/proxy/config.json b/cloudfunctions/proxy/config.json new file mode 100644 index 0000000..5ecc33e --- /dev/null +++ b/cloudfunctions/proxy/config.json @@ -0,0 +1,6 @@ +{ + "permissions": { + "openapi": [ + ] + } +} \ No newline at end of file diff --git a/cloudfunctions/proxy/index.js b/cloudfunctions/proxy/index.js new file mode 100644 index 0000000..361d273 --- /dev/null +++ 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; + }) +} \ No newline at end of file diff --git a/cloudfunctions/proxy/package-lock.json b/cloudfunctions/proxy/package-lock.json new file mode 100644 index 0000000..965905a --- /dev/null +++ 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==" + } + } +} diff --git a/cloudfunctions/proxy/package.json b/cloudfunctions/proxy/package.json new file mode 100644 index 0000000..6e14f39 --- /dev/null +++ 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" + } +} diff --git a/miniprogram/app.js b/miniprogram/app.js index 029c136..d14d119 100644 --- 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); diff --git a/miniprogram/app.json b/miniprogram/app.json index df36151..407249a 100644 --- 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" } diff --git a/miniprogram/images/定位.png b/miniprogram/images/定位.png index 77a40b103819ed229320abfe0e74128b74bc8ade..e2d15cc0c8869217d6d3c59fda9bd8aa799943a7 100644 GIT binary patch literal 2358 zcmV-63CZ?}P)Nkl{XfIav3EY-*>`6w)UI@_?{0VQ_x$HS&oeU%XE*4GzRaH@tZEbDd_bCOC3iuRY0&Q$;WPN>o z>bvvj&quXeUS6)?aGg5qKw4W{T~BY!DuCI7bFHvewXET}T37IU7#Gz{@THvbTL@0N zvKtrsxy!m;XL6tMk0*LAT)5yaT)5DsK)gYC0+=!UOu^N4=wfvy=(2mCe*ki|XwYO9 zbzM2Y9sBX|cba}%P*C7f5KvxH0J;Y}7D^hxOu!@11iZN6S2f({djY^T$zbDsFQwDt zOkBD@bY%O#DS*kzNvV5)0+=a$GVmy9vIR5E1B~C9UXNH!*H^)vYe5T5%T@C zgEcNVOZP1AHp{Y8rwIpp{K`}fOmk&3cR zT=0mu>vpdb**R~`1p2lzgVnFhVHFDvb@|y5haKzNvB*gJ^;CX+S6q!oBR^tY|e1Ww9p z)yeDeGEA)ET&s=JER4_Z__M&jiGG!oe&nvagkU@09#5*g>sUwZLtE}4aO8G-Vq(IM zaRU!eQN{4^upw`MJeaJHpKL5-xxU0#1wxE99k`sVDdxV{d@}~3C4{hI?GjFn zaTSls-5CY90RCEXaO>Tsazux#nN?U=sJu?uC0yi^t~!Tt6~aJ&&&&u{Yg)q_0gW5 zl&#{;DkuVGpk`}dGM~>Ru!N~l+UMAjmOE@5sSHk9u}7stjB3NUqwO0aEAP2<;Sz$6 zf6`?1?s~;>96ObCNNqPdDXuRB!_ z-^mNg{+LN{Hq_f-^zZ*jt4-xT)k#)dyAV7kJ!anRkKO6!-}IYwl_#b7NdG4O@k@tM z-eGM=*@SX;s?%Bp?p;V|)zPj}p0C(c!wM>QVO3P+RX=vW(EFWt?~pvrF8=+y{PY`V z2pXc$!a;$jy^zp$p@p*cI#e-=i;I==P{nYnf3T6~6#dX;q9V#Z-VIOBW~WOjFEF&z zJ@)KtDB}|CNCGEl{Oyp^=`P(Os_UGN00aty!2CgZUc+NfVVEl(TM( zX4Yq^0j%JMm<;tZC)6iLP9K=;-P4Cs?gA8+mI|8Iml`?~i)AffBsJ37li(>m;t&K+ z7J@x!A|5&Wd_G=y_wE7Rz;MT=W%M^bmjnzCy97=9D0C)py~fPc_JmU1YZ-#adqJ-& zSFRW*PMi=WB_#&^J}D0$s~~Q^Z_gPGe(?_vE+tzKFoEM58if+Jkl22cmoHy-(1r>G z_hf8CC@#FV4HOpyi!N8t!C+9mU-s4C|3`zLdG+f{pr}i*1dh)gSWZD>%uvOlpfbJ% z7qLvN@*N!=94m1FC{kOUv5`YrM^t_1^-KE3lY1L)B449doZQ@8NgJF{S0YG>1p);y zXPcf=;B^qSwY3~;LIb7Q2m}HGV5GWHyXEk(zUlp^*O%gRCnqOI;u;BCI0#hYGZz8O z`8IP@N~U}bOK88d<;#~-mN96>1Q?^?XWb+EhK}ZyCFl(aaHTlrJ+z{6(Oa^#v^4T` zVlFrKqu|4DG(4Tvz@)+Ym0hR(`r?;2-%<>#5V%dMpE`Ald``f$SHiC6qZF@o2w1}# z-QC?am6eqbwR9R^(-*aW$@<;k;NUOUtXXqRXAKSRQ6lNn2d`>T-i`M~lFu}>0*3{D zf?WM$3_|v!*RO54{rp~oA?q+qp0;5uYzxB^sD7pJ(^qdv_C#X3h9ls}CathT3qg1G z1lV8t&B#6LZ?#$7s$2z+^tTPEu-yZllF}Jb9CM2rz#Jv$9S8mF+^074n2DPhqbdD*t3EVrqrL0NdO7*$|QoRedS`+T>d9wW3Z9xZ2Li|K6=$I9k6Je zh|MbD&oT;~DR314Y*Pb8A4LH4pA)L_>P8S<2 cH>~3S1%Plkm8FJ+P5=M^07*qoM6N<$g2)Mqw*UYD literal 5973 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 Dx0gvf diff --git a/miniprogram/images/定位back.png b/miniprogram/images/定位back.png new file mode 100644 index 0000000000000000000000000000000000000000..77a40b103819ed229320abfe0e74128b74bc8ade GIT binary patch literal 5973 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 Dx0gvf literal 0 HcmV?d00001 diff --git a/miniprogram/pages/chat/privateChat/privateChat.wxml b/miniprogram/pages/chat/privateChat/privateChat.wxml index d67ffc5..3df1ea9 100644 --- a/miniprogram/pages/chat/privateChat/privateChat.wxml +++ b/miniprogram/pages/chat/privateChat/privateChat.wxml @@ -49,10 +49,10 @@ - + @@ -61,9 +61,9 @@ - + 发送 diff --git a/miniprogram/pages/contacts/contacts.js b/miniprogram/pages/contacts/contacts.js index 4e84109..ee6f33d 100644 --- 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, diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index 22b8844..4f5ccfc 100644 --- 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('用户点击取消') + // } + // } + // }) + }) + } -}) +}) \ No newline at end of file diff --git a/miniprogram/pages/index/index.json b/miniprogram/pages/index/index.json index 7394880..68e0ffa 100644 --- 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":"首页" } \ No newline at end of file diff --git a/miniprogram/pages/index/index.scss b/miniprogram/pages/index/index.scss index cce3228..6f00e98 100644 --- 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; } \ No newline at end of file diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 89672a2..dee2688 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,4 +1,14 @@ - + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss index ddce647..821ff81 100644 --- 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; +} diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js index 91f961f..c287275 100644 --- 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 - }); } }) \ No newline at end of file diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml index 200293a..81a49d5 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/login.wxml @@ -1,17 +1,18 @@ diff --git a/miniprogram/static/images/lxr.png b/miniprogram/static/images/lxr.png new file mode 100644 index 0000000000000000000000000000000000000000..f59f5b36efc5482abcbfe14c6467b086e731837c GIT binary patch literal 6262 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 literal 0 HcmV?d00001 diff --git a/miniprogram/static/images/lxrh.png b/miniprogram/static/images/lxrh.png new file mode 100644 index 0000000000000000000000000000000000000000..09c09bf0c95a65cdac6cd98d573dcd7faf6c1d0d GIT binary patch literal 6033 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 literal 0 HcmV?d00001 diff --git a/miniprogram/static/images/xx.png b/miniprogram/static/images/xx.png new file mode 100644 index 0000000000000000000000000000000000000000..0ecc87346aa8352191cdf4c42c7d3c646931c59f GIT binary patch literal 7334 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%0D3B&qd-teEm7hWXq_zWXgdaDK+hKExJJ| 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 literal 0 HcmV?d00001 diff --git a/miniprogram/static/lib/restapi.js b/miniprogram/static/lib/restapi.js index f646da7..652d2cf 100644 --- 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(); \ No newline at end of file +RestApi.prototype.setUserList = function (list) { + console.log(list) + users = list +} + +let restapi = new RestApi(); +export default restapi \ No newline at end of file diff --git a/miniprogram/utils/api.js b/miniprogram/utils/api.js index d0311ee..c5ade51 100644 --- 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}) } \ No newline at end of file diff --git a/miniprogram/utils/request.js b/miniprogram/utils/request.js index 023f51e..a725656 100644 --- 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) + } + }) + } + }) } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 459c9e1..4e98842 100644 --- 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": []