Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
7d761bf4
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
7d761bf4
编写于
3月 29, 2022
作者:
R
Ray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update max thread pool
上级
2dfa56d4
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
98 addition
and
125 deletion
+98
-125
o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SliceEntityManagerContainerFactory.java
...container/factory/SliceEntityManagerContainerFactory.java
+9
-1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java
...ava/com/x/base/core/project/config/ApplicationServer.java
+7
-5
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
...src/main/java/com/x/base/core/project/config/Message.java
+9
-8
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java
...rc/main/java/com/x/base/core/project/config/Messages.java
+54
-77
o2server/x_base_core_project/src/main/java/com/x/base/core/project/message/MessageConnector.java
...ava/com/x/base/core/project/message/MessageConnector.java
+5
-1
o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
...com/x/server/console/server/center/CenterServerTools.java
+1
-1
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
.../java/com/x/server/console/server/web/WebServerTools.java
+1
-1
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
...ge/assemble/communicate/jaxrs/connector/ActionCreate.java
+12
-7
o2server/x_organization_assemble_authentication/src/test/resources/oauth2.json
...on_assemble_authentication/src/test/resources/oauth2.json
+0
-5
o2server/x_organization_assemble_authentication/src/test/resources/x_organization_assemble_authentication.xml
...test/resources/x_organization_assemble_authentication.xml
+0
-19
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SliceEntityManagerContainerFactory.java
浏览文件 @
7d761bf4
...
...
@@ -29,6 +29,7 @@ import com.x.base.core.entity.annotation.CheckPersist;
import
com.x.base.core.entity.annotation.CheckRemove
;
import
com.x.base.core.entity.annotation.Flag
;
import
com.x.base.core.entity.annotation.RestrictFlag
;
import
com.x.base.core.entity.dynamic.DynamicEntity
;
public
abstract
class
SliceEntityManagerContainerFactory
{
...
...
@@ -76,7 +77,14 @@ public abstract class SliceEntityManagerContainerFactory {
flagMap
.
put
(
clz
,
Collections
.
unmodifiableList
(
flagFields
));
restrictFlagMap
.
put
(
clz
,
Collections
.
unmodifiableList
(
restrictFlagFields
));
}
if
(
null
!=
classLoader
)
{
boolean
hasDynamicEntityClass
=
false
;
for
(
String
className
:
classNames
)
{
if
(
StringUtils
.
startsWith
(
className
,
DynamicEntity
.
CLASS_PACKAGE
))
{
hasDynamicEntityClass
=
true
;
break
;
}
}
if
((
null
!=
classLoader
)
&&
hasDynamicEntityClass
)
{
clz
=
(
Class
<?
extends
JpaObject
>)
cl
.
loadClass
(
"com.x.base.core.entity.dynamic.DynamicBaseEntity"
);
checkPersistFieldMap
.
put
(
clz
,
new
HashMap
<>());
checkRemoveFieldMap
.
put
(
clz
,
new
HashMap
<>());
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java
浏览文件 @
7d761bf4
...
...
@@ -9,6 +9,8 @@ import com.x.base.core.project.annotation.FieldDescribe;
public
class
ApplicationServer
extends
ConfigObject
{
private
static
final
long
serialVersionUID
=
4182216855396608843L
;
public
static
ApplicationServer
defaultInstance
()
{
return
new
ApplicationServer
();
}
...
...
@@ -22,7 +24,7 @@ public class ApplicationServer extends ConfigObject {
private
static
final
Integer
DEFAULT_MAXFORMCONTENT
=
20
;
private
static
final
Boolean
DEFAULT_EXPOSEJEST
=
true
;
private
static
final
Boolean
DEFAULT_PERSISTENTCONNECTIONSENABLE
=
true
;
private
static
final
Integer
DEFAULT_MAXTHREAD
=
5
00
;
private
static
final
Integer
DEFAULT_MAXTHREAD
=
20
00
;
private
static
final
Boolean
DEFAULT_REQUESTLOGENABLE
=
false
;
private
static
final
String
DEFAULT_REQUESTLOGFORMAT
=
""
;
private
static
final
Integer
DEFAULT_REQUESTLOGRETAINDAYS
=
7
;
...
...
@@ -36,10 +38,10 @@ public class ApplicationServer extends ConfigObject {
this
.
proxyPort
=
DEFAULT_PORT
;
this
.
redeploy
=
true
;
this
.
scanInterval
=
DEFAULT_SCANINTERVAL
;
this
.
includes
=
new
CopyOnWriteArrayList
<
String
>();
this
.
excludes
=
new
CopyOnWriteArrayList
<
String
>();
this
.
weights
=
new
CopyOnWriteArrayList
<
NameWeightPair
>();
this
.
scheduleWeights
=
new
CopyOnWriteArrayList
<
NameWeightPair
>();
this
.
includes
=
new
CopyOnWriteArrayList
<>();
this
.
excludes
=
new
CopyOnWriteArrayList
<>();
this
.
weights
=
new
CopyOnWriteArrayList
<>();
this
.
scheduleWeights
=
new
CopyOnWriteArrayList
<>();
this
.
statEnable
=
DEFAULT_STATENABLE
;
this
.
statExclusions
=
DEFAULT_STATEXCLUSIONS
;
this
.
maxFormContent
=
DEFAULT_MAXFORMCONTENT
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
浏览文件 @
7d761bf4
...
...
@@ -9,6 +9,8 @@ import com.x.base.core.project.gson.GsonPropertyObject;
public
class
Message
extends
GsonPropertyObject
{
private
static
final
long
serialVersionUID
=
2536141863287117519L
;
public
Message
()
{
}
...
...
@@ -19,22 +21,21 @@ public class Message extends GsonPropertyObject {
public
Message
(
List
<
String
>
list
,
Map
<
String
,
String
>
map
)
{
this
.
consumers
.
addAll
(
list
);
if
(
map
!=
null
)
{
if
(
map
!=
null
)
{
this
.
consumersV2
.
putAll
(
map
);
}
}
public
Message
(
String
...
args
)
{
if
(
args
!=
null
)
{
for
(
String
arg
:
args
){
this
.
consumersV2
.
put
(
arg
,
""
);
if
(
args
!=
null
)
{
for
(
String
arg
:
args
)
{
this
.
consumersV2
.
put
(
arg
,
""
);
}
}
//this.consumers.addAll(ListTools.toList(args));
}
public
Message
(
Map
<
String
,
String
>
map
){
if
(
map
!=
null
)
{
public
Message
(
Map
<
String
,
String
>
map
)
{
if
(
map
!=
null
)
{
this
.
consumersV2
.
putAll
(
map
);
}
}
...
...
@@ -45,7 +46,7 @@ public class Message extends GsonPropertyObject {
private
List
<
String
>
consumers
=
new
ArrayList
<>();
private
Map
<
String
,
String
>
consumersV2
=
new
HashMap
<>();
private
Map
<
String
,
String
>
consumersV2
=
new
HashMap
<>();
public
List
<
String
>
getConsumers
()
{
return
consumers
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Messages.java
浏览文件 @
7d761bf4
...
...
@@ -14,153 +14,130 @@ public class Messages extends ConcurrentSkipListMap<String, Message> {
public
static
final
Boolean
DEFAULT_WEBSOCKETENABLE
=
true
;
public
Messages
()
throws
Exception
{
public
Messages
()
{
super
();
}
public
static
Messages
defaultInstance
()
throws
Exception
{
public
static
Messages
defaultInstance
()
{
Messages
o
=
new
Messages
();
/* 示例 */
Map
<
String
,
String
>
map
=
new
HashMap
<>();
// 示例
Map
<
String
,
String
>
map
=
new
HashMap
<>();
map
.
put
(
MessageConnector
.
CONSUME_QIYEWEIXIN
,
"excute"
);
map
.
put
(
"describe"
,
"excute表示脚本messageSendRule.js中的方法名称,该js文件需放在与messages.json同目录下,更改脚本需重启服务"
);
map
.
put
(
"describe"
,
"excute表示脚本messageSendRule.js中的方法名称,该js文件需放在与messages.json同目录下,更改脚本需重启服务"
);
o
.
put
(
"##sample##"
,
new
Message
(
map
));
/* 文件通知 */
// 文件通知
o
.
put
(
MessageConnector
.
TYPE_ATTACHMENT_SHARE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_ATTACHMENT_EDITOR
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_ATTACHMENT_SHARECANCEL
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_ATTACHMENT_EDITORCANCEL
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_ATTACHMENT_EDITORMODIFY
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
/* 文件通知结束 */
/* 会议通知 */
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
// 会议通知
o
.
put
(
MessageConnector
.
TYPE_MEETING_INVITE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_MEETING_DELETE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
/* 会议通知结束 */
/* 待办已办通知 */
o
.
put
(
MessageConnector
.
TYPE_TASK_CREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
/* 待办转已办通知 */
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
// 待办已办通知
o
.
put
(
MessageConnector
.
TYPE_TASK_CREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
// 待办转已办通知
o
.
put
(
MessageConnector
.
TYPE_TASK_TO_TASKCOMPLETED
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
/* 待办提醒通知 */
o
.
put
(
MessageConnector
.
TYPE_TASK_PRESS
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
// 待办提醒通知
o
.
put
(
MessageConnector
.
TYPE_TASK_PRESS
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_TASK_DELETE
,
new
Message
());
o
.
put
(
MessageConnector
.
TYPE_TASKCOMPLETED_CREATE
,
new
Message
());
o
.
put
(
MessageConnector
.
TYPE_TASKCOMPLETED_DELETE
,
new
Message
());
/* 待办已办通知结束 */
/* 待阅已阅通知 */
o
.
put
(
MessageConnector
.
TYPE_READ_CREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
/* 待阅转已阅通知 */
// 待阅已阅通知
o
.
put
(
MessageConnector
.
TYPE_READ_CREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
// 待阅转已阅通知
o
.
put
(
MessageConnector
.
TYPE_READ_TO_READCOMPLETED
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
,
MessageConnector
.
CONSUME_MQ
));
o
.
put
(
MessageConnector
.
TYPE_READ_DELETE
,
new
Message
());
o
.
put
(
MessageConnector
.
TYPE_READCOMPLETED_CREATE
,
new
Message
());
o
.
put
(
MessageConnector
.
TYPE_READCOMPLETED_DELETE
,
new
Message
());
/* 待阅已阅通知结束 */
/* 日程管理消息通知 */
// 日程管理消息通知
o
.
put
(
MessageConnector
.
TYPE_CALENDAR_ALARM
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
,
MessageConnector
.
CONSUME_DINGDING
,
MessageConnector
.
CONSUME_ZHENGWUDINGDING
,
MessageConnector
.
CONSUME_QIYEWEIXIN
,
MessageConnector
.
CONSUME_WELINK
));
/* 文档发布消息通知 */
// o.put(MessageConnector.TYPE_CMS_PUBLISH,
// new Message(MessageConnector.CONSUME_WS, MessageConnector.CONSUME_PMS ));
/* 社区新贴发布消息通知 */
// 社区新贴发布消息通知
o
.
put
(
MessageConnector
.
TYPE_BBS_SUBJECTCREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
));
/* 社区新回复发布消息通知 */
// 社区新回复发布消息通知
o
.
put
(
MessageConnector
.
TYPE_BBS_REPLYCREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
));
/
* 脑图分享消息通知 */
/
/ 脑图分享消息通知
o
.
put
(
MessageConnector
.
TYPE_MIND_FILESHARE
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
));
/* 脑图发送消息通知 */
// 脑图发送消息通知
o
.
put
(
MessageConnector
.
TYPE_MIND_FILESEND
,
new
Message
(
MessageConnector
.
CONSUME_WS
,
MessageConnector
.
CONSUME_PMS
));
/* im聊天消息发送 */
o
.
put
(
MessageConnector
.
TYPE_IM_CREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
));
// im聊天消息发送
o
.
put
(
MessageConnector
.
TYPE_IM_CREATE
,
new
Message
(
MessageConnector
.
CONSUME_WS
));
return
o
;
}
public
List
<
String
>
getConsumers
(
String
type
)
{
Message
o
=
this
.
get
(
type
);
if
(
o
!=
null
)
{
/
* 这里必须复制内容,在消息处理中会对列表进行删除操作 */
/
/ 这里必须复制内容,在消息处理中会对列表进行删除操作
List
<
String
>
list
=
new
ArrayList
<>();
list
.
addAll
(
o
.
getConsumers
());
return
list
;
}
return
new
ArrayList
<
String
>();
return
new
ArrayList
<>();
}
public
Map
<
String
,
String
>
getConsumersV2
(
String
type
)
{
public
Map
<
String
,
String
>
getConsumersV2
(
String
type
)
{
Message
o
=
this
.
get
(
type
);
Map
<
String
,
String
>
map
=
new
HashMap
<>();
if
(
o
!=
null
)
{
/* 这里必须复制内容,在消息处理中会对列表进行删除操作 */
if
(
o
.
getConsumersV2
()!=
null
){
map
.
putAll
(
o
.
getConsumersV2
());
}
Map
<
String
,
String
>
map
=
new
HashMap
<>();
// 这里必须复制内容,在消息处理中会对列表进行删除操作
if
((
o
!=
null
)
&&
(
o
.
getConsumersV2
()
!=
null
))
{
map
.
putAll
(
o
.
getConsumersV2
());
}
return
map
;
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/message/MessageConnector.java
浏览文件 @
7d761bf4
...
...
@@ -143,6 +143,8 @@ public class MessageConnector {
public
static
final
String
CONSUME_MQ
=
"mq"
;
public
static
final
String
CONSUME_QUERY
=
"query"
;
private
static
Context
context
;
private
static
LinkedBlockingQueue
<
Wrap
>
connectQueue
=
new
LinkedBlockingQueue
<>(
10000
);
...
...
@@ -157,8 +159,9 @@ public class MessageConnector {
public
static
void
stop
()
{
try
{
connectQueue
.
put
(
new
StopSignal
());
}
catch
(
Exception
e
)
{
}
catch
(
Interrupted
Exception
e
)
{
e
.
printStackTrace
();
Thread
.
currentThread
().
interrupt
();
}
}
...
...
@@ -172,6 +175,7 @@ public class MessageConnector {
}
public
static
class
ConnectorThread
extends
Thread
{
@Override
public
void
run
()
{
while
(
true
)
{
try
{
...
...
o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
浏览文件 @
7d761bf4
...
...
@@ -48,7 +48,7 @@ public class CenterServerTools extends JettySeverTools {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
CenterServerTools
.
class
);
private
static
final
int
CENTERSERVER_THREAD_POOL_SIZE_MIN
=
20
;
private
static
final
int
CENTERSERVER_THREAD_POOL_SIZE_MAX
=
5
00
;
private
static
final
int
CENTERSERVER_THREAD_POOL_SIZE_MAX
=
20
00
;
public
static
Server
start
(
CenterServer
centerServer
)
throws
Exception
{
...
...
o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java
浏览文件 @
7d761bf4
...
...
@@ -43,7 +43,7 @@ public class WebServerTools extends JettySeverTools {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
WebServerTools
.
class
);
private
static
final
int
WEBSERVER_THREAD_POOL_SIZE_MIN
=
20
;
private
static
final
int
WEBSERVER_THREAD_POOL_SIZE_MAX
=
5
00
;
private
static
final
int
WEBSERVER_THREAD_POOL_SIZE_MAX
=
20
00
;
public
static
Server
start
(
WebServer
webServer
)
throws
Exception
{
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/connector/ActionCreate.java
浏览文件 @
7d761bf4
...
...
@@ -40,16 +40,18 @@ class ActionCreate extends BaseAction {
private
static
ConcurrentMap
<
String
,
CompiledScript
>
scriptMap
=
new
ConcurrentHashMap
<>();
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
JsonElement
jsonElement
)
throws
Exception
{
LOGGER
.
debug
(
effectivePerson
.
getDistinguishedName
());
LOGGER
.
debug
(
"execute:{}, jsonElement:{}."
,
effectivePerson:
:
getDistinguishedName
,
()
->
jsonElement
);
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
List
<
String
>
consumers
=
Config
.
messages
().
getConsumers
(
wi
.
getType
());
//
List<String> consumers = Config.messages().getConsumers(wi.getType());
Map
<
String
,
String
>
consumersV2
=
Config
.
messages
().
getConsumersV2
(
wi
.
getType
());
for
(
String
consumer
:
consumers
)
{
if
(!
consumersV2
.
containsKey
(
consumer
))
{
consumersV2
.
put
(
consumer
,
""
);
}
}
//
for (String consumer : consumers) {
// if (BooleanUtils.isFalse(consumersV2.containsKey(consumer)
)) {
//
consumersV2.put(consumer, "");
//
}
//
}
Instant
instant
=
this
.
instant
(
wi
,
new
ArrayList
<>(
consumersV2
.
keySet
()));
List
<
Message
>
messages
=
new
ArrayList
<>();
assemble
(
wi
,
consumersV2
,
instant
,
messages
);
...
...
@@ -159,6 +161,9 @@ class ActionCreate extends BaseAction {
case
MessageConnector
.
CONSUME_MPWEIXIN
:
message
=
this
.
mpweixinMessage
(
cpWi
,
instant
);
break
;
// case MessageConnector.CONSUME_MPWEIXtN:
// message = this.mpweixinMessage(cpWi, instant);
// break;
default
:
if
(
consumer
.
startsWith
(
MessageConnector
.
CONSUME_MQ
))
{
message
=
this
.
mqMessage
(
cpWi
,
instant
,
consumer
);
...
...
o2server/x_organization_assemble_authentication/src/test/resources/oauth2.json
已删除
100644 → 0
浏览文件 @
2dfa56d4
{
"name"
:
"林玲"
,
"mail"
:
"linling@zoneland.net"
,
"employee"
:
"001"
}
\ No newline at end of file
o2server/x_organization_assemble_authentication/src/test/resources/x_organization_assemble_authentication.xml
已删除
100644 → 0
浏览文件 @
2dfa56d4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure
class=
"org.eclipse.jetty.webapp.WebAppContext"
>
<Set
name=
"contextPath"
>
/x_organization_assemble_authentication
</Set>
<Set
name=
"war"
>
d:/o2server/store/x_organization_assemble_authentication.war
</Set>
<Set
name=
"extraClasspath"
>
d:/o2server/commons/ext/slf4j-api-1.7.21.jar;d:/o2server/commons/ext/slf4j-simple-1.7.21.jar;d:/o2server/commons/ext/openjpa-all-2.4.2-SNAPSHOT.jar;d:/o2server/commons/ext/ehcache-2.10.1.jar;d:/o2server/store/jars/x_base_core_foundation-4.0.0.jar;d:/o2server/store/jars/x_base_core_project-4.0.0.jar;d:/o2server/store/jars/x_organization_core_entity-4.0.0.jar
</Set>
<Set
name=
"tempDirectory"
>
d:/o2server/temp/aaa
</Set>
<!-- Get name="classLoader"> <Call name="addClassPath"> <Arg>d:/lib/ehcache-2.10.1.jar</Arg>
</Call> <Call name="addClassPath"> <Arg>d:/lib/openjpa-all-2.4.2-SNAPSHOT.jar</Arg>
</Call> <Call name="addClassPath"> <Arg>d:/lib/slf4j-api-1.7.21.jar</Arg>
</Call> <Call name="addClassPath"> <Arg>d:/lib/slf4j-simple-1.7.21.jar</Arg>
</Call> <Call name="addClassPath"> <Arg>d:/lib/x_base_core_foundation-4.0.0.jar</Arg>
</Call> <Call name="addClassPath"> <Arg>d:/lib/x_base_core_project-4.0.0.jar</Arg>
</Call> <Call name="addClassPath"> <Arg>d:/lib/x_organization_core_entity-4.0.0.jar</Arg>
</Call> </Get -->
</Configure>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录