Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
SteamTools
提交
6def6709
S
SteamTools
项目概览
jobily
/
SteamTools
9 个月 前同步成功
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SteamTools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
6def6709
编写于
8月 26, 2023
作者:
A
Aigio Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix SetWebProxyMode
上级
5653df99
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
11 deletion
+18
-11
src/BD.WTTS.Client/Startup/Startup.Host.cs
src/BD.WTTS.Client/Startup/Startup.Host.cs
+12
-11
src/BD.WTTS.Client/Startup/Startup.cs
src/BD.WTTS.Client/Startup/Startup.cs
+6
-0
未找到文件。
src/BD.WTTS.Client/Startup/Startup.Host.cs
浏览文件 @
6def6709
...
...
@@ -129,7 +129,7 @@ partial class Startup // 配置 Host
if
(
HasHttpClientFactory
||
HasHttpProxy
)
{
static
void
SetWebProxyMode
(
AppWebProxyMode
mode
)
void
SetWebProxyMode
(
AppWebProxyMode
mode
)
{
switch
(
mode
)
{
...
...
@@ -138,27 +138,27 @@ partial class Startup // 配置 Host
break
;
case
AppWebProxyMode
.
Custom
:
WebProxy
webProxy
;
if
(!
string
.
IsNullOrEmpty
(
GeneralSettings
.
CustomWebProxyModeHost
.
Value
)
&&
GeneralSettings
.
CustomWebProxyModePort
.
Value
!=
default
)
if
(!
string
.
IsNullOrEmpty
(
generalSettings
.
CurrentValue
.
CustomWebProxyModeHost
)
&&
generalSettings
.
CurrentValue
.
CustomWebProxyModePort
!=
default
)
{
webProxy
=
new
(
GeneralSettings
.
CustomWebProxyModeHost
.
Value
,
GeneralSettings
.
CustomWebProxyModePort
.
Value
)
webProxy
=
new
(
generalSettings
.
CurrentValue
.
CustomWebProxyModeHost
,
generalSettings
.
CurrentValue
.
CustomWebProxyModePort
)
{
BypassProxyOnLocal
=
GeneralSettings
.
CustomWebProxyModeBypassOnLocal
.
Value
,
BypassProxyOnLocal
=
generalSettings
.
CurrentValue
.
CustomWebProxyModeBypassOnLocal
,
};
}
else
if
(!
string
.
IsNullOrEmpty
(
GeneralSettings
.
CustomWebProxyModeAddress
.
Value
))
else
if
(!
string
.
IsNullOrEmpty
(
generalSettings
.
CurrentValue
.
CustomWebProxyModeAddress
))
{
webProxy
=
new
(
GeneralSettings
.
CustomWebProxyModeAddress
.
Value
,
GeneralSettings
.
CustomWebProxyModeBypassOnLocal
.
Value
);
webProxy
=
new
(
generalSettings
.
CurrentValue
.
CustomWebProxyModeAddress
,
generalSettings
.
CurrentValue
.
CustomWebProxyModeBypassOnLocal
);
}
else
{
SetWebProxyMode
(
AppWebProxyMode
.
FollowSystem
);
return
;
}
if
(!
string
.
IsNullOrEmpty
(
GeneralSettings
.
CustomWebProxyModeCredentialUserName
.
Valu
e
))
if
(!
string
.
IsNullOrEmpty
(
generalSettings
.
CurrentValue
.
CustomWebProxyModeCredentialUserNam
e
))
{
NetworkCredential
credential
=
new
(
GeneralSettings
.
CustomWebProxyModeCredentialUserName
.
Valu
e
,
GeneralSettings
.
CustomWebProxyModeCredentialPassword
.
Value
??
""
,
GeneralSettings
.
CustomWebProxyModeCredentialDomain
.
Value
??
""
);
NetworkCredential
credential
=
new
(
generalSettings
.
CurrentValue
.
CustomWebProxyModeCredentialUserNam
e
,
generalSettings
.
CurrentValue
.
CustomWebProxyModeCredentialPassword
??
""
,
generalSettings
.
CurrentValue
.
CustomWebProxyModeCredentialDomain
??
""
);
webProxy
.
Credentials
=
credential
;
}
HttpClient
.
DefaultProxy
=
webProxy
;
...
...
@@ -172,7 +172,8 @@ partial class Startup // 配置 Host
break
;
}
}
SetWebProxyMode
(
GeneralSettings
.
WebProxyMode
.
Value
);
if
(
generalSettings
!=
null
)
SetWebProxyMode
(
generalSettings
.
CurrentValue
.
WebProxyMode
);
#if STARTUP_WATCH_TRACE || DEBUG
WatchTrace
.
Record
(
"DynamicHttpWindowsProxy"
);
#endif
...
...
src/BD.WTTS.Client/Startup/Startup.cs
浏览文件 @
6def6709
...
...
@@ -428,6 +428,12 @@ public abstract partial class Startup
catch
(
Exception
ex
)
{
GlobalExceptionHandler
.
Handler
(
ex
,
nameof
(
StartAsync
));
#if WINDOWS
WPFMessageBox
.
Show
(
ex
.
ToString
(),
AssemblyInfo
.
Trademark
,
WPFMessageBoxButton
.
OK
,
WPFMessageBoxImage
.
Error
);
#endif
throw
;
}
finally
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录