Skip to content
This repository has been archived by the owner on Apr 25, 2020. It is now read-only.

Commit

Permalink
style: rename
Browse files Browse the repository at this point in the history
  • Loading branch information
qiujun8023 committed Apr 25, 2020
1 parent 87890af commit 0a283a8
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ install:
- npm install -q

before_script:
- mysql -e 'CREATE DATABASE birthday CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'
- mysql -e 'CREATE DATABASE reminder CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'
- cp config/travis_ci.js config/local.js

script:
Expand Down
20 changes: 9 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

### 状态

#### Master

[![Build Status](https://travis-ci.org/qiujun8023/birthday-server.svg?branch=master)](https://travis-ci.org/qiujun8023/birthday-server)
[![Coverage Status](https://coveralls.io/repos/github/qiujun8023/birthday-server/badge.svg?branch=master)](https://coveralls.io/github/qiujun8023/birthday-server?branch=master)
[![Build Status](https://travis-ci.org/qiujun8023/reminder-server.svg?branch=master)](https://travis-ci.org/qiujun8023/reminder-server)
[![Coverage Status](https://coveralls.io/repos/github/qiujun8023/reminder-server/badge.svg?branch=master)](https://coveralls.io/github/qiujun8023/reminder-server?branch=master)

### 特性

Expand Down Expand Up @@ -53,11 +51,11 @@ services:
volumes:
- "./mysql:/var/lib/mysql"
environment:
MYSQL_DATABASE: birthday
MYSQL_USER: birthday
MYSQL_DATABASE: reminder
MYSQL_USER: reminder
MYSQL_PASSWORD: password
server:
image: qiujun8023/birthday-server
image: qiujun8023/reminder-server
restart: always
depends_on:
- redis
Expand All @@ -70,12 +68,12 @@ services:
APP_KEYS_2: i like turtle
APP_REDIS_HOST: redis
APP_REDIS_PORT: 6379
APP_REDIS_KEY_PREFIX: 'birthday:'
APP_REDIS_KEY_PREFIX: 'reminder:'
APP_MYSQL_HOST: mysql
APP_MYSQL_PORT: 3306
APP_MYSQL_USER: birthday
APP_MYSQL_USER: reminder
APP_MYSQL_PASSWORD: password
APP_MYSQL_DATABASE: birthday
APP_MYSQL_DATABASE: reminder
APP_WECHAT_CORP_ID: wx4e2c2b771c467c9f
APP_WECHAT_AGENT_ID: 0
APP_WECHAT_SECRET: secret
Expand All @@ -84,7 +82,7 @@ services:
- "./wait-for-it.sh:/app/wait-for-it.sh"
command: ["./wait-for-it.sh", "-t", "0", "mysql:3306", "--", "node", "index.js"]
client:
image: qiujun8023/birthday-client
image: qiujun8023/reminder-client
restart: always
ports:
- "8888:80"
Expand Down
6 changes: 3 additions & 3 deletions config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ module.exports = {
redis: {
host: 'localhost', // Redis 地址
port: 6379, // Redis 端口
keyPrefix: 'birthday:' // Redis 前缀,一般不用修改
keyPrefix: 'reminder:' // Redis 前缀,一般不用修改
},

mysql: {
host: 'localhost', // 数据库地址
port: 3306, // 数据库端口
user: 'birthday', // 数据库用户名
user: 'reminder', // 数据库用户名
password: 'password', // 数据库密码
database: 'birthday' // 数据库库名
database: 'reminder' // 数据库库名
},

wechat: {
Expand Down
4 changes: 2 additions & 2 deletions config/docker.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ module.exports = {
redis: {
host: process.env.APP_REDIS_HOST || 'redis',
port: Number(process.env.APP_REDIS_PORT || 6379),
keyPrefix: process.env.APP_REDIS_KEY_PREFIX || 'birthday:'
keyPrefix: process.env.APP_REDIS_KEY_PREFIX || 'reminder:'
},

mysql: {
host: process.env.APP_MYSQL_HOST || 'mysql',
port: Number(process.env.APP_MYSQL_PORT || 3306),
user: process.env.APP_MYSQL_USER || 'root',
password: process.env.APP_MYSQL_PASSWORD || 'root',
database: process.env.APP_MYSQL_DATABASE || 'birthday'
database: process.env.APP_MYSQL_DATABASE || 'reminder'
},

wechat: {
Expand Down
4 changes: 2 additions & 2 deletions config/travis_ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ module.exports = {
redis: {
host: 'localhost',
port: 6379,
keyPrefix: 'birthday:'
keyPrefix: 'reminder:'
},

mysql: {
poolSize: 5,
host: 'localhost',
user: 'root',
password: '',
database: 'birthday'
database: 'reminder'
}
}
2 changes: 1 addition & 1 deletion package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "birthday",
"name": "reminder",
"version": "0.4.2",
"private": true,
"engines": {
Expand All @@ -10,7 +10,7 @@
"license": "MIT",
"repository": {
"type": "git",
"url": "https://github.com/qiujun8023/birthday-server.git"
"url": "https://github.com/qiujun8023/reminder-server.git"
},
"scripts": {
"dev": "nodemon -e js,yaml src/index.js",
Expand Down

0 comments on commit 0a283a8

Please sign in to comment.