Skip to content

Commit 546a2c3

Browse files
author
guosw
committed
perf: Update sequelize configuration
1 parent 6323c92 commit 546a2c3

File tree

7 files changed

+79
-256
lines changed

7 files changed

+79
-256
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"dev": "node scripts/start.js",
7777
"build": "node scripts/build.js",
7878
"test": "node scripts/test.js",
79-
"commit": "git-cz"
79+
"commit": "git-cz",
80+
"dev:server": "cd server && npm run dev"
8081
},
8182
"browserslist": {
8283
"production": [

server/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ loadRouter(app)
4646

4747
app.listen(config.PORT, () => {
4848
db.sequelize
49-
.sync({ force: false, logging: false }) // If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
49+
.sync({ force: false }) // If force is true, each DAO will do DROP TABLE IF EXISTS ..., before it tries to create its own table
5050
.then(async () => {
5151
const initData = require('./initData')
5252
initData() // 创建初始化数据

server/controllers/user.js

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -258,19 +258,15 @@ class UserController {
258258
* @param {String} githubLoginName - github name
259259
*/
260260
static async initGithubUser(githubLoginName) {
261-
const github = await getGithubInfo(githubLoginName)
262-
const temp = await UserController.find({ id: github.id })
263-
if (!temp) {
264-
UserController.createGithubUser(github, 1)
261+
try {
262+
const github = await getGithubInfo(githubLoginName)
263+
const temp = await UserController.find({ id: github.id })
264+
if (!temp) {
265+
UserController.createGithubUser(github, 1)
266+
}
267+
} catch (error) {
268+
console.trace('create github user error ==============>', error.message)
265269
}
266-
267-
// const tempList = await Promise.all(list.map(username => UserController.find({ username }))) // 查找库里是否有这个用户
268-
// list.forEach(async (username, i) => {
269-
// if (!tempList[i]) {
270-
// const result = await getGithubInfo(username)
271-
// UserController.createGithubUser(result, 1)
272-
// }
273-
// })
274270
}
275271
}
276272

server/models/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const Op = Sequelize.Op
77

88
const sequelize = new Sequelize(DATABASE.database, DATABASE.user, DATABASE.password, {
99
...DATABASE.options,
10+
logging: false,
1011
// 在 sequelize V4 版本以后新加了符号运算符来代替 Op.xxx
1112
// https://sequelize.org/master/manual/querying.html#operators
1213
operatorsAliases: {

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"koa2-cors": "^2.0.6",
2323
"mysql2": "^1.7.0",
2424
"nodemailer": "^6.3.0",
25-
"sequelize": "^5.18.1"
25+
"sequelize": "^5.21.5"
2626
},
2727
"devDependencies": {
2828
"cross-env": "^5.2.1",

server/yarn.lock

Lines changed: 56 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ bl@^3.0.0:
203203
readable-stream "^3.0.1"
204204

205205
bluebird@^3.5.0:
206-
version "3.5.5"
207-
resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
208-
integrity sha1-qNCv1zJR7/u9X+OEp31zADwXpx8=
206+
version "3.7.2"
207+
resolved "http://192.168.1.206:11001/repository/npm-group/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
208+
integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28=
209209

210210
boxen@^1.2.1:
211211
version "1.3.0"
@@ -355,7 +355,7 @@ cli-boxes@^1.0.0:
355355

356356
cls-bluebird@^2.1.0:
357357
version "2.1.0"
358-
resolved "https://registry.npm.taobao.org/cls-bluebird/download/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee"
358+
resolved "http://192.168.1.206:11001/repository/npm-group/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee"
359359
integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=
360360
dependencies:
361361
is-bluebird "^1.0.2"
@@ -560,7 +560,7 @@ debug@^3.1.0, debug@^3.2.6:
560560

561561
debug@^4.1.1:
562562
version "4.1.1"
563-
resolved "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
563+
resolved "http://192.168.1.206:11001/repository/npm-group/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
564564
integrity sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=
565565
dependencies:
566566
ms "^2.1.1"
@@ -635,9 +635,9 @@ dot-prop@^4.1.0:
635635
is-obj "^1.0.0"
636636

637637
dottie@^2.0.0:
638-
version "2.0.1"
639-
resolved "https://registry.npm.taobao.org/dottie/download/dottie-2.0.1.tgz#697ad9d72004db7574d21f892466a3c285893659"
640-
integrity sha1-aXrZ1yAE23V00h+JJGajwoWJNlk=
638+
version "2.0.2"
639+
resolved "http://192.168.1.206:11001/repository/npm-group/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
640+
integrity sha1-zJHAcmzjoFTr8RxV+8kqfyZt0VQ=
641641

642642
duplexer3@^0.1.4:
643643
version "0.1.4"
@@ -1005,7 +1005,7 @@ inflation@^2.0.0:
10051005

10061006
inflection@1.12.0:
10071007
version "1.12.0"
1008-
resolved "https://registry.npm.taobao.org/inflection/download/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
1008+
resolved "http://192.168.1.206:11001/repository/npm-group/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
10091009
integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
10101010

10111011
inflight@^1.0.4:
@@ -1054,7 +1054,7 @@ is-binary-path@^1.0.0:
10541054

10551055
is-bluebird@^1.0.2:
10561056
version "1.0.2"
1057-
resolved "https://registry.npm.taobao.org/is-bluebird/download/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
1057+
resolved "http://192.168.1.206:11001/repository/npm-group/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
10581058
integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=
10591059

10601060
is-buffer@^1.1.5:
@@ -1365,6 +1365,14 @@ koa-is-json@^1.0.0:
13651365
resolved "https://registry.npm.taobao.org/koa-is-json/download/koa-is-json-1.0.0.tgz#273c07edcdcb8df6a2c1ab7d59ee76491451ec14"
13661366
integrity sha1-JzwH7c3Ljfaiwat9We52SRRR7BQ=
13671367

1368+
koa-json-error@^3.1.2:
1369+
version "3.1.2"
1370+
resolved "http://192.168.1.206:11001/repository/npm-group/koa-json-error/-/koa-json-error-3.1.2.tgz#acad750c6739cb12cc4ea6c25f224d59b765abfe"
1371+
integrity sha1-rK11DGc5yxLMTqbCXyJNWbdlq/4=
1372+
dependencies:
1373+
lodash.compact "^3.0.1"
1374+
lodash.curry "^4.1.1"
1375+
13681376
koa-logger@^3.2.1:
13691377
version "3.2.1"
13701378
resolved "https://registry.npm.taobao.org/koa-logger/download/koa-logger-3.2.1.tgz?cache=0&sync_timestamp=1563332734179&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fkoa-logger%2Fdownload%2Fkoa-logger-3.2.1.tgz#ab9db879526db3837cc9ce4fd983c025b1689f22"
@@ -1446,6 +1454,16 @@ lazystream@^1.0.0:
14461454
dependencies:
14471455
readable-stream "^2.0.5"
14481456

1457+
lodash.compact@^3.0.1:
1458+
version "3.0.1"
1459+
resolved "http://192.168.1.206:11001/repository/npm-group/lodash.compact/-/lodash.compact-3.0.1.tgz#540ce3837745975807471e16b4a2ba21e7256ca5"
1460+
integrity sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU=
1461+
1462+
lodash.curry@^4.1.1:
1463+
version "4.1.1"
1464+
resolved "http://192.168.1.206:11001/repository/npm-group/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
1465+
integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA=
1466+
14491467
lodash.defaults@^4.2.0:
14501468
version "4.2.0"
14511469
resolved "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
@@ -1501,7 +1519,7 @@ lodash.union@^4.6.0:
15011519
resolved "https://registry.npm.taobao.org/lodash.union/download/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
15021520
integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
15031521

1504-
lodash@^4.17.11, lodash@^4.17.14:
1522+
lodash@^4.17.14, lodash@^4.17.15:
15051523
version "4.17.15"
15061524
resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
15071525
integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=
@@ -1639,15 +1657,15 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
16391657
minimist "0.0.8"
16401658

16411659
moment-timezone@^0.5.21:
1642-
version "0.5.26"
1643-
resolved "https://registry.npm.taobao.org/moment-timezone/download/moment-timezone-0.5.26.tgz#c0267ca09ae84631aa3dc33f65bedbe6e8e0d772"
1644-
integrity sha1-wCZ8oJroRjGqPcM/Zb7b5ujg13I=
1660+
version "0.5.28"
1661+
resolved "http://192.168.1.206:11001/repository/npm-group/moment-timezone/-/moment-timezone-0.5.28.tgz#f093d789d091ed7b055d82aa81a82467f72e4338"
1662+
integrity sha1-8JPXidCR7XsFXYKqgagkZ/cuQzg=
16451663
dependencies:
16461664
moment ">= 2.9.0"
16471665

16481666
"moment@>= 2.9.0", moment@^2.24.0:
16491667
version "2.24.0"
1650-
resolved "https://registry.npm.taobao.org/moment/download/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
1668+
resolved "http://192.168.1.206:11001/repository/npm-group/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
16511669
integrity sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s=
16521670

16531671
ms@2.0.0:
@@ -2104,9 +2122,9 @@ ret@~0.1.10:
21042122
resolved "https://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
21052123
integrity sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=
21062124

2107-
retry-as-promised@^3.1.0:
2125+
retry-as-promised@^3.2.0:
21082126
version "3.2.0"
2109-
resolved "https://registry.npm.taobao.org/retry-as-promised/download/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543"
2127+
resolved "http://192.168.1.206:11001/repository/npm-group/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543"
21102128
integrity sha1-dp9j1Ta+xHg1SdsHd8tW2t2dhUM=
21112129
dependencies:
21122130
any-promise "^1.3.0"
@@ -2157,9 +2175,9 @@ semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
21572175
resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
21582176
integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=
21592177

2160-
semver@^6.1.1:
2178+
semver@^6.3.0:
21612179
version "6.3.0"
2162-
resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
2180+
resolved "http://192.168.1.206:11001/repository/npm-group/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
21632181
integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
21642182

21652183
seq-queue@^0.0.5:
@@ -2169,29 +2187,29 @@ seq-queue@^0.0.5:
21692187

21702188
sequelize-pool@^2.3.0:
21712189
version "2.3.0"
2172-
resolved "https://registry.npm.taobao.org/sequelize-pool/download/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d"
2190+
resolved "http://192.168.1.206:11001/repository/npm-group/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d"
21732191
integrity sha1-ZPH+h0QigXLEdPUwYEthM75kmT0=
21742192

2175-
sequelize@^5.18.1:
2176-
version "5.18.1"
2177-
resolved "https://registry.npm.taobao.org/sequelize/download/sequelize-5.18.1.tgz#31d5246dcdf01d0ac317454c28fb598359d5b60a"
2178-
integrity sha1-MdUkbc3wHQrDF0VMKPtZg1nVtgo=
2193+
sequelize@^5.21.5:
2194+
version "5.21.5"
2195+
resolved "http://192.168.1.206:11001/repository/npm-group/sequelize/-/sequelize-5.21.5.tgz#44056f3ab8862ccbfeebd5e03ce041c570477ea2"
2196+
integrity sha1-RAVvOriGLMv+69XgPOBBxXBHfqI=
21792197
dependencies:
21802198
bluebird "^3.5.0"
21812199
cls-bluebird "^2.1.0"
21822200
debug "^4.1.1"
21832201
dottie "^2.0.0"
21842202
inflection "1.12.0"
2185-
lodash "^4.17.11"
2203+
lodash "^4.17.15"
21862204
moment "^2.24.0"
21872205
moment-timezone "^0.5.21"
2188-
retry-as-promised "^3.1.0"
2189-
semver "^6.1.1"
2206+
retry-as-promised "^3.2.0"
2207+
semver "^6.3.0"
21902208
sequelize-pool "^2.3.0"
21912209
toposort-class "^1.0.1"
2192-
uuid "^3.2.1"
2210+
uuid "^3.3.3"
21932211
validator "^10.11.0"
2194-
wkx "^0.4.6"
2212+
wkx "^0.4.8"
21952213

21962214
set-blocking@~2.0.0:
21972215
version "2.0.0"
@@ -2232,7 +2250,7 @@ shebang-regex@^1.0.0:
22322250

22332251
shimmer@^1.1.0:
22342252
version "1.2.1"
2235-
resolved "https://registry.npm.taobao.org/shimmer/download/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
2253+
resolved "http://192.168.1.206:11001/repository/npm-group/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
22362254
integrity sha1-YQhZ994ye1h+/r9QH7QxF/mv8zc=
22372255

22382256
signal-exit@^3.0.0, signal-exit@^3.0.2:
@@ -2467,7 +2485,7 @@ topo@3.x.x:
24672485

24682486
toposort-class@^1.0.1:
24692487
version "1.0.1"
2470-
resolved "https://registry.npm.taobao.org/toposort-class/download/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
2488+
resolved "http://192.168.1.206:11001/repository/npm-group/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
24712489
integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=
24722490

24732491
touch@^3.1.0:
@@ -2575,14 +2593,14 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
25752593
resolved "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
25762594
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
25772595

2578-
uuid@^3.2.1:
2579-
version "3.3.3"
2580-
resolved "https://registry.npm.taobao.org/uuid/download/uuid-3.3.3.tgz?cache=0&sync_timestamp=1566221202613&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
2581-
integrity sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY=
2596+
uuid@^3.3.3:
2597+
version "3.4.0"
2598+
resolved "http://192.168.1.206:11001/repository/npm-group/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
2599+
integrity sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4=
25822600

25832601
validator@^10.11.0:
25842602
version "10.11.0"
2585-
resolved "https://registry.npm.taobao.org/validator/download/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
2603+
resolved "http://192.168.1.206:11001/repository/npm-group/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
25862604
integrity sha1-ADEI6m6amHTTHMyeUAaFbM12sig=
25872605

25882606
vary@^1.1.2:
@@ -2611,9 +2629,9 @@ widest-line@^2.0.0:
26112629
dependencies:
26122630
string-width "^2.1.1"
26132631

2614-
wkx@^0.4.6:
2632+
wkx@^0.4.8:
26152633
version "0.4.8"
2616-
resolved "https://registry.npm.taobao.org/wkx/download/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"
2634+
resolved "http://192.168.1.206:11001/repository/npm-group/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"
26172635
integrity sha1-oJLPCI0RJoP9xxgv0xSTssWCAAM=
26182636
dependencies:
26192637
"@types/node" "*"

0 commit comments

Comments
 (0)