Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
7395f90a
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,发现更多精彩内容 >>
提交
7395f90a
编写于
8月 17, 2021
作者:
F
fancy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复O2云链接修改账号密码等功能的问题
上级
0129a614
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
7 deletion
+15
-7
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/apppack/ActionAndroidRePack.java
...m/x/program/center/jaxrs/apppack/ActionAndroidRePack.java
+4
-1
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/apppack/ActionPackInfo.java
...va/com/x/program/center/jaxrs/apppack/ActionPackInfo.java
+4
-1
o2web/source/x_component_Collect/Main.js
o2web/source/x_component_Collect/Main.js
+5
-3
o2web/source/x_component_Collect/lp/en.js
o2web/source/x_component_Collect/lp/en.js
+1
-1
o2web/source/x_component_Collect/lp/zh-cn.js
o2web/source/x_component_Collect/lp/zh-cn.js
+1
-1
未找到文件。
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/apppack/ActionAndroidRePack.java
浏览文件 @
7395f90a
...
...
@@ -10,9 +10,11 @@ import com.x.base.core.project.http.ActionResult;
import
com.x.base.core.project.jaxrs.WrapBoolean
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
org.apache.commons.lang3.StringUtils
;
import
java.lang.reflect.Type
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -30,7 +32,8 @@ public class ActionAndroidRePack extends BaseAction {
if
(
StringUtils
.
isEmpty
(
token
))
{
throw
new
ExceptionNoToken
();
}
String
url
=
Config
.
collect
().
appPackServerApi
(
String
.
format
(
Collect
.
ADDRESS_APPPACK_INFO_RESTART
,
Config
.
collect
().
getName
()));
String
collectNameEncode
=
URLEncoder
.
encode
(
Config
.
collect
().
getName
(),
DefaultCharset
.
name
);
String
url
=
Config
.
collect
().
appPackServerApi
(
String
.
format
(
Collect
.
ADDRESS_APPPACK_INFO_RESTART
,
collectNameEncode
));
List
<
NameValuePair
>
header
=
new
ArrayList
<>();
header
.
add
(
new
NameValuePair
(
"token"
,
token
));
String
json
=
HttpConnection
.
postAsString
(
url
,
header
,
"{}"
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/apppack/ActionPackInfo.java
浏览文件 @
7395f90a
...
...
@@ -10,10 +10,12 @@ import com.x.base.core.project.gson.XGsonBuilder;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
org.apache.commons.lang3.StringUtils
;
import
java.lang.reflect.Type
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
/**
...
...
@@ -42,7 +44,8 @@ public class ActionPackInfo extends BaseAction {
private
Wo
getPackInfo
(
String
token
)
{
try
{
logger
.
info
(
"打包服务器token:"
+
token
);
String
url
=
Config
.
collect
().
appPackServerApi
(
String
.
format
(
Collect
.
ADDRESS_APPPACK_INFO
,
Config
.
collect
().
getName
()));
String
collectNameEncode
=
URLEncoder
.
encode
(
Config
.
collect
().
getName
(),
DefaultCharset
.
name
);
String
url
=
Config
.
collect
().
appPackServerApi
(
String
.
format
(
Collect
.
ADDRESS_APPPACK_INFO
,
collectNameEncode
));
logger
.
info
(
"打包信息请求,url:"
+
url
);
ArrayList
<
NameValuePair
>
heads
=
new
ArrayList
<>();
heads
.
add
(
new
NameValuePair
(
"token"
,
token
));
...
...
o2web/source/x_component_Collect/Main.js
浏览文件 @
7395f90a
...
...
@@ -681,7 +681,7 @@ MWF.xApplication.Collect.RegisterForm = new Class({
this
.
collect
.
showContent
(
"
checkContentNode
"
);
this
.
collect
.
backNode
.
setStyle
(
"
display
"
,
"
none
"
);
window
.
setTimeout
(
function
(){
this
.
check
.
recheck
();
this
.
c
ollect
.
c
heck
.
recheck
();
}.
bind
(
this
),
1000
);
}.
bind
(
this
),
function
(
xhr
,
text
,
error
){
var
errorText
=
error
+
"
:
"
+
text
;
...
...
@@ -921,6 +921,7 @@ MWF.xApplication.Collect.ModifyForm = new Class({
this
.
errorNode
.
empty
();
}
else
{
this
.
errorInput
(
this
.
codeNode
,
this
.
lp
.
errorCode
);
this
.
nextStepWaited
();
}
}.
bind
(
this
),
function
(
xhr
,
text
,
error
){
if
(
xhr
){
...
...
@@ -958,7 +959,7 @@ MWF.xApplication.Collect.ModifyForm = new Class({
this
.
firstStep
();
this
.
collect
.
showContent
(
"
checkContentNode
"
);
this
.
collect
.
backNode
.
setStyle
(
"
display
"
,
"
none
"
);
this
.
check
.
recheck
();
this
.
c
ollect
.
c
heck
.
recheck
();
}.
bind
(
this
),
function
(
xhr
,
text
,
error
){
var
errorText
=
error
+
"
:
"
+
text
;
if
(
xhr
)
errorText
=
xhr
.
responseText
;
...
...
@@ -1112,6 +1113,7 @@ MWF.xApplication.Collect.ModifyPwdForm = new Class({
this
.
errorNode
.
empty
();
}
else
{
this
.
errorInput
(
this
.
codeNode
,
this
.
lp
.
errorCode
);
this
.
nextStepWaited
();
}
}.
bind
(
this
),
function
(
xhr
,
text
,
error
){
if
(
xhr
){
...
...
@@ -1145,7 +1147,7 @@ MWF.xApplication.Collect.ModifyPwdForm = new Class({
this
.
firstStep
();
this
.
collect
.
showContent
(
"
checkContentNode
"
);
this
.
collect
.
backNode
.
setStyle
(
"
display
"
,
"
none
"
);
this
.
check
.
recheck
();
this
.
c
ollect
.
c
heck
.
recheck
();
}.
bind
(
this
),
function
(
xhr
,
text
,
error
){
var
errorText
=
error
+
"
:
"
+
text
;
if
(
xhr
)
errorText
=
xhr
.
responseText
;
...
...
o2web/source/x_component_Collect/lp/en.js
浏览文件 @
7395f90a
MWF
.
xApplication
.
Collect
.
LP
=
{
"
title
"
:
"
Connect O2Cloud
"
,
"
title
"
:
"
O2Cloud Config
"
,
"
collectConnected
"
:
"
You can already connect to O2 Cloud!
"
,
"
collectDisconnect
"
:
"
Your server cannot connect to O2 Cloud!
"
,
"
checking
"
:
"
Checking……
"
,
...
...
o2web/source/x_component_Collect/lp/zh-cn.js
浏览文件 @
7395f90a
MWF
.
xApplication
.
Collect
.
LP
=
{
"
title
"
:
"
连接到O2云
"
,
"
title
"
:
"
O2云配置
"
,
"
collectConnected
"
:
"
您已经可以连接到O2云了!
"
,
"
collectDisconnect
"
:
"
您的服务器无法连接到O2云!
"
,
"
checking
"
:
"
检测中……
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录