Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
399042a5
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,发现更多精彩内容 >>
提交
399042a5
编写于
12月 25, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
梳理config配置,增加手工配置的configSample配置文件
上级
94166730
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
485 addition
and
36 deletion
+485
-36
.gitignore
.gitignore
+2
-1
o2server/configSample/externalDataSources.json
o2server/configSample/externalDataSources.json
+10
-0
o2server/configSample/externalDataSources_db2.json
o2server/configSample/externalDataSources_db2.json
+10
-0
o2server/configSample/externalDataSources_dm.json
o2server/configSample/externalDataSources_dm.json
+10
-0
o2server/configSample/externalDataSources_informix.json
o2server/configSample/externalDataSources_informix.json
+10
-0
o2server/configSample/externalDataSources_kingbase.json
o2server/configSample/externalDataSources_kingbase.json
+10
-0
o2server/configSample/externalDataSources_mysql.json
o2server/configSample/externalDataSources_mysql.json
+10
-0
o2server/configSample/externalDataSources_oracle.json
o2server/configSample/externalDataSources_oracle.json
+10
-0
o2server/configSample/externalDataSources_postgresql.json
o2server/configSample/externalDataSources_postgresql.json
+10
-0
o2server/configSample/externalDataSources_sqlserver.json
o2server/configSample/externalDataSources_sqlserver.json
+10
-0
o2server/configSample/externalStorageSources.json
o2server/configSample/externalStorageSources.json
+290
-0
o2server/configSample/manifest.cfg
o2server/configSample/manifest.cfg
+38
-0
o2server/configSample/messageSendRule.js
o2server/configSample/messageSendRule.js
+18
-0
o2server/configSample/mq.json
o2server/configSample/mq.json
+31
-0
o2server/configSample/web.json
o2server/configSample/web.json
+4
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
...ava/com/x/base/core/project/build/CreateConfigSample.java
+3
-26
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
.../src/main/java/com/x/base/core/project/config/Config.java
+5
-5
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/JpushConfig.java
...main/java/com/x/base/core/project/config/JpushConfig.java
+4
-4
未找到文件。
.gitignore
浏览文件 @
399042a5
...
...
@@ -30,11 +30,12 @@
/o2server/configSample/person.json
/o2server/configSample/portal.json
/o2server/configSample/processPlatform.json
/o2server/configSample/pushConfig.json
/o2server/configSample/
j
pushConfig.json
/o2server/configSample/qiyeweixin.json
/o2server/configSample/query.json
/o2server/configSample/token.json
/o2server/configSample/vfs.json
/o2server/configSample/weLink.json
/o2server/configSample/workTime.json
/o2server/configSample/zhengwuDingding.json
/o2server/*/src/main/webapp/describe/
...
...
o2server/configSample/externalDataSources.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:mysql://127.0.0.1:3306/X?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8"
,
"username"
:
"root"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_db2.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:db2://127.0.0.1:50000/X"
,
"username"
:
"db2admin"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_dm.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:dm://127.0.0.1/X"
,
"username"
:
"admin"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_informix.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:sqlserver://127.0.0.1:1433;DatabaseName=X;selectMethod=cursor;sendStringParametersAsUnicode=false"
,
"username"
:
"sa"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_kingbase.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:kingbase://127.0.0.1:54321/X"
,
"username"
:
"system"
,
"password"
:
"krms"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_mysql.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:mysql://127.0.0.1:3306/X?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8"
,
"username"
:
"root"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_oracle.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:oracle:thin:@//127.0.0.1:1521/orcl"
,
"username"
:
"X"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_postgresql.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:postgresql://localhost:5432/X"
,
"username"
:
"postgres"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalDataSources_sqlserver.json
0 → 100755
浏览文件 @
399042a5
[
{
"url"
:
"jdbc:sqlserver://127.0.0.1:1433;DatabaseName=X;selectMethod=cursor;sendStringParametersAsUnicode=false"
,
"username"
:
"sa"
,
"password"
:
"password"
,
"includes"
:
[],
"excludes"
:
[],
"enable"
:
true
}
]
\ No newline at end of file
o2server/configSample/externalStorageSources.json
0 → 100755
浏览文件 @
399042a5
{
"file"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"processPlatform"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"mind"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"meeting"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"calendar"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"okr"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"cms"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"bbs"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"report"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"strategyDeploy"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"teamwork"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
],
"structure"
:
[
{
"protocol"
:
"webdav"
,
"username"
:
"admin"
,
"password"
:
"admin"
,
"host"
:
"127.0.0.1"
,
"port"
:
8080.0
,
"prefix"
:
""
,
"enable"
:
true
,
"weight"
:
100.0
,
"name"
:
"251"
,
"deepPath"
:
false
,
"###protocol"
:
"协议,可选值ftp,webdav###"
,
"###username"
:
"登录用户名.###"
,
"###password"
:
"登录密码.###"
,
"###host"
:
"主机地址.###"
,
"###port"
:
"端口.###"
,
"###prefix"
:
"前缀路径.###"
,
"###enable"
:
"是否启用###"
,
"###weight"
:
"设置权重.###"
,
"###name"
:
"存储节点名,对应存储名称,谨慎修改.###"
,
"###deepPath"
:
"是否使用更深的路径.###"
}
]
}
\ No newline at end of file
o2server/configSample/manifest.cfg
0 → 100755
浏览文件 @
399042a5
{"node_127.0.0.1.json":"节点配置",
"appStyle.json":"移动端应用样式配置",
"centerServer.json":"中心服务配置",
"clientInit.json":"客户端初始化配置",
"collect.json":"连接到云平台配置",
"communicate.json":"消息配置",
"components.json":"组件配置",
"dingding.json":"钉钉配置",
"dumpRestoreData.json":"导出导入数据配置",
"exmail.json":"腾讯企业邮邮件配置",
"externalDataSources.json":"数据库配置",
"externalDataSources_db2.json":"db2数据库配置",
"externalDataSources_dm.json":"达梦数据库配置",
"externalDataSources_informix.json":"informix数据库配置",
"externalDataSources_kingbase.json":"金仓数据库配置",
"externalDataSources_mysql.json":"mysql数据库配置",
"externalDataSources_oracle.json":"oracle数据库配置",
"externalDataSources_postgresql.json":"postgresql数据库配置",
"externalDataSources_sqlserver.json":"sqlserver数据库配置",
"externalStorageSources.json":"文件存储配置",
"jpushConfig.json":"极光推送配置",
"logLevel.json":"日志配置",
"meeting.json":"openMeeting配置",
"messages.json":"消息发送配置",
"messageSendRule.js":"消息发送规则",
"mq.json":"消息队列配置",
"person.json":"个人信息配置",
"portal.json":"门户配置",
"processPlatform.json":"流程平台配置",
"qiyeweixin.json":"企业微信配置",
"query.json":"数据中心配置",
"token.json":"令牌,密钥配置",
"vfs.json":"虚拟文件存储配置",
"web.json":"web端参数配置",
"welink.json":"华为WeLink配置",
"workTime.json":"工作时间配置",
"zhengwuDingding.json":"政务钉钉配置"
}
o2server/configSample/messageSendRule.js
0 → 100755
浏览文件 @
399042a5
/**
* 统一消息推送执行脚本,使用在messages.json配置文件
* 方法返回boolean类型,true表示满足发送条件且接受对body体的修改,false表示不发送
* 变量body表示消息体,每个消息类型的消息体可能不同,是一个Gson的JsonObject对象
* 以下excute方法表示拟稿状态的待办不发送消息;excute1方法表示变更或者添加body对象中的modifyFlag参数
*/
function
excute
()
{
if
(
body
.
has
(
"
first
"
)
&&
body
.
has
(
"
workCreateType
"
)){
if
(
body
.
get
(
"
first
"
).
getAsBoolean
()
&&
"
surface
"
.
equals
(
body
.
get
(
"
workCreateType
"
).
getAsString
())){
return
false
;
}
}
return
true
;
}
function
excute1
()
{
body
.
addProperty
(
"
modifyFlag
"
,
"
1
"
);
return
true
;
}
\ No newline at end of file
o2server/configSample/mq.json
0 → 100755
浏览文件 @
399042a5
{
"enable"
:
true
,
"mq"
:
"kafka"
,
"kafka"
:{
"bootstrap_servers"
:
"localhost:9092"
,
"topic"
:
"topic-test"
,
"acks"
:
"all"
,
"retries"
:
0
,
"batch_size"
:
16384
,
"linger_ms"
:
1
,
"buffer_memory"
:
33554432
,
"key_deserializer"
:
"org.apache.kafka.common.serialization.StringDeserializer"
,
"value_deserializer"
:
"org.apache.kafka.common.serialization.StringDeserializer"
,
"###bootstrap_servers"
:
"服务器地址###"
,
"###acks"
:
"指定必须有多少个分区副本接收消息,生产者才认为消息写入成功,用户检测数据丢失的可能性###"
,
"###retries"
:
"生产者从服务器收到的错误有可能是临时性的错误的次数###"
,
"###batch_size"
:
"该参数指定了一个批次可以使用的内存大小,按照字节数计算(而不是消息个数)。###"
,
"###linger_ms"
:
"该参数指定了生产者在发送批次之前等待更多消息加入批次的时间,增加延迟,提高吞吐量###"
,
"###buffer_memory"
:
"该参数用来设置生产者内存缓冲区的大小,生产者用它缓冲要发送到服务器的消息###"
,
"###key_deserializer"
:
"key值的序列化类###"
,
"###value_deserializer"
:
"value的序列化类###"
},
"activeMQ"
:{
"url"
:
"tcp://127.0.0.1:61616"
,
"queueName"
:
"queue-test"
,
"###url"
:
"服务地址,端口默认61616.###"
,
"###queueName"
:
"要创建的消息名称###"
},
"###enable"
:
"是否启用.###"
,
"###mq"
:
"消息服务类型.###"
}
\ No newline at end of file
o2server/configSample/web.json
0 → 100755
浏览文件 @
399042a5
{
"mock"
:
{},
"###mock"
:
"使用Post模拟Put,Get模拟Delete的模块.###"
}
\ No newline at end of file
o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
浏览文件 @
399042a5
...
...
@@ -11,37 +11,13 @@ import java.util.LinkedHashMap;
import
java.util.List
;
import
java.util.Map
;
import
com.x.base.core.project.config.*
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.reflect.FieldUtils
;
import
org.apache.commons.lang3.reflect.MethodUtils
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.config.AppStyle
;
import
com.x.base.core.project.config.Cache
;
import
com.x.base.core.project.config.CenterServer
;
import
com.x.base.core.project.config.ClientInit
;
import
com.x.base.core.project.config.Collect
;
import
com.x.base.core.project.config.Communicate
;
import
com.x.base.core.project.config.Components
;
import
com.x.base.core.project.config.ConfigObject
;
import
com.x.base.core.project.config.Dingding
;
import
com.x.base.core.project.config.DumpRestoreData
;
import
com.x.base.core.project.config.Exmail
;
import
com.x.base.core.project.config.LogLevel
;
import
com.x.base.core.project.config.Meeting
;
import
com.x.base.core.project.config.Messages
;
import
com.x.base.core.project.config.Node
;
import
com.x.base.core.project.config.Person
;
import
com.x.base.core.project.config.Portal
;
import
com.x.base.core.project.config.ProcessPlatform
;
import
com.x.base.core.project.config.PushConfig
;
import
com.x.base.core.project.config.Qiyeweixin
;
import
com.x.base.core.project.config.Query
;
import
com.x.base.core.project.config.Token
;
import
com.x.base.core.project.config.Vfs
;
import
com.x.base.core.project.config.WorkTime
;
import
com.x.base.core.project.config.ZhengwuDingding
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
...
...
@@ -72,11 +48,12 @@ public class CreateConfigSample {
classes
.
add
(
Person
.
class
);
classes
.
add
(
Portal
.
class
);
classes
.
add
(
ProcessPlatform
.
class
);
classes
.
add
(
P
ushConfig
.
class
);
classes
.
add
(
Jp
ushConfig
.
class
);
classes
.
add
(
Qiyeweixin
.
class
);
classes
.
add
(
Query
.
class
);
classes
.
add
(
Token
.
class
);
classes
.
add
(
Vfs
.
class
);
classes
.
add
(
WeLink
.
class
);
classes
.
add
(
WorkTime
.
class
);
classes
.
add
(
ZhengwuDingding
.
class
);
classes
.
add
(
Cache
.
class
);
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
浏览文件 @
399042a5
...
...
@@ -62,7 +62,7 @@ public class Config {
public
static
final
String
PATH_CONFIG_PROCESSPLATFORM
=
"config/processPlatform.json"
;
public
static
final
String
PATH_CONFIG_QUERY
=
"config/query.json"
;
public
static
final
String
PATH_CONFIG_DINGDING
=
"config/dingding.json"
;
public
static
final
String
PATH_CONFIG_WELINK
=
"config/we
l
ink.json"
;
public
static
final
String
PATH_CONFIG_WELINK
=
"config/we
L
ink.json"
;
public
static
final
String
PATH_CONFIG_ZHENGWUDINGDING
=
"config/zhengwuDingding.json"
;
public
static
final
String
PATH_CONFIG_QIYEWEIXIN
=
"config/qiyeweixin.json"
;
public
static
final
String
PATH_CONFIG_MQ
=
"config/mq.json"
;
...
...
@@ -892,15 +892,15 @@ public class Config {
return
instance
().
messageSendRuleScript
;
}
private
P
ushConfig
pushConfig
;
private
Jp
ushConfig
pushConfig
;
public
static
synchronized
P
ushConfig
pushConfig
()
throws
Exception
{
public
static
synchronized
Jp
ushConfig
pushConfig
()
throws
Exception
{
if
(
null
==
instance
().
pushConfig
)
{
PushConfig
custom
=
BaseTools
.
readConfigObject
(
PATH_CONFIG_JPUSH
,
P
ushConfig
.
class
);
JpushConfig
custom
=
BaseTools
.
readConfigObject
(
PATH_CONFIG_JPUSH
,
Jp
ushConfig
.
class
);
if
(
null
!=
custom
)
{
instance
().
pushConfig
=
custom
;
}
else
{
instance
().
pushConfig
=
P
ushConfig
.
defaultInstance
();
instance
().
pushConfig
=
Jp
ushConfig
.
defaultInstance
();
}
}
return
instance
().
pushConfig
;
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/
P
ushConfig.java
→
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/
Jp
ushConfig.java
浏览文件 @
399042a5
...
...
@@ -3,16 +3,16 @@ package com.x.base.core.project.config;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
org.apache.commons.lang3.BooleanUtils
;
public
class
P
ushConfig
extends
ConfigObject
{
public
class
Jp
ushConfig
extends
ConfigObject
{
private
static
final
String
O2_app_key_default
=
"9aca7cc20fe0cc987cd913ca"
;
private
static
final
String
O2_master_secret_default
=
"96ee7e2e0daffd51bac57815"
;
public
static
P
ushConfig
defaultInstance
()
{
return
new
P
ushConfig
();
public
static
Jp
ushConfig
defaultInstance
()
{
return
new
Jp
ushConfig
();
}
public
P
ushConfig
()
{
public
Jp
ushConfig
()
{
this
.
enable
=
false
;
this
.
appKey
=
O2_app_key_default
;
this
.
masterSecret
=
O2_master_secret_default
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录