Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
7521a60b
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,发现更多精彩内容 >>
提交
7521a60b
编写于
4月 21, 2022
作者:
R
Ray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
udpate pom
上级
573a4c81
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
38 addition
and
32 deletion
+38
-32
o2server/pom.xml
o2server/pom.xml
+11
-17
o2server/start_aix.sh
o2server/start_aix.sh
+1
-1
o2server/start_aix_debug.sh
o2server/start_aix_debug.sh
+1
-1
o2server/start_arm.sh
o2server/start_arm.sh
+1
-1
o2server/start_arm_debug.sh
o2server/start_arm_debug.sh
+1
-1
o2server/start_linux.sh
o2server/start_linux.sh
+1
-1
o2server/start_linux_debug.sh
o2server/start_linux_debug.sh
+1
-1
o2server/start_linux_min.sh
o2server/start_linux_min.sh
+1
-1
o2server/start_macos.sh
o2server/start_macos.sh
+1
-1
o2server/start_macos_debug.sh
o2server/start_macos_debug.sh
+1
-1
o2server/start_mips.sh
o2server/start_mips.sh
+1
-1
o2server/start_mips_debug.sh
o2server/start_mips_debug.sh
+1
-1
o2server/start_raspi.sh
o2server/start_raspi.sh
+1
-1
o2server/start_raspi_debug.sh
o2server/start_raspi_debug.sh
+1
-1
o2server/start_windows.bat
o2server/start_windows.bat
+1
-1
o2server/start_windows_debug.bat
o2server/start_windows_debug.bat
+1
-1
o2server/x_jpush_assemble_control/pom.xml
o2server/x_jpush_assemble_control/pom.xml
+12
-0
未找到文件。
o2server/pom.xml
浏览文件 @
7521a60b
...
...
@@ -474,12 +474,6 @@
<packagingExcludes>
persistence.xml,WEB-INF/lib/**,META-INF
</packagingExcludes>
<failOnMissingWebXml>
false
</failOnMissingWebXml>
<webResources>
<resource>
<directory>
ext
</directory>
<targetPath>
WEB-INF/ext
</targetPath>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
...
...
@@ -612,57 +606,57 @@
<dependency>
<groupId>
org.apache.ftpserver
</groupId>
<artifactId>
ftpserver-core
</artifactId>
<version>
1.
1.1
</version>
<version>
1.
2.0
</version>
</dependency>
<dependency>
<groupId>
org.apache.ftpserver
</groupId>
<artifactId>
ftplet-api
</artifactId>
<version>
1.
1.1
</version>
<version>
1.
2.0
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-core
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-frontend-jaxws
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-frontend-simple
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-wsdl
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-databinding-jaxb
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-transports-http
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-bindings-soap
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-bindings-xml
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
<groupId>
org.apache.cxf
</groupId>
<artifactId>
cxf-rt-ws-addr
</artifactId>
<version>
3.
3.10
</version>
<version>
3.
5.2
</version>
</dependency>
<dependency>
...
...
o2server/start_aix.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_aix_debug.sh
浏览文件 @
7521a60b
...
...
@@ -32,7 +32,7 @@ then
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
...
...
o2server/start_arm.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_arm_debug.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_linux.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_linux_debug.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_linux_min.sh
浏览文件 @
7521a60b
...
...
@@ -32,7 +32,7 @@ then
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
...
...
o2server/start_macos.sh
浏览文件 @
7521a60b
...
...
@@ -27,7 +27,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_macos_debug.sh
浏览文件 @
7521a60b
...
...
@@ -27,7 +27,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_mips.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_mips_debug.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_raspi.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_raspi_debug.sh
浏览文件 @
7521a60b
...
...
@@ -26,7 +26,7 @@ if [ -d ${current_dir}/local/update ]; then
fi
done
for
A
in
"start"
"stop"
"restart"
"console"
"service"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
for
B
in
"_windows.bat"
"_linux.sh"
"_
linux_docker.sh"
"_
macos.sh"
"_arm.sh"
"_mips.sh"
"_raspi.sh"
"_aix.sh"
;
do
if
[
-f
${
current_dir
}
/local/update/o2server/
$A$B
]
;
then
echo
"update
${
current_dir
}
/
$A$B
."
cp
-f
-p
${
current_dir
}
/local/update/o2server/
$A$B
${
current_dir
}
/
...
...
o2server/start_windows.bat
浏览文件 @
7521a60b
...
...
@@ -21,7 +21,7 @@ if exist "%~dp0local\update" (
)
)
for
%%A
in
(
start
,
stop
,
restart
,
console
,
service
)
do
(
for
%%B
in
(
_windows.bat
,
_linux.sh
,
_macos.sh
,
_arm.sh
,
_mips.sh
,
_raspi.sh
,
_aix.sh
)
do
(
for
%%B
in
(
_windows.bat
,
_linux.sh
,
_
linux_docker.sh
,
_
macos.sh
,
_arm.sh
,
_mips.sh
,
_raspi.sh
,
_aix.sh
)
do
(
if
exist
"
%~dp0
local\update\o2server\
%%A%%
B"
(
echo
update
%~dp0
%%A%%
B
copy
"
%~dp0
local\update\o2server\
%%A%%
B"
"
%~dp0
"
...
...
o2server/start_windows_debug.bat
浏览文件 @
7521a60b
...
...
@@ -21,7 +21,7 @@ if exist "%~dp0local\update" (
)
)
for
%%A
in
(
start
,
stop
,
restart
,
console
,
service
)
do
(
for
%%B
in
(
_windows.bat
,
_linux.sh
,
_macos.sh
,
_arm.sh
,
_mips.sh
,
_raspi.sh
,
_aix.sh
)
do
(
for
%%B
in
(
_windows.bat
,
_linux.sh
,
_
linux_docker.sh
,
_
macos.sh
,
_arm.sh
,
_mips.sh
,
_raspi.sh
,
_aix.sh
)
do
(
if
exist
"
%~dp0
local\update\o2server\
%%A%%
B"
(
echo
update
%~dp0
%%A%%
B
copy
"
%~dp0
local\update\o2server\
%%A%%
B"
"
%~dp0
"
...
...
o2server/x_jpush_assemble_control/pom.xml
浏览文件 @
7521a60b
...
...
@@ -131,6 +131,18 @@
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-war-plugin
</artifactId>
<configuration>
<webResources>
<resource>
<directory>
ext
</directory>
<targetPath>
WEB-INF/ext
</targetPath>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录