Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
35aefe8d
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
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,发现更多精彩内容 >>
提交
35aefe8d
编写于
6月 30, 2020
作者:
hlwwx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
'1创建encryptKey时提示修改,2修改会议室显示问题'
上级
2cc5fd67
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
10 deletion
+18
-10
o2server/x_console/src/main/java/com/x/server/console/action/ActionCreateEncryptKey.java
...a/com/x/server/console/action/ActionCreateEncryptKey.java
+1
-1
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/factory/MeetingFactory.java
...om/x/meeting/assemble/control/factory/MeetingFactory.java
+8
-4
o2server/x_meeting_assemble_control/src/main/webapp/describe/sources/com/x/meeting/assemble/control/factory/MeetingFactory.java
...om/x/meeting/assemble/control/factory/MeetingFactory.java
+8
-4
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPasswordEmpty.java
...tication/jaxrs/authentication/ExceptionPasswordEmpty.java
+1
-1
未找到文件。
o2server/x_console/src/main/java/com/x/server/console/action/ActionCreateEncryptKey.java
浏览文件 @
35aefe8d
...
...
@@ -51,7 +51,7 @@ public class ActionCreateEncryptKey extends ActionBase {
//为前端提供publicKey,为密码加密
this
.
writeConfigFile
(
new
String
(
Base64
.
encodeBase64
(
pair
.
getPublic
().
getEncoded
())));
System
.
out
.
println
(
"public key: config/public.key, private key: config/private.key, create key success!"
);
System
.
out
.
println
(
"public key: config/public.key, private key: config/private.key, create key success!
Please restart server!
"
);
return
true
;
}
...
...
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/factory/MeetingFactory.java
浏览文件 @
35aefe8d
...
...
@@ -163,8 +163,10 @@ public class MeetingFactory extends AbstractFactory {
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Meeting
>
root
=
cq
.
from
(
Meeting
.
class
);
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
end
));
//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
end
));
cq
.
select
(
root
.
get
(
Meeting_
.
id
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
();
}
...
...
@@ -174,8 +176,10 @@ public class MeetingFactory extends AbstractFactory {
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Meeting
>
root
=
cq
.
from
(
Meeting
.
class
);
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
end
));
//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
end
));
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
equal
(
root
.
get
(
Meeting_
.
applicant
),
person
),
cb
.
equal
(
root
.
get
(
Meeting_
.
auditor
),
person
),
cb
.
isMember
(
person
,
root
.
get
(
Meeting_
.
invitePersonList
))));
...
...
o2server/x_meeting_assemble_control/src/main/webapp/describe/sources/com/x/meeting/assemble/control/factory/MeetingFactory.java
浏览文件 @
35aefe8d
...
...
@@ -163,8 +163,10 @@ public class MeetingFactory extends AbstractFactory {
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Meeting
>
root
=
cq
.
from
(
Meeting
.
class
);
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
end
));
//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
end
));
cq
.
select
(
root
.
get
(
Meeting_
.
id
)).
where
(
p
);
return
em
.
createQuery
(
cq
).
getResultList
();
}
...
...
@@ -174,8 +176,10 @@ public class MeetingFactory extends AbstractFactory {
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Meeting
>
root
=
cq
.
from
(
Meeting
.
class
);
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
startTime
),
end
));
//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
Predicate
p
=
cb
.
greaterThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
start
);
p
=
cb
.
and
(
p
,
cb
.
lessThanOrEqualTo
(
root
.
get
(
Meeting_
.
completedTime
),
end
));
p
=
cb
.
and
(
p
,
cb
.
or
(
cb
.
equal
(
root
.
get
(
Meeting_
.
applicant
),
person
),
cb
.
equal
(
root
.
get
(
Meeting_
.
auditor
),
person
),
cb
.
isMember
(
person
,
root
.
get
(
Meeting_
.
invitePersonList
))));
...
...
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPasswordEmpty.java
浏览文件 @
35aefe8d
...
...
@@ -7,6 +7,6 @@ class ExceptionPasswordEmpty extends PromptException {
private
static
final
long
serialVersionUID
=
1859164370743532895L
;
ExceptionPasswordEmpty
()
{
super
(
"密码不能为空."
);
super
(
"密码不能为空
或者密码解密错误
."
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录