Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
f2b7bb2e
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f2b7bb2e
编写于
12月 25, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除clientInit配置2
上级
69dca2d2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
71 addition
and
74 deletion
+71
-74
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
.../java/com/x/server/console/server/web/WebServerTools.java
+71
-74
未找到文件。
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
浏览文件 @
f2b7bb2e
...
...
@@ -178,85 +178,82 @@ public class WebServerTools extends JettySeverTools {
File
file
=
new
File
(
dir
,
"config.json"
);
Gson
gson
=
XGsonBuilder
.
instance
();
if
(
Config
.
clientInit
().
getEnable
())
{
FileUtils
.
write
(
file
,
gson
.
toJson
(
Config
.
clientInit
()),
DefaultCharset
.
charset
);
}
else
{
LinkedHashMap
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
/** 覆盖掉配置的参数 */
com
.
x
.
base
.
core
.
project
.
config
.
CenterServer
centerServerConfig
=
Config
.
nodes
().
centerServers
().
first
()
.
getValue
();
map
.
putAll
(
centerServerConfig
.
getConfig
());
List
<
Map
<
String
,
String
>>
centers
=
new
ArrayList
<>();
map
.
put
(
"center"
,
centers
);
/** 写入center地址 */
Map
<
String
,
String
>
center
=
new
HashMap
<
String
,
String
>();
LinkedHashMap
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
/** 覆盖掉配置的参数 */
com
.
x
.
base
.
core
.
project
.
config
.
CenterServer
centerServerConfig
=
Config
.
nodes
().
centerServers
().
first
()
.
getValue
();
map
.
putAll
(
centerServerConfig
.
getConfig
());
List
<
Map
<
String
,
String
>>
centers
=
new
ArrayList
<>();
map
.
put
(
"center"
,
centers
);
/** 写入center地址 */
Map
<
String
,
String
>
center
=
new
HashMap
<
String
,
String
>();
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
""
);
center
.
put
(
"port"
,
centerServerConfig
.
getPort
().
toString
());
centers
.
add
(
center
);
if
(!
Objects
.
equals
(
centerServerConfig
.
getProxyPort
(),
centerServerConfig
.
getPort
()))
{
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
""
);
center
.
put
(
"port"
,
centerServerConfig
.
getProxyPort
().
toString
());
centers
.
add
(
center
);
}
String
host
=
Config
.
nodes
().
primaryCenterNode
();
if
(!
Host
.
isRollback
(
host
))
{
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
host
);
center
.
put
(
"port"
,
centerServerConfig
.
getPort
().
toString
());
centers
.
add
(
center
);
if
(!
Objects
.
equals
(
centerServerConfig
.
getProxyPort
(),
centerServerConfig
.
getPort
()))
{
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
""
);
center
.
put
(
"port"
,
centerServerConfig
.
getProxyPort
().
toString
());
centers
.
add
(
center
);
}
String
host
=
Config
.
nodes
().
primaryCenterNode
();
if
(!
Host
.
isRollback
(
host
))
{
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
host
);
center
.
put
(
"port"
,
centerServerConfig
.
getPort
().
toString
());
centers
.
add
(
center
);
}
/** 写入proxy地址 */
if
(
StringUtils
.
isNotEmpty
(
centerServerConfig
.
getProxyHost
()))
{
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
centerServerConfig
.
getProxyHost
());
center
.
put
(
"port"
,
centerServerConfig
.
getProxyPort
().
toString
());
centers
.
add
(
center
);
}
}
/** 写入proxy地址 */
if
(
StringUtils
.
isNotEmpty
(
centerServerConfig
.
getProxyHost
()))
{
center
=
new
HashMap
<
String
,
String
>();
center
.
put
(
"host"
,
centerServerConfig
.
getProxyHost
());
center
.
put
(
"port"
,
centerServerConfig
.
getProxyPort
().
toString
());
centers
.
add
(
center
);
}
/** 写入systemName */
map
.
put
(
"footer"
,
Config
.
collect
().
getFooter
());
map
.
put
(
"title"
,
Config
.
collect
().
getTitle
());
map
.
put
(
"appUrl"
,
Config
.
collect
().
getAppUrl
());
/***/
if
(
centerServerConfig
.
getSslEnable
())
{
map
.
put
(
"app_protocol"
,
"https:"
);
}
else
{
map
.
put
(
"app_protocol"
,
"http:"
);
}
/* 上面的无效 */
map
.
put
(
"app_protocol"
,
"auto"
);
if
((
null
!=
Config
.
portal
().
getLoginPage
())
&&
(
BooleanUtils
.
isTrue
(
Config
.
portal
().
getLoginPage
().
getEnable
())))
{
map
.
put
(
MAP_LOGINPAGE
,
Config
.
portal
().
getLoginPage
());
}
else
if
((
null
!=
Config
.
person
().
getLoginPage
())
&&
(
BooleanUtils
.
isTrue
(
Config
.
person
().
getLoginPage
().
getEnable
())))
{
map
.
put
(
MAP_LOGINPAGE
,
Config
.
person
().
getLoginPage
());
}
else
{
map
.
put
(
MAP_LOGINPAGE
,
Config
.
portal
().
getLoginPage
());
}
map
.
put
(
"indexPage"
,
Config
.
portal
().
getIndexPage
());
map
.
put
(
"webSocketEnable"
,
Config
.
communicate
().
wsEnable
());
map
.
put
(
"urlMapping"
,
Config
.
portal
().
getUrlMapping
());
/* 密码规则 */
map
.
put
(
"passwordRegex"
,
Config
.
person
().
getPasswordRegex
());
map
.
put
(
"passwordRegexHint"
,
Config
.
person
().
getPasswordRegexHint
());
/* RSA */
File
publicKeyFile
=
new
File
(
Config
.
base
(),
"config/public.key"
);
if
(
publicKeyFile
.
exists
()
&&
publicKeyFile
.
isFile
())
{
String
publicKey
=
FileUtils
.
readFileToString
(
publicKeyFile
,
"utf-8"
);
byte
[]
publicKeyB
=
Base64
.
decodeBase64
(
publicKey
);
publicKey
=
new
String
(
Base64
.
encodeBase64
(
publicKeyB
));
map
.
put
(
"publicKey"
,
publicKey
);
}
for
(
Entry
<
String
,
JsonElement
>
en
:
Config
.
web
().
entrySet
())
{
map
.
put
(
en
.
getKey
(),
en
.
getValue
());
}
FileUtils
.
writeStringToFile
(
file
,
gson
.
toJson
(
map
),
DefaultCharset
.
charset
);
/** 写入systemName */
map
.
put
(
"footer"
,
Config
.
collect
().
getFooter
());
map
.
put
(
"title"
,
Config
.
collect
().
getTitle
());
map
.
put
(
"appUrl"
,
Config
.
collect
().
getAppUrl
());
/***/
if
(
centerServerConfig
.
getSslEnable
())
{
map
.
put
(
"app_protocol"
,
"https:"
);
}
else
{
map
.
put
(
"app_protocol"
,
"http:"
);
}
/* 上面的无效 */
map
.
put
(
"app_protocol"
,
"auto"
);
if
((
null
!=
Config
.
portal
().
getLoginPage
())
&&
(
BooleanUtils
.
isTrue
(
Config
.
portal
().
getLoginPage
().
getEnable
())))
{
map
.
put
(
MAP_LOGINPAGE
,
Config
.
portal
().
getLoginPage
());
}
else
if
((
null
!=
Config
.
person
().
getLoginPage
())
&&
(
BooleanUtils
.
isTrue
(
Config
.
person
().
getLoginPage
().
getEnable
())))
{
map
.
put
(
MAP_LOGINPAGE
,
Config
.
person
().
getLoginPage
());
}
else
{
map
.
put
(
MAP_LOGINPAGE
,
Config
.
portal
().
getLoginPage
());
}
map
.
put
(
"indexPage"
,
Config
.
portal
().
getIndexPage
());
map
.
put
(
"webSocketEnable"
,
Config
.
communicate
().
wsEnable
());
map
.
put
(
"urlMapping"
,
Config
.
portal
().
getUrlMapping
());
/* 密码规则 */
map
.
put
(
"passwordRegex"
,
Config
.
person
().
getPasswordRegex
());
map
.
put
(
"passwordRegexHint"
,
Config
.
person
().
getPasswordRegexHint
());
/* RSA */
File
publicKeyFile
=
new
File
(
Config
.
base
(),
"config/public.key"
);
if
(
publicKeyFile
.
exists
()
&&
publicKeyFile
.
isFile
())
{
String
publicKey
=
FileUtils
.
readFileToString
(
publicKeyFile
,
"utf-8"
);
byte
[]
publicKeyB
=
Base64
.
decodeBase64
(
publicKey
);
publicKey
=
new
String
(
Base64
.
encodeBase64
(
publicKeyB
));
map
.
put
(
"publicKey"
,
publicKey
);
}
for
(
Entry
<
String
,
JsonElement
>
en
:
Config
.
web
().
entrySet
())
{
map
.
put
(
en
.
getKey
(),
en
.
getValue
());
}
FileUtils
.
writeStringToFile
(
file
,
gson
.
toJson
(
map
),
DefaultCharset
.
charset
);
}
private
static
void
createIndexPage
()
throws
Exception
{
...
...
@@ -300,4 +297,4 @@ public class WebServerTools extends JettySeverTools {
FileUtils
.
copyDirectory
(
p
.
toFile
(),
Config
.
path_servers_webServer
(
true
).
toFile
());
}
}
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录