Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@lienren
lienren committed Jan 10, 2018
1 parent d1b9a3e commit e4fdad9
Show file tree
Hide file tree
Showing 5 changed files with 190 additions and 5 deletions.
13 changes: 10 additions & 3 deletions app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: Lienren
* @Date: 2018-01-02 14:28:21
* @Last Modified by: Lienren
* @Last Modified time: 2018-01-10 14:41:10
* @Last Modified time: 2018-01-10 19:57:23
*/
'use strict';
const http = require('http');
Expand All @@ -13,10 +13,17 @@ const cors = require('koa2-cors');
const bodyParser = require('koa-bodyparser');
const app = new koa();

const mysqlconfig = require('./configs/mysql_config');
const sqlhelper = require('mysql-helper-simple')(mysqlconfig);
// mysql数据库初始化
const mysql_config = require('./configs/mysql_config');
const sqlhelper = require('mysql-helper-simple')(mysql_config);
app.context.db = sqlhelper;

// redis初始化
const redis_config = require('./configs/redis_config');
const redis = require('ioredis');
const redishelper = new redis(redis_config);
app.context.redis = redishelper;

// 静态存放地址
const staticPath = './static';
app.use(koastatic(path.join(__dirname, staticPath)));
Expand Down
5 changes: 5 additions & 0 deletions configs/redis_config.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"port": 6379,
"host": "127.0.0.1",
"db": 0
}
3 changes: 3 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
"main": "app.js",
"dependencies": {
"async": "^2.6.0",
"axios": "^0.17.1",
"ioredis": "^3.2.2",
"koa": "^2.4.1",
"koa-bodyparser": "^4.2.0",
"koa-router": "^7.3.0",
"koa-static": "^4.0.2",
"koa2-cors": "^2.0.5",
"md5": "^2.2.1",
"mysql-helper-simple": "^1.1.2",
"squel": "^5.12.0"
},
Expand Down
23 changes: 22 additions & 1 deletion router.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
* @Author: Lienren
* @Date: 2018-01-08 16:21:55
* @Last Modified by: Lienren
* @Last Modified time: 2018-01-10 17:20:06
* @Last Modified time: 2018-01-10 20:18:48
*/
'use strict';
const Router = require('koa-router');
const squel = require('squel');
const axios = require('axios');
const md5 = require('md5');
const router = new Router();

router
Expand Down Expand Up @@ -44,6 +46,25 @@ router
ctx.body = {
...results[0]
};
})
.get('/users', async (ctx, next) => {
let response = await axios.get('https://bmstorex.billgenius.cn/api/user/getusers');
console.log('response:', response);
if (response.status === 200) {
let data = await ctx.redis.get('data');
if (data && md5(data) !== md5(JSON.stringify(response.data))) {
data = JSON.stringify(response.data);
ctx.redis.set('data', JSON.stringify(response.data));
}

ctx.body = {
data: JSON.parse(data)
};
} else {
ctx.body = {
...response.status
};
}
});

module.exports = router.routes();
151 changes: 150 additions & 1 deletion yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,33 @@ async@^2.6.0:
dependencies:
lodash "^4.14.0"

axios@^0.17.1:
version "0.17.1"
resolved "http://registry.npm.taobao.org/axios/download/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
dependencies:
follow-redirects "^1.2.5"
is-buffer "^1.1.5"

[email protected]:
version "4.0.4"
resolved "http://registry.npm.taobao.org/bignumber.js/download/bignumber.js-4.0.4.tgz#7c40f5abcd2d6623ab7b99682ee7db81b11889a4"

bluebird@^3.3.4:
version "3.5.1"
resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"

[email protected]:
version "3.0.0"
resolved "http://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"

charenc@~0.0.1:
version "0.0.2"
resolved "http://registry.npm.taobao.org/charenc/download/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"

cluster-key-slot@^1.0.6:
version "1.0.8"
resolved "http://registry.npm.taobao.org/cluster-key-slot/download/cluster-key-slot-1.0.8.tgz#7654556085a65330932a2e8b5976f8e2d0b3e414"

co-body@^5.1.0:
version "5.1.1"
resolved "http://registry.npm.taobao.org/co-body/download/co-body-5.1.1.tgz#d97781d1e3344ba4a820fd1806bddf8341505236"
Expand Down Expand Up @@ -63,13 +82,17 @@ core-util-is@~1.0.0:
version "1.0.2"
resolved "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"

crypt@~0.0.1:
version "0.0.2"
resolved "http://registry.npm.taobao.org/crypt/download/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"

debug@*, debug@^3.1.0:
version "3.1.0"
resolved "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
dependencies:
ms "2.0.0"

debug@^2.6.3, debug@^2.6.8:
debug@^2.6.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
Expand All @@ -83,6 +106,10 @@ delegates@^1.0.0:
version "1.0.0"
resolved "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"

denque@^1.1.0:
version "1.2.2"
resolved "http://registry.npm.taobao.org/denque/download/denque-1.2.2.tgz#e06cf7cf0da8badc88cbdaabf8fc0a70d659f1d4"

[email protected], depd@^1.1.0, depd@~1.1.1:
version "1.1.1"
resolved "http://registry.npm.taobao.org/depd/download/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
Expand All @@ -103,6 +130,16 @@ escape-html@~1.0.1:
version "1.0.3"
resolved "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"

[email protected]:
version "0.0.6"
resolved "http://registry.npm.taobao.org/flexbuffer/download/flexbuffer-0.0.6.tgz#039fdf23f8823e440c38f3277e6fef1174215b30"

