Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Evan redis #2

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Evan redis #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ef2a7f3
for local save
Dec 8, 2018
1db166a
redis edition one done by evan
Dec 17, 2018
b3114f3
for code save
Dec 18, 2018
21a5104
for code save
Dec 18, 2018
54c1802
change origin
Dec 18, 2018
c4678e7
conflict fixed
Dec 18, 2018
17a6bb0
add test change redis
Dec 28, 2018
49742a2
save
Dec 28, 2018
cf81f8a
for merge
Dec 28, 2018
96adc16
save and done
Dec 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ typings/
# vscode config file
.vscode

.idea
.gitgnore


12 changes: 12 additions & 0 deletions .idea/easyNode.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

242 changes: 242 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion conf/dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = Object.assign({}, config, {
config: {
connectionLimit: 10,
host: '127.0.0.1',
port: '3306',
port: '27017',
user: 'root',
password: 'ycdn8Tm5Nj',
database: 'test'
Expand Down
1 change: 0 additions & 1 deletion controller/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ let queryB = (app, req, res) => {
}

let queryC = (app, req, res, parms) => {
console.log(parms);
res.writeHead('200', {
'Content-Type': 'application/json'
});
Expand Down
6 changes: 3 additions & 3 deletions core/server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ let http = require('http'),
Route = require('../route'),
middleWare = require('../middleWare');

log4j.configure(log4jconf);
global.logger = log4j.getLogger('logInfo')
console.log = logger.info.bind(logger);
log4j.configure(log4jconf);
global.logger = log4j.getLogger('logInfo')
console.log = logger.info.bind(logger);
/**
*
* @description 创建一个http实例
Expand Down
2 changes: 1 addition & 1 deletion coverage/coverage.raw.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading