Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
a5723a52
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a5723a52
编写于
1月 20, 2018
作者:
E
Evgeny Fradkin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#2213 Use environment variables in all the connection properties
上级
c7cfaadc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
12 deletion
+16
-12
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
.../dbeaver/model/connection/DBPConnectionConfiguration.java
+13
-7
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/net/DBWHandlerConfiguration.java
.../org/jkiss/dbeaver/model/net/DBWHandlerConfiguration.java
+3
-5
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionConfiguration.java
浏览文件 @
a5723a52
...
@@ -358,12 +358,18 @@ public class DBPConnectionConfiguration implements DBPObject
...
@@ -358,12 +358,18 @@ public class DBPConnectionConfiguration implements DBPObject
}
}
public
void
resolveSystemEnvironmentVariables
()
{
public
void
resolveSystemEnvironmentVariables
()
{
hostName
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
hostName
);
hostName
=
hostName
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
hostName
)
:
null
;
hostPort
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
hostPort
);
hostPort
=
hostPort
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
hostPort
)
:
null
;
serverName
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
serverName
);
serverName
=
serverName
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
serverName
)
:
null
;
databaseName
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
databaseName
);
databaseName
=
databaseName
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
databaseName
)
:
null
;
userName
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
userName
);
userName
=
userName
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
userName
)
:
null
;
userPassword
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
userPassword
);
userPassword
=
userPassword
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
userPassword
)
:
null
;
url
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
url
);
url
=
url
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
url
)
:
null
;
for
(
String
prop
:
this
.
properties
.
keySet
())
{
String
value
=
this
.
properties
.
get
(
prop
);
if
(!
CommonUtils
.
isEmpty
(
value
))
{
this
.
properties
.
put
(
prop
,
GeneralUtils
.
replaceSystemEnvironmentVariables
(
value
));
}
}
}
}
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/net/DBWHandlerConfiguration.java
浏览文件 @
a5723a52
...
@@ -20,8 +20,6 @@ import org.jkiss.code.NotNull;
...
@@ -20,8 +20,6 @@ import org.jkiss.code.NotNull;
import
org.jkiss.code.Nullable
;
import
org.jkiss.code.Nullable
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.model.connection.DBPDriver
;
import
org.jkiss.dbeaver.model.connection.DBPDriver
;
import
org.jkiss.dbeaver.model.impl.net.SSHConstants
;
import
org.jkiss.dbeaver.model.impl.net.SocksConstants
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
import
org.jkiss.utils.CommonUtils
;
...
@@ -157,9 +155,9 @@ public class DBWHandlerConfiguration {
...
@@ -157,9 +155,9 @@ public class DBWHandlerConfiguration {
}
}
public
void
resolveSystemEnvironmentVariables
()
{
public
void
resolveSystemEnvironmentVariables
()
{
userName
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
userName
)
;
userName
=
userName
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
userName
)
:
null
;
password
=
GeneralUtils
.
replaceSystemEnvironmentVariables
(
password
)
;
password
=
password
!=
null
?
GeneralUtils
.
replaceSystemEnvironmentVariables
(
password
)
:
null
;
for
(
String
prop
:
new
String
[]
{
SSHConstants
.
PROP_HOST
,
SSHConstants
.
PROP_PORT
,
SocksConstants
.
PROP_HOST
,
SocksConstants
.
PROP_PORT
}
)
{
for
(
String
prop
:
this
.
properties
.
keySet
()
)
{
String
value
=
this
.
properties
.
get
(
prop
);
String
value
=
this
.
properties
.
get
(
prop
);
if
(!
CommonUtils
.
isEmpty
(
value
))
{
if
(!
CommonUtils
.
isEmpty
(
value
))
{
this
.
properties
.
put
(
prop
,
GeneralUtils
.
replaceSystemEnvironmentVariables
(
value
));
this
.
properties
.
put
(
prop
,
GeneralUtils
.
replaceSystemEnvironmentVariables
(
value
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录