mirror of
https://git.mirrors.martin98.com/https://github.com/sub-store-org/Sub-Store.git
synced 2025-04-23 06:09:33 +08:00
Merge ; commit '47d06919aa1524905cb68fcab67f5b8968e5d0d1'
Conflicts: config/Surge.sgmodule
This commit is contained in:
commit
88634b146a
5
backend/.idea/workspace.xml
generated
5
backend/.idea/workspace.xml
generated
@ -20,7 +20,8 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="8b97a098-48b2-4e64-a9ef-522fe2d30b52" name="Default Changelist" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/../config/Loon.plugin" beforeDir="false" afterPath="$PROJECT_DIR$/../config/Loon.plugin" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../web/src/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/config.js" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@ -79,7 +80,7 @@
|
||||
<workItem from="1598442849645" duration="8914000" />
|
||||
<workItem from="1598778633049" duration="8638000" />
|
||||
<workItem from="1598795202964" duration="3825000" />
|
||||
<workItem from="1598806004385" duration="785000" />
|
||||
<workItem from="1598806004385" duration="1065000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
@ -1,5 +1,5 @@
|
||||
[MITM]
|
||||
hostname=sub.com
|
||||
hostname=sub.store
|
||||
|
||||
[Script]
|
||||
http-request https?:\/\/sub\.com script-path=https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/backend/sub-store.js, requires-body=true, timeout=120, tag=Sub-Store
|
||||
http-request https?:\/\/sub\.store script-path=https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/backend/sub-store.js, requires-body=true, timeout=120, tag=Sub-Store
|
@ -1,7 +1,7 @@
|
||||
#!name=Sub-Store
|
||||
#!desc=高级订阅管理工具 @Peng-YM
|
||||
[MITM]
|
||||
hostname=sub.com
|
||||
hostname=sub.store
|
||||
|
||||
[Script]
|
||||
Sub-Store = type=http-request,pattern=^https?:\/\/sub\.com,script-path=https://raw.githubusercontent.com/Peng-YM/Sub-Store/master/backend/sub-store.js,requires-body=true,timeout=120
|
||||
|
@ -1,3 +1,3 @@
|
||||
const DEBUG = false;
|
||||
|
||||
export const BACKEND_BASE = DEBUG ? `http://192.168.1.134:3000` : `https://sub.com`;
|
||||
export const BACKEND_BASE = DEBUG ? `http://192.168.1.134:3000` : `https://sub.store`;
|
Loading…
x
Reference in New Issue
Block a user