Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
7618e3c3
o2oa
项目概览
fuyue82
/
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,发现更多精彩内容 >>
提交
7618e3c3
编写于
2月 22, 2022
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into develop
上级
1f08f337
18d2e284
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
48 addition
and
79 deletion
+48
-79
o2server/restart_linux.sh
o2server/restart_linux.sh
+3
-16
o2server/service_linux_install.sh
o2server/service_linux_install.sh
+31
-0
o2server/stop_linux.sh
o2server/stop_linux.sh
+14
-1
o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java
...e/src/main/java/com/x/server/console/action/DumpData.java
+0
-1
o2server/x_console/src/main/java/com/x/server/console/action/DumpRestoreStorageCatalog.java
...om/x/server/console/action/DumpRestoreStorageCatalog.java
+0
-9
o2server/x_console/src/main/java/com/x/server/console/action/DumpRestoreStorageCatalogItem.java
.../server/console/action/DumpRestoreStorageCatalogItem.java
+0
-52
未找到文件。
o2server/restart_linux.sh
浏览文件 @
7618e3c3
echo
"ready to stop server
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
"
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/jvm/linux_java11/bin/java
-javaagent
:
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/console.jar
-cp
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/console.jar com.x.server.console.swapcommand.Exit
echo
'check server stoped wait 2s-10s'
sleep
2
PID
=
`
ps
-ef
|
grep
"
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
"
|
grep
-v
grep
|
awk
'{print $2}'
`
if
[
"X
$PID
"
!=
"X"
]
then
sleep
8
if
[
"X
$PID
"
!=
"X"
]
then
echo
ready to
kill
server
$PID
kill
-9
$PID
fi
fi
echo
'server stoped ready to start'
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/start_linux.sh
current_dir
=
"
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
"
${
current_dir
}
/stop_linux.sh
${
current_dir
}
/start_linux.sh
\ No newline at end of file
o2server/service_linux_install.sh
0 → 100755
浏览文件 @
7618e3c3
current_dir
=
"
$(
cd
"
$(
dirname
"
$0
"
)
"
pwd
)
"
if
[
-z
"
$1
"
]
;
then
echo
"usage: ./service_linux_install.sh name [start.sh default is start_linux.sh]"
exit
fi
name
=
"
$1
"
scriptFile
=
"start_linux.sh"
if
[
-z
"
$2
"
]
;
then
echo
"use
${
current_dir
}
/
${
scriptFile
}
as start script."
else
scriptFile
=
"
$2
"
fi
if
[
!
-f
${
current_dir
}
/
${
scriptFile
}
]
;
then
echo
"start script
${
current_dir
}
/
${
scriptFile
}
not exist."
exit
fi
servicefile
=
"/etc/systemd/system/
${
name
}
.service"
echo
"[Unit]"
>
${
servicefile
}
echo
"Description=o2server name:
${
name
}
"
>>
${
servicefile
}
echo
"Wants=network-online.target"
>>
${
servicefile
}
echo
"After=network.target"
>>
${
servicefile
}
echo
"[Service]"
>>
${
servicefile
}
echo
"Type=simple"
>>
${
servicefile
}
echo
"ExecStart=
${
current_dir
}
/start_linux.sh"
>>
${
servicefile
}
echo
"ExecReload=
${
current_dir
}
/restart_linux.sh"
>>
${
servicefile
}
echo
"ExecStop=
${
current_dir
}
/stop_linux.sh"
>>
${
servicefile
}
echo
"[Install]"
>>
${
servicefile
}
echo
"WantedBy=multi-user.target"
>>
${
servicefile
}
o2server/stop_linux.sh
浏览文件 @
7618e3c3
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/jvm/linux_java11/bin/java
-javaagent
:
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/console.jar
-cp
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
/console.jar com.x.server.console.swapcommand.Exit
current_dir
=
"
$(
cd
"
$(
dirname
"
$0
"
)
"
;
pwd
)
"
echo
"ready to stop o2server path:
${
current_dir
}
"
${
current_dir
}
/jvm/linux_java11/bin/java
-javaagent
:
${
current_dir
}
/console.jar
-cp
${
current_dir
}
/console.jar com.x.server.console.swapcommand.Exit
sleep
10
PID
=
`
ps
-ef
|
grep
"
${
current_dir
}
/jvm/linux_java11/bin/java"
|
grep
-v
grep
|
awk
'{print $2}'
`
if
[
"X
$PID
"
!=
"X"
]
then
sleep
5
if
[
"X
$PID
"
!=
"X"
]
then
echo
ready to
kill
server
$PID
kill
-9
$PID
fi
fi
\ No newline at end of file
o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java
浏览文件 @
7618e3c3
...
...
@@ -138,7 +138,6 @@ public class DumpData {
List
<
String
>
list
=
new
ArrayList
<>();
if
(
StringUtils
.
equals
(
Config
.
dumpRestoreData
().
getMode
(),
DumpRestoreData
.
TYPE_FULL
))
{
list
.
addAll
((
List
<
String
>)
Config
.
resource
(
Config
.
RESOURCE_CONTAINERENTITYNAMES
));
//return list;
}
else
{
for
(
String
str
:
(
List
<
String
>)
Config
.
resource
(
Config
.
RESOURCE_CONTAINERENTITYNAMES
))
{
Class
<?>
cls
=
Thread
.
currentThread
().
getContextClassLoader
().
loadClass
(
str
);
...
...
o2server/x_console/src/main/java/com/x/server/console/action/DumpRestoreStorageCatalog.java
已删除
100644 → 0
浏览文件 @
1f08f337
package
com.x.server.console.action
;
import
java.util.LinkedHashMap
;
public
class
DumpRestoreStorageCatalog
extends
LinkedHashMap
<
String
,
DumpRestoreStorageCatalogItem
>
{
private
static
final
long
serialVersionUID
=
3233230359546489069L
;
}
o2server/x_console/src/main/java/com/x/server/console/action/DumpRestoreStorageCatalogItem.java
已删除
100644 → 0
浏览文件 @
1f08f337
package
com.x.server.console.action
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
public
class
DumpRestoreStorageCatalogItem
extends
GsonPropertyObject
{
private
Integer
count
;
private
Long
size
;
private
Integer
invalidStorage
;
private
Integer
empty
;
private
Integer
normal
;
public
Integer
getCount
()
{
return
count
;
}
public
void
setCount
(
Integer
count
)
{
this
.
count
=
count
;
}
public
Long
getSize
()
{
return
size
;
}
public
void
setSize
(
Long
size
)
{
this
.
size
=
size
;
}
public
Integer
getInvalidStorage
()
{
return
invalidStorage
;
}
public
void
setInvalidStorage
(
Integer
invalidStorage
)
{
this
.
invalidStorage
=
invalidStorage
;
}
public
Integer
getEmpty
()
{
return
empty
;
}
public
void
setEmpty
(
Integer
empty
)
{
this
.
empty
=
empty
;
}
public
Integer
getNormal
()
{
return
normal
;
}
public
void
setNormal
(
Integer
normal
)
{
this
.
normal
=
normal
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录