follow-redirects@^1.2.5:
version "1.3.0"
resolved "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.3.0.tgz#f684871fc116d2e329fda55ef67687f4fabc905c"
dependencies:
debug "^3.1.0"

fresh@^0.5.2:
version "0.5.2"
resolved "http://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
Expand Down Expand Up @@ -143,6 +180,38 @@ [email protected], inherits@~2.0.3:
version "2.0.3"
resolved "http://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"

ioredis@^3.2.2:
version "3.2.2"
resolved "http://registry.npm.taobao.org/ioredis/download/ioredis-3.2.2.tgz#b7d5ff3afd77bb9718bb2821329b894b9a44c00b"
dependencies:
bluebird "^3.3.4"
cluster-key-slot "^1.0.6"
debug "^2.6.9"
denque "^1.1.0"
flexbuffer "0.0.6"
lodash.assign "^4.2.0"
lodash.bind "^4.2.1"
lodash.clone "^4.5.0"
lodash.clonedeep "^4.5.0"
lodash.defaults "^4.2.0"
lodash.difference "^4.5.0"
lodash.flatten "^4.4.0"
lodash.foreach "^4.5.0"
lodash.isempty "^4.4.0"
lodash.keys "^4.2.0"
lodash.noop "^3.0.1"
lodash.partial "^4.2.1"
lodash.pick "^4.4.0"
lodash.sample "^4.2.1"
lodash.shuffle "^4.2.0"
lodash.values "^4.3.0"
redis-commands "^1.2.0"
redis-parser "^2.4.0"

is-buffer@^1.1.5, is-buffer@~1.1.1:
version "1.1.6"
resolved "http://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"

is-generator-function@^1.0.3:
version "1.0.7"
resolved "http://registry.npm.taobao.org/is-generator-function/download/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
Expand Down Expand Up @@ -247,10 +316,82 @@ koa@^2.4.1:
type-is "^1.5.5"
vary "^1.0.0"

lodash.assign@^4.2.0:
version "4.2.0"
resolved "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"

lodash.bind@^4.2.1:
version "4.2.1"
resolved "http://registry.npm.taobao.org/lodash.bind/download/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"

lodash.clone@^4.5.0:
version "4.5.0"
resolved "http://registry.npm.taobao.org/lodash.clone/download/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"

lodash.clonedeep@^4.5.0:
version "4.5.0"
resolved "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"

lodash.defaults@^4.2.0:
version "4.2.0"
resolved "http://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"

lodash.difference@^4.5.0:
version "4.5.0"
resolved "http://registry.npm.taobao.org/lodash.difference/download/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"

lodash.flatten@^4.4.0:
version "4.4.0"
resolved "http://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"

lodash.foreach@^4.5.0:
version "4.5.0"
resolved "http://registry.npm.taobao.org/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"

lodash.isempty@^4.4.0:
version "4.4.0"
resolved "http://registry.npm.taobao.org/lodash.isempty/download/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"

lodash.keys@^4.2.0:
version "4.2.0"
resolved "http://registry.npm.taobao.org/lodash.keys/download/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"

lodash.noop@^3.0.1:
version "3.0.1"
resolved "http://registry.npm.taobao.org/lodash.noop/download/lodash.noop-3.0.1.tgz#38188f4d650a3a474258439b96ec45b32617133c"

lodash.partial@^4.2.1:
version "4.2.1"
resolved "http://registry.npm.taobao.org/lodash.partial/download/lodash.partial-4.2.1.tgz#49f3d8cfdaa3bff8b3a91d127e923245418961d4"

lodash.pick@^4.4.0:
version "4.4.0"
resolved "http://registry.npm.taobao.org/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"

lodash.sample@^4.2.1:
version "4.2.1"
resolved "http://registry.npm.taobao.org/lodash.sample/download/lodash.sample-4.2.1.tgz#5e4291b0c753fa1abeb0aab8fb29df1b66f07f6d"

lodash.shuffle@^4.2.0:
version "4.2.0"
resolved "http://registry.npm.taobao.org/lodash.shuffle/download/lodash.shuffle-4.2.0.tgz#145b5053cf875f6f5c2a33f48b6e9948c6ec7b4b"

lodash.values@^4.3.0:
version "4.3.0"
resolved "http://registry.npm.taobao.org/lodash.values/download/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"

lodash@^4.14.0:
version "4.17.4"
resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

md5@^2.2.1:
version "2.2.1"
resolved "http://registry.npm.taobao.org/md5/download/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
dependencies:
charenc "~0.0.1"
crypt "~0.0.1"
is-buffer "~1.1.1"

[email protected]:
version "0.3.0"
resolved "http://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
Expand Down Expand Up @@ -357,6 +498,14 @@ [email protected]:
string_decoder "~1.0.3"
util-deprecate "~1.0.1"

redis-commands@^1.2.0:
version "1.3.1"
resolved "http://registry.npm.taobao.org/redis-commands/download/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"

redis-parser@^2.4.0:
version "2.6.0"
resolved "http://registry.npm.taobao.org/redis-parser/download/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"

resolve-path@^1.3.3:
version "1.3.3"
resolved "http://registry.npm.taobao.org/resolve-path/download/resolve-path-1.3.3.tgz#4d83aba6468c2b8e632a575e3f52b0fa0dbe1a5c"
Expand Down

0 comments on commit e4fdad9

Please sign in to comment.