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 Nov 20, 2019
2 parents 95159c9 + f0aeafe commit c1c8437
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@

### 软件演示

![软件演示](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/full.gif)
![软件演示](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/full.gif)

## 下载和安装

### 最新版本下载

- Windows
- 链接: [whu-library-seat-setup-1.8.3.exe](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.8.3/whu-library-seat-setup-1.8.3.exe)
- 备用地址: [whu-library-seat-setup-1.8.3.exe](https://assets.cs-tao.cc/whu-library-seat/releases/v1.8.3/whu-library-seat-setup-1.8.3.exe)
- 链接: [whu-library-seat-setup-1.8.4.exe](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.8.4/whu-library-seat-setup-1.8.4.exe)
- 备用地址: [whu-library-seat-setup-1.8.4.exe](https://assets.cs-tao.cc/whu-library-seat/releases/v1.8.4/whu-library-seat-setup-1.8.4.exe)

- Mac OS
- 链接: [whu-library-seat-1.8.3.dmg](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.8.3/whu-library-seat-1.8.3.dmg)
- 备用地址: [whu-library-seat-1.8.3.dmg](https://assets.cs-tao.cc/whu-library-seat/releases/v1.8.3/whu-library-seat-1.8.3.dmg)
- 链接: [whu-library-seat-1.8.4.dmg](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.8.4/whu-library-seat-1.8.4.dmg)
- 备用地址: [whu-library-seat-1.8.4.dmg](https://assets.cs-tao.cc/whu-library-seat/releases/v1.8.4/whu-library-seat-1.8.4.dmg)

- Linux
- 链接: [whu-library-seat-1.8.3-x86_64.AppImage](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.8.3/whu-library-seat-1.8.3-x86_64.AppImage)
- 备用地址: [whu-library-seat-1.8.3-x86_64.AppImage](https://assets.cs-tao.cc/whu-library-seat/releases/v1.8.3/whu-library-seat-1.8.3-x86_64.AppImage)
- 链接: [whu-library-seat-1.8.4-x86_64.AppImage](https://github.com/CS-Tao/whu-library-seat/releases/download/v1.8.4/whu-library-seat-1.8.4-x86_64.AppImage)
- 备用地址: [whu-library-seat-1.8.4-x86_64.AppImage](https://assets.cs-tao.cc/whu-library-seat/releases/v1.8.4/whu-library-seat-1.8.4-x86_64.AppImage)

### 安装软件

Expand All @@ -49,7 +49,7 @@

软件启动的时候会自动访问[GitHub Release](https://github.com/CS-Tao/whu-library-seat/releases/latest)检查更新,如果有更新,在软件的左下角会出现更新的按钮,您可以点击菜单中的 `关于` -> `更新日志` 查看新版本的特性

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/update.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/update.png)

## 面向开发者

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ footer: Copyright © 2018 CS-Tao

> 以桌面端为例,移动端相关操作与之一致
![软件演示](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/full.gif)
![软件演示](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/full.gif)

#### Gitter 群聊

Expand Down
2 changes: 1 addition & 1 deletion docs/specification/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

### 软件更新

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/update.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/update.png)

- 桌面端
软件启动的时候会自动访问[GitHub Release](https://github.com/CS-Tao/whu-library-seat/releases/latest)检查更新,如果有更新,在软件的左下角会出现更新的按钮
Expand Down
16 changes: 8 additions & 8 deletions docs/specification/auth.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,34 @@

1. 点击软件下方的**钥匙**进入软件授权页面(第一次打开软件会默认进入本页面)

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/1.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/1.png)

1. 点击`GitHub Star 永久授权`按钮,软件会打开系统浏览器访问认证页面,如果出现无法连接服务器的弹窗,请移步[手动申请 Token](manualtoken.html)进行认证

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/3.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/3.png)

1. 点击`确定通过 GitHub 账号登录`,此时 GitHub 会让你确认是否授权(如果没有登录 GitHub,此时会进入登录页面)

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/4.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/4.png)

1. 点击`Authorize CS-Tao`即可成功登录

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.png)

1. 登录成功后返回软件,如果出现下面的弹窗,说明您还未对本仓库点星,请进行下一步

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.1.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.1.png)

1. 如果您还未给本仓库点星,请到指定仓库点星以供管理员了解软件使用情况。桌面端进入:[whu-library-seat](https://github.com/CS-Tao/whu-library-seat),移动端进入:[whu-library-seat-mobile](https://github.com/CS-Tao/whu-library-seat-mobile)

- 桌面端点击右上角的`Star`按钮,按钮如下图所示:

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.2.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.2.png)

- 移动端需要登录才会显示`Star`按钮,登录状态下直接点击即可,按钮如下图所示:

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.3.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.3.png)

1. 点星后回到本软件,点击确定即可

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/6.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/6.png)
16 changes: 8 additions & 8 deletions docs/specification/manualtoken.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
如果软件无法连接后台服务器,软件会出现如下的弹窗提醒您手动申请 Token:

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/ManualToken/1.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/ManualToken/1.png)

请点击弹窗中的绿色文字进入 GitHub 的 [Token 申请页面](https://github.com/settings/tokens/new)

进入页面后,在 Note 的输入框中输入任意文字,如: whu-library-seat。无需选择 scope,直接点击页面最下方的 `Generate token` 按钮,生成 Token

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/ManualToken/2.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/ManualToken/2.png)

复制生成的 40 位 Token 字符串

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/ManualToken/3.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/ManualToken/3.png)

粘贴到软件弹窗的输入框中,点击确认按钮

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/ManualToken/4.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/ManualToken/4.png)

如果出现下面的弹窗,说明您还未对本仓库点星,请进行下一步

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.1.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.1.png)

如果您还未给本仓库点星,请到指定仓库点星以供管理员了解软件使用情况。桌面端进入:[whu-library-seat](https://github.com/CS-Tao/whu-library-seat),移动端进入:[whu-library-seat-mobile](https://github.com/CS-Tao/whu-library-seat-mobile)

- 桌面端点击右上角的`Star`按钮,按钮如下图所示:

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.2.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.2.png)

- 移动端需要登录才会显示`Star`按钮,登录状态下直接点击即可,按钮如下图所示:

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/5.3.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/5.3.png)

点星后回到本软件,点击确定即可

![图片加载失败](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/OAuth/6.png)
![图片加载失败](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/OAuth/6.png)
2 changes: 1 addition & 1 deletion docs/specification/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

启动程序,在未登录的状态下,点击软件右上角的设置按钮即可进入设置界面

![settings.png](https://raw.githubusercontent.com/CS-Tao/github-content/master/contents/github/whu-library-seat/settings.png)
![settings.png](https://home.cs-tao.cc/github-content/contents/github/whu-library-seat/settings.png)

### 配置设置项

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "whu-library-seat",
"version": "1.8.3",
"version": "1.8.4",
"author": "CS-Tao <[email protected]>",
"description": "武汉大学图书馆抢座软件",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/api/gitcontents.api.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import axios from 'axios'
import urls from './urls'

var service = axios.create({
baseURL: 'https://raw.githubusercontent.com/CS-Tao/whu-library-seat',
baseURL: 'http://home.cs-tao.cc/github-content/contents/github/whu-library-seat',
timeout: 8000,
withCredentials: true
})
Expand Down

0 comments on commit c1c8437

Please sign in to comment.