Skip to content

add some package #1

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

Merged
detailyang merged 2 commits into from
Mar 21, 2016
Merged

add some package #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8c2fe6
add package
Mar 21, 2016
f279a45
Merge branch 'master' of https://github.com/Raistlin916/cas-server
Mar 21, 2016
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
2 changes: 1 addition & 1 deletion config/mysql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
if (process.env.NODE_ENV === 'dev') {
module.exports = {
username: 'root',
password: '123456',
password: '',
Copy link
Copy Markdown
Owner

@detailyang detailyang Mar 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, empty password default is better

database: 'cas',
host: '127.0.0.1',
port: '3306',
Expand Down
5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
"zxcvbn": "^4.2.0"
},
"devDependencies": {
"antd": "^0.12.12",
"babel-core": "^6.6.5",
"babel-loader": "^6.2.4",
"backbone": "^1.3.1",
"classnames": "^2.2.3",
Expand All @@ -67,10 +69,13 @@
"jquery": "^2.2.1",
"node-sass": "^3.4.2",
"qrcode.react": "^0.6.0",
"react": "^0.14.7",
"react-dom": "^0.14.7",
"react-hot-loader": "^1.3.0",
"sass-loader": "^3.1.2",
"style-loader": "^0.13.0",
"underscore": "^1.8.3",
"webpack": "^1.12.14",
"webpack-dev-server": "^1.14.1"
}
}
2 changes: 1 addition & 1 deletion scripts/init_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require('babel-polyfill');
const fs = require('fs');
const path = require('path');
const Sequelize = require('sequelize');
const config = require('../config').database;
const config = require('../config').mysql;
const db = {};
const sequelize = new Sequelize(config.database, config.username, config.password, config);
const modeldir = `${__dirname}/../models`;
Expand Down