Merge branch 'master' of http://123.207.147.179:8888/node_server/tikeyi

# Conflicts:
#	src/data/interface/url.ts

package-lock.json

@@ -84,6 +84,48 @@
         }
       }
     },
+    "@redis/bloom": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz",
+      "integrity": "sha512-EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw=="
+    },
+    "@redis/client": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.1.0.tgz",
+      "integrity": "sha512-xO9JDIgzsZYDl3EvFhl6LC52DP3q3GCMUer8zHgKV6qSYsq1zB+pZs9+T80VgcRogrlRYhi4ZlfX6A+bHiBAgA==",
+      "requires": {
+        "cluster-key-slot": "1.1.0",
+        "generic-pool": "3.8.2",
+        "yallist": "4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
+    },
+    "@redis/graph": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.0.1.tgz",
+      "integrity": "sha512-oDE4myMCJOCVKYMygEMWuriBgqlS5FqdWerikMoJxzmmTUErnTRRgmIDa2VcgytACZMFqpAOWDzops4DOlnkfQ=="
+    },
+    "@redis/json": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.3.tgz",
+      "integrity": "sha512-4X0Qv0BzD9Zlb0edkUoau5c1bInWSICqXAGrpwEltkncUwcxJIGEcVryZhLgb0p/3PkKaLIWkjhHRtLe9yiA7Q=="
+    },
+    "@redis/search": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.0.6.tgz",
+      "integrity": "sha512-pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA=="
+    },
+    "@redis/time-series": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.3.tgz",
+      "integrity": "sha512-OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA=="
+    },
     "@types/bson": {
       "version": "4.0.3",
       "resolved": "https://registry.npm.taobao.org/@types/bson/download/@types/bson-4.0.3.tgz?cache=0&sync_timestamp=1613378303280&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fbson%2Fdownload%2F%40types%2Fbson-4.0.3.tgz",
@@ -273,6 +315,11 @@
       "resolved": "https://registry.npm.taobao.org/charenc/download/charenc-0.0.2.tgz",
       "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
     },
+    "cluster-key-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
+      "integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
+    },
     "codepage": {
       "version": "1.14.0",
       "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
@@ -569,6 +616,11 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
+    "generic-pool": {
+      "version": "3.8.2",
+      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
+      "integrity": "sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="
+    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz",
@@ -1028,6 +1080,19 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "redis": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-4.1.0.tgz",
+      "integrity": "sha512-5hvJ8wbzpCCiuN1ges6tx2SAh2XXCY0ayresBmu40/SGusWHFW86TAlIPpbimMX2DFHOX7RN34G2XlPA1Z43zg==",
+      "requires": {
+        "@redis/bloom": "1.0.2",
+        "@redis/client": "1.1.0",
+        "@redis/graph": "1.0.1",
+        "@redis/json": "1.0.3",
+        "@redis/search": "1.0.6",
+        "@redis/time-series": "1.0.3"
+      }
+    },
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",

package.json

@@ -19,6 +19,7 @@
     "mysql": "^2.18.1",
     "node-xlsx": "^0.16.1",
     "nodemailer": "^6.1.1",
+    "redis": "^4.1.0",
     "request": "^2.88.0",
     "svg-captcha": "^1.3.12",
     "ws": "^5.2.2"

src/biz/permission.ts

+import { getUrl, urlEnum } from "../data/interface/url";
+import { get } from "../util/request";
+import * as redis from 'redis';
+
+//创建Redis客户端
+const client = redis.createClient();
+
+//点击权限按钮的token验证
+export async function checkToken(req, res) {
+    let access_token = req.body;
+    let userInfo = await get(getUrl(urlEnum.获取accesstoken), {access_token}, {});
+
+    //使用Redis将用户信息存入缓存
+    client.on('connect', function() {
+        client.set(userInfo)
+    })
+
+}
+
+
+//权限列表
+export async function getList(req, res) {
+    let access_token = req.body;
+    let userInfo = await get(getUrl(urlEnum.权限列表), {}, {});
+    return userInfo;
+}
+
+//搜索框
+export async function searchByName(req, res) {
+    let {name, tel} = req.body;
+    let userInfo = await get(getUrl())
+}
\ No newline at end of file

src/data/interface/url.ts

@@ -23,7 +23,10 @@ export enum urlEnum {
     资源部署="/service/api/kyzx/zybs",
     资源可用性="/service/api/kyzx/zykyx",
     资源使用率趋势="/service/api/kyzx/zysylqs",
-    重要活动保障列表="/service/api/kyzx/zyhdbzlb"
+    重要活动保障列表="/service/api/kyzx/zyhdbzlb",
+    获取accesstoken="",
+    权限列表=""
+
 };
 
 export function getUrl(urlName) {

src/db/redis.ts

+import * as redis from 'redis';
+
+//创建Redis客户端
+const client = redis.createClient();
+
+//连接错误处理
+client.on("error", function (error) {
+    console.log(error);
+})
+
+client.on("connect", function(){
+    console.log("redis连接成功");
+})