github
/
dev-sidecar
mirror of https://github.com/docmirror/dev-sidecar
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/192/head
xiaojunnuo 2021-12-15 12:54:46 +08:00
parent 8f9cd7547b 732458b863
commit f9541b01b9
17 changed files with 78 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/linux.md
View File

@ -1,6 +1,8 @@
# linux 支持
`linux`使用说明，目前仅支持`ubuntu_x64（GNOME）`，其他`linux`未测试
> 注意：需要开启[sudo免密支持](https://www.jianshu.com/p/5d02428f313d)
## 安装
### 1. ubuntu

2
lerna.json
View File

@ -14,5 +14,5 @@
"ignore": []
}
},
"version": "1.7.1"
"version": "1.7.2"
}

2
packages/core/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@docmirror/dev-sidecar",
"version": "1.7.1",
"version": "1.7.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

6
packages/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@docmirror/dev-sidecar",
"version": "1.7.1",
"version": "1.7.2",
"description": "给开发者的加速代理工具",
"main": "src/index.js",
"keywords": [
@ -17,7 +17,7 @@
"test": "mocha"
},
"dependencies": {
"@docmirror/mitmproxy": "^1.7.1",
"@docmirror/mitmproxy": "^1.7.2",
"agentkeepalive": "^2.1.1",
"babel-preset-es2020": "^1.0.2",
"charset": "^1.0.0",
@ -78,5 +78,5 @@
"last 2 versions",
"not dead"
],
"gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc"
"gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e"
}

3
packages/core/src/config/index.js
View File

@ -22,7 +22,8 @@ module.exports = {
dock: {
hideWhenWinClose: false
},
closeStrategy: 0
closeStrategy: 0,
showShutdownTip: true
},
server: {
enabled: true,

2
packages/gui/build/installer.nsh
View File

@ -1,4 +1,4 @@
!macro customUnInit
MessageBox MB_OK "卸载前请务必手动右下角小图标退出DevSidecar之后,再进行下一步(如果已经退出请忽略)↘↘↘↘↘↘↘↘↘"
MessageBox MB_OK "卸载前请务必手动退出DevSidecar之后,再进行下一步(如果已经退出请忽略)"
ExecWait '"$INSTDIR\resources\extra\sysproxy.exe" set 1'
!macroend

8
packages/gui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@docmirror/dev-sidecar-gui",
"version": "1.7.1",
"version": "1.7.2",
"private": false,
"license": "MPL-2.0",
"main": "background.js",
@ -21,8 +21,8 @@
"name": "Greper"
},
"dependencies": {
"@docmirror/dev-sidecar": "^1.7.1",
"@docmirror/mitmproxy": "^1.7.1",
"@docmirror/dev-sidecar": "^1.7.2",
"@docmirror/mitmproxy": "^1.7.2",
"adm-zip": "^0.5.5",
"ant-design-vue": "^1.6.5",
"compressing": "^1.5.1",
@ -84,5 +84,5 @@
"not dead"
],
"__npminstall_done": false,
"gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc"
"gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e"
}

1
packages/gui/pkg/after-all-artifact-build.js
View File

