Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
CS-Tao committed Sep 28, 2018
2 parents cf025aa + 3ca43bc commit dea5392
Show file tree
Hide file tree
Showing 12 changed files with 259 additions and 53 deletions.
9 changes: 3 additions & 6 deletions README.md
Expand Up @@ -26,16 +26,13 @@
### 稳定版本下载

- Windows
- 安装包: `whu-library-seat-setup-<version>.exe`
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-setup-1.2.1.exe)
- 链接: [v1.3.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.3.0/whu-library-seat-setup-1.3.0.exe)

- Mac OS
- 安装包: `whu-library-seat-<version>.dmg`
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1.dmg)
- 链接: [v1.3.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.3.0/whu-library-seat-1.3.0.dmg)

- Linux
- 安装包: `whu-library-seat-<version>-x86_64.AppImage`
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1-x86_64.AppImage)
- 链接: [v1.3.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.3.0/whu-library-seat-1.3.0-x86_64.AppImage)

### 安装软件

Expand Down
9 changes: 3 additions & 6 deletions docs/specification/README.md
Expand Up @@ -9,16 +9,13 @@
#### 稳定版本下载

- Windows
- 安装包: `whu-library-seat-setup-<version>.exe`
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-setup-1.2.1.exe)
- 链接: [v1.3.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.3.0/whu-library-seat-setup-1.3.0.exe)

- Mac OS
- 安装包: `whu-library-seat-<version>.dmg`
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1.dmg)
- 链接: [v1.3.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.3.0/whu-library-seat-1.3.0.dmg)

- Linux
- 安装包: `whu-library-seat-<version>-x86_64.AppImage`
- 链接: [v1.2.1](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.2.1/whu-library-seat-1.2.1-x86_64.AppImage)
- 链接: [v1.3.0](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.3.0/whu-library-seat-1.3.0-x86_64.AppImage)

### 安装软件

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "whu-library-seat",
"version": "1.2.1",
"version": "1.3.0",
"author": "CS-Tao <whucstao@qq.com>",
"description": "武汉大学图书馆抢座软件",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/api/gitcontents.api.js
Expand Up @@ -35,7 +35,7 @@ export default {
validateUser: () => {
return service({
url: urls.gitcontents.validateUser.url(),
method: 'get',
method: urls.gitcontents.validateUser.method,
params: {
time: new Date()
}
Expand Down
30 changes: 20 additions & 10 deletions src/renderer/api/library.api.js
Expand Up @@ -6,7 +6,7 @@ export default {
Login: (account, passwd) => {
return request({
url: urls.library.Login.url(),
method: 'get',
method: urls.library.Login.method,
params: {
username: account,
password: passwd
Expand All @@ -17,7 +17,7 @@ export default {
FreeFilters: (token) => {
return request({
url: urls.library.FreeFilters.url(),
method: 'get',
method: urls.library.FreeFilters.method,
headers: {
token
}
Expand All @@ -27,7 +27,7 @@ export default {
RoomStats: (libraryId, token) => {
return request({
url: urls.library.RoomStats.url(libraryId),
method: 'get',
method: urls.library.RoomStats.method,
headers: {
token
}
Expand All @@ -37,7 +37,7 @@ export default {
ValidateToken: (token) => {
return request({
url: urls.library.ValidateToken.url(),
method: 'get',
method: urls.library.ValidateToken.method,
headers: {
token
}
Expand All @@ -47,7 +47,7 @@ export default {
LayoutByDate: (roomId, dateStr, token) => {
return request({
url: urls.library.LayoutByDate.url(roomId, dateStr),
method: 'get',
method: urls.library.LayoutByDate.method,
headers: {
token
}
Expand All @@ -59,7 +59,7 @@ export default {
SearchSeat: (buildingId, roomId, dateStr, startTime, endTime, token) => {
return request({
url: urls.library.SearchSeat.url(dateStr, startTime, endTime),
method: 'post',
method: urls.library.SearchSeat.method,
headers: {
token
},
Expand All @@ -71,7 +71,7 @@ export default {
Book: (t, t2, startTime, endTime, seat, date, token) => {
return request({
url: urls.library.Book.url(),
method: 'post',
method: urls.library.Book.method,
headers: {
token
},
Expand All @@ -82,7 +82,7 @@ export default {
Cancel: (id, token) => {
return request({
url: urls.library.Cancel.url(id),
method: 'get',
method: urls.library.Cancel.method,
headers: {
token
}
Expand All @@ -92,7 +92,7 @@ export default {
User: (token) => {
return request({
url: urls.library.User.url(),
method: 'get',
method: urls.library.User.method,
headers: {
token
}
Expand All @@ -102,7 +102,17 @@ export default {
History: (page, count, token) => {
return request({
url: urls.library.History.url(page, count),
method: 'get',
method: urls.library.History.method,
headers: {
token
}
})
},
// 终止使用
Stop: (token) => {
return request({
url: urls.library.Stop.url(),
method: urls.library.Stop.method,
headers: {
token
}
Expand Down
32 changes: 21 additions & 11 deletions src/renderer/api/mock/index.js
@@ -1,37 +1,47 @@
import Mock from 'mockjs'
import gitcontentsApi from './gitcontents.api'
import usageApi from './usage.api'
import libraryApi from './library.api'
import urls from '../urls'

// 用户验证
Mock.mock(urls.gitcontents.validateUser.regular, 'get', gitcontentsApi.validateUser)
Mock.mock(urls.gitcontents.validateUser.regular, gitcontentsApi.validateUser.method, gitcontentsApi.validateUser)

// 登录状态
Mock.mock(urls.usage.loginState.regular, usageApi.loginState.method, usageApi.loginState)

// 抢座状态
Mock.mock(urls.gitcontents.grabState.regular, usageApi.grabState.method, usageApi.grabState)

// 登录
Mock.mock(urls.library.Login.regular, 'get', libraryApi.Login)
Mock.mock(urls.library.Login.regular, libraryApi.Login.method, libraryApi.Login)

// 得到可以使用的房间信息
Mock.mock(urls.library.FreeFilters.regular, 'get', libraryApi.FreeFilters)
Mock.mock(urls.library.FreeFilters.regular, libraryApi.FreeFilters.method, libraryApi.FreeFilters)

// 得到房间详细信息
Mock.mock(urls.library.RoomStats.regular, 'get', libraryApi.RoomStats)
Mock.mock(urls.library.RoomStats.regular, libraryApi.RoomStats.method, libraryApi.RoomStats)

// 验证 token 是否可用
Mock.mock(urls.library.ValidateToken.regular, 'get', libraryApi.ValidateToken)
Mock.mock(urls.library.ValidateToken.regular, libraryApi.ValidateToken.method, libraryApi.ValidateToken)

// 得到位置详细信息
Mock.mock(urls.library.LayoutByDate.regular, 'get', libraryApi.LayoutByDate)
Mock.mock(urls.library.LayoutByDate.regular, libraryApi.LayoutByDate.method, libraryApi.LayoutByDate)

// 按时间搜索位置
Mock.mock(urls.library.SearchSeat.regular, 'post', libraryApi.SearchSeat)
Mock.mock(urls.library.SearchSeat.regular, libraryApi.SearchSeat.method, libraryApi.SearchSeat)

// 预约位置
Mock.mock(urls.library.Book.regular, 'post', libraryApi.Book)
Mock.mock(urls.library.Book.regular, libraryApi.Book.method, libraryApi.Book)

// 取消预约
Mock.mock(urls.library.Cancel.regular, 'get', libraryApi.Cancel)
Mock.mock(urls.library.Cancel.regular, libraryApi.Cancel.method, libraryApi.Cancel)

// 得到用户信息
Mock.mock(urls.library.User.regular, 'get', libraryApi.User)
Mock.mock(urls.library.User.regular, libraryApi.User.method, libraryApi.User)

// 得到预约历史
Mock.mock(urls.library.History.regular, 'get', libraryApi.History)
Mock.mock(urls.library.History.regular, libraryApi.History.method, libraryApi.History)

// 终止使用
Mock.mock(urls.library.Stop.regular, libraryApi.Stop.method, libraryApi.Stop)
4 changes: 4 additions & 0 deletions src/renderer/api/mock/library.api.js
Expand Up @@ -602,5 +602,9 @@ export default {
'23022': {'type': 'empty'}}},
'message': '',
'code': '0'}
},
Stop: config => {
console.log('Mock: ' + config.url)
return {'status': 'success', 'data': null, 'message': '已终止使用当前预约', 'code': '0'}
}
}
20 changes: 20 additions & 0 deletions src/renderer/api/mock/usage.api.js
@@ -0,0 +1,20 @@
export default {
loginState: config => {
console.log('Mock: ' + config.url)
return {
'status': 'success',
'code': '0',
'message': '',
'data': null
}
},
grabState: config => {
console.log('Mock: ' + config.url)
return {
'status': 'success',
'code': '0',
'message': '',
'data': null
}
}
}
59 changes: 48 additions & 11 deletions src/renderer/api/urls/index.js
Expand Up @@ -5,7 +5,26 @@ const urls = {
url () {
return '/user-validation/validation.json'
},
regular: /\/user-validation\/validation.json/
regular: /\/user-validation\/validation.json/,
method: 'get'
}
},
usage: {
// 登录状态
loginState: {
url () {
return '/loginState'
},
regular: /\/user-loginState/,
method: 'post'
},
// 抢座状态
grabState: {
url () {
return '/grabState'
},
regular: /\/grabState/,
method: 'post'
}
},
library: {
Expand All @@ -14,70 +33,88 @@ const urls = {
url () {
return '/rest/auth'
},
regular: /\/rest\/auth/
regular: /\/rest\/auth/,
method: 'get'
},
// 得到可以使用的房间信息
FreeFilters: {
url () {
return '/rest/v2/free/filters'
},
regular: /\/rest\/v2\/free\/filters/
regular: /\/rest\/v2\/free\/filters/,
method: 'get'
},
// 得到房间详细信息
RoomStats: {
url (libraryId) {
return `/rest/v2/room/stats2/${libraryId}`
},
regular: /\/rest\/v2\/room\/stats2\//
regular: /\/rest\/v2\/room\/stats2\//,
method: 'get'
},
ValidateToken: {
// 验证 token 是否可用
url () {
return '/rest/v2/violations'
},
regular: /\/rest\/v2\/violations/
regular: /\/rest\/v2\/violations/,
method: 'get'
},
// 得到位置详细信息
LayoutByDate: {
url (roomId, dateStr) {
return `/rest/v2/room/layoutByDate/${roomId}/${dateStr}`
},
regular: /\/rest\/v2\/room\/layoutByDate\//
regular: /\/rest\/v2\/room\/layoutByDate\//,
method: 'get'
},
// 按时间搜索位置
SearchSeat: {
url (dateStr, startTime, endTime) {
return `/rest/v2/searchSeats/${dateStr}/${startTime}/${endTime}`
},
regular: /\/rest\/v2\/searchSeats\//
regular: /\/rest\/v2\/searchSeats\//,
method: 'post'
},
// 预约位置
Book: {
url () {
return '/rest/v2/freeBook'
},
regular: /\/rest\/v2\/freeBook/
regular: /\/rest\/v2\/freeBook/,
method: 'post'
},
// 取消预约
Cancel: {
url (id) {
return `/rest/v2/cancel/${id}`
},
regular: /\/rest\/v2\/cancel\//
regular: /\/rest\/v2\/cancel\//,
method: 'get'
},
// 得到用户信息
User: {
url () {
return '/rest/v2/user'
},
regular: /\/rest\/v2\/user/
regular: /\/rest\/v2\/user/,
method: 'get'
},
// 得到预约历史
History: {
url (page, count) {
return `/rest/v2/history/${page}/${count}`
},
regular: /\/rest\/v2\/history\//
regular: /\/rest\/v2\/history\//,
method: 'get'
},
// 终止使用
Stop: {
url () {
return '/rest/v2/stop'
},
regular: /\/rest\/v2\/stop/,
method: 'get'
}
}
}
Expand Down

0 comments on commit dea5392

Please sign in to comment.