Skip to content

Commit

Permalink
trigger ci 修复pac地址
Browse files Browse the repository at this point in the history
  • Loading branch information
erguotou520 committed Sep 9, 2018
1 parent a83b1b0 commit eb32f29
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-ssr",
"version": "0.2.3",
"version": "0.2.4",
"author": "erguotou <[email protected]>",
"description": "Cross platform ShadowsocksR GUI client built with electron",
"homepage": "https://github.com/erguotou520/electron-ssr/",
Expand Down
2 changes: 1 addition & 1 deletion src/main/pac.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export async function downloadPac (force = false) {
const pacExisted = await pathExists(pacPath)
if (force || !pacExisted) {
logger.debug('start download pac')
const pac = await request('https://softs.loan/Other/pac.txt')
const pac = await request('https://raw.githubusercontent.com/erguotou520/pac.txt/pac/pac.txt')
pacContent = pac
return await writeFile(pacPath, pac)
}
Expand Down
8 changes: 4 additions & 4 deletions src/renderer/views/Options.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<i-tab-pane label="订阅管理" name="subscribes">
<option-subscribe></option-subscribe>
</i-tab-pane>
<i-tab-pane label="快捷键" name="shortcut">
<!-- <i-tab-pane label="快捷键" name="shortcut">
<option-shortcut></option-shortcut>
</i-tab-pane>
</i-tab-pane> -->
</i-tabs>
<div class="w-100 flex flex-jc-end px-2 py-1 border-1px-t">
<i-button class="w-6r mr-2" @click="$emit('back')">返回</i-button>
Expand All @@ -26,14 +26,14 @@ import { hideWindow } from '../ipc'
import OptionCommon from './option/Common'
import OptionSsr from './option/SSR'
import OptionSubscribe from './option/Subscribe'
import OptionShortcut from './option/Shortcut'
// import OptionShortcut from './option/Shortcut'
export default {
computed: {
...mapState(['view'])
},
components: {
OptionCommon, OptionSsr, OptionSubscribe, OptionShortcut
OptionCommon, OptionSsr, OptionSubscribe
},
methods: {
...mapMutations(['resetState', 'updateView']),
Expand Down
33 changes: 25 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@ async-validator@^1.8.2:
dependencies:
babel-runtime "6.x"

[email protected]:
version "1.5.0"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.0.tgz#2796642723573859565633fc6274444bee2f8ce3"

async@^1.5.2:
version "1.5.2"
resolved "https://registry.npmjs.org/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
Expand Down Expand Up @@ -3856,6 +3860,15 @@ handle-thing@^1.2.5:
version "1.2.5"
resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"

happypack@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/happypack/-/happypack-4.0.1.tgz#d71a6520d13c1ddf6cc5ca040cfe22711cba5209"
dependencies:
async "1.5.0"
json-stringify-safe "5.0.1"
loader-utils "1.1.0"
serialize-error "^2.1.0"

har-schema@^1.0.5:
version "1.0.5"
resolved "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
Expand Down Expand Up @@ -4665,7 +4678,7 @@ json-stable-stringify@^1.0.1:
dependencies:
jsonify "~0.0.0"

json-stringify-safe@~5.0.1:
json-stringify-safe@5.0.1, json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"

Expand Down Expand Up @@ -4809,22 +4822,22 @@ loader-runner@^2.3.0:
version "2.3.0"
resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"

loader-utils@^0.2.15, loader-utils@^0.2.16:
version "0.2.17"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
loader-utils@1.1.0, loader-utils@^1.0.2, loader-utils@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"
object-assign "^4.0.1"

loader-utils@^1.0.2, loader-utils@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
loader-utils@^0.2.15, loader-utils@^0.2.16:
version "0.2.17"
resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"
object-assign "^4.0.1"

locate-path@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -6789,6 +6802,10 @@ sentence-case@^2.1.0:
no-case "^2.2.0"
upper-case-first "^1.1.2"

serialize-error@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"

serialize-javascript@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
Expand Down

0 comments on commit eb32f29

Please sign in to comment.