@ -10,6 +10,7 @@ function appendIntro (context, systemType, latest) {
const latestFilePath = path.join(context.outDir, latest)
fs.appendFile(latestFilePath, `partPackage: ${partUpdateUrl}
partMiniVersion: 1.7.0
releaseNotes:
- 升级日志
- https://download.fastgit.org/docmirror/dev-sidecar/releases/download/v${version}/DevSidecar-${version}.exe

4
packages/gui/src/bridge/on-close/front.js
View File

@ -14,7 +14,7 @@ function install (app, api) {
app.$confirm({
title: '关闭策略',
content: h => <div>
<div>
<div style={'margin-top:10px'}>
<a-radio-group vOn:change={onRadioChange}>
<a-radio value={1}>
直接关闭
@ -24,7 +24,7 @@ function install (app, api) {
</a-radio>
</a-radio-group>
</div>
<div>
<div style={'margin-top:10px'}>
<a-checkbox vOn:change={onCheckChange} >
记住本次选择，不再提示
< /a-checkbox>

20
packages/gui/src/bridge/update/front.js
View File

@ -76,6 +76,23 @@ function install (app, api) {
}
})
}
/**
* 是否小版本升级
* @param version1
* @param version2
*/
async function isSupportPartUpdate (value) {
const info = await api.info.get()
console.log('升级版本:', value.version)
console.log('增量更新最小版本:', value.partMiniVersion)
console.log('当前版本:', info.version)
if (!value.partPackage) {
return false
}
return !!(value.partMiniVersion && value.partMiniVersion < info.version)
}
async function downloadNewVersion (value) {
const platform = await api.shell.getSystemPlatform()
console.log('download new version platform', platform)
@ -83,7 +100,8 @@ function install (app, api) {
goManualUpdate(app, value)
return
}
if (value.partPackage) {
const partUpdate = await isSupportPartUpdate(value)
if (partUpdate) {
// 有增量更新
api.update.downloadPart(value)
} else {

4
packages/gui/src/view/App.vue
View File

@ -1,4 +1,5 @@
<template>
<a-config-provider :locale="locale">
<div class="ds_layout">
<a-layout>
<a-layout-sider theme="light">
@ -42,16 +43,19 @@
</a-layout>
</a-layout>
</div>
</a-config-provider>
</template>
<script>
import createMenus from '@/view/router/menu'
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
export default {
name: 'App',
components: {
},
data () {
return {
locale: zhCN,
info: {},
menus: undefined
}

23
packages/gui/src/view/pages/index.vue
View File

@ -19,15 +19,15 @@
</template>
<div class="box">
<a-alert message="本应用开启后会修改系统代理，直接重启电脑可能会无法上网，您可以再次启动本应用即可恢复。如您需要卸载，在卸载前请务必右键右下角小图标退出本应用再进行卸载" banner />
<a-alert v-if="config && config.app.showShutdownTip" message="本应用开启后会修改系统代理，直接重启电脑可能会无法上网，您可以再次启动本应用即可恢复。如您需要卸载，在卸载前请务必完全退出本应用再进行卸载" banner closable @close="onShutdownTipClose"/>
<div class="mode-bar" style="margin:20px;" v-if="config && config.app">
<a-radio-group v-model="config.app.mode" button-style="solid" @change="modeChange">
<a-tooltip placement="topLeft" title="启用测速，关闭拦截，关闭增强（功能最弱，不稳定，不需要安装证书，最安全）">
<a-tooltip placement="topLeft" title="启用测速，关闭拦截，关闭增强（不稳定，不需要安装证书，最安全）">
<a-radio-button value="safe">
安全模式
</a-radio-button>
</a-tooltip>
<a-tooltip placement="topLeft" title="启用测速，启用拦截，关闭增强（功能稍强，需要安装证书）">
<a-tooltip placement="topLeft" title="启用测速，启用拦截，关闭增强（需要安装证书）">
<a-radio-button value="default">
默认模式
</a-radio-button>
@ -89,7 +89,7 @@
<div class="star" >
<div class="donate" @click="donateModal=true">
<a-icon type="like" theme="outlined"/>
捐赠（本项目完全免费，用爱发电）
捐赠
</div>
<div class="right">
<div>如果它解决了你的问题，请不要吝啬你的star哟！点这里
@ -103,7 +103,8 @@
</div>
<a-modal title="捐赠" v-model="donateModal" width="550px" cancelText="不了" okText="果断支持" @ok="goDonate">
<div>* 如果觉得好用，可以给予捐赠，开源项目持续发展离不开您的支持，感谢。</div>
<div>* 本应用完全免费，如果觉得好用，可以给予捐赠。</div>
<div>* 开源项目持续发展离不开您的支持，感谢</div>
<div class="payQrcode">
<img height="200px" src="/pay.jpg"/>
</div>
@ -202,7 +203,7 @@ export default {
return
}
this.config.server.intercept.enabled = true
this.config.server.dns.speedTest.enabled = false
this.config.server.dns.speedTest.enabled = true
this.config.plugin.overwall.enabled = true
}
this.$api.config.save(this.config).then(() => {
@ -336,6 +337,16 @@ export default {
},
openExternal (url) {
this.$api.ipc.openExternal(url)
},
onShutdownTipClose (e) {
this.$confirm({
title: '是否永久关闭该提示',
okText: '我已知晓，不再提示',
cancelText: '下次还显示',
onOk: () => {
this.$api.config.update({ app: { showShutdownTip: false } })
}
})
}
}
}

4
packages/gui/src/view/pages/plugin/node.vue
View File

@ -53,9 +53,9 @@
<a-form-item label="镜像变量设置" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-checkbox v-model="config.plugin.node.startup.variables">
自动设置
自动设置，启动npm加速开关时将会设置如下环境变量
</a-checkbox>
<div>某些库需要自己设置镜像变量，才能下载，比如：electron</div>
<div class="form-help">某些库需要自己设置镜像变量，才能下载，比如：electron</div>
<a-row :gutter="10" style="margin-top: 10px" v-for="(item,index) of npmVariables" :key='index'>
<a-col :span="10">
<a-input :disabled="item.key ===false" v-model="item.key"></a-input>

2
packages/gui/src/view/pages/plugin/pip.vue
View File

@ -37,7 +37,7 @@
原生
</a-radio-button>
<a-radio-button value="https://mirrors.aliyun.com/pypi/simple/">
taobao镜像
aliyun镜像
</a-radio-button>
</a-radio-group>
<div class="form-help">设置后立即生效，即使关闭ds也会继续保持</div>

6
packages/gui/src/view/pages/server.vue
View File

@ -51,18 +51,16 @@
v-model="config.server.setting.rootCaFile.keyPath"/>
</a-form-item>
<a-form-item label="启用拦截" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-tooltip title="关闭拦截，且关闭功能增强的话，就不需要安装根证书，本应用退化为dns优选，最安全">
<a-checkbox v-model="config.server.intercept.enabled">
启用拦截
</a-checkbox>
</a-tooltip>
<div class="form-help">关闭拦截，且关闭功能增强的话，就不需要安装根证书，本应用退化为安全模式</div>
</a-form-item>
<a-form-item label="启用脚本" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-tooltip title="关闭后，github的clone加速链接复制也将关闭">
<a-checkbox v-model="config.server.setting.script.enabled">
允许插入并运行脚本
</a-checkbox>
</a-tooltip>
<div class="form-help">关闭后，github的clone加速链接复制也将关闭</div>
</a-form-item>
</a-tab-pane>
<a-tab-pane tab="拦截设置" key="2">

14
packages/gui/src/view/pages/setting.vue
View File

@ -35,6 +35,20 @@
<a-form-item label="远程配置地址" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-input v-model="config.app.remoteConfig.url"></a-input>
</a-form-item>
<a-form-item label="首页提示" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-radio-group v-model="config.app.showShutdownTip"
default-value="true" button-style="solid">
<a-radio-button :value="true">
显示
</a-radio-button>
<a-radio-button :value="false">
隐藏
</a-radio-button>
</a-radio-group>
<div class="form-help">
是否显示首页的警告提示
</div>
</a-form-item>
<a-form-item v-if="!isLinux()" label="关闭策略" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-radio-group v-model="config.app.closeStrategy"
default-value="0" button-style="solid">

4
packages/mitmproxy/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@docmirror/mitmproxy",
"version": "1.7.1",
"version": "1.7.2",
"description": "",
"main": "src/index.js",
"keywords": [
@ -66,5 +66,5 @@
"last 2 versions",
"not dead"
],
"gitHead": "9b027af3ee7e88975a54692ed83096802764a8dc"
"gitHead": "30ecf21cb001fb8d821e575d476ca0ffb4ff086e"
}