diff --git a/build.xml b/build.xml
index 81f002e76c69ea95d12307901081c84e052581fb..1cf9e28cd6057abbaed2f8ab1b222b0eed899516 100644
--- a/build.xml
+++ b/build.xml
@@ -45,14 +45,14 @@
project.setNewProperty("length_aix_mb", length_aix_mbytes);
]]>
-
-
+
+
@@ -116,14 +116,14 @@
"url": "/download/o2server-${VERSION}-aix.zip",
"sha256": "${build_aix.sha}"
},
- "raspberrypi": {
+ "raspi": {
"system": "raspberrypi",
"name": "o2server-${VERSION}-raspi.zip",
"fileName": "o2server-${VERSION}-raspi.zip",
"fileSize": "${length_raspberrypi_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-raspi.zip",
- "sha256": "${build_raspberrypi.sha}"
+ "sha256": "${build_raspi.sha}"
},
"mips": {
"system": "mips",
@@ -185,14 +185,14 @@
"url": "/download/o2server-${VERSION}-aix.zip",
"sha256": "${build_aix.sha}"
},
- "raspberrypi": {
- "system": "raspberrypi",
+ "raspi": {
+ "system": "raspi",
"name": "o2server-${VERSION}-raspi.zip",
"fileName": "o2server-${VERSION}-raspi.zip",
- "fileSize": "${length_raspberrypi_mb}MB",
+ "fileSize": "${length_raspi_mb}MB",
"updateTime": "${TODAY}",
"url": "/download/o2server-${VERSION}-raspi.zip",
- "sha256": "${build_raspberrypi.sha}"
+ "sha256": "${build_raspi.sha}"
},
"mips": {
"system": "mips",
@@ -220,7 +220,7 @@
}
}
-
+
@@ -308,7 +308,7 @@
-
+
@@ -320,7 +320,7 @@
-
+
diff --git a/gulpfile.js b/gulpfile.js
index b3e14a849a2f8814747cec43d2e0880806def360..c1039f0add596b13dcbcb4b0d309a0baf00baee5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,8 @@ var fg = require('fast-glob');
var logger = require('gulp-logger');
var assetRev = require('gulp-tm-asset-rev');
const os = require('os');
+var through2 = require('through2');
+var path = require('path');
//var downloadHost = "download.o2oa.net";
// var downloadHost = "release.o2oa.net";
@@ -46,7 +48,7 @@ var jvmUrls = {
"arm": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/arm",
"macos": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/macos",
"risc": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/risc",
- "raspberrypi": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/raspberrypi",
+ "raspi": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/raspi",
"windows": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/windows"
};
@@ -57,15 +59,16 @@ var scripts = {
"arm": ["o2server/*arm*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
"macos": ["o2server/*macos*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
"risc": ["o2server/*risc*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
- "raspberrypi": ["o2server/*raspberrypi*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
+ "raspi": ["o2server/*raspi*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
"windows": ["o2server/*windows*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"]
};
var o_options = minimist(process.argv.slice(2), {//upload: local ftp or sftp
- string: ["e"]
+ string: ["e", "lp"]
});
var options = {};
options.ev = o_options.e || "all";
+options.lp = o_options.lp || "zh-cn";
var jvmUrl = jvmUrls[options.ev];
var scriptSource = scripts[options.ev];
@@ -460,6 +463,8 @@ function build_concat_xform(){
'o2web/source/' + path + '/DatagridPC.js',
'o2web/source/' + path + '/Textfield.js',
'o2web/source/' + path + '/Personfield.js',
+ 'o2web/source/' + path + '/Button.js',
+ 'o2web/source/' + path + '/ViewSelector.js',
'o2web/source/' + path + '/*.js',
'o2web/source/x_component_process_Work/Processor.js',
'!o2web/source/' + path + '/Office.js'
@@ -491,9 +496,100 @@ function build_bundle(){
.pipe(gulp.dest(dest))
}
-function build_concat_basework() {
+
+function concat_Actions(){
+ return through2.obj(function (file, enc, cb) {
+ if (file.isNull()) {
+ this.push(file);
+ return cb();
+ }
+
+ if (file.isStream()) {
+ this.emit('error', new gutil.PluginError(PLUGIN_NAME, 'Streaming not supported'));
+ return cb();
+ }
+ var content = file.contents.toString();
+
+ var o = path.parse(file.path);
+ var name = o.name;
+ content = "var actionJson = "+content;
+ content = content+"\nif (!o2.xAction.RestActions.Action[\""+name+"\"]) o2.xAction.RestActions.Action[\""+name+"\"] = new Class({Extends: o2.xAction.RestActions.Action});";
+ content = content+"\no2.Actions.actions[\""+name+"\"] = new o2.xAction.RestActions.Action[\""+name+"\"](\""+name+"\", actionJson);";
+
+ file.contents = new Buffer.from(content);
+ this.push(file);
+ cb();
+ });
+}
+function concat_Style(){
+ return through2.obj(function (file, enc, cb) {
+ if (file.isNull()) {
+ this.push(file);
+ return cb();
+ }
+
+ if (file.isStream()) {
+ this.emit('error', new gutil.PluginError(PLUGIN_NAME, 'Streaming not supported'));
+ return cb();
+ }
+ var content = file.contents.toString();
+ var name = file.path.replace(process.cwd(), "").replace(/\\/g, "/")
+ name = ".."+name.substring(name.indexOf("/source")+7);
+ content = "var csskey = encodeURIComponent(\""+name+"\");\no2.widget.css[csskey]="+content;
+
+ file.contents = new Buffer.from(content);
+ this.push(file);
+ cb();
+ });
+}
+
+function build_concat_basework_style(){
+ return gulp.src([
+ "o2web/source/x_component_process_Work/$Main/default/css.wcss",
+ "o2web/source/x_component_process_Xform/$Form/default/css.wcss",
+ "o2web/source/o2_core/o2/widget/$Tab/mobileForm/css.wcss",
+ "o2web/source/o2_core/o2/widget/$Menu/tab/css.wcss",
+ "o2web/source/o2_core/o2/widget/$Tab/form/css.wcss",
+ "o2web/source/x_component_process_Xform/$Form/default/doc.wcss",
+ "o2web/source/o2_core/o2/widget/$Toolbar/documentEdit/css.wcss",
+ "o2web/source/o2_core/o2/widget/$Toolbar/documentEdit_side/css.wcss",
+ "o2web/source/x_component_process_Xform/$Form/default/css.wcss"
+ ])
+ .pipe(concat_Style())
+ .pipe(concat('js/base_work_style_temp.js'))
+ .pipe(gulp.dest('o2web/source/x_desktop/'));
+}
+
+function build_concat_basework_action(){
+ return gulp.src([
+ "o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.json",
+ "o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json",
+ "o2web/source/o2_core/o2/xAction/services/x_organization_assemble_control.json",
+ "o2web/source/o2_core/o2/xAction/services/x_query_assemble_surface.json",
+ "o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.json",
+ "o2web/source/o2_core/o2/xAction/services/x_program_center.json",
+ "o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.json"
+ ])
+ .pipe(concat_Actions())
+ .pipe(concat('js/base_work_actions_temp.js'))
+ .pipe(gulp.dest('o2web/source/x_desktop/'));
+}
+
+function build_concat_basework_clean(cb) {
+ var dest = [
+ 'o2web/source/x_desktop/js/base_work_actions_temp.js',
+ 'o2web/source/x_desktop/js/base_work_style_temp.js'
+ ];
+ return del(dest, cb);
+}
+
+function build_concat_basework_body() {
var src = [
- 'o2web/source/x_desktop/js/base_work_begin.js',
+ 'o2web/source/x_desktop/js/base_concat_head.js',
+ 'o2web/source/o2_core/o2/lp/'+(options.lp || 'zh-cn')+'.js',
+
+ 'o2web/source/x_desktop/js/base_work_style_temp.js',
+
'o2web/source/o2_core/o2/widget/Common.js',
'o2web/source/o2_core/o2/widget/Dialog.js',
'o2web/source/o2_core/o2/widget/UUID.js',
@@ -511,6 +607,12 @@ function build_concat_basework() {
'o2web/source/o2_core/o2/xDesktop/Dialog.js',
'o2web/source/o2_core/o2/xDesktop/Window.js',
'o2web/source/x_component_Common/Main.js',
+
+ 'o2web/source/o2_core/o2/lp/'+(options.lp || 'zh-cn')+'.js',
+ 'o2web/source/x_component_process_Work/lp/'+(options.lp || 'zh-cn')+'.js',
+ 'o2web/source/x_component_process_Xform/lp/'+(options.lp || 'zh-cn')+'.js',
+ 'o2web/source/x_component_Selector/lp/'+(options.lp || 'zh-cn')+'.js',
+
'o2web/source/x_component_process_Work/Main.js',
'o2web/source/x_component_Selector/package.js',
'o2web/source/x_component_Selector/Person.js',
@@ -526,13 +628,16 @@ function build_concat_basework() {
'o2web/source/o2_core/o2/xScript/Environment.js',
'o2web/source/x_component_Template/MTooltips.js',
'o2web/source/x_component_Template/MSelector.js',
+
'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js',
'o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js',
'o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
'o2web/source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
- 'o2web/source/x_desktop/js/base_work_end.js',
+
+ 'o2web/source/x_desktop/js/base_work_actions_temp.js',
+
'o2web/source/x_desktop/js/base.js'
];
var dest = 'target/o2server/servers/webServer/x_desktop/js/';
@@ -543,10 +648,116 @@ function build_concat_basework() {
.pipe(rename({ extname: '.min.js' }))
.pipe(gulp.dest(dest));
}
-// function build_concat(){
-// return gulp.parallel(build_concat_o2, build_concat_desktop, build_concat_xform);
-// }
-exports.build_concat = gulp.parallel(build_concat_o2, build_concat_desktop, build_concat_xform, build_bundle, build_concat_basework);
+
+function build_concat_baseportal_style(){
+ return gulp.src([
+ "o2web/source/x_component_process_Work/$Main/default/css.wcss",
+ "o2web/source/x_component_portal_Portal/$Main/default/css.wcss",
+ "o2web/source/x_component_process_Xform/$Form/default/css.wcss",
+ "o2web/source/o2_core/o2/widget/$Tab/mobileForm/css.wcss",
+ "o2web/source/o2_core/o2/widget/$Menu/tab/css.wcss",
+ ])
+ .pipe(concat_Style())
+ .pipe(concat('js/base_portal_style_temp.js'))
+ .pipe(gulp.dest('o2web/source/x_desktop/'));
+}
+
+function build_concat_baseportal_action(){
+ return gulp.src([
+ "o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.json",
+ "o2web/source/o2_core/o2/xAction/services/x_portal_assemble_surface.json",
+ "o2web/source/o2_core/o2/xAction/services/x_organization_assemble_control.json",
+ "o2web/source/o2_core/o2/xAction/services/x_query_assemble_surface.json",
+ "o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.json",
+ "o2web/source/o2_core/o2/xAction/services/x_program_center.json",
+ "o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.json"
+ ])
+ .pipe(concat_Actions())
+ .pipe(concat('js/base_portal_actions_temp.js'))
+ .pipe(gulp.dest('o2web/source/x_desktop/'));
+}
+
+function build_concat_baseportal_clean(cb) {
+ var dest = [
+ 'o2web/source/x_desktop/js/base_portal_actions_temp.js',
+ 'o2web/source/x_desktop/js/base_portal_style_temp.js'
+ ];
+ return del(dest, cb);
+}
+
+function build_concat_baseportal_body() {
+ var src = [
+ 'o2web/source/x_desktop/js/base_concat_head.js',
+ 'o2web/source/o2_core/o2/lp/'+(options.lp || 'zh-cn')+'.js',
+
+ 'o2web/source/x_desktop/js/base_portal_style_temp.js',
+
+ 'o2web/source/o2_core/o2/widget/Common.js',
+ 'o2web/source/o2_core/o2/widget/Dialog.js',
+ 'o2web/source/o2_core/o2/widget/UUID.js',
+ 'o2web/source/o2_core/o2/widget/Menu.js',
+ 'o2web/source/o2_core/o2/widget/Toolbar.js',
+ 'o2web/source/o2_core/o2/xDesktop/Common.js',
+ 'o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js',
+ 'o2web/source/o2_core/o2/xAction/RestActions.js',
+ 'o2web/source/o2_core/o2/xDesktop/Access.js',
+ 'o2web/source/o2_core/o2/xDesktop/Dialog.js',
+ 'o2web/source/o2_core/o2/xDesktop/Menu.js',
+ 'o2web/source/o2_core/o2/xDesktop/UserData.js',
+ 'o2web/source/x_component_Template/MPopupForm.js',
+ 'o2web/source/o2_core/o2/xDesktop/Authentication.js',
+ 'o2web/source/o2_core/o2/xDesktop/Window.js',
+
+ 'o2web/source/x_component_Common/Main.js',
+
+ 'o2web/source/x_component_process_Work/lp/'+(options.lp || 'zh-cn')+'.js',
+ 'o2web/source/x_component_portal_Portal/lp/'+(options.lp || 'zh-cn')+'.js',
+ 'o2web/source/x_component_process_Xform/lp/'+(options.lp || 'zh-cn')+'.js',
+ 'o2web/source/x_component_Selector/lp/'+(options.lp || 'zh-cn')+'.js',
+
+ 'o2web/source/x_component_portal_Portal/Main.js',
+
+ 'o2web/source/x_component_Selector/package.js',
+ 'o2web/source/x_component_Selector/Person.js',
+ 'o2web/source/x_component_Selector/Identity.js',
+ 'o2web/source/x_component_Selector/Unit.js',
+ 'o2web/source/x_component_Selector/IdentityWidthDuty.js',
+ 'o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js',
+ 'o2web/source/x_component_Selector/UnitWithType.js',
+
+ 'o2web/source/o2_core/o2/xScript/Actions/UnitActions.js',
+ 'o2web/source/o2_core/o2/xScript/Actions/ScriptActions.js',
+ 'o2web/source/o2_core/o2/xScript/Actions/CMSScriptActions.js',
+ 'o2web/source/o2_core/o2/xScript/Actions/PortalScriptActions.js',
+ 'o2web/source/o2_core/o2/xScript/PageEnvironment.js',
+
+ 'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js',
+ 'o2web/source/o2_core/o2/xAction/services/x_cms_assemble_control.js',
+ 'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_control.js',
+ 'o2web/source/o2_core/o2/xAction/services/x_query_assemble_surface.js',
+ 'o2web/source/o2_core/o2/xAction/services/x_organization_assemble_personal.js',
+
+ 'o2web/source/x_desktop/js/base_portal_actions_temp.js',
+
+ 'o2web/source/x_desktop/js/base.js'
+ ];
+ var dest = 'target/o2server/servers/webServer/x_desktop/js/';
+ return gulp.src(src)
+ .pipe(concat('base_portal.js'))
+ .pipe(gulp.dest(dest))
+ .pipe(uglify())
+ .pipe(rename({ extname: '.min.js' }))
+ .pipe(gulp.dest(dest));
+}
+
+exports.build_concat = gulp.parallel(
+ build_concat_o2,
+ build_concat_desktop,
+ build_concat_xform,
+ build_bundle,
+ gulp.series(build_concat_basework_style, build_concat_basework_action, build_concat_basework_body,build_concat_basework_clean),
+ gulp.series(build_concat_baseportal_style, build_concat_baseportal_action, build_concat_baseportal_body,build_concat_baseportal_clean)
+);
function build_web_v_html() {
@@ -638,7 +849,20 @@ function chmod_sh(){
function chmod_servers(){
return (shell.task('chmod 777 -R target/o2server/servers'))();
}
-exports.build_web = gulp.series(build_web_minimize, build_web_move, gulp.parallel(build_concat_o2, build_concat_desktop, build_concat_xform, build_bundle, build_concat_basework), build_web_v_html, build_web_v_o2);
+exports.build_web = gulp.series(
+ build_web_minimize,
+ build_web_move,
+ gulp.parallel(
+ build_concat_o2,
+ build_concat_desktop,
+ build_concat_xform,
+ gulp.series(build_concat_basework_style, build_concat_basework_action, build_concat_basework_body,build_concat_basework_clean),
+ gulp.series(build_concat_baseportal_style, build_concat_baseportal_action, build_concat_baseportal_body,build_concat_baseportal_clean),
+ build_bundle
+ ),
+ build_web_v_html,
+ build_web_v_o2);
+
if (os.platform().indexOf("win")==-1){
exports.deploy = gulp.series(deploy_server, chmod_jvm, chmod_commons, chmod_sh, chmod_servers);
}else{
diff --git a/o2server/configSample/centerServer.json b/o2server/configSample/centerServer.json
index 9a8a25e125f1291667f256e75a45dd3d3133bf1f..de869d1039b5fa6212c9b525510c6d37b4bc7844 100644
--- a/o2server/configSample/centerServer.json
+++ b/o2server/configSample/centerServer.json
@@ -13,6 +13,7 @@
"statExclusions": "*.js,*.gif,*.jpg,*.png,*.css,*.ico",
"maxFormContent": 20.0,
"exposeJest": true,
+ "persistentConnectionsEnable": true,
"###enable": "是否启用###",
"###order": "center节点顺序,顺序排列0,1,2...###",
"###sslEnable": "是否启用ssl传输加密,如果启用将使用config/keystore文件作为密钥文件.使用config/token.json文件中的sslKeyStorePassword字段为密钥密码,sslKeyManagerPassword为管理密码.###",
@@ -27,5 +28,6 @@
"###statEnable": "启用统计,默认启用统计.###",
"###statExclusions": "统计忽略路径,默认忽略*.js,*.gif,*.jpg,*.png,*.css,*.ico###",
"###maxFormContent": "最大提交数据限制(M),限制有所上传的内容大小,包括附件.###",
- "###exposeJest": "暴露jest接口.###"
+ "###exposeJest": "暴露jest接口.###",
+ "###persistentConnectionsEnable": "是否启用长连接,默认false.###"
}
\ No newline at end of file
diff --git a/o2server/configSample/dingding.json b/o2server/configSample/dingding.json
index 1ee8b2c1d8d29dda299d0c40a1c91b68a28e97b9..838d323e5425e011cc56d1d454c38253b74d64f7 100644
--- a/o2server/configSample/dingding.json
+++ b/o2server/configSample/dingding.json
@@ -19,7 +19,7 @@
"###agentId": "agentId###",
"###appKey": "应用的key,唯一标识###",
"###appSecret": "应用的密钥###",
- "###syncCron": "组织同步cron,默认每10分钟同步一次.###",
+ "###syncCron": "回调信号触发同步检查,默认每10分钟运行一次,如果期间内有钉钉回调信号接收到,那么触发同步任务进行人员同步.###",
"###forceSyncCron": "强制拉入同步cron,默认在每天的8点和12点强制进行同步.###",
"###oapiAddress": "oapi服务器地址###",
"###workUrl": "钉钉消息打开工作的url地址，如：http://dev.o2oa.net/x_desktop/###",
diff --git a/o2server/configSample/externalStorageSources.json b/o2server/configSample/externalStorageSources.json
index 2f2c8996accf46968ef7addfff2b8229ac85f314..3c4199eb8a430e2ff8d9c7d4d79396cbe54f59e7 100644
--- a/o2server/configSample/externalStorageSources.json
+++ b/o2server/configSample/externalStorageSources.json
@@ -286,5 +286,29 @@
"###name": "存储节点名,对应存储名称,谨慎修改.###",
"###deepPath": "是否使用更深的路径.###"
}
+ ],
+ "general": [
+ {
+ "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
diff --git a/o2server/configSample/manifest.cfg b/o2server/configSample/manifest.cfg
index cc35f009db5b28e713e874239f00762e17868236..da4c786d84479b4af16da964f9c3aa47b88fa392 100644
--- a/o2server/configSample/manifest.cfg
+++ b/o2server/configSample/manifest.cfg
@@ -33,5 +33,6 @@
"vfs.json":"虚拟文件存储配置",
"welink.json":"华为WeLink配置",
"workTime.json":"工作时间配置",
- "zhengwuDingding.json":"政务钉钉配置"
+ "zhengwuDingding.json":"政务钉钉配置",
+ "web.json":"前端相关配置"
}
\ No newline at end of file
diff --git a/o2server/configSample/node_127.0.0.1.json b/o2server/configSample/node_127.0.0.1.json
index a50eeae2e00568755b61bfc76afff6e9730b55ec..778a757aa6478ca598173cb10efa6fcf40f99320 100644
--- a/o2server/configSample/node_127.0.0.1.json
+++ b/o2server/configSample/node_127.0.0.1.json
@@ -16,6 +16,7 @@
"statExclusions": "*.js,*.gif,*.jpg,*.png,*.css,*.ico",
"maxFormContent": 20.0,
"exposeJest": true,
+ "persistentConnectionsEnable": true,
"###enable": "是否启用###",
"###order": "center节点顺序,顺序排列0,1,2...###",
"###sslEnable": "是否启用ssl传输加密,如果启用将使用config/keystore文件作为密钥文件.使用config/token.json文件中的sslKeyStorePassword字段为密钥密码,sslKeyManagerPassword为管理密码.###",
@@ -30,7 +31,8 @@
"###statEnable": "启用统计,默认启用统计.###",
"###statExclusions": "统计忽略路径,默认忽略*.js,*.gif,*.jpg,*.png,*.css,*.ico###",
"###maxFormContent": "最大提交数据限制(M),限制有所上传的内容大小,包括附件.###",
- "###exposeJest": "暴露jest接口.###"
+ "###exposeJest": "暴露jest接口.###",
+ "###persistentConnectionsEnable": "是否启用长连接,默认false.###"
},
"application": {
"enable": true,
@@ -48,6 +50,7 @@
"statExclusions": "*.js,*.gif,*.jpg,*.png,*.css,*.ico",
"maxFormContent": 20.0,
"exposeJest": true,
+ "persistentConnectionsEnable": true,
"###enable": "是否启用###",
"###port": "http/https端口,负责向前端提供数据访问接口.默认为20020端口.###",
"###sslEnable": "是否启用ssl传输加密,如果启用将使用config/keystore文件作为密钥文件.使用config/token.json文件中的sslKeyStorePassword字段为密钥密码,sslKeyManagerPassword为管理密码.###",
@@ -62,7 +65,8 @@
"###statEnable": "启用统计,默认启用统计.###",
"###statExclusions": "统计忽略路径,默认忽略*.js,*.gif,*.jpg,*.png,*.css,*.ico###",
"###maxFormContent": "最大提交数据限制(M),限制有所上传的内容大小,包括附件.###",
- "###exposeJest": "暴露jest接口.###"
+ "###exposeJest": "暴露jest接口.###",
+ "###persistentConnectionsEnable": "是否启用长连接,默认false.###"
},
"web": {
"enable": true,
@@ -73,6 +77,7 @@
"statEnable": false,
"statExclusions": "*.gif,*.jpg,*.png,*.ico",
"cacheControlMaxAge": 0.0,
+ "persistentConnectionsEnable": true,
"###enable": "是否启用###",
"###port": "http/https端口,用户输入网址后实际访问的第一个端口.http协议默认为80端口,https默认为443端口.###",
"###sslEnable": "是否启用ssl传输加密,如果启用将使用config/keystore文件作为密钥文件.使用config/token.json文件中的sslKeyStorePassword字段为密钥密码,sslKeyManagerPassword为管理密码.###",
@@ -84,7 +89,8 @@
"###statExclusions": "统计忽略路径,默认忽略*.gif,*.jpg,*.png,*.ico###",
"###cacheControlMaxAge": "服务器max-age缓存时间(秒)###",
"###proxyCenterEnable": "是否启用center服务器代理.###",
- "###proxyApplicationEnable": "是否启用application服务器代理###"
+ "###proxyApplicationEnable": "是否启用application服务器代理###",
+ "###persistentConnectionsEnable": "是否启用长连接,默认true.###"
},
"data": {
"enable": true,
@@ -108,7 +114,7 @@
"###excludes": "在此节点上不存储的类,和includes一起设置实际存储的类,可以使用通配符*###",
"###jmxEnable": "是否启动jmx,如果启用,可以通过本地的jmx客户端进行访问,不支持远程jmx客户端.###",
"###cacheSize": "H2数据库缓存大小,设置H2用于作为缓存的内存大小,以M作为单位,这里默认为512M.###",
- "###logLevel": "默认日志级别,FATAL, ERROR, WARN, INFO, TRACE. 完成的配置为DefaultLevel\u003dWARN, Tool\u003dTRACE, Enhance\u003dTRACE, METADATA\u003dTRACE, Runtime\u003dTRACE, Query\u003dTRACE, DataCache\u003dTRACE, JDBC\u003dTRACE, SQL\u003dTRACE###",
+ "###logLevel": "默认日志级别,FATAL, ERROR, WARN, INFO, TRACE. 完整的配置为DefaultLevel\u003dWARN, Tool\u003dTRACE, Enhance\u003dTRACE, METADATA\u003dTRACE, Runtime\u003dTRACE, Query\u003dTRACE, DataCache\u003dTRACE, JDBC\u003dTRACE, SQL\u003dTRACE###",
"###maxTotal": "最大使用连接数###",
"###maxIdle": "最大空闲连接数###",
"###statEnable": "启用统计,默认启用###",
@@ -135,12 +141,12 @@
},
"logLevel": "warn",
"dumpData": {
- "enable": true,
+ "enable": false,
"cron": "",
"size": 7.0,
"path": "",
- "###enable": "是否启用,默认每天凌晨2点进行备份.###",
- "###cron": "定时任务cron表达式###",
+ "###enable": "是否启用,默认禁用.###",
+ "###cron": "定时任务cron表达式,默认每天凌晨2点进行备份.###",
"###size": "最大保留份数,超过将自动删除最久的数据.###",
"###path": "备份路径###"
},
diff --git a/o2server/configSample/qiyeweixin.json b/o2server/configSample/qiyeweixin.json
index 109d3c13614d87291d63a56bd3a11a3698979fa0..a01f75fe8c9707096ed2dd5062f622b491bfdd22 100644
--- a/o2server/configSample/qiyeweixin.json
+++ b/o2server/configSample/qiyeweixin.json
@@ -17,7 +17,7 @@
"attendanceSyncAgentId": "",
"attendanceSyncSecret": "",
"###enable": "是否启用.###",
- "###syncCron": "拉入同步cron,默认每10分钟同步一次.###",
+ "###syncCron": "回调信号触发同步检查,默认每10分钟运行一次,如果期间内有企业微信回调信号接收到,那么触发同步任务进行人员同步.###",
"###forceSyncCron": "强制拉入同步cron,默认在每天的8点和12点强制进行同步.###",
"###apiAddress": "api服务器地址###",
"###corpId": "企业微信corpId###",
diff --git a/o2server/configSample/vfs.json b/o2server/configSample/vfs.json
index a5428ea8f93542a1cd7d1f1d54623a522824680c..6d6b22858344748b837b2ae6892b6b4933b1ae3d 100644
--- a/o2server/configSample/vfs.json
+++ b/o2server/configSample/vfs.json
@@ -4,5 +4,8 @@
},
"ftps": {
"passive": true
+ },
+ "sftp": {
+ "passive": true
}
}
\ No newline at end of file
diff --git a/o2server/configSample/web.json b/o2server/configSample/web.json
new file mode 100644
index 0000000000000000000000000000000000000000..122e7c7ede322c0acef4b28555906d766ed52c0f
--- /dev/null
+++ b/o2server/configSample/web.json
@@ -0,0 +1,4 @@
+{
+ "mock": {},
+ "###mock": "使用Post模拟Put,Get模拟Delete的模块.###"
+}
\ No newline at end of file
diff --git a/o2server/configSample/zhengwuDingding.json b/o2server/configSample/zhengwuDingding.json
index 40d4b3c326eb0bda739bb2390ab07ea797139d27..6e3b4e7ba63d2c0f8e58c5b393fde07ed0a2adf8 100644
--- a/o2server/configSample/zhengwuDingding.json
+++ b/o2server/configSample/zhengwuDingding.json
@@ -21,7 +21,7 @@
"###appId": "政务钉钉appId###",
"###appSecret": "政务钉钉appSecret###",
"###agentId": "政务钉钉agentId###",
- "###syncCron": "拉入同步cron,默认每10分钟同步一次.###",
+ "###syncCron": "回调信号触发同步检查,默认每10分钟运行一次,如果期间内有政务钉钉回调信号接收到,那么触发同步任务进行人员同步.###",
"###forceSyncCron": "强制拉入同步cron,默认在每天的8点和12点强制进行同步.###",
"###oapiAddress": "oapi服务器地址###",
"###corpId": "政务钉钉corpId###",
diff --git a/o2server/pom.xml b/o2server/pom.xml
index 26f69acc5dc3e8c298222c1acc9cc52d8a894bdd..9662987b3e78c59f3432a332dc8d34ef811ced1f 100644
--- a/o2server/pom.xml
+++ b/o2server/pom.xml
@@ -1017,4 +1017,10 @@
+
+
+ o2oa-release
+ http://maven.o2oa.net/repository/o2oa-release/
+
+
diff --git a/o2server/x_attendance_assemble_control/pom.xml b/o2server/x_attendance_assemble_control/pom.xml
index 641ae1c6866a7ac0471f20c2fd4a25d7929745e0..bf0ee4c05852ea645537d0388410aa62902501d3 100644
--- a/o2server/x_attendance_assemble_control/pom.xml
+++ b/o2server/x_attendance_assemble_control/pom.xml
@@ -128,6 +128,12 @@
+
+ maven-deploy-plugin
+
+ true
+
+
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
index bb314cff4fa9cfc72c1d80d52603ed20182e6ee2..f5e9bc1592463eb57b5b413f8e1d5a34a5440241 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
@@ -10,6 +10,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map.Entry;
import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
import javax.persistence.EntityManager;
@@ -17,7 +18,6 @@ import javax.persistence.Query;
import javax.persistence.Tuple;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -644,6 +644,61 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
return os.stream().findFirst().orElse(null);
}
+ public Optional firstEqualAndLessThanOrEqualTo(Class cls, String attribute,
+ Object value, String otherAttribute, Comparable otherValue) throws Exception {
+ EntityManager em = this.get(cls);
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery cq = cb.createQuery(cls);
+ Root root = cq.from(cls);
+ cq.select(root)
+ .where(cb.and(cb.equal(root.get(attribute), value),
+ cb.lessThanOrEqualTo(root.get(otherAttribute), otherValue)))
+ .orderBy(cb.desc(root.get(otherAttribute)));
+ List os = em.createQuery(cq).setMaxResults(1).getResultList();
+ return os.stream().findFirst();
+ }
+
+ public Optional firstEqualAndLessThan(Class cls, String attribute, Object value,
+ String otherAttribute, Comparable otherValue) throws Exception {
+ EntityManager em = this.get(cls);
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery cq = cb.createQuery(cls);
+ Root root = cq.from(cls);
+ cq.select(root)
+ .where(cb.and(cb.equal(root.get(attribute), value), cb.lessThan(root.get(otherAttribute), otherValue)))
+ .orderBy(cb.desc(root.get(otherAttribute)));
+ List os = em.createQuery(cq).setMaxResults(1).getResultList();
+ return os.stream().findFirst();
+ }
+
+ public Optional firstEqualAndGreaterThanOrEqualTo(Class cls, String attribute,
+ Object value, String otherAttribute, Comparable otherValue) throws Exception {
+ EntityManager em = this.get(cls);
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery cq = cb.createQuery(cls);
+ Root root = cq.from(cls);
+ cq.select(root)
+ .where(cb.and(cb.equal(root.get(attribute), value),
+ cb.greaterThanOrEqualTo(root.get(otherAttribute), otherValue)))
+ .orderBy(cb.asc(root.get(otherAttribute)));
+ List os = em.createQuery(cq).setMaxResults(1).getResultList();
+ return os.stream().findFirst();
+ }
+
+ public Optional firstEqualAndGreaterThan(Class cls, String attribute, Object value,
+ String otherAttribute, Comparable otherValue) throws Exception {
+ EntityManager em = this.get(cls);
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery cq = cb.createQuery(cls);
+ Root root = cq.from(cls);
+ cq.select(root)
+ .where(cb.and(cb.equal(root.get(attribute), value),
+ cb.greaterThan(root.get(otherAttribute), otherValue)))
+ .orderBy(cb.asc(root.get(otherAttribute)));
+ List os = em.createQuery(cq).setMaxResults(1).getResultList();
+ return os.stream().findFirst();
+ }
+
public Long count(Class cls) throws Exception {
EntityManager em = this.get(cls);
CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -888,8 +943,7 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
CriteriaQuery cq = cb.createQuery(String.class);
Root root = cq.from(cls);
cq.select(root.get(JpaObject.id_FIELDNAME)).where(cb.isMember(root.get(attribute), cb.literal(values)));
- return new ArrayList<>(
- em.createQuery(cq).getResultList().stream().distinct().collect(Collectors.toList()));
+ return new ArrayList<>(em.createQuery(cq).getResultList().stream().distinct().collect(Collectors.toList()));
}
public List idsNotIn(Class cls, String attribute,
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java
index 76254845c8765cb3e1db4426e6b9842b3ae79240..cae34a96a8bb8dfeee8f3f2f7b39eaf1baca8e47 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java
@@ -172,7 +172,7 @@ public class PersistenceXmlHelper {
mapped_element.addText(o.getName());
}
}
- if(dynamicFlag) {
+ if (dynamicFlag) {
for (String className : names) {
if (className.startsWith(DynamicEntity.CLASS_PACKAGE)) {
dyClasses.add(className);
@@ -192,7 +192,7 @@ public class PersistenceXmlHelper {
mapped_element.addText(dyClass);
}
for (Class o : JpaObjectTools.scanMappedSuperclass(DynamicBaseEntity.class)) {
- if(!o.getName().equals(DynamicBaseEntity.class.getName())) {
+ if (!o.getName().equals(DynamicBaseEntity.class.getName())) {
Element mapped_element = unit.addElement("class");
mapped_element.addText(o.getName());
}
@@ -296,6 +296,9 @@ public class PersistenceXmlHelper {
if (Config.externalDataSources().hasSchema()) {
properties.put("openjpa.jdbc.Schema", JpaObject.default_schema);
}
+ if (StringUtils.isNotEmpty(Config.externalDataSources().getTransactionIsolation())) {
+ properties.put("openjpa.jdbc.TransactionIsolation", Config.externalDataSources().getTransactionIsolation());
+ }
for (String name : Config.externalDataSources().findNamesOfContainerEntity(className)) {
properties.put("openjpa.ConnectionFactoryName", Config.RESOURCE_JDBC_PREFIX + name);
properties.put("openjpa.Log", Config.externalDataSources().log(name));
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java
index 57a5541e5f18dd4b9b8499441bfece0cf7115e4f..e27110a95339b40e395267463ece7efef9d92098 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.openjpa.persistence.jdbc.ContainerTable;
+import org.apache.openjpa.persistence.jdbc.Strategy;
import com.x.base.core.entity.annotation.Flag;
import com.x.base.core.entity.annotation.RestrictFlag;
@@ -309,8 +310,15 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab
if (BooleanUtils.isTrue(excludeInvisible) && FieldsInvisible.contains(field.getName())) {
continue;
}
- if (BooleanUtils.isTrue(excludeLob) && (null != field.getAnnotation(Lob.class))) {
- continue;
+ if (BooleanUtils.isTrue(excludeLob)) {
+ if (null != field.getAnnotation(Lob.class)) {
+ continue;
+ } else {
+ Strategy strategy = field.getAnnotation(Strategy.class);
+ if ((null != strategy) && StringUtils.equals(JsonPropertiesValueHandler, strategy.value())) {
+ continue;
+ }
+ }
}
names.add(field.getName());
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java
index 51306750691480f82ea16a1b909ed06ece555e08..e65218fc7741f45b759c10b4fd7e3914810cb250 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject.java
@@ -117,14 +117,6 @@ public abstract class StorageObject extends SliceJpaObject {
return this.updateContent(mapping, input);
}
- // /** 更新Content内容 */
- // public Long updateContent(StorageMapping mapping, byte[] bytes) throws
- // Exception {
- // try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes)) {
- // return updateContent(mapping, bais);
- // }
- // }
-
/** 更新Content内容 */
public Long updateContent(StorageMapping mapping, byte[] bytes, String name) throws Exception {
try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes)) {
@@ -148,64 +140,6 @@ public abstract class StorageObject extends SliceJpaObject {
/** 更新Content内容 */
public Long updateContent(StorageMapping mapping, InputStream input) throws Exception {
return updateContent(mapping, IOUtils.toByteArray(input));
- // long length = -1L;
- // FileSystemManager manager = this.getFileSystemManager();
- // String prefix = this.getPrefix(mapping);
- // String path = this.path();
- // if (StringUtils.isEmpty(path)) {
- // throw new Exception("path can not be empty.");
- // }
- // FileSystemOptions options = this.getOptions(mapping);
- // try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- // /* 由于可以在传输过程中取消传输,先拷贝到内存 */
- // IOUtils.copyLarge(input, baos);
- // FileObject fo = null;
- // OutputStream output = null;
- // try {
- // /*
- // * 需要进行两次判断，在前端使用nginx分发的情况下，可能同时触发多个文件的上传，多个文件同时上传可能会同时创建文件的存储目录，会在后台导致错误
- // * org.apache.commons.vfs2.FileSystemException: Could not create folder
- // *
- // "ftp://processPlatform:***@o2.server01.com:20040/20200601/1beb018a-5009-4baa-a9ef-7e903f9d48ef".
- // * 这种情况下再次发起请求尝试获取文件可以解决这个问题.
- // */
- // try {
- // fo = manager.resolveFile(prefix + PATHSEPARATOR + path, options);
- // output = fo.getContent().getOutputStream();
- // } catch (FileSystemException fse) {
- // // 此段代码全部关闭对象，并要进行webdav判断进行关闭。
- // if (null != output) {
- // output.close();
- // }
- // if (null != fo) {
- // if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())) {
- // /* webdav关闭会试图去关闭commons.httpClient */
- // manager.closeFileSystem(fo.getFileSystem());
- // }
- // fo.close();
- // }
- // fo = manager.resolveFile(prefix + PATHSEPARATOR + path, options);
- // output = fo.getContent().getOutputStream();
- // }
- // length = IOUtils.copyLarge(new ByteArrayInputStream(baos.toByteArray()),
- // output);
- // this.setLength(length);
- // if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())) {
- // /* webdav关闭会试图去关闭commons.httpClient */
- // manager.closeFileSystem(fo.getFileSystem());
- // }
- // } finally {
- // if (null != output) {
- // output.close();
- // }
- // if (null != fo) {
- // fo.close();
- // }
- // }
- // }
- // this.setStorage(mapping.getName());
- // this.setLastUpdateTime(new Date());
- // return length;
}
/** 更新Content内容 */
@@ -229,7 +163,8 @@ public abstract class StorageObject extends SliceJpaObject {
OutputStream output = fo.getContent().getOutputStream()) {
length = IOUtils.copyLarge(new ByteArrayInputStream(bytes), output);
this.setLength(length);
- if (!Objects.equals(StorageProtocol.webdav, mapping.getProtocol())) {
+ if ((!Objects.equals(StorageProtocol.webdav, mapping.getProtocol()))
+ && (!Objects.equals(StorageProtocol.sftp, mapping.getProtocol()))) {
/* webdav关闭会试图去关闭commons.httpClient */
manager.closeFileSystem(fo.getFileSystem());
}
@@ -339,6 +274,12 @@ public abstract class StorageObject extends SliceJpaObject {
+ URLEncoder.encode(mapping.getPassword(), DefaultCharset.name) + "@" + mapping.getHost() + ":"
+ mapping.getPort();
break;
+ case sftp:
+ // ftps://[ username[: password]@] hostname[: port][ relative-path]
+ prefix = "sftp://" + URLEncoder.encode(mapping.getUsername(), DefaultCharset.name) + ":"
+ + URLEncoder.encode(mapping.getPassword(), DefaultCharset.name) + "@" + mapping.getHost() + ":"
+ + mapping.getPort();
+ break;
case cifs:
// smb://[ username[: password]@] hostname[: port][ absolute-path]
prefix = "smb://" + URLEncoder.encode(mapping.getUsername(), DefaultCharset.name) + ":"
@@ -369,6 +310,19 @@ public abstract class StorageObject extends SliceJpaObject {
switch (mapping.getProtocol()) {
// bzip2,file, ftp, ftps, gzip, hdfs, http, https, jar, ram, res, sftp,
// tar, temp, webdav, zip, cifs, mime;
+ case sftp:
+ FtpFileSystemConfigBuilder sftpBuilder = FtpFileSystemConfigBuilder.getInstance();
+ sftpBuilder.setPassiveMode(opts, Config.vfs().getSftp().getPassive());
+ /** 强制不校验IP */
+ sftpBuilder.setRemoteVerification(opts, false);
+ sftpBuilder.setFileType(opts, FtpFileType.BINARY);
+ sftpBuilder.setConnectTimeout(opts, 10000);
+ sftpBuilder.setSoTimeout(opts, 10000);
+ sftpBuilder.setControlEncoding(opts, DefaultCharset.name);
+ // By default, the path is relative to the user's home directory. This can be
+ // changed with:
+ sftpBuilder.setUserDirIsRoot(opts, false);
+ break;
case ftp:
FtpFileSystemConfigBuilder ftpBuilder = FtpFileSystemConfigBuilder.getInstance();
/*
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java
index 99a0745cd48bcc6e2b4ed8b2331e7123c355bd73..257d95355d4555594140e8a2fa87f0a1e5a91a78 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageProtocol.java
@@ -1,6 +1,7 @@
package com.x.base.core.entity;
public enum StorageProtocol {
- ftp, ftps, webdav, cifs, file;
+ ftp, ftps, webdav, cifs, file, sftp;
+
public static final int length = JpaObject.length_16B;
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/dynamic/DynamicEntityBuilder.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/dynamic/DynamicEntityBuilder.java
index 95439255327e033cbe86d1f4cce3cf703ffbf417..a088a7fc59d0a1ee48667699f070a8272b28ee97 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/dynamic/DynamicEntityBuilder.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/dynamic/DynamicEntityBuilder.java
@@ -16,7 +16,6 @@ import javax.persistence.OrderColumn;
import javax.persistence.Table;
import javax.persistence.Temporal;
-import org.apache.commons.lang3.StringUtils;
import org.apache.openjpa.persistence.PersistentCollection;
import org.apache.openjpa.persistence.PersistentMap;
import org.apache.openjpa.persistence.jdbc.ContainerTable;
@@ -42,6 +41,7 @@ import com.x.base.core.entity.annotation.ContainerEntity;
import com.x.base.core.entity.dynamic.DynamicEntity.Field;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.tools.ListTools;
+import com.x.base.core.project.tools.StringTools;
public class DynamicEntityBuilder {
@@ -196,10 +196,10 @@ public class DynamicEntityBuilder {
FieldSpec fieldSpec = FieldSpec.builder(typeClass, field.getName(), Modifier.PRIVATE)
.addAnnotation(this.fieldDescribe(field)).addAnnotation(this.index(field))
.addAnnotation(this.checkPersist(field)).addAnnotation(column).build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(typeClass).addStatement("return this." + field.getName())
.build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(typeClass, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
@@ -222,10 +222,10 @@ public class DynamicEntityBuilder {
FieldSpec fieldSpec = FieldSpec.builder(Date.class, field.getName(), Modifier.PRIVATE)
.addAnnotation(this.fieldDescribe(field)).addAnnotation(this.index(field))
.addAnnotation(this.checkPersist(field)).addAnnotation(column).addAnnotation(temporal).build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(Date.class).addStatement("return this." + field.getName())
.build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(Date.class, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
@@ -249,10 +249,10 @@ public class DynamicEntityBuilder {
FieldSpec fieldSpec = FieldSpec.builder(Date.class, field.getName(), Modifier.PRIVATE)
.addAnnotation(this.fieldDescribe(field)).addAnnotation(this.index(field))
.addAnnotation(this.checkPersist(field)).addAnnotation(column).addAnnotation(temporal).build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(Date.class).addStatement("return this." + field.getName())
.build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(Date.class, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
@@ -276,10 +276,10 @@ public class DynamicEntityBuilder {
FieldSpec fieldSpec = FieldSpec.builder(Date.class, field.getName(), Modifier.PRIVATE)
.addAnnotation(this.fieldDescribe(field)).addAnnotation(this.index(field))
.addAnnotation(this.checkPersist(field)).addAnnotation(column).addAnnotation(temporal).build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(Date.class).addStatement("return this." + field.getName())
.build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(Date.class, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
@@ -365,10 +365,10 @@ public class DynamicEntityBuilder {
FieldSpec fieldSpec = FieldSpec.builder(list_type, field.getName(), Modifier.PRIVATE)
.addAnnotation(this.fieldDescribe(field)).addAnnotation(containerTable).addAnnotation(elementIndex)
.addAnnotation(persistentCollection).addAnnotation(orderColumn).addAnnotation(elementColumn).build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(list_type).addStatement("return this." + field.getName())
.build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(list_type, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
@@ -401,10 +401,10 @@ public class DynamicEntityBuilder {
FieldSpec fieldSpec = FieldSpec.builder(String.class, field.getName(), Modifier.PRIVATE)
.addAnnotation(this.fieldDescribe(field)).addAnnotation(lob).addAnnotation(basic).addAnnotation(column)
.build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(String.class).addStatement("return this." + field.getName())
.build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(String.class, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
@@ -467,9 +467,9 @@ public class DynamicEntityBuilder {
.addAnnotation(keyColumn).addAnnotation(elementColumn).addAnnotation(elementIndex)
.addAnnotation(keyIndex).build();
- MethodSpec get = MethodSpec.methodBuilder("get" + StringUtils.capitalize(field.getName()))
+ MethodSpec get = MethodSpec.methodBuilder(StringTools.getMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(map_type).addStatement("return this." + field.getName()).build();
- MethodSpec set = MethodSpec.methodBuilder("set" + StringUtils.capitalize(field.getName()))
+ MethodSpec set = MethodSpec.methodBuilder(StringTools.setMethodName(field.getName()))
.addModifiers(Modifier.PUBLIC).returns(void.class).addParameter(map_type, field.getName())
.addStatement("this." + field.getName() + " = " + field.getName()).build();
builder.addField(this.fieldName(field)).addField(fieldSpec).addMethod(get).addMethod(set);
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8Dictionary.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8Dictionary.java
index 10a987734cbdd9d891753288f34d72c65cda6fa0..254e071a17a236dbdbd5ee990688c92d7ab11376 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8Dictionary.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8Dictionary.java
@@ -27,7 +27,7 @@ public class Kingbase8Dictionary extends DBDictionary {
public String namedSequenceFromOneSchemaSQL = "select SYS_NAMESPACE.NSPNAME as SEQUENCE_SCHEMA, SYS_CLASS.RELNAME as SEQUENCE_NAME from SYS_NAMESPACE,SYS_CLASS where SYS_NAMESPACE.OID=SYS_CLASS.RELNAMESPACE and SYS_CLASS.RELKIND='S' AND SYS_CLASS.RELNAME = ? AND SYS_NAMESPACE.NSPNAME = ?";
public Kingbase8Dictionary() {
- this.platform = "KingbaseES";
+ this.platform = "KingbaseES8";
this.validationSQL = "SELECT NOW()";
this.supportsSelectStartIndex = true;
this.supportsSelectEndIndex = true;
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8DictionaryBack.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8DictionaryBack.java
deleted file mode 100644
index 004034793e63e6b33a270ffff23580683bff2e3a..0000000000000000000000000000000000000000
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8DictionaryBack.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.x.base.core.openjpa.jdbc.sql;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.apache.openjpa.jdbc.schema.Column;
-import org.apache.openjpa.jdbc.sql.BooleanRepresentation;
-import org.apache.openjpa.jdbc.sql.BooleanRepresentationFactory;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
-import org.apache.openjpa.lib.util.Localizer;
-
-public class Kingbase8DictionaryBack extends DBDictionary {
-
- public static final String VENDOR_DAMENG = "Kingbase8";
- private static final Localizer _loc = Localizer.forPackage(DMDictionary.class);
-
- public Kingbase8DictionaryBack() {
- this.platform = "Kingbase8";
- supportsDeferredConstraints = false;
- }
-
- public void connectedConfiguration(Connection conn) throws SQLException {
- super.connectedConfiguration(conn);
- boolean requiresWarnings = true;
- DatabaseMetaData meta = conn.getMetaData();
- String driverName = meta.getDriverName();
- String url = meta.getURL();
- if (this.driverVendor == null) {
- if ((driverName != null) && (driverName.equalsIgnoreCase("com.kingbase8.Driver"))) {
- this.driverVendor = "Kingbase8JdbcDriver";
- if ((url != null) && (url.startsWith("jdbc:kingbase8://"))) {
- requiresWarnings = false;
- }
- } else {
- this.driverVendor = "other";
- }
- }
- if (("Kingbase8JdbcDriver".equalsIgnoreCase(this.driverVendor)) && (requiresWarnings)) {
- this.log.warn(_loc.get("kingbase8 Jdbc connection", url));
- }
- }
-
- protected BooleanRepresentation booleanRepresentation = BooleanRepresentationFactory.BOOLEAN;
-
- /**
- * Convert the specified column of the SQL ResultSet to the proper java type.
- */
- public boolean getBoolean(ResultSet rs, int column) throws SQLException {
- return booleanRepresentation.getBoolean(rs, column);
- }
-
- /**
- * Set the given value as a parameter to the statement.
- */
- public void setBoolean(PreparedStatement stmnt, int idx, boolean val, Column col) throws SQLException {
- booleanRepresentation.setBoolean(stmnt, idx, val);
- }
-
- public String booleanTypeName = "BOOL";
-
-}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8R6Dictionary.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8R6Dictionary.java
new file mode 100644
index 0000000000000000000000000000000000000000..1fba7c79094f032d2b1a6e4e397adab36ec084b1
--- /dev/null
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/Kingbase8R6Dictionary.java
@@ -0,0 +1,254 @@
+package com.x.base.core.openjpa.jdbc.sql;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
+import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.schema.Sequence;
+import org.apache.openjpa.jdbc.schema.Table;
+import org.apache.openjpa.jdbc.sql.BooleanRepresentation;
+import org.apache.openjpa.jdbc.sql.BooleanRepresentationFactory;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.SQLBuffer;
+import org.apache.openjpa.lib.jdbc.DelegatingConnection;
+import org.apache.openjpa.lib.jdbc.DelegatingPreparedStatement;
+
+public class Kingbase8R6Dictionary extends DBDictionary {
+ public String allSequencesSQL = "select SYS_NAMESPACE.NSPNAME as SEQUENCE_SCHEMA, SYS_CLASS.RELNAME as SEQUENCE_NAME from SYS_NAMESPACE,SYS_CLASS where SYS_NAMESPACE.OID=SYS_CLASS.RELNAMESPACE and SYS_CLASS.RELKIND='S'";
+ public String namedSequencesFromAllSchemasSQL = "select SYS_NAMESPACE.NSPNAME as SEQUENCE_SCHEMA, SYS_CLASS.RELNAME as SEQUENCE_NAME from SYS_NAMESPACE,SYS_CLASS where SYS_NAMESPACE.OID=SYS_CLASS.RELNAMESPACE and SYS_CLASS.RELKIND='S' AND SYS_CLASS.RELNAME = ?";
+ public String allSequencesFromOneSchemaSQL = "select SYS_NAMESPACE.NSPNAME as SEQUENCE_SCHEMA, SYS_CLASS.RELNAME as SEQUENCE_NAME from SYS_NAMESPACE,SYS_CLASS where SYS_NAMESPACE.OID=SYS_CLASS.RELNAMESPACE and SYS_CLASS.RELKIND='S' AND SYS_NAMESPACE.NSPNAME = ?";
+ public String namedSequenceFromOneSchemaSQL = "select SYS_NAMESPACE.NSPNAME as SEQUENCE_SCHEMA, SYS_CLASS.RELNAME as SEQUENCE_NAME from SYS_NAMESPACE,SYS_CLASS where SYS_NAMESPACE.OID=SYS_CLASS.RELNAMESPACE and SYS_CLASS.RELKIND='S' AND SYS_CLASS.RELNAME = ? AND SYS_NAMESPACE.NSPNAME = ?";
+
+ public Kingbase8R6Dictionary() {
+ this.platform = "KingbaseES8R6";
+ // 适配 V8R6
+ this.schemaCase = SCHEMA_CASE_LOWER;
+ // 适配 V8R6
+ this.doubleTypeName = "DOUBLE PRECISION";
+ this.validationSQL = "SELECT NOW()";
+ this.supportsSelectStartIndex = true;
+ this.supportsSelectEndIndex = true;
+ this.supportsLockingWithDistinctClause = false;
+ this.maxTableNameLength = 63;
+ this.maxColumnNameLength = 63;
+ this.maxIndexNameLength = 63;
+ this.maxConstraintNameLength = 63;
+ this.maxAutoAssignNameLength = 63;
+ this.lastGeneratedKeyQuery = "SELECT CURRVAL(''{2}'')";
+ this.supportsAutoAssign = true;
+ this.autoAssignTypeName = "INT IDENTITY";
+ this.nextSequenceQuery = "SELECT NEXTVAL(''{0}'')";
+ this.binaryTypeName = "BYTEA";
+ this.longVarbinaryTypeName = "BYTEA";
+ this.varbinaryTypeName = "BYTEA";
+ this.longVarcharTypeName = "TEXT";
+ this.charTypeName = "CHAR{0}";
+ this.varcharTypeName = "VARCHAR{0}";
+ /* add by Ray */
+ this.bitTypeName = "BOOL";
+ this.systemSchemaSet.addAll(Arrays.asList(new String[] { "INFORMATION_SCHEMA", "SYS_CATALOG" }));
+ this.fixedSizeTypeNameSet.addAll(Arrays.asList(new String[] { "TEXT", "XML", "INTERVAL YEAR", "INTERVAL MONTH",
+ "INTERVAL DAY", "INTERVAL HOUR", "INTERVAL MINUTE", "INTERVAL SECOND", " INTERVAL YEAR TO MONTH",
+ "INTERVAL DAY TO SECOND", "BIT VARYING", "BYTEA", "BOOLEAN" }));
+ this.reservedWordSet.addAll(Arrays.asList(new String[] { "ABORT", "ABSOLUTE", "ACCESS", "ACTION", "ADD",
+ "ADMIN", "AFTER", "AGGREGATE", "ALL", "ALSO", "ALTER", "ANALYSE", "ANALYZE", "AND", "ANY", "ARRAY",
+ "AS", "ASC", "ASSERTION", "ASSIGNMENT", "ASYMMETRIC", "AT", "AUTHID", "AUTHORIZATION", "BACKWARD",
+ "BEFORE", "BEGIN", "BETWEEN", "BIGINT", "BINARY", "BIT", "BODY", "BOOLEAN", "BOTH", "BY", "CACHE",
+ "CALL", "CALLED", "CASCADE", "CASCADED", "CASE", "CAST", "CHAIN", "CHAR", "CHARACTER",
+ "CHARACTERISTICS", "CHECK", "CHECKALLOCATE", "CHECKCATALOG", "CHECKDB", "CHECKINDEX", "CHECKPOINT",
+ "CHECKTABLE", "CHECKTABLESPACE", "CLASS", "CLOSE", "CLUSTER", "COALESCE", "COLLATE", "COLUMN",
+ "COMMENT", "COMMIT", "COMMITTED", "CONCURRENTLY", "CONNECTION", "CONSTANT", "CONSTRAINT", "CONSTRAINTS",
+ "CONVERSION", "CONVERT", "COPY", "CREATE", "CREATEDB", "CREATEROLE", "CREATEUSER", "CROSS", "CSV",
+ "CURRENT_DATE", "CURRENT_ROLE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "CYCLE",
+ "DATABASE", "DATAFILE", "DATEADD", "DATEDIFF", "DATEPART", "DAY", "DBCC", "DEALLOCATE", "DEC",
+ "DECIMAL", "DECLARE", "DEFAULT", "DEFAULTS", "DEFERRABLE", "DEFERRED", "DEFINER", "DELETE", "DELIMITER",
+ "DELIMITERS", "DESC", "DISABLE", "DISTINCT", "DO", "DOMAIN", "DOUBLE", "DROP", "EACH", "ELSE", "ENABLE",
+ "ENCODING", "ENCRYPTED", "END", "ESCAPE", "EXCEPT", "EXCLUDING", "EXCLUSIVE", "EXECUTE", "EXISTS",
+ "EXPLAIN", "EXTERNAL", "EXTERNALLY", "EXTRACT", "FALSE", "FETCH", "FILEGROWTH", "FILENAME", "FIRST",
+ "FLOAT", "FOR", "FORCE", "FOREIGN", "FORWARD", "FREEZE", "FROM", "FULL", "FUNCTION", "GETDATE",
+ "GLOBAL", "GRANT", "GRANTED", "GREATEST", "GROUP", "HANDLER", "HAVING", "HOLD", "HOUR", "IDENTIFIED",
+ "IDENTITY", "IF", "IFNULL", "ILIKE", "IMMEDIATE", "IMMUTABLE", "IMPLICIT", "IN", "INCLUDING",
+ "INCREMENT", "INDEX", "INDEXES", "INHERIT", "INHERITS", "INITIALLY", "INNER", "INOUT", "INPUT",
+ "INSENSITIVE", "INSERT", "INSTEAD", "INT", "INTEGER", "INTERNAL", "INTERSECT", "INTERVAL", "INTO",
+ "INVOKER", "IS", "ISNULL", "ISOLATION", "JOIN", "KEY", "LANCOMPILER", "LANGUAGE", "LARGE", "LAST",
+ "LEADING", "LEAST", "LEFT", "LEVEL", "LIKE", "LIMIT", "LINK", "LIST", "LISTEN", "LOAD", "LOCAL",
+ "LOCALTIME", "LOCALTIMESTAMP", "LOCATION", "LOCK", "LOGFILE", "LOGIN", "MATCH", "MAXSIZE", "MAXVALUE",
+ "MINUTE", "MINVALUE", "MODE", "MODIFY", "MONTH", "MOVE", "NAME", "NAMES", "NATIONAL", "NATURAL",
+ "NCHAR", "NEW", "NEXT", "NO", "NOALLOCATE", "NOCONSTRAINT", "NOCREATEDB", "NOCREATEROLE",
+ "NOCREATEUSER", "NOINDEX", "NOINHERIT", "NOLOGIN", "NONE", "NOSUPERUSER", "NOT", "NOTHING", "NOTIFY",
+ "NOTNULL", "NOWAIT", "NULL", "NULLIF", "NUMERIC", "OBJECT", "OF", "OFF", "OFFSET", "OIDS", "OLD", "ON",
+ "ONLY", "OPERATOR", "OPTION", "OR", "ORDER", "OUT", "OUTER", "OVERLAPS", "OVERLAY", "OWNED", "OWNER",
+ "PACKAGE", "PARTIAL", "PASSWORD", "PERCENT", "PLACING", "POSITION", "PRECISION", "PREPARE", "PREPARED",
+ "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES", "PROCEDURAL", "PROCEDURE", "QUOTE", "READ", "REAL",
+ "REASSIGN", "RECHECK", "REFERENCES", "REINDEX", "RELATIVE", "RELEASE", "REMOVE", "RENAME", "REPEATABLE",
+ "REPLACE", "RESET", "RESIZE", "RESTART", "RESTRICT", "RETURNING", "RETURNS", "REVOKE", "RIGHT", "ROLE",
+ "ROLLBACK", "ROW", "ROWNUM", "ROWS", "ROWTYPE", "RULE", "SAVEPOINT", "SCHEMA", "SCROLL", "SECOND",
+ "SECURITY", "SELECT", "SEQUENCE", "SERIALIZABLE", "SESSION", "SESSION_USER", "SET", "SETOF", "SHARE",
+ "SHOW", "SIMILAR", "SIMPLE", "SIZE", "SMALLINT", "SOME", "STABLE", "START", "STATEMENT", "STATISTICS",
+ "STDIN", "STDOUT", "STORAGE", "STRICT", "SUBSTRING", "SUPERUSER", "SWITCH", "SYMMETRIC", "SYSDATE",
+ "SYSID", "SYSTEM", "TABLE", "TABLESPACE", "TEMP", "TEMPFILE", "TEMPLATE", "TEMPORARY", "THEN", "TIME",
+ "TIMESTAMP", "TIMESTAMPADD", "TIMESTAMPDIFF", "TINYINT", "TO", "TOP", "TRAILING", "TRANSACTION",
+ "TREAT", "TRIGGER", "TRIM", "TRUE", "TRUNCATE", "TRUSTED", "TYPE", "UNCOMMITTED", "UNENCRYPTED",
+ "UNION", "UNIQUE", "UNKNOWN", "UNLISTEN", "UNTIL", "UPDATE", "USAGE", "USER", "USING", "VACUUM",
+ "VALID", "VALIDATOR", "VALUES", "VARCHAR", "VARCHAR2", "VARYING", "VERBOSE", "VIEW", "VOLATILE", "WHEN",
+ "WHERE", "WITH", "WITHOUT", "WORK", "WRITE", "YEAR", "ZONE", "BLOB", "BYTEA", "CLOB", "DATE", "TEXT",
+ "TIMESTAMPTZ", "TIMETZ", "RETURN", "ROWCOUNT", "CMAX", "CMIN", "CTID", "OID", "TABLEOID", "XMAX",
+ "XMIN" }));
+ }
+
+ public Date getDate(ResultSet paramResultSet, int paramInt) throws SQLException {
+ try {
+ return super.getDate(paramResultSet, paramInt);
+ } catch (StringIndexOutOfBoundsException localStringIndexOutOfBoundsException) {
+ String str = paramResultSet.getString(paramInt);
+ SimpleDateFormat localSimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SS");
+ try {
+ return localSimpleDateFormat.parse(str);
+ } catch (ParseException localParseException) {
+ throw new SQLException(localParseException.toString());
+ }
+ }
+ }
+
+ /* add by Ray */
+ protected BooleanRepresentation booleanRepresentation = BooleanRepresentationFactory.BOOLEAN;
+
+ /**
+ * Convert the specified column of the SQL ResultSet to the proper java type.
+ */
+ public boolean getBoolean(ResultSet rs, int column) throws SQLException {
+ return booleanRepresentation.getBoolean(rs, column);
+ }
+
+ /**
+ * Set the given value as a parameter to the statement.
+ */
+ public void setBoolean(PreparedStatement stmnt, int idx, boolean val, Column col) throws SQLException {
+ booleanRepresentation.setBoolean(stmnt, idx, val);
+ }
+
+// public void setBoolean(PreparedStatement paramPreparedStatement, int paramInt, boolean paramBoolean,
+// Column paramColumn) throws SQLException {
+// paramPreparedStatement.setBoolean(paramInt, paramBoolean);
+// }
+
+ /* add by Ray end */
+
+ protected void appendSelectRange(SQLBuffer paramSQLBuffer, long paramLong1, long paramLong2, boolean paramBoolean) {
+ if (paramLong2 != Long.MAX_VALUE) {
+ paramSQLBuffer.append(" LIMIT ").appendValue(paramLong2 - paramLong1);
+ }
+ if (paramLong1 != 0L) {
+ paramSQLBuffer.append(" OFFSET ").appendValue(paramLong1);
+ }
+ }
+
+ public void indexOf(SQLBuffer paramSQLBuffer, FilterValue paramFilterValue1, FilterValue paramFilterValue2,
+ FilterValue paramFilterValue3) {
+ paramSQLBuffer.append("(POSITION(");
+ paramFilterValue2.appendTo(paramSQLBuffer);
+ paramSQLBuffer.append(" IN ");
+ if (paramFilterValue3 != null) {
+ substring(paramSQLBuffer, paramFilterValue1, paramFilterValue3, null);
+ } else {
+ paramFilterValue1.appendTo(paramSQLBuffer);
+ }
+ paramSQLBuffer.append(") - 1");
+ if (paramFilterValue3 != null) {
+ paramSQLBuffer.append(" + ");
+ paramFilterValue3.appendTo(paramSQLBuffer);
+ }
+ paramSQLBuffer.append(")");
+ }
+
+ public String[] getCreateSequenceSQL(Sequence paramSequence) {
+ String[] arrayOfString = super.getCreateSequenceSQL(paramSequence);
+ if (paramSequence.getAllocate() > 1) {
+ int tmp23_22 = 0;
+ String[] tmp23_21 = arrayOfString;
+ tmp23_21[tmp23_22] = (tmp23_21[tmp23_22] + " CACHE " + paramSequence.getAllocate());
+ }
+ return arrayOfString;
+ }
+
+ protected String getSequencesSQL(String paramString1, String paramString2) {
+ if ((paramString1 == null) && (paramString2 == null)) {
+ return this.allSequencesSQL;
+ }
+ if (paramString1 == null) {
+ return this.namedSequencesFromAllSchemasSQL;
+ }
+ if (paramString2 == null) {
+ return this.allSequencesFromOneSchemaSQL;
+ }
+ return this.namedSequenceFromOneSchemaSQL;
+ }
+
+ public boolean isSystemSequence(String paramString1, String paramString2, boolean paramBoolean) {
+ if (super.isSystemSequence(paramString1, paramString2, paramBoolean)) {
+ return true;
+ }
+ int i = paramString1.indexOf('_');
+ return (i != -1) && (i != paramString1.length() - 4) && (paramString1.toUpperCase().endsWith("_SEQ"));
+ }
+
+ public boolean isSystemTable(String paramString1, String paramString2, boolean paramBoolean) {
+ return (super.isSystemTable(paramString1, paramString2, paramBoolean))
+ || ((paramString1 != null) && (paramString1.toLowerCase().startsWith("sys_")));
+ }
+
+ public boolean isSystemIndex(String paramString, Table paramTable) {
+ return (super.isSystemIndex(paramString, paramTable))
+ || ((paramString != null) && (paramString.toLowerCase().startsWith("sys_")));
+ }
+
+ public Connection decorate(Connection paramConnection) throws SQLException {
+ return new KingbaseConnection(super.decorate(paramConnection), this);
+ }
+
+ private static class KingbasePreparedStatement extends DelegatingPreparedStatement {
+ public KingbasePreparedStatement(PreparedStatement paramPreparedStatement, Connection paramConnection,
+ Kingbase8R6Dictionary paramKingbaseDictionary) {
+ super(paramPreparedStatement, paramConnection);
+ }
+
+ protected ResultSet executeQuery(boolean paramBoolean) throws SQLException {
+ try {
+ return super.executeQuery(paramBoolean);
+ } catch (SQLException localSQLException) {
+ ResultSet localResultSet = getResultSet(paramBoolean);
+ if (localResultSet == null) {
+ throw localSQLException;
+ }
+ return localResultSet;
+ }
+ }
+ }
+
+ private static class KingbaseConnection extends DelegatingConnection {
+ private final Kingbase8R6Dictionary _dict;
+
+ public KingbaseConnection(Connection paramConnection, Kingbase8R6Dictionary paramKingbaseDictionary) {
+ super(paramConnection);
+ this._dict = paramKingbaseDictionary;
+ }
+
+ protected PreparedStatement prepareStatement(String paramString, boolean paramBoolean) throws SQLException {
+ return new Kingbase8R6Dictionary.KingbasePreparedStatement(super.prepareStatement(paramString, false), this,
+ this._dict);
+ }
+
+ protected PreparedStatement prepareStatement(String paramString, int paramInt1, int paramInt2,
+ boolean paramBoolean) throws SQLException {
+ return new Kingbase8R6Dictionary.KingbasePreparedStatement(
+ super.prepareStatement(paramString, paramInt1, paramInt2, false), this, this._dict);
+ }
+ }
+}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/OscarDictionary.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/OscarDictionary.java
index a3a3349b14793e44b1f2008750448bfef0c39491..4e5bfb1e7196bfa481f758ebc4a87ae484c2569b 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/OscarDictionary.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/openjpa/jdbc/sql/OscarDictionary.java
@@ -1,5 +1,6 @@
package com.x.base.core.openjpa.jdbc.sql;
+import org.apache.openjpa.jdbc.sql.BooleanRepresentationFactory;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.lib.util.Localizer;
@@ -18,6 +19,10 @@ public class OscarDictionary extends DBDictionary {
maxEmbeddedClobSize = -1;
maxEmbeddedBlobSize = -1;
doubleTypeName = "DOUBLE PRECISION";
+ booleanTypeName = "BOOL";
+ useGetStringForClobs = true;
+ useSetStringForClobs = true;
+ booleanRepresentation = BooleanRepresentationFactory.BOOLEAN;
}
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiAllBuilder.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiAllBuilder.java
new file mode 100644
index 0000000000000000000000000000000000000000..e651f1e5e8d355fd3fe47fe1e58fe7d890684b14
--- /dev/null
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiAllBuilder.java
@@ -0,0 +1,910 @@
+package com.x.base.core.project.annotation;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.persistence.Table;
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.HEAD;
+import javax.ws.rs.OPTIONS;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.OrderColumn;
+import org.apache.openjpa.persistence.jdbc.ElementColumn;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.apache.openjpa.persistence.jdbc.ContainerTable;
+
+import org.apache.commons.collections4.list.SetUniqueList;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.MethodUtils;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsApiMethod;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsClass;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsField;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsFormParameter;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsMethod;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsPathParameter;
+import com.x.base.core.project.annotation.ApiBuilder.JaxrsQueryParameter;
+import com.x.base.core.project.bean.WrapCopier;
+import com.x.base.core.project.gson.XGsonBuilder;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+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 com.x.base.core.project.tools.ListTools;
+
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfo;
+import io.github.classgraph.ScanResult;
+
+public class ApiAllBuilder {
+
+ private static Logger logger = LoggerFactory.getLogger(ApiAllBuilder.class);
+
+ public static void main(String[] args) throws IOException {
+ String filePath = args[0];
+ filePath = filePath.substring(0, filePath.lastIndexOf(File.separator));
+ filePath = filePath + File.separator+"x_program_center";
+ File dir = new File(filePath ,"src/main/webapp/describe/api");
+ ApiAllBuilder builder = new ApiAllBuilder();
+ builder.scan(dir);
+ }
+
+ private void scan(File dir) {
+ try {
+ ArrayList List = new ArrayList();
+ List.add("x_processplatform_assemble_surface");
+ List.add("x_portal_assemble_surface");
+ List.add("x_query_assemble_surface");
+ List.add("x_cms_assemble_control");
+ List.add("x_organization_assemble_express");
+ List.add("x_organization_assemble_control");
+
+ if (dir.isDirectory()) {
+ LinkedHashMap mapList = new LinkedHashMap<>();
+ File[] fs = dir.listFiles();
+ for(File f:fs){
+ if(f.isFile()) {
+ String fileNameJosn = f.getName();
+ if(!fileNameJosn.equalsIgnoreCase("apiList.json")) {
+ if(List.contains(fileNameJosn.substring(0,fileNameJosn.lastIndexOf(".")))) {
+ mapList.put(fileNameJosn.substring(0,fileNameJosn.lastIndexOf(".")), FileUtils.readFileToString(f,"UTF-8"));
+ }
+ }
+ }
+ }
+ File fileList = new File(dir, "apiList.json");
+ FileUtils.writeStringToFile(fileList, XGsonBuilder.toJson(mapList), DefaultCharset.charset);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void scan0(File dir,String fileName) {
+ try {
+ List jaxrsClasses = new ArrayList<>();
+ List> classes = this.scanJaxrsClass();
+ for (Class clz : classes) {
+ if (StandardJaxrsAction.class.isAssignableFrom(clz)) {
+ jaxrsClasses.add(this.jaxrsClass(clz));
+ }
+ }
+
+
+ LinkedHashMap> map = new LinkedHashMap<>();
+ jaxrsClasses = jaxrsClasses.stream().sorted(Comparator.comparing(JaxrsClass::getName))
+ .collect(Collectors.toList());
+ map.put("jaxrs", jaxrsClasses);
+ File file = new File(dir, fileName + ".json");
+ FileUtils.writeStringToFile(file, XGsonBuilder.toJson(map), DefaultCharset.charset);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ private List> scanJaxrsClass() throws Exception {
+ try (ScanResult scanResult = new ClassGraph().disableJarScanning().enableAnnotationInfo().scan()) {
+ SetUniqueList> classes = SetUniqueList.setUniqueList(new ArrayList>());
+ for (ClassInfo info : scanResult.getClassesWithAnnotation(ApplicationPath.class.getName())) {
+ Class applicationPathClass = ClassUtils.getClass(info.getName());
+ for (Class o : (Set>) MethodUtils.invokeMethod(applicationPathClass.newInstance(),
+ "getClasses")) {
+ Path path = o.getAnnotation(Path.class);
+ JaxrsDescribe jaxrsDescribe = o.getAnnotation(JaxrsDescribe.class);
+ if (null != path && null != jaxrsDescribe) {
+ classes.add(o);
+ }
+ }
+ }
+ return classes;
+ }
+ }
+
+ private JaxrsClass jaxrsClass(Class clz) throws Exception {
+ logger.print("describe class:{}.", clz.getName());
+ JaxrsDescribe jaxrsDescribe = clz.getAnnotation(JaxrsDescribe.class);
+ JaxrsClass jaxrsClass = new JaxrsClass();
+ jaxrsClass.setName(clz.getSimpleName());
+ for (Method method : clz.getMethods()) {
+ JaxrsMethodDescribe jaxrsMethodDescribe = method.getAnnotation(JaxrsMethodDescribe.class);
+ if (null != jaxrsMethodDescribe) {
+
+ jaxrsClass.getMethods().add(this.jaxrsApiMethod(clz, method));
+ }
+ }
+
+ return jaxrsClass;
+
+ }
+
+
+ private List> getSortData(String indicator, List> data) {
+ class MapSort implements Comparator> {
+ private String keyName = "";
+ private MapSort(String keyName) {
+ this.keyName = keyName;
+ }
+ public int compare(Map mp1, Map mp2) {
+ System.out.println("this.keyName=" + mp1.keySet().toArray()[0]);
+ String d1 = mp1.keySet().toArray()[0].toString();
+ String d2 = mp2.keySet().toArray()[0].toString();
+ return d2.compareTo(d1);
+ }
+ }
+ MapSort mapSort = new MapSort(indicator);
+ Collections.sort(data, mapSort);
+ return data;
+ }
+
+ private JaxrsApiMethod jaxrsApiMethod(Class clz, Method method) throws Exception {
+ JaxrsMethodDescribe jaxrsMethodDescribe = method.getAnnotation(JaxrsMethodDescribe.class);
+ JaxrsApiMethod jaxrsMethod = new JaxrsApiMethod();
+ jaxrsMethod.setName(method.getName());
+ Class actionClass = jaxrsMethodDescribe.action();
+ if (null != method.getAnnotation(GET.class)) {
+ jaxrsMethod.setMethod("GET");
+ } else if (null != method.getAnnotation(POST.class)) {
+ jaxrsMethod.setMethod("POST");
+ } else if (null != method.getAnnotation(PUT.class)) {
+ jaxrsMethod.setMethod("PUT");
+ } else if (null != method.getAnnotation(DELETE.class)) {
+ jaxrsMethod.setMethod("DELETE");
+ } else if (null != method.getAnnotation(OPTIONS.class)) {
+ jaxrsMethod.setMethod("OPTIONS");
+ } else if (null != method.getAnnotation(HEAD.class)) {
+ jaxrsMethod.setMethod("HEAD");
+ }
+
+ if (!jaxrsMethod.getMethod().equalsIgnoreCase("GET")) {
+ Consumes consumes = method.getAnnotation(Consumes.class);
+ if (null != consumes) {
+ if(consumes.value()[0].equals("multipart/form-data")) {
+ jaxrsMethod.setEnctype("formData");
+ }else {
+ jaxrsMethod.setEnctype(consumes.value()[0]);
+ }
+ } else {
+ //jaxrsMethod.setEnctype(MediaType.APPLICATION_JSON);
+ }
+ }
+
+
+ Path path = method.getAnnotation(Path.class);
+ if (null == path) {
+ jaxrsMethod.setUri("jaxrs/" + clz.getAnnotation(Path.class).value());
+ } else {
+ jaxrsMethod.setUri("jaxrs/" + clz.getAnnotation(Path.class).value() + "/" + path.value());
+ }
+
+ return jaxrsMethod;
+ }
+
+ private JaxrsMethod jaxrsMethod(Class clz, Method method) throws Exception {
+ JaxrsMethodDescribe jaxrsMethodDescribe = method.getAnnotation(JaxrsMethodDescribe.class);
+
+
+ JaxrsMethod jaxrsMethod = new JaxrsMethod();
+ jaxrsMethod.setName(method.getName());
+ jaxrsMethod.setDescription(jaxrsMethodDescribe.value());
+ Class actionClass = jaxrsMethodDescribe.action();
+ jaxrsMethod.setClassName(actionClass.getName());
+ if (null != method.getAnnotation(GET.class)) {
+ jaxrsMethod.setType("GET");
+ } else if (null != method.getAnnotation(POST.class)) {
+ jaxrsMethod.setType("POST");
+ } else if (null != method.getAnnotation(PUT.class)) {
+ jaxrsMethod.setType("PUT");
+ } else if (null != method.getAnnotation(DELETE.class)) {
+ jaxrsMethod.setType("DELETE");
+ } else if (null != method.getAnnotation(OPTIONS.class)) {
+ jaxrsMethod.setType("OPTIONS");
+ } else if (null != method.getAnnotation(HEAD.class)) {
+ jaxrsMethod.setType("HEAD");
+ }
+ Class woClass = this.getWoClass(actionClass);
+ if (null != woClass) {
+ jaxrsMethod.setOuts(this.jaxrsOutField(woClass));
+ }
+ Class wiClass = this.getWiClass(actionClass);
+ if (null != wiClass) {
+ jaxrsMethod.setIns(this.jaxrsInField(wiClass));
+ } else {
+ if (StringUtils.equals("POST", jaxrsMethod.getType()) || StringUtils.equals("PUT", jaxrsMethod.getType())) {
+ /** 如果没有定义Wi对象,那么有可能使用的是jsonElement对象 */
+ if (ArrayUtils.contains(method.getParameterTypes(), JsonElement.class)) {
+ jaxrsMethod.setUseJsonElementParameter(true);
+ } else {
+ jaxrsMethod.setUseStringParameter(true);
+ }
+ }
+ }
+ Consumes consumes = method.getAnnotation(Consumes.class);
+ if (null != consumes) {
+ jaxrsMethod.setContentType(consumes.value()[0]);
+ } else {
+ jaxrsMethod.setContentType(MediaType.APPLICATION_JSON);
+ }
+ Produces produces = method.getAnnotation(Produces.class);
+ if (null != produces) {
+ jaxrsMethod.setResultContentType(produces.value()[0]);
+ jaxrsMethod.setResultContentType(produces.value()[0]);
+ }
+ Path path = method.getAnnotation(Path.class);
+ if (null == path) {
+ jaxrsMethod.setPath("jaxrs/" + clz.getAnnotation(Path.class).value());
+ } else {
+ jaxrsMethod.setPath("jaxrs/" + clz.getAnnotation(Path.class).value() + "/" + path.value());
+ }
+ for (Parameter o : method.getParameters()) {
+ FormDataParam formDataParam = o.getAnnotation(FormDataParam.class);
+ FormParam formParam = o.getAnnotation(FormParam.class);
+ PathParam pathParam = o.getAnnotation(PathParam.class);
+ QueryParam queryParam = o.getAnnotation(QueryParam.class);
+ if (null != formDataParam) {
+ jaxrsMethod.getFormParameters().add(this.jaxrsFormDataParameter(clz, method, o));
+ } else if (null != formParam) {
+ jaxrsMethod.getFormParameters().add(this.jaxrsFormParameter(clz, method, o));
+ } else if (null != queryParam) {
+ jaxrsMethod.getQueryParameters().add(this.jaxrsQueryParameter(clz, method, o));
+ } else if (null != pathParam) {
+ jaxrsMethod.getPathParameters().add(this.jaxrsPathParameter(clz, method, o));
+ }
+ }
+ jaxrsMethod.setFormParameters(jaxrsMethod.getFormParameters().stream().filter(Objects::nonNull)
+ .sorted(Comparator.comparing(JaxrsFormParameter::getName, Comparator.nullsLast(String::compareTo)))
+ .collect(Collectors.toList()));
+ jaxrsMethod.setQueryParameters(jaxrsMethod.getQueryParameters().stream().filter(Objects::nonNull)
+ .sorted(Comparator.comparing(JaxrsQueryParameter::getName, Comparator.nullsLast(String::compareTo)))
+ .collect(Collectors.toList()));
+ jaxrsMethod.setPathParameters(jaxrsMethod.getPathParameters().stream().filter(Objects::nonNull)
+ .sorted(Comparator.comparing(JaxrsPathParameter::getName, Comparator.nullsLast(String::compareTo)))
+ .collect(Collectors.toList()));
+ return jaxrsMethod;
+ }
+
+ private JaxrsFormParameter jaxrsFormDataParameter(Class clz, Method method, Parameter parameter) {
+ JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
+ FormDataParam formDataParam = parameter.getAnnotation(FormDataParam.class);
+ if (StringUtils.equalsIgnoreCase("file", formDataParam.value())) {
+ if (parameter.getType() == FormDataContentDisposition.class) {
+ /** 单独处理附件 */
+ JaxrsFormParameter o = new JaxrsFormParameter();
+ o.setType("File");
+ o.setName(formDataParam.value());
+ if (null != jaxrsParameterDescribe) {
+ o.setDescription(jaxrsParameterDescribe.value());
+ } else {
+ logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+ formDataParam.value());
+ o.setDescription("");
+ }
+ return o;
+ }
+ } else {
+ JaxrsFormParameter o = new JaxrsFormParameter();
+ o.setType(this.simpleType(parameter.getType().toString()));
+ o.setName(formDataParam.value());
+ if (null != jaxrsParameterDescribe) {
+ o.setDescription(jaxrsParameterDescribe.value());
+ } else {
+ logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+ formDataParam.value());
+ o.setDescription("");
+ }
+ return o;
+ }
+ return null;
+ }
+
+ private JaxrsFormParameter jaxrsFormParameter(Class clz, Method method, Parameter parameter) {
+ JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
+ FormParam formParam = parameter.getAnnotation(FormParam.class);
+ JaxrsFormParameter o = new JaxrsFormParameter();
+ o.setType(this.simpleType(parameter.getType().toString()));
+ o.setName(formParam.value());
+ if (null != jaxrsParameterDescribe) {
+ o.setDescription(jaxrsParameterDescribe.value());
+ } else {
+ logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+ formParam.value());
+ o.setDescription("");
+ }
+ return o;
+ }
+
+ private JaxrsQueryParameter jaxrsQueryParameter(Class clz, Method method, Parameter parameter) {
+ JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
+ QueryParam queryParam = parameter.getAnnotation(QueryParam.class);
+ JaxrsQueryParameter o = new JaxrsQueryParameter();
+ if (null != jaxrsParameterDescribe) {
+ o.setDescription(jaxrsParameterDescribe.value());
+ } else {
+ logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+ queryParam.value());
+ o.setDescription("");
+ }
+ o.setName(queryParam.value());
+ o.setType(this.simpleType(parameter.getType().getName()));
+ return o;
+ }
+
+ private JaxrsPathParameter jaxrsPathParameter(Class clz, Method method, Parameter parameter) throws Exception {
+ JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
+ PathParam pathParam = parameter.getAnnotation(PathParam.class);
+ JaxrsPathParameter o = new JaxrsPathParameter();
+ o.setName(pathParam.value());
+ if (null != jaxrsParameterDescribe) {
+ o.setDescription(jaxrsParameterDescribe.value());
+ } else {
+ logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+ pathParam.value());
+ o.setDescription("");
+ }
+ o.setType(this.getJaxrsParameterType(parameter));
+ return o;
+ }
+
+ private Class getWiClass(Class actionClass) {
+ for (Class c : actionClass.getDeclaredClasses()) {
+ if (StringUtils.equals(c.getSimpleName(), "Wi")) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+ private Class getWoClass(Class actionClass) {
+ for (Class c : actionClass.getDeclaredClasses()) {
+ if (StringUtils.equals(c.getSimpleName(), "Wo")) {
+ return c;
+ }
+ }
+ return null;
+ }
+
+ private List jaxrsInField(Class clz) throws Exception {
+ List list = new ArrayList<>();
+ List fields = FieldUtils.getAllFieldsList(clz);
+ List copierCopyFields = this.listCopierCopyFields(clz);
+ if (ListTools.isNotEmpty(copierCopyFields)) {
+ List os = new ArrayList<>();
+ for (Field o : fields) {
+ FieldDescribe fieldDescribe = o.getAnnotation(FieldDescribe.class);
+ if ((null != fieldDescribe)
+ && (copierCopyFields.contains(o.getName()) || this.inWiNotInEntity(o.getName(), clz))) {
+ os.add(o);
+ }
+ fields = os;
+ }
+ }
+ for (Field o : fields) {
+ FieldDescribe fieldDescribe = o.getAnnotation(FieldDescribe.class);
+ if (null != fieldDescribe) {
+ JaxrsField jaxrsField = new JaxrsField();
+ jaxrsField.setName(o.getName());
+ jaxrsField.setDescription(fieldDescribe.value());
+ jaxrsField.setType(this.getJaxrsFieldType(o));
+ jaxrsField.setIsBaseType(false);
+ if (Collection.class.isAssignableFrom(o.getType())) {
+ jaxrsField.setIsCollection(true);
+ if (StringUtils.containsAny(jaxrsField.getType(), "", "", "", "",
+ "", "", "")) {
+ jaxrsField.setIsBaseType(true);
+ }
+ } else {
+ // O2LEE，String[]未被判断为collection导致组织的JSON格式不符合wrapIn要求
+ if (StringUtils.equalsAnyIgnoreCase("String[]", jaxrsField.getType())) {
+ jaxrsField.setIsCollection(true);
+ } else {
+ jaxrsField.setIsCollection(false);
+ }
+ if (StringUtils.startsWithAny(jaxrsField.getType(), "String", "Boolean", "Date", "Integer",
+ "Double", "Long", "Float")) {
+ jaxrsField.setIsBaseType(true);
+ }
+ }
+ list.add(jaxrsField);
+ }
+ }
+ return list;
+ }
+
+ private List jaxrsOutField(Class clz) throws Exception {
+ List list = new ArrayList<>();
+ List fields = FieldUtils.getAllFieldsList(clz);
+ List copierEraseFields = this.listCopierEraseFields(clz);
+ if (ListTools.isNotEmpty(copierEraseFields)) {
+ List os = new ArrayList<>();
+ for (Field o : fields) {
+ FieldDescribe fieldDescribe = o.getAnnotation(FieldDescribe.class);
+ if ((null != fieldDescribe) && (!copierEraseFields.contains(o.getName()))) {
+ os.add(o);
+ }
+ }
+ fields = os;
+ }
+ for (Field o : fields) {
+ FieldDescribe fieldDescribe = o.getAnnotation(FieldDescribe.class);
+ if (null != fieldDescribe) {
+ JaxrsField jaxrsField = new JaxrsField();
+ jaxrsField.setName(o.getName());
+ jaxrsField.setDescription(fieldDescribe.value());
+ jaxrsField.setType(this.getJaxrsFieldType(o));
+ if (Collection.class.isAssignableFrom(o.getType())) {
+ jaxrsField.setIsCollection(true);
+ } else {
+ jaxrsField.setIsCollection(false);
+ }
+ list.add(jaxrsField);
+ }
+ }
+ return list;
+ }
+
+ private String getJaxrsFieldType(Field o) {
+ String value = o.getGenericType().getTypeName();
+ return this.simpleType(value);
+ }
+
+ private String getJaxrsParameterType(Parameter o) {
+ String value = o.getType().getTypeName();
+ return this.simpleType(value);
+ }
+
+ private String simpleType(String value) {
+ value = value.replaceAll(" ", "");
+ String[] ss = value.split("[,|<|>]");
+ for (String s : ss) {
+ String[] ns = s.split("[.|\\$]");
+ value = value.replace(s, ns[ns.length - 1]);
+ }
+ return value;
+ }
+
+ private List listCopierEraseFields(Class clz) {
+ try {
+ Object o = FieldUtils.readStaticField(clz, "copier", true);
+ WrapCopier copier = (WrapCopier) o;
+ return copier.getEraseFields();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private List listCopierCopyFields(Class clz) {
+ try {
+ Object o = FieldUtils.readStaticField(clz, "copier", true);
+ WrapCopier copier = (WrapCopier) o;
+ return copier.getCopyFields();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ /** 判断字段是否在Wi中但是没有在Entity类中说明是Wi新增字段,需要进行描述 */
+ private Boolean inWiNotInEntity(String field, Class clz) {
+ try {
+ Object o = FieldUtils.readStaticField(clz, "copier", true);
+ WrapCopier copier = (WrapCopier) o;
+ if ((null != FieldUtils.getField(copier.getOrigClass(), field, true))
+ && (null == FieldUtils.getField(copier.getDestClass(), field, true))) {
+ return true;
+ }
+ return false;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public class JaxrsClass {
+
+ private String name;
+ private List methods = new ArrayList<>();
+
+ public List getMethods() {
+ return methods;
+ }
+
+ public void setMethods(List methods) {
+ this.methods = methods;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+
+ public class JaxrsApiMethod{
+ private String name;
+ private String uri;
+ private String method;
+ private String enctype;
+
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getUri() {
+ return uri;
+ }
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+ public String getMethod() {
+ return method;
+ }
+ public void setMethod(String method) {
+ this.method = method;
+ }
+ public String getEnctype() {
+ return enctype;
+ }
+ public void setEnctype(String enctype) {
+ this.enctype = enctype;
+ }
+
+ }
+ public class JaxsApiMethodProperty{
+ private String name;
+ private String uri;
+ private String method;
+ private String enctype;
+
+ public String getUri() {
+ return uri;
+ }
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+ public String getMethod() {
+ return method;
+ }
+ public void setMethod(String method) {
+ this.method = method;
+ }
+ public String getEnctype() {
+ return enctype;
+ }
+ public void setEnctype(String enctype) {
+ this.enctype = enctype;
+ }
+
+ }
+ public class JaxrsMethod {
+ private String name;
+ private String className;
+ private String description;
+ private String type;
+ private String path;
+ private String contentType;
+ private String resultContentType;
+ private Boolean useJsonElementParameter = false;
+ private Boolean useStringParameter = false;
+ private List pathParameters = new ArrayList<>();
+ private List formParameters = new ArrayList<>();
+ private List queryParameters = new ArrayList<>();
+ private List ins = new ArrayList<>();
+ private List outs = new ArrayList<>();
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List getIns() {
+ return ins;
+ }
+
+ public void setIns(List ins) {
+ this.ins = ins;
+ }
+
+ public List getOuts() {
+ return outs;
+ }
+
+ public void setOuts(List outs) {
+ this.outs = outs;
+ }
+
+ public String getContentType() {
+ return contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public List getPathParameters() {
+ return pathParameters;
+ }
+
+ public void setPathParameters(List pathParameters) {
+ this.pathParameters = pathParameters;
+ }
+
+ public List getFormParameters() {
+ return formParameters;
+ }
+
+ public void setFormParameters(List formParameters) {
+ this.formParameters = formParameters;
+ }
+
+ public List getQueryParameters() {
+ return queryParameters;
+ }
+
+ public void setQueryParameters(List queryParameters) {
+ this.queryParameters = queryParameters;
+ }
+
+ public Boolean getUseJsonElementParameter() {
+ return useJsonElementParameter;
+ }
+
+ public void setUseJsonElementParameter(Boolean useJsonElementParameter) {
+ this.useJsonElementParameter = useJsonElementParameter;
+ }
+
+ public String getResultContentType() {
+ return resultContentType;
+ }
+
+ public void setResultContentType(String resultContentType) {
+ this.resultContentType = resultContentType;
+ }
+
+ public Boolean getUseStringParameter() {
+ return useStringParameter;
+ }
+
+ public void setUseStringParameter(Boolean useStringParameter) {
+ this.useStringParameter = useStringParameter;
+ }
+
+ }
+
+ public class JaxrsField {
+
+ private String name;
+ private String type;
+ private Boolean isCollection;
+ private String description;
+ private Boolean isBaseType;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public Boolean getIsCollection() {
+ return isCollection;
+ }
+
+ public void setIsCollection(Boolean isCollection) {
+ this.isCollection = isCollection;
+ }
+
+ public Boolean getIsBaseType() {
+ return isBaseType;
+ }
+
+ public void setIsBaseType(Boolean isBaseType) {
+ this.isBaseType = isBaseType;
+ }
+
+ }
+
+ public class JaxrsPathParameter {
+
+ private String name;
+ private String type;
+ private String description;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ }
+
+ public class JaxrsFormParameter {
+
+ private String name;
+ private String type;
+ private String description;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ }
+
+ public class JaxrsQueryParameter {
+
+ private String name;
+ private String type;
+ private String description;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiBuilder.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiBuilder.java
index c1d2a306f108332c7de36963b8bfd03c189e79d3..e38c40307da0d5b8e5aff579d774b9fabe476728 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiBuilder.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/ApiBuilder.java
@@ -9,11 +9,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@@ -63,22 +61,45 @@ public class ApiBuilder {
private static Logger logger = LoggerFactory.getLogger(ApiBuilder.class);
public static void main(String[] args) throws IOException {
- //System.out.println("ApiBuilder......");
File basedir = new File(args[0]);
File sourcedir = new File(args[1]);
File dir = new File(basedir, "src/main/webapp/describe");
-
FileUtils.forceMkdir(dir);
-
ApiBuilder builder = new ApiBuilder();
-
builder.scan(dir);
- //FileUtils.copyDirectory(sourcedir, new File(dir, "sources"));
-
+ String filePath = args[0];
+ String fileName = filePath.substring(filePath.lastIndexOf(File.separator), filePath.length());
+ filePath = filePath.substring(0, filePath.lastIndexOf(File.separator));
+ filePath = filePath + File.separator+"x_program_center";
+ dir = new File(filePath ,"src/main/webapp/describe/api");
+ FileUtils.forceMkdir(dir);
+ builder.scan(dir,fileName);
+ }
+
+ private void scan(File dir,String fileName) {
+ try {
+ List jaxrsClasses = new ArrayList<>();
+ List> classes = this.scanJaxrsClass();
+ for (Class clz : classes) {
+ if (StandardJaxrsAction.class.isAssignableFrom(clz)) {
+ jaxrsClasses.add(this.jaxrsClass(clz));
+ }
+ }
+
+ LinkedHashMap> map = new LinkedHashMap<>();
+ jaxrsClasses = jaxrsClasses.stream().sorted(Comparator.comparing(JaxrsClass::getName))
+ .collect(Collectors.toList());
+ map.put("jaxrs", jaxrsClasses);
+ File file = new File(dir, fileName + ".json");
+ FileUtils.writeStringToFile(file, XGsonBuilder.toJson(map), DefaultCharset.charset);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+
private void scan(File dir) {
try {
List jaxrsClasses = new ArrayList<>();
@@ -123,23 +144,13 @@ public class ApiBuilder {
logger.print("describe class:{}.", clz.getName());
JaxrsDescribe jaxrsDescribe = clz.getAnnotation(JaxrsDescribe.class);
JaxrsClass jaxrsClass = new JaxrsClass();
- //jaxrsClass.setClassName(clz.getName());
jaxrsClass.setName(clz.getSimpleName());
- //jaxrsClass.setDescription(jaxrsDescribe.value());
for (Method method : clz.getMethods()) {
JaxrsMethodDescribe jaxrsMethodDescribe = method.getAnnotation(JaxrsMethodDescribe.class);
if (null != jaxrsMethodDescribe) {
- /*
- Map map = new HashMap();
- map.put(method.getName(), this.jaxrsApiMethod(clz, method));
- jaxrsClass.getMethods().add(map);
- */
jaxrsClass.getMethods().add(this.jaxrsApiMethod(clz, method));
}
- }
-
- //jaxrsClass.setMethods(this.getSortData("name",jaxrsClass.getMethods()));
-
+ }
return jaxrsClass;
}
@@ -152,7 +163,6 @@ public class ApiBuilder {
this.keyName = keyName;
}
public int compare(Map mp1, Map mp2) {
- System.out.println("this.keyName=" + mp1.keySet().toArray()[0]);
String d1 = mp1.keySet().toArray()[0].toString();
String d2 = mp2.keySet().toArray()[0].toString();
return d2.compareTo(d1);
@@ -167,9 +177,7 @@ public class ApiBuilder {
JaxrsMethodDescribe jaxrsMethodDescribe = method.getAnnotation(JaxrsMethodDescribe.class);
JaxrsApiMethod jaxrsMethod = new JaxrsApiMethod();
jaxrsMethod.setName(method.getName());
- //jaxrsMethod.setDescription(jaxrsMethodDescribe.value());
Class actionClass = jaxrsMethodDescribe.action();
- //jaxrsMethod.setClassName(actionClass.getName());
if (null != method.getAnnotation(GET.class)) {
jaxrsMethod.setMethod("GET");
} else if (null != method.getAnnotation(POST.class)) {
@@ -541,23 +549,13 @@ public class ApiBuilder {
public String getName() {
return name;
}
- /*
- private List> methods = new ArrayList>();
- public List> getMethods() {
- return methods;
- }
- public void setMethods(List> methods) {
- this.methods = methods;
- }
- */
public void setName(String name) {
this.name = name;
}
}
public class JaxrsApiMethod{
- //private List name = new ArrayList<>();
private String name;
private String uri;
private String method;
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
index 4e5beb35a5a9fdbfb4673ab336748f47f1eb28a2..714f80d7adbefde47d97c2725dd58a3e80114a9b 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java
@@ -80,6 +80,7 @@ public class CreateConfigSample {
classes.add(WorkTime.class);
classes.add(ZhengwuDingding.class);
classes.add(Cache.class);
+ //classes.add(Web.class);
Collections.sort(classes, new Comparator>() {
public int compare(Class c1, Class c2) {
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java
index 9a11d4f38e541058e8d1e9a46810f39163eb1319..e7806774c0a4ae6c01074d944c2f732ef47f217c 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java
@@ -21,6 +21,7 @@ public class ApplicationServer extends ConfigObject {
private static final String DEFAULT_STATEXCLUSIONS = "*.js,*.gif,*.jpg,*.png,*.css,*.ico";
private static final Integer DEFAULT_MAXFORMCONTENT = 20;
private static final Boolean DEFAULT_EXPOSEJEST = true;
+ private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true;
public ApplicationServer() {
this.enable = true;
@@ -38,6 +39,7 @@ public class ApplicationServer extends ConfigObject {
this.statExclusions = DEFAULT_STATEXCLUSIONS;
this.maxFormContent = DEFAULT_MAXFORMCONTENT;
this.exposeJest = DEFAULT_EXPOSEJEST;
+ this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE;
}
@FieldDescribe("是否启用")
@@ -71,6 +73,14 @@ public class ApplicationServer extends ConfigObject {
@FieldDescribe("暴露jest接口.")
private Boolean exposeJest;
+ @FieldDescribe("是否启用长连接,默认false.")
+ private Boolean persistentConnectionsEnable;
+
+ public Boolean getPersistentConnectionsEnable() {
+ return persistentConnectionsEnable == null ? DEFAULT_PERSISTENTCONNECTIONSENABLE
+ : this.persistentConnectionsEnable;
+ }
+
public Boolean getExposeJest() {
return BooleanUtils.isNotFalse(this.exposeJest);
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java
index 616c967fbf6670ca385aa2d610fbab9b0300782d..b126487471044efa1c8ab3a6433fb5ef94a234ac 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java
@@ -22,6 +22,7 @@ public class CenterServer extends ConfigObject {
private static final String DEFAULT_STATEXCLUSIONS = "*.js,*.gif,*.jpg,*.png,*.css,*.ico";
private static final Integer DEFAULT_MAXFORMCONTENT = 20;
private static final Boolean DEFAULT_EXPOSEJEST = true;
+ private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true;
public static CenterServer defaultInstance() {
return new CenterServer();
@@ -42,6 +43,7 @@ public class CenterServer extends ConfigObject {
this.statExclusions = DEFAULT_STATEXCLUSIONS;
this.maxFormContent = DEFAULT_MAXFORMCONTENT;
this.exposeJest = DEFAULT_EXPOSEJEST;
+ this.persistentConnectionsEnable = DEFAULT_PERSISTENTCONNECTIONSENABLE;
}
@FieldDescribe("是否启用")
@@ -75,6 +77,14 @@ public class CenterServer extends ConfigObject {
@FieldDescribe("暴露jest接口.")
private Boolean exposeJest;
+ @FieldDescribe("是否启用长连接,默认false.")
+ private Boolean persistentConnectionsEnable;
+
+ public Boolean getPersistentConnectionsEnable() {
+ return persistentConnectionsEnable == null ? DEFAULT_PERSISTENTCONNECTIONSENABLE
+ : this.persistentConnectionsEnable;
+ }
+
public Boolean getExposeJest() {
return BooleanUtils.isNotFalse(this.exposeJest);
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
index 77769307cc11a628b0e9345f90561ec69e8ef10a..d37417911a64b632ffd85a990892876315b27e14 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java
@@ -3,9 +3,10 @@ package com.x.base.core.project.config;
import java.io.File;
import java.io.FileFilter;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
@@ -13,6 +14,13 @@ import java.util.concurrent.LinkedBlockingQueue;
import javax.naming.InitialContext;
import javax.ws.rs.core.MediaType;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.http.MimeTypes;
+
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.x.base.core.project.x_program_center;
@@ -22,13 +30,6 @@ import com.x.base.core.project.tools.DefaultCharset;
import com.x.base.core.project.tools.Host;
import com.x.base.core.project.tools.NumberTools;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jetty.http.MimeTypes;
-
public class Config {
private static Config INSTANCE;
@@ -79,11 +80,13 @@ public class Config {
public static final String PATH_CONFIG_CACHE = "config/cache.json";
public static final String PATH_CONFIG_COMPONENTS = "config/components.json";
public static final String PATH_CONFIG_EMAIL = "config/email.json";
+ public static final String PATH_CONFIG_WEB = "config/web.json";
public static final String DIR_COMMONS = "commons";
public static final String DIR_COMMONS_TESS4J_TESSDATA = "commons/tess4j/tessdata";
public static final String DIR_COMMONS_EXT = "commons/ext";
public static final String DIR_CONFIG = "config";
+ public static final String DIR_CONFIG_COVERTOWEBSERVER = "config/coverToWebServer";
public static final String DIR_CONFIGSAMPLE = "configSample";
public static final String DIR_CUSTOM = "custom";
public static final String DIR_CUSTOM_JARS = "custom/jars";
@@ -100,6 +103,7 @@ public class Config {
public static final String DIR_LOCAL_UPDATE = "local/update";
public static final String DIR_LOCAL_TEMP = "local/temp";
public static final String DIR_LOCAL_TEMP_CLASSES = "local/temp/classes";
+ public static final String DIR_LOCAL_TEMP_CUSTOM = "local/temp/custom";
public static final String DIR_LOCAL_TEMP_SQL = "local/temp/sql";
public static final String DIR_LOCAL_TEMP_DYNAMIC = "local/temp/dynamic";
public static final String DIR_LOCAL_TEMP_DYNAMIC_SRC = "local/temp/dynamic/src";
@@ -115,6 +119,7 @@ public class Config {
public static final String DIR_SERVERS_CENTERSERVER_WEBAPPS = "servers/centerServer/webapps";
public static final String DIR_SERVERS_CENTERSERVER_WORK = "servers/centerServer/work";
public static final String DIR_SERVERS_WEBSERVER = "servers/webServer";
+ public static final String DIR_SERVERS_WEBSERVER_X_DESKTOP_RES_CONFIG = "servers/webServer/x_desktop/res/config";
public static final String DIR_STORE = "store";
public static final String DIR_STORE_JARS = "store/jars";
@@ -320,6 +325,20 @@ public class Config {
return new File(base(), DIR_LOCAL_TEMP_CLASSES);
}
+ public static File dir_local_temp_custom() throws Exception {
+ return new File(base(), DIR_LOCAL_TEMP_CUSTOM);
+ }
+
+ public static File dir_local_temp_custom(Boolean force) throws Exception {
+ File dir = new File(base(), DIR_LOCAL_TEMP_CUSTOM);
+ if (force) {
+ if ((!dir.exists()) || dir.isFile()) {
+ FileUtils.forceMkdir(dir);
+ }
+ }
+ return dir;
+ }
+
public static File dir_local_temp_dynamic() throws Exception {
return new File(base(), DIR_LOCAL_TEMP_DYNAMIC);
}
@@ -442,41 +461,51 @@ public class Config {
return dir;
}
- public static void flush() {
- if (null != INSTANCE) {
- synchronized (Config.class) {
- if (null != INSTANCE) {
- INSTANCE = null;
- }
- }
+ public static Path path_servers_webServer_x_desktop_res_config(Boolean force) throws Exception {
+ Path path = Paths.get(base(), DIR_SERVERS_WEBSERVER_X_DESKTOP_RES_CONFIG);
+ if (!Files.exists(path)) {
+ Files.createDirectories(path);
+ }
+ return path;
+ }
+
+ public static Path path_config_coverToWebServer(Boolean force) throws Exception {
+ Path path = Paths.get(base(), DIR_CONFIG_COVERTOWEBSERVER);
+ if (!Files.exists(path)) {
+ Files.createDirectories(path);
+ }
+ return path;
+ }
+
+ public static Path path_servers_webServer(Boolean force) throws Exception {
+ Path path = Paths.get(base(), DIR_SERVERS_WEBSERVER);
+ if (!Files.exists(path)) {
+ Files.createDirectories(path);
}
+ return path;
}
- private static Config instance() throws Exception {
+ public static synchronized void flush() {
+ INSTANCE = null;
+ }
+
+ private static synchronized Config instance() throws Exception {
if (null == INSTANCE) {
- synchronized (Config.class) {
- if (null == INSTANCE) {
- INSTANCE = new Config();
- }
- }
+ INSTANCE = new Config();
}
return INSTANCE;
}
private String version;
- public static String version() throws Exception {
+ public static synchronized String version() throws Exception {
if (null == instance().version) {
- synchronized (Config.class) {
- if (null == instance().version) {
- String text = BaseTools.readString(PATH_VERSION);
- if (XGsonBuilder.isJsonObject(text)) {
- JsonObject obj = XGsonBuilder.instance().fromJson(text, JsonObject.class);
- instance().version = obj.get("version").getAsString();
- } else {
- instance().version = text;
- }
- }
+ String text = BaseTools.readString(PATH_VERSION);
+ if (XGsonBuilder.isJsonObject(text)) {
+ JsonObject obj = XGsonBuilder.instance().fromJson(text, JsonObject.class);
+ instance().version = obj.get("version").getAsString();
+ } else {
+ instance().version = text;
}
}
return instance().version;
@@ -484,132 +513,104 @@ public class Config {
private String node;
- public static String node() throws Exception {
+ public static synchronized String node() throws Exception {
if (null == instance().node) {
- synchronized (Config.class) {
- if (null == instance().node) {
- instance().node = BaseTools.readCfg(PATH_LOCAL_NODE, Host.ROLLBACK_IPV4);
- }
- }
+ instance().node = BaseTools.readCfg(PATH_LOCAL_NODE, Host.ROLLBACK_IPV4);
}
return instance().node;
}
private String base;
- public static String base() throws Exception {
+ public static synchronized String base() throws Exception {
if (null == instance().base) {
- synchronized (Config.class) {
- if (null == instance().base) {
- instance().base = BaseTools.getBasePath();
- }
- }
+ instance().base = BaseTools.getBasePath();
}
return instance().base;
}
private Nodes nodes;
- public static Nodes nodes() throws Exception {
+ public static synchronized Nodes nodes() throws Exception {
if (null == instance().nodes) {
- synchronized (Config.class) {
- if (null == instance().nodes) {
- Nodes nodes = new Nodes();
- FileFilter fileFilter = new WildcardFileFilter("node_*.json");
- File[] files = dir_config().listFiles(fileFilter);
- if (null != files && files.length > 0) {
- for (File o : files) {
- String name = StringUtils.substringBetween(o.getName(), "node_", ".json");
- Node node = BaseTools.readConfigObject(DIR_CONFIG + "/" + o.getName(), Node.class);
- if (StringUtils.isNotEmpty(name) && BooleanUtils.isTrue(node.getEnable())) {
- nodes.put(name, node);
- }
- }
- } else {
- Node o = Node.defaultInstance();
- nodes.put(node(), o);
- }
- /* 20191009兼容centerServer */
- CenterServer c = BaseTools.readConfigObject(PATH_CONFIG_CENTERSERVER, CenterServer.class);
- if (null != c) {
- for (Node n : nodes.values()) {
- n.setCenter(c);
- }
+ Nodes nodes = new Nodes();
+ FileFilter fileFilter = new WildcardFileFilter("node_*.json");
+ File[] files = dir_config().listFiles(fileFilter);
+ if (null != files && files.length > 0) {
+ for (File o : files) {
+ String name = StringUtils.substringBetween(o.getName(), "node_", ".json");
+ Node node = BaseTools.readConfigObject(DIR_CONFIG + "/" + o.getName(), Node.class);
+ if (StringUtils.isNotEmpty(name) && BooleanUtils.isTrue(node.getEnable())) {
+ nodes.put(name, node);
}
- /* 20191009兼容centerServer end */
- instance().nodes = nodes;
+ }
+ } else {
+ Node o = Node.defaultInstance();
+ nodes.put(node(), o);
+ }
+ /* 20191009兼容centerServer */
+ CenterServer c = BaseTools.readConfigObject(PATH_CONFIG_CENTERSERVER, CenterServer.class);
+ if (null != c) {
+ for (Node n : nodes.values()) {
+ n.setCenter(c);
}
}
+ /* 20191009兼容centerServer end */
+ instance().nodes = nodes;
}
return instance().nodes;
}
private Token token;
- public static Token token() throws Exception {
+ public static synchronized Token token() throws Exception {
if (null == instance().token) {
- synchronized (Config.class) {
- if (null == instance().token) {
- Token o = BaseTools.readConfigObject(PATH_CONFIG_TOKEN, Token.class);
- if (null == o) {
- o = Token.defaultInstance();
- }
- instance().token = o;
- }
+ Token o = BaseTools.readConfigObject(PATH_CONFIG_TOKEN, Token.class);
+ if (null == o) {
+ o = Token.defaultInstance();
}
+ instance().token = o;
}
return instance().token;
}
private ExternalDataSources externalDataSources;
- public static ExternalDataSources externalDataSources() throws Exception {
+ public static synchronized ExternalDataSources externalDataSources() throws Exception {
if (null == instance().externalDataSources) {
- synchronized (Config.class) {
- if (null == instance().externalDataSources) {
- ExternalDataSources obj = BaseTools.readConfigObject(PATH_CONFIG_EXTERNALDATASOURCES,
- ExternalDataSources.class);
- if (null == obj) {
- obj = ExternalDataSources.defaultInstance();
- }
- instance().externalDataSources = obj;
- }
+ ExternalDataSources obj = BaseTools.readConfigObject(PATH_CONFIG_EXTERNALDATASOURCES,
+ ExternalDataSources.class);
+ if (null == obj) {
+ obj = ExternalDataSources.defaultInstance();
}
+ instance().externalDataSources = obj;
}
return instance().externalDataSources;
}
private ExternalStorageSources externalStorageSources;
- public static ExternalStorageSources externalStorageSources() throws Exception {
+ public static synchronized ExternalStorageSources externalStorageSources() throws Exception {
if (null == instance().externalStorageSources) {
- synchronized (Config.class) {
- if (null == instance().externalStorageSources) {
- ExternalStorageSources obj = BaseTools.readConfigObject(PATH_CONFIG_EXTERNALSTORAGESOURCES,
- ExternalStorageSources.class);
- if (null == obj) {
- obj = ExternalStorageSources.defaultInstance();
- }
- instance().externalStorageSources = obj;
- }
+ ExternalStorageSources obj = BaseTools.readConfigObject(PATH_CONFIG_EXTERNALSTORAGESOURCES,
+ ExternalStorageSources.class);
+ if (null == obj) {
+ obj = ExternalStorageSources.defaultInstance();
}
+ instance().externalStorageSources = obj;
}
return instance().externalStorageSources;
}
private String publicKey;
- public static String publicKey() throws Exception {
+ public static synchronized String publicKey() throws Exception {
if (null == instance().publicKey) {
- synchronized (Config.class) {
- if (null == instance().publicKey) {
- File file = new File(Config.base(), PATH_CONFIG_PUBLICKEY);
- if (file.exists() && file.isFile()) {
- instance().publicKey = FileUtils.readFileToString(file, "utf-8");
- } else {
- instance().publicKey = DEFAULT_PUBLIC_KEY;
- }
- }
+ File file = new File(Config.base(), PATH_CONFIG_PUBLICKEY);
+ if (file.exists() && file.isFile()) {
+ instance().publicKey = FileUtils.readFileToString(file, "utf-8");
+ } else {
+ instance().publicKey = DEFAULT_PUBLIC_KEY;
}
}
return instance().publicKey;
@@ -617,17 +618,13 @@ public class Config {
private String privateKey;
- public static String privateKey() throws Exception {
+ public static synchronized String privateKey() throws Exception {
if (null == instance().privateKey) {
- synchronized (Config.class) {
- if (null == instance().privateKey) {
- File file = new File(Config.base(), PATH_CONFIG_PRIVATEKEY);
- if (file.exists() && file.isFile()) {
- instance().privateKey = FileUtils.readFileToString(file, "utf-8");
- } else {
- instance().privateKey = DEFAULT_PRIVATE_KEY;
- }
- }
+ File file = new File(Config.base(), PATH_CONFIG_PRIVATEKEY);
+ if (file.exists() && file.isFile()) {
+ instance().privateKey = FileUtils.readFileToString(file, "utf-8");
+ } else {
+ instance().privateKey = DEFAULT_PRIVATE_KEY;
}
}
return instance().privateKey;
@@ -635,191 +632,128 @@ public class Config {
private Person person = null;
- public static Person person() throws Exception {
+ public static synchronized Person person() throws Exception {
if (null == instance().person) {
- synchronized (Config.class) {
- if (null == instance().person) {
- Person obj = BaseTools.readConfigObject(PATH_CONFIG_PERSON, Person.class);
- if (null == obj) {
- obj = Person.defaultInstance();
- }
- instance().person = obj;
- }
+ Person obj = BaseTools.readConfigObject(PATH_CONFIG_PERSON, Person.class);
+ if (null == obj) {
+ obj = Person.defaultInstance();
}
+ instance().person = obj;
}
return instance().person;
}
private Communicate communicate = null;
- public static Communicate communicate() throws Exception {
+ public static synchronized Communicate communicate() throws Exception {
if (null == instance().communicate) {
- synchronized (Config.class) {
- if (null == instance().communicate) {
- Communicate obj = BaseTools.readConfigObject(PATH_CONFIG_COMMUNICATE, Communicate.class);
- if (null == obj) {
- obj = Communicate.defaultInstance();
- }
- instance().communicate = obj;
- }
+ Communicate obj = BaseTools.readConfigObject(PATH_CONFIG_COMMUNICATE, Communicate.class);
+ if (null == obj) {
+ obj = Communicate.defaultInstance();
}
+ instance().communicate = obj;
}
return instance().communicate;
}
private Meeting meeting;
- public static Meeting meeting() throws Exception {
+ public static synchronized Meeting meeting() throws Exception {
if (null == instance().meeting) {
- synchronized (Config.class) {
- if (null == instance().meeting) {
- Meeting obj = BaseTools.readConfigObject(PATH_CONFIG_MEETING, Meeting.class);
- if (null == obj) {
- obj = Meeting.defaultInstance();
- }
- instance().meeting = obj;
- }
+ Meeting obj = BaseTools.readConfigObject(PATH_CONFIG_MEETING, Meeting.class);
+ if (null == obj) {
+ obj = Meeting.defaultInstance();
}
+ instance().meeting = obj;
}
return instance().meeting;
}
private com.x.base.core.project.utils.time.WorkTime workTime;
- public static com.x.base.core.project.utils.time.WorkTime workTime() throws Exception {
+ public static synchronized com.x.base.core.project.utils.time.WorkTime workTime() throws Exception {
if (null == instance().workTime) {
- synchronized (Config.class) {
- if (null == instance().workTime) {
- com.x.base.core.project.config.WorkTime obj = BaseTools.readConfigObject(PATH_CONFIG_WORKTIME,
- com.x.base.core.project.config.WorkTime.class);
- if (null == obj) {
- obj = com.x.base.core.project.config.WorkTime.defaultInstance();
- }
- instance().workTime = new com.x.base.core.project.utils.time.WorkTime(obj.getAmStart(),
- obj.getAmEnd(), obj.getPmStart(), obj.getPmEnd(), obj.getHolidays(), obj.getWorkdays(),
- obj.getWeekends());
- }
+ com.x.base.core.project.config.WorkTime obj = BaseTools.readConfigObject(PATH_CONFIG_WORKTIME,
+ com.x.base.core.project.config.WorkTime.class);
+ if (null == obj) {
+ obj = com.x.base.core.project.config.WorkTime.defaultInstance();
}
+ instance().workTime = new com.x.base.core.project.utils.time.WorkTime(obj.getAmStart(), obj.getAmEnd(),
+ obj.getPmStart(), obj.getPmEnd(), obj.getHolidays(), obj.getWorkdays(), obj.getWeekends());
}
return instance().workTime;
}
public Collect collect;
- public static Collect collect() throws Exception {
+ public static synchronized Collect collect() throws Exception {
if (null == instance().collect) {
- synchronized (Config.class) {
- if (null == instance().collect) {
- Collect obj = BaseTools.readConfigObject(PATH_CONFIG_COLLECT, Collect.class);
- if (null == obj) {
- obj = Collect.defaultInstance();
- }
- instance().collect = obj;
-
- }
+ Collect obj = BaseTools.readConfigObject(PATH_CONFIG_COLLECT, Collect.class);
+ if (null == obj) {
+ obj = Collect.defaultInstance();
}
+ instance().collect = obj;
}
return instance().collect;
}
public DumpRestoreData dumpRestoreData;
- public static DumpRestoreData dumpRestoreData() throws Exception {
+ public static synchronized DumpRestoreData dumpRestoreData() throws Exception {
if (null == instance().dumpRestoreData) {
- synchronized (Config.class) {
- if (null == instance().dumpRestoreData) {
- DumpRestoreData obj = BaseTools.readConfigObject(PATH_CONFIG_DUMPRESTOREDATA,
- DumpRestoreData.class);
- if (null == obj) {
- obj = DumpRestoreData.defaultInstance();
- }
- instance().dumpRestoreData = obj;
- }
+ DumpRestoreData obj = BaseTools.readConfigObject(PATH_CONFIG_DUMPRESTOREDATA, DumpRestoreData.class);
+ if (null == obj) {
+ obj = DumpRestoreData.defaultInstance();
}
+ instance().dumpRestoreData = obj;
}
return instance().dumpRestoreData;
}
-// public DumpRestoreStorage dumpRestoreStorage;
-//
-// public static DumpRestoreStorage dumpRestoreStorage() throws Exception {
-// if (null == instance().dumpRestoreStorage) {
-// synchronized (Config.class) {
-// if (null == instance().dumpRestoreStorage) {
-// DumpRestoreStorage obj = BaseTools.readConfigObject(PATH_CONFIG_DUMPRESTORESTORAGE,
-// DumpRestoreStorage.class);
-// if (null == obj) {
-// obj = DumpRestoreStorage.defaultInstance();
-// }
-// instance().dumpRestoreStorage = obj;
-// }
-// }
-// }
-// return instance().dumpRestoreStorage;
-// }
-
public String initialScriptText;
- public static String initialScriptText() throws Exception {
+ public static synchronized String initialScriptText() throws Exception {
if (null == instance().initialScriptText) {
- synchronized (Config.class) {
- if (null == instance().initialScriptText) {
- instance().initialScriptText = BaseTools.readString(PATH_COMMONS_INITIALSCRIPTTEXT);
- }
- }
+ instance().initialScriptText = BaseTools.readString(PATH_COMMONS_INITIALSCRIPTTEXT);
}
return instance().initialScriptText;
}
public String initialServiceScriptText;
- public static String initialServiceScriptText() throws Exception {
+ public static synchronized String initialServiceScriptText() throws Exception {
if (null == instance().initialServiceScriptText) {
- synchronized (Config.class) {
- if (null == instance().initialServiceScriptText) {
- instance().initialServiceScriptText = BaseTools.readString(PATH_COMMONS_INITIALSERVICESCRIPTTEXT);
- }
- }
+ instance().initialServiceScriptText = BaseTools.readString(PATH_COMMONS_INITIALSERVICESCRIPTTEXT);
}
return instance().initialServiceScriptText;
}
public String mooToolsScriptText;
- public static String mooToolsScriptText() throws Exception {
+ public static synchronized String mooToolsScriptText() throws Exception {
if (null == instance().mooToolsScriptText) {
- synchronized (Config.class) {
- if (null == instance().mooToolsScriptText) {
- instance().mooToolsScriptText = BaseTools.readString(PATH_COMMONS_MOOTOOLSSCRIPTTEXT);
- }
- }
+ instance().mooToolsScriptText = BaseTools.readString(PATH_COMMONS_MOOTOOLSSCRIPTTEXT);
}
return instance().mooToolsScriptText;
}
private MimeTypes mimeTypes;
- public static MimeTypes mimeTypes() throws Exception {
+ public static synchronized MimeTypes mimeTypes() throws Exception {
if (null == instance().mimeTypes) {
- synchronized (Config.class) {
- if (null == instance().mimeTypes) {
- MimeTypes mimeTypes = new MimeTypes();
- /* 添加o2自定义格式 */
- mimeTypes.addMimeMapping("wcss", "application/json");
- /* 添加默认格式 */
- mimeTypes.addMimeMapping("", "application/octet-stream");
- /* 添加新版office格式 */
- mimeTypes.addMimeMapping("docx",
- "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
- mimeTypes.addMimeMapping("xlsx",
- "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- mimeTypes.addMimeMapping("pptx",
- "application/vnd.openxmlformats-officedocument.presentationml.presentation");
- /* 名片 */
- mimeTypes.addMimeMapping("vcf", "text/x-vcard");
- instance().mimeTypes = mimeTypes;
- }
- }
+ MimeTypes mimeTypes = new MimeTypes();
+ /* 添加o2自定义格式 */
+ mimeTypes.addMimeMapping("wcss", "application/json");
+ /* 添加默认格式 */
+ mimeTypes.addMimeMapping("", "application/octet-stream");
+ /* 添加新版office格式 */
+ mimeTypes.addMimeMapping("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ mimeTypes.addMimeMapping("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ mimeTypes.addMimeMapping("pptx",
+ "application/vnd.openxmlformats-officedocument.presentationml.presentation");
+ /* 名片 */
+ mimeTypes.addMimeMapping("vcf", "text/x-vcard");
+ instance().mimeTypes = mimeTypes;
}
return instance().mimeTypes;
}
@@ -843,18 +777,14 @@ public class Config {
private StorageMappings storageMappings;
- public static StorageMappings storageMappings() throws Exception {
+ public static synchronized StorageMappings storageMappings() throws Exception {
if (null == instance().storageMappings) {
- synchronized (Config.class) {
- if (null == instance().storageMappings) {
- ExternalStorageSources obj = BaseTools.readConfigObject(PATH_CONFIG_EXTERNALSTORAGESOURCES,
- ExternalStorageSources.class);
- if ((obj != null)) {
- instance().storageMappings = new StorageMappings(obj);
- } else {
- instance().storageMappings = new StorageMappings(nodes());
- }
- }
+ ExternalStorageSources obj = BaseTools.readConfigObject(PATH_CONFIG_EXTERNALSTORAGESOURCES,
+ ExternalStorageSources.class);
+ if ((obj != null)) {
+ instance().storageMappings = new StorageMappings(obj);
+ } else {
+ instance().storageMappings = new StorageMappings(nodes());
}
}
return instance().storageMappings;
@@ -862,20 +792,16 @@ public class Config {
private File sslKeyStore;
- public static File sslKeyStore() throws Exception {
+ public static synchronized File sslKeyStore() throws Exception {
if (null == instance().sslKeyStore) {
- synchronized (Config.class) {
- if (null == instance().sslKeyStore) {
- File file = new File(BaseTools.getBasePath(), PATH_CONFIG_SSLKEYSTORE);
- if ((!file.exists()) || file.isDirectory()) {
- file = new File(BaseTools.getBasePath(), PATH_CONFIG_SSLKEYSTORE + ".jks");
- }
- if ((!file.exists()) || file.isDirectory()) {
- file = new File(BaseTools.getBasePath(), PATH_CONFIG_SSLKEYSTORESAMPLE);
- }
- instance().sslKeyStore = file;
- }
+ File file = new File(BaseTools.getBasePath(), PATH_CONFIG_SSLKEYSTORE);
+ if ((!file.exists()) || file.isDirectory()) {
+ file = new File(BaseTools.getBasePath(), PATH_CONFIG_SSLKEYSTORE + ".jks");
}
+ if ((!file.exists()) || file.isDirectory()) {
+ file = new File(BaseTools.getBasePath(), PATH_CONFIG_SSLKEYSTORESAMPLE);
+ }
+ instance().sslKeyStore = file;
}
return instance().sslKeyStore;
}
@@ -939,55 +865,42 @@ public class Config {
private Messages messages;
- public static Messages messages() throws Exception {
+ public static synchronized Messages messages() throws Exception {
if (null == instance().messages) {
- synchronized (Config.class) {
- if (null == instance().messages) {
- Messages obj = Messages.defaultInstance();
- Messages custom = BaseTools.readConfigObject(PATH_CONFIG_MESSAGES, Messages.class);
- if (null != custom) {
- custom.entrySet().stream().forEach(o -> {
- obj.put(o.getKey(),
- new Message(o.getValue().getConsumers(), o.getValue().getConsumersV2()));
- });
- }
- instance().messages = obj;
- }
+ Messages obj = Messages.defaultInstance();
+ Messages custom = BaseTools.readConfigObject(PATH_CONFIG_MESSAGES, Messages.class);
+ if (null != custom) {
+ custom.entrySet().stream().forEach(o -> {
+ obj.put(o.getKey(), new Message(o.getValue().getConsumers(), o.getValue().getConsumersV2()));
+ });
}
+ instance().messages = obj;
}
return instance().messages;
}
private String messageSendRuleScript;
- public static String messageSendRuleScript() throws Exception {
+ public static synchronized String messageSendRuleScript() throws Exception {
if (null == instance().messageSendRuleScript) {
- synchronized (Config.class) {
- if (null == instance().messageSendRuleScript) {
- String scriptStr = BaseTools.readString(PATH_CONFIG_MESSAGES_SEND_RULE);
- if (scriptStr == null) {
- scriptStr = "";
- }
- instance().messageSendRuleScript = scriptStr;
- }
+ String scriptStr = BaseTools.readString(PATH_CONFIG_MESSAGES_SEND_RULE);
+ if (scriptStr == null) {
+ scriptStr = "";
}
+ instance().messageSendRuleScript = scriptStr;
}
return instance().messageSendRuleScript;
}
private PushConfig pushConfig;
- public static PushConfig pushConfig() throws Exception {
+ public static synchronized PushConfig pushConfig() throws Exception {
if (null == instance().pushConfig) {
- synchronized (Config.class) {
- if (null == instance().pushConfig) {
- PushConfig custom = BaseTools.readConfigObject(PATH_CONFIG_JPUSH, PushConfig.class);
- if (null != custom) {
- instance().pushConfig = custom;
- } else {
- instance().pushConfig = PushConfig.defaultInstance();
- }
- }
+ PushConfig custom = BaseTools.readConfigObject(PATH_CONFIG_JPUSH, PushConfig.class);
+ if (null != custom) {
+ instance().pushConfig = custom;
+ } else {
+ instance().pushConfig = PushConfig.defaultInstance();
}
}
return instance().pushConfig;
@@ -995,172 +908,130 @@ public class Config {
private ProcessPlatform processPlatform;
- public static ProcessPlatform processPlatform() throws Exception {
+ public static synchronized ProcessPlatform processPlatform() throws Exception {
if (null == instance().processPlatform) {
- synchronized (Config.class) {
- if (null == instance().processPlatform) {
- ProcessPlatform obj = BaseTools.readConfigObject(PATH_CONFIG_PROCESSPLATFORM,
- ProcessPlatform.class);
- if (null == obj) {
- obj = ProcessPlatform.defaultInstance();
- }
- instance().processPlatform = obj;
- }
+ ProcessPlatform obj = BaseTools.readConfigObject(PATH_CONFIG_PROCESSPLATFORM, ProcessPlatform.class);
+ if (null == obj) {
+ obj = ProcessPlatform.defaultInstance();
}
+ instance().processPlatform = obj;
}
return instance().processPlatform;
}
private Query query;
- public static Query query() throws Exception {
+ public static synchronized Query query() throws Exception {
if (null == instance().query) {
- synchronized (Config.class) {
- if (null == instance().query) {
- Query obj = BaseTools.readConfigObject(PATH_CONFIG_QUERY, Query.class);
- if (null == obj) {
- obj = Query.defaultInstance();
- }
- instance().query = obj;
- }
+ Query obj = BaseTools.readConfigObject(PATH_CONFIG_QUERY, Query.class);
+ if (null == obj) {
+ obj = Query.defaultInstance();
}
+ instance().query = obj;
}
return instance().query;
}
private Dingding dingding;
- public static Dingding dingding() throws Exception {
+ public static synchronized Dingding dingding() throws Exception {
if (null == instance().dingding) {
- synchronized (Config.class) {
- if (null == instance().dingding) {
- Dingding obj = BaseTools.readConfigObject(PATH_CONFIG_DINGDING, Dingding.class);
- if (null == obj) {
- obj = Dingding.defaultInstance();
- }
- instance().dingding = obj;
- }
+ Dingding obj = BaseTools.readConfigObject(PATH_CONFIG_DINGDING, Dingding.class);
+ if (null == obj) {
+ obj = Dingding.defaultInstance();
}
+ instance().dingding = obj;
}
return instance().dingding;
}
private WeLink weLink;
- public static WeLink weLink() throws Exception {
+ public static synchronized WeLink weLink() throws Exception {
if (null == instance().weLink) {
- synchronized (Config.class) {
- if (null == instance().weLink) {
- WeLink obj = BaseTools.readConfigObject(PATH_CONFIG_WELINK, WeLink.class);
- if (null == obj) {
- obj = WeLink.defaultInstance();
- }
- instance().weLink = obj;
- }
+ WeLink obj = BaseTools.readConfigObject(PATH_CONFIG_WELINK, WeLink.class);
+ if (null == obj) {
+ obj = WeLink.defaultInstance();
}
+ instance().weLink = obj;
}
return instance().weLink;
}
private Qiyeweixin qiyeweixin;
- public static Qiyeweixin qiyeweixin() throws Exception {
+ public static synchronized Qiyeweixin qiyeweixin() throws Exception {
if (null == instance().qiyeweixin) {
- synchronized (Config.class) {
- if (null == instance().qiyeweixin) {
- Qiyeweixin obj = BaseTools.readConfigObject(PATH_CONFIG_QIYEWEIXIN, Qiyeweixin.class);
- if (null == obj) {
- obj = Qiyeweixin.defaultInstance();
- }
- instance().qiyeweixin = obj;
- }
+ Qiyeweixin obj = BaseTools.readConfigObject(PATH_CONFIG_QIYEWEIXIN, Qiyeweixin.class);
+ if (null == obj) {
+ obj = Qiyeweixin.defaultInstance();
}
+ instance().qiyeweixin = obj;
}
return instance().qiyeweixin;
}
private ZhengwuDingding zhengwuDingding;
- public static ZhengwuDingding zhengwuDingding() throws Exception {
+ public static synchronized ZhengwuDingding zhengwuDingding() throws Exception {
if (null == instance().zhengwuDingding) {
- synchronized (Config.class) {
- if (null == instance().zhengwuDingding) {
- ZhengwuDingding obj = BaseTools.readConfigObject(PATH_CONFIG_ZHENGWUDINGDING,
- ZhengwuDingding.class);
- if (null == obj) {
- obj = ZhengwuDingding.defaultInstance();
- }
- instance().zhengwuDingding = obj;
- }
+ ZhengwuDingding obj = BaseTools.readConfigObject(PATH_CONFIG_ZHENGWUDINGDING, ZhengwuDingding.class);
+ if (null == obj) {
+ obj = ZhengwuDingding.defaultInstance();
}
+ instance().zhengwuDingding = obj;
}
return instance().zhengwuDingding;
}
private MQ mq;
- public static MQ mq() throws Exception {
+ public static synchronized MQ mq() throws Exception {
if (null == instance().mq) {
- synchronized (Config.class) {
- if (null == instance().mq) {
- MQ obj = BaseTools.readConfigObject(PATH_CONFIG_MQ, MQ.class);
- if (null == obj) {
- obj = MQ.defaultInstance();
- }
- instance().mq = obj;
- }
+ MQ obj = BaseTools.readConfigObject(PATH_CONFIG_MQ, MQ.class);
+ if (null == obj) {
+ obj = MQ.defaultInstance();
}
+ instance().mq = obj;
}
return instance().mq;
}
private Vfs vfs;
- public static Vfs vfs() throws Exception {
+ public static synchronized Vfs vfs() throws Exception {
if (null == instance().vfs) {
- synchronized (Config.class) {
- if (null == instance().vfs) {
- Vfs obj = BaseTools.readConfigObject(PATH_CONFIG_VFS, Vfs.class);
- if (null == obj) {
- obj = Vfs.defaultInstance();
- }
- instance().vfs = obj;
- }
+ Vfs obj = BaseTools.readConfigObject(PATH_CONFIG_VFS, Vfs.class);
+ if (null == obj) {
+ obj = Vfs.defaultInstance();
}
+ instance().vfs = obj;
}
return instance().vfs;
}
private AppStyle appStyle;
- public static AppStyle appStyle() throws Exception {
+ public static synchronized AppStyle appStyle() throws Exception {
if (null == instance().appStyle) {
- synchronized (Config.class) {
- if (null == instance().appStyle) {
- AppStyle obj = BaseTools.readConfigObject(PATH_CONFIG_APPSTYLE, AppStyle.class);
- if (null == obj) {
- obj = AppStyle.defaultInstance();
- }
- instance().appStyle = obj;
- }
+ AppStyle obj = BaseTools.readConfigObject(PATH_CONFIG_APPSTYLE, AppStyle.class);
+ if (null == obj) {
+ obj = AppStyle.defaultInstance();
}
+ instance().appStyle = obj;
}
return instance().appStyle;
}
private File startImage;
- public static File startImage() throws Exception {
+ public static synchronized File startImage() throws Exception {
if (null == instance().startImage) {
- synchronized (Config.class) {
- if (null == instance().startImage) {
- File file = new File(BaseTools.getBasePath(), PATH_CONFIG_STARTIMAGE);
- if (file.exists() && file.isFile()) {
- instance().startImage = file;
- } else {
- instance().startImage = null;
- }
- }
+ File file = new File(BaseTools.getBasePath(), PATH_CONFIG_STARTIMAGE);
+ if (file.exists() && file.isFile()) {
+ instance().startImage = file;
+ } else {
+ instance().startImage = null;
}
}
return instance().startImage;
@@ -1168,51 +1039,39 @@ public class Config {
private LogLevel logLevel;
- public static LogLevel logLevel() throws Exception {
+ public static synchronized LogLevel logLevel() throws Exception {
if (null == instance().logLevel) {
- synchronized (Config.class) {
- if (null == instance().logLevel) {
- LogLevel obj = BaseTools.readConfigObject(PATH_CONFIG_LOGLEVEL, LogLevel.class);
- if (null == obj) {
- obj = LogLevel.defaultInstance();
- }
- instance().logLevel = obj;
- }
+ LogLevel obj = BaseTools.readConfigObject(PATH_CONFIG_LOGLEVEL, LogLevel.class);
+ if (null == obj) {
+ obj = LogLevel.defaultInstance();
}
+ instance().logLevel = obj;
}
return instance().logLevel;
}
private ClientInit clientInit;
- public static ClientInit clientInit() throws Exception {
+ public static synchronized ClientInit clientInit() throws Exception {
if (null == instance().clientInit) {
- synchronized (Config.class) {
- if (null == instance().clientInit) {
- ClientInit obj = BaseTools.readConfigObject(PATH_CONFIG_CLIENTINIT, ClientInit.class);
- if (null == obj) {
- obj = ClientInit.defaultInstance();
- }
- instance().clientInit = obj;
- }
+ ClientInit obj = BaseTools.readConfigObject(PATH_CONFIG_CLIENTINIT, ClientInit.class);
+ if (null == obj) {
+ obj = ClientInit.defaultInstance();
}
+ instance().clientInit = obj;
}
return instance().clientInit;
}
private byte[] bindLogo;
- public static byte[] bindLogo() throws Exception {
+ public static synchronized byte[] bindLogo() throws Exception {
if (null == instance().bindLogo) {
- synchronized (Config.class) {
- if (null == instance().bindLogo) {
- File file = new File(Config.base(), PATH_CONFIG_BINDLOGO);
- if (file.exists() && file.isFile()) {
- instance().bindLogo = FileUtils.readFileToByteArray(file);
- } else {
- instance().bindLogo = DEFAULT_BINDLOGO;
- }
- }
+ File file = new File(Config.base(), PATH_CONFIG_BINDLOGO);
+ if (file.exists() && file.isFile()) {
+ instance().bindLogo = FileUtils.readFileToByteArray(file);
+ } else {
+ instance().bindLogo = DEFAULT_BINDLOGO;
}
}
return instance().bindLogo;
@@ -1220,64 +1079,48 @@ public class Config {
private InitialContext initialContext;
- private static InitialContext initialContext() throws Exception {
+ private static synchronized InitialContext initialContext() throws Exception {
if (null == instance().initialContext) {
- synchronized (Config.class) {
- if (null == instance().initialContext) {
- instance().initialContext = new InitialContext();
- }
- }
+ instance().initialContext = new InitialContext();
}
return instance().initialContext;
}
public Slice slice;
- public static Slice slice() throws Exception {
+ public static synchronized Slice slice() throws Exception {
if (null == instance().slice) {
- synchronized (Config.class) {
- if (null == instance().slice) {
- Slice obj = BaseTools.readConfigObject(PATH_CONFIG_SLICE, Slice.class);
- if (null == obj) {
- obj = Slice.defaultInstance();
- }
- instance().slice = obj;
- }
+ Slice obj = BaseTools.readConfigObject(PATH_CONFIG_SLICE, Slice.class);
+ if (null == obj) {
+ obj = Slice.defaultInstance();
}
+ instance().slice = obj;
}
return instance().slice;
}
public Exmail exmail;
- public static Exmail exmail() throws Exception {
+ public static synchronized Exmail exmail() throws Exception {
if (null == instance().exmail) {
- synchronized (Config.class) {
- if (null == instance().exmail) {
- Exmail obj = BaseTools.readConfigObject(PATH_CONFIG_EXMAIL, Exmail.class);
- if (null == obj) {
- obj = Exmail.defaultInstance();
- }
- instance().exmail = obj;
- }
+ Exmail obj = BaseTools.readConfigObject(PATH_CONFIG_EXMAIL, Exmail.class);
+ if (null == obj) {
+ obj = Exmail.defaultInstance();
}
+ instance().exmail = obj;
}
return instance().exmail;
}
public Portal portal;
- public static Portal portal() throws Exception {
+ public static synchronized Portal portal() throws Exception {
if (null == instance().portal) {
- synchronized (Config.class) {
- if (null == instance().portal) {
- Portal obj = BaseTools.readConfigObject(PATH_CONFIG_PORTAL, Portal.class);
- if (null == obj) {
- obj = Portal.defaultInstance();
- }
- instance().portal = obj;
- }
+ Portal obj = BaseTools.readConfigObject(PATH_CONFIG_PORTAL, Portal.class);
+ if (null == obj) {
+ obj = Portal.defaultInstance();
}
+ instance().portal = obj;
}
return instance().portal;
}
@@ -1310,21 +1153,46 @@ public class Config {
private Components components = null;
- public static Components components() throws Exception {
+ public static synchronized Components components() throws Exception {
if (null == instance().components) {
- synchronized (Config.class) {
- if (null == instance().components) {
- Components obj = BaseTools.readConfigObject(PATH_CONFIG_COMPONENTS, Components.class);
- if (null == obj) {
- obj = Components.defaultInstance();
- }
- instance().components = obj;
- }
+ Components obj = BaseTools.readConfigObject(PATH_CONFIG_COMPONENTS, Components.class);
+ if (null == obj) {
+ obj = Components.defaultInstance();
}
+ instance().components = obj;
}
return instance().components;
}
+ public JsonObject web;
+
+ public static synchronized JsonObject web() throws Exception {
+ if (null == instance().web) {
+ JsonObject obj = BaseTools.readConfigObject(PATH_CONFIG_WEB, JsonObject.class);
+ if (null == obj) {
+ obj = new JsonObject();
+ }
+ instance().web = obj;
+ }
+ return instance().web;
+ }
+
+ public Map customConfig = new HashMap<>();
+
+ public static synchronized JsonObject customConfig(String configName) throws Exception {
+ if(StringUtils.isBlank(configName)){
+ return null;
+ }else{
+ if(instance().customConfig.get(configName)==null){
+ JsonObject obj = BaseTools.readConfigObject(DIR_CONFIG+"/"+configName+".json", JsonObject.class);
+ if(obj!=null){
+ instance().customConfig.put(configName, obj);
+ }
+ }
+ return instance().customConfig.get(configName);
+ }
+ }
+
public static Object resource(String name) throws Exception {
return initialContext().lookup(name);
}
@@ -1415,4 +1283,4 @@ public class Config {
initialContext().rebind(RESOURCE_NODE_PROCESSPLATFORMEXECUTORS, executorServices);
}
-}
\ No newline at end of file
+}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java
index 448a5670972ffd1f2ec84e07102d281a01190dc7..7f38f9070759e2b564b37a2aec6a90e649ceb091 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/DataServer.java
@@ -57,7 +57,7 @@ public class DataServer extends ConfigObject {
private Boolean jmxEnable;
@FieldDescribe("H2数据库缓存大小,设置H2用于作为缓存的内存大小,以M作为单位,这里默认为512M.")
private Integer cacheSize;
- @FieldDescribe("默认日志级别,FATAL, ERROR, WARN, INFO, TRACE. 完成的配置为DefaultLevel=WARN, Tool=TRACE, Enhance=TRACE, METADATA=TRACE, Runtime=TRACE, Query=TRACE, DataCache=TRACE, JDBC=TRACE, SQL=TRACE")
+ @FieldDescribe("默认日志级别,FATAL, ERROR, WARN, INFO, TRACE. 完整的配置为DefaultLevel=WARN, Tool=TRACE, Enhance=TRACE, METADATA=TRACE, Runtime=TRACE, Query=TRACE, DataCache=TRACE, JDBC=TRACE, SQL=TRACE")
private String logLevel;
@FieldDescribe("最大使用连接数")
private Integer maxTotal;
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Dingding.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Dingding.java
index 6c755210fd598b5620f390e9aacb5b16d64d82ee..7184c5b164fdb941d059f9f29b4df9ec543e4efb 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Dingding.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Dingding.java
@@ -31,7 +31,7 @@ public class Dingding extends ConfigObject {
@FieldDescribe("应用的密钥")
private String appSecret;
- @FieldDescribe("组织同步cron,默认每10分钟同步一次.")
+ @FieldDescribe("回调信号触发同步检查,默认每10分钟运行一次,如果期间内有钉钉回调信号接收到,那么触发同步任务进行人员同步.")
private String syncCron;
@FieldDescribe("强制拉入同步cron,默认在每天的8点和12点强制进行同步.")
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSource.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSource.java
index dfe42d92f8f9a10f35031e1960a784c21973ce7a..cf4e896f787dfa6bc9f21f690c53456d7fef3741 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSource.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSource.java
@@ -30,6 +30,9 @@ public class ExternalDataSource extends ConfigObject {
this.statEnable = DEFAULT_STATENABLE;
this.statFilter = DEFAULT_STATFILTER;
this.slowSqlMillis = DEFAULT_SLOWSQLMILLIS;
+ this.transactionIsolation = DEFAULT_TRANSACTIONISOLATION;
+ this.testConnectionOnCheckin = DEFAULT_TESTCONNECTIONONCHECKIN;
+ this.testConnectionOnCheckout = DEFAULT_TESTCONNECTIONONCHECKOUT;
}
public static ExternalDataSource defaultInstance() {
@@ -58,13 +61,20 @@ public class ExternalDataSource extends ConfigObject {
private String statFilter;
@FieldDescribe("执行缓慢sql毫秒数,默认2000毫秒,执行缓慢的sql将被单独记录.")
private Integer slowSqlMillis;
-
@FieldDescribe("设置此数据库存储的类,默认情况下存储所有类型,如果需要对每个类进行单独的控制以达到高性能,可以将不同的类存储到不同的节点上提高性能.可以使用通配符*")
private List includes;
@FieldDescribe("在此节点上不存储的类,和includes一起设置实际存储的类,可以使用通配符*")
private List excludes;
@FieldDescribe("默认日志级别,FATAL, ERROR, WARN, INFO, TRACE. 完成的配置为DefaultLevel=WARN, Tool=TRACE, Enhance=TRACE, METADATA=TRACE, Runtime=TRACE, Query=TRACE, DataCache=TRACE, JDBC=TRACE, SQL=TRACE")
private String logLevel = DEFAULT_LOGLEVEL;
+ @FieldDescribe("事务隔离级别:default,none,read-committed,read-uncommitted,repeatable-read,serializable.默认使用default(数据库设置的事务级别).")
+ private String transactionIsolation;
+ @FieldDescribe("测试入池连接,默认false.")
+ private Boolean testConnectionOnCheckin;
+ @FieldDescribe("测试出池连接,默认false.")
+ private Boolean testConnectionOnCheckout;
+ @FieldDescribe("空闲阈值,默认300秒.")
+ private Integer maxIdleTime;
public static final Integer DEFAULT_MAXTOTAL = 50;
@@ -78,6 +88,31 @@ public class ExternalDataSource extends ConfigObject {
public static final String DEFAULT_LOGLEVEL = "WARN";
+ public static final String DEFAULT_TRANSACTIONISOLATION = "default";
+
+ public static final Boolean DEFAULT_TESTCONNECTIONONCHECKIN = false;
+
+ public static final Boolean DEFAULT_TESTCONNECTIONONCHECKOUT = false;
+
+ public static final Integer DEFAULT_MAXIDLETIME = 300;
+
+ public Integer getMaxIdleTime() {
+ return maxIdleTime == null ? DEFAULT_MAXIDLETIME : this.maxIdleTime;
+ }
+
+ public Boolean getTestConnectionOnCheckin() {
+ return this.testConnectionOnCheckin == null ? DEFAULT_TESTCONNECTIONONCHECKIN : this.testConnectionOnCheckin;
+ }
+
+ public Boolean getTestConnectionOnCheckout() {
+ return this.testConnectionOnCheckout == null ? DEFAULT_TESTCONNECTIONONCHECKOUT : this.testConnectionOnCheckout;
+ }
+
+ public String getTransactionIsolation() {
+ return StringUtils.isEmpty(this.transactionIsolation) ? DEFAULT_TRANSACTIONISOLATION
+ : this.transactionIsolation;
+ }
+
public String getLogLevel() {
return StringUtils.isEmpty(this.logLevel) ? DEFAULT_LOGLEVEL : this.logLevel;
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSources.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSources.java
index d08814d5e8bf3307d19bb6064e92b282375a689d..9059313342c5fe9b46159be46013e3e6a2e25b75 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSources.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSources.java
@@ -117,4 +117,32 @@ public class ExternalDataSources extends CopyOnWriteArrayList result = new ActionResult<>();
result.setData(woCallback.getObject());
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoFile.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoFile.java
index 8310acddfd34faaa41e30b86ab3392801a17f836..55b5693a1f7f6ae529101af820b4b173f9459c74 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoFile.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoFile.java
@@ -1,9 +1,8 @@
package com.x.base.core.project.jaxrs;
import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.gson.GsonPropertyObject;
-public abstract class WoFile extends GsonPropertyObject {
+public abstract class WoFile extends WoMaxAgeFastETag {
private static final long serialVersionUID = -4566232046358204025L;
@FieldDescribe("说明")
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoMaxAgeFastETag.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoMaxAgeFastETag.java
new file mode 100644
index 0000000000000000000000000000000000000000..92781ce11141b905ce803d0c55451c49ddd4d35d
--- /dev/null
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoMaxAgeFastETag.java
@@ -0,0 +1,28 @@
+package com.x.base.core.project.jaxrs;
+
+import com.x.base.core.project.gson.GsonPropertyObject;
+
+public class WoMaxAgeFastETag extends GsonPropertyObject {
+
+ private static final long serialVersionUID = -8408799363043605326L;
+
+ private String fastETag;
+
+ private Integer maxAge = null;
+
+ public String getFastETag() {
+ return fastETag;
+ }
+
+ public void setFastETag(String fastETag) {
+ this.fastETag = fastETag;
+ }
+
+ public Integer getMaxAge() {
+ return maxAge;
+ }
+
+ public void setMaxAge(Integer maxAge) {
+ this.maxAge = maxAge;
+ }
+}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoText.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoText.java
index 52520bf0481eec70759ae74d377ee19c8f665c0d..1b944716ea285e655c1b249ae52964f46cd22593 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoText.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WoText.java
@@ -1,9 +1,11 @@
package com.x.base.core.project.jaxrs;
+import org.apache.commons.lang3.StringUtils;
+
import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.http.HttpMediaType;
-public class WoText extends GsonPropertyObject {
+public class WoText extends WoMaxAgeFastETag {
public WoText() {
}
@@ -15,6 +17,17 @@ public class WoText extends GsonPropertyObject {
@FieldDescribe("text")
private String text;
+ @FieldDescribe("返回Content_Type")
+ private String contentType;
+
+ public String getContentType() {
+ return StringUtils.isEmpty(this.contentType) ? HttpMediaType.TEXT_PLAIN_UTF_8 : this.contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
public String getText() {
return text;
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Logger.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Logger.java
index cba1d16a7f8769271a920e2d3fbce5775ce5b799..3453ff93c32ca76330c2dc862d30a1dd836f22b9 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Logger.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/logger/Logger.java
@@ -198,7 +198,8 @@ public class Logger {
sb.append(e.getMessage());
String headString = this.headToString(request);
String bodyString = this.bodyToString(body);
- String requestUrl = request.getRequestURL().toString();
+ String requestUrl = request.getRequestURL().toString()
+ + (StringUtils.isEmpty(request.getQueryString()) ? "" : "?" + request.getQueryString());
String stackTraceString = ExceptionUtils.getStackTrace(e);
Object[] arr = new String[] { effectivePerson.getDistinguishedName(), request.getMethod(), requestUrl,
request.getRemoteHost(), request.getRemoteAddr(), headString, bodyString };
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java
index 02ee820c13eca0e4257bc1fa65054d2915b96568..ca66cccba8041644daf48444d7b089bcb2d509d5 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/script/ScriptFactory.java
@@ -3,30 +3,26 @@ package com.x.base.core.project.script;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
-import java.util.regex.Matcher;
import javax.script.Compilable;
import javax.script.CompiledScript;
-import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import javax.script.SimpleScriptContext;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.config.Config;
-import com.x.base.core.project.tools.StringTools;
+import com.x.base.core.project.tools.PropertyTools;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import jdk.nashorn.internal.runtime.ScriptObject;
public class ScriptFactory {
@@ -242,10 +238,7 @@ public class ScriptFactory {
if (obj instanceof CharSequence) {
list.add(Objects.toString(obj, ""));
} else {
- Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
- if (null != d) {
- list.add(Objects.toString(d, ""));
- }
+ list.add(PropertyTools.getOrElse(obj, JpaObject.DISTINGUISHEDNAME, String.class, ""));
}
}
}
@@ -258,19 +251,23 @@ public class ScriptFactory {
if (obj instanceof CharSequence) {
list.add(Objects.toString(obj, ""));
} else {
- Object d = PropertyUtils.getProperty(obj, JpaObject.DISTINGUISHEDNAME);
- if (null != d) {
- list.add(Objects.toString(d, ""));
+ if (obj instanceof ScriptObject) {
+ ScriptObject so = (ScriptObject) obj;
+ if (so.containsKey(JpaObject.DISTINGUISHEDNAME)) {
+ list.add(Objects.toString(so.get(JpaObject.DISTINGUISHEDNAME), ""));
+ }
+ } else {
+ list.add(PropertyTools.getOrElse(obj, JpaObject.DISTINGUISHEDNAME, String.class,
+ ""));
}
}
}
}
} else {
- Object d = PropertyUtils.getProperty(o, JpaObject.DISTINGUISHEDNAME);
- if (null != d) {
- list.add(Objects.toString(d, ""));
- }
+ list.add(PropertyTools.getOrElse(o, JpaObject.DISTINGUISHEDNAME, String.class, ""));
}
+ } else {
+ list.add(Objects.toString(o, ""));
}
}
return list;
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/EscapeStringTools.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/EscapeStringTools.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b6ad41c860c2630d3765b376d7f5f41a3cf0d86
--- /dev/null
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/EscapeStringTools.java
@@ -0,0 +1,198 @@
+package com.x.base.core.project.tools;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.util.regex.Pattern;
+
+public class EscapeStringTools {
+ public static final Charset utf8Charset = Charset.forName("UTF-8");
+
+ protected static final String _allowableInUrl = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$&'()*+,-./:;=?@_~";
+
+ protected static final String _allowableInUrlQuery = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&'()*+,-./:;=?@_~";
+
+ private static final char _URIEscape = '%';
+
+ static final byte blank = 32;
+
+ static final byte plus = 43;
+
+ static final byte hexa = 97;
+
+ static final byte hexf = 102;
+
+ static final byte hexA = 65;
+
+ static final byte hexF = 70;
+
+ static final byte hex0 = 48;
+
+ static final byte hex9 = 57;
+
+ static final byte ten = 10;
+
+ private static String xescapeString(String in, String allowable, char esc, boolean spaceplus) {
+ try {
+ StringBuffer out = new StringBuffer();
+ if (in == null)
+ return null;
+ byte[] utf8 = in.getBytes(utf8Charset);
+ byte[] allow8 = allowable.getBytes(utf8Charset);
+ for (byte b : utf8) {
+ if (b == 32 && spaceplus) {
+ out.append('+');
+ } else {
+ boolean found = false;
+ for (byte a : allow8) {
+ if (a == b) {
+ found = true;
+ break;
+ }
+ }
+ if (found) {
+ out.append((char)b);
+ } else {
+ String c = Integer.toHexString(b);
+ out.append(esc);
+ if (c.length() < 2)
+ out.append('0');
+ out.append(c);
+ }
+ }
+ }
+ return out.toString();
+ } catch (Exception e) {
+ return in;
+ }
+ }
+
+ private static String escapeString(String in, String allowable) {
+ return xescapeString(in, allowable, '%', false);
+ }
+
+ private static String xunescapeString(String in, char escape, boolean spaceplus) {
+ try {
+ if (in == null)
+ return null;
+ byte[] utf8 = in.getBytes(utf8Charset);
+ byte escape8 = (byte)escape;
+ byte[] out = new byte[utf8.length];
+ int index8 = 0;
+ for (int i = 0; i < utf8.length; ) {
+ byte b = utf8[i++];
+ if (b == 43 && spaceplus) {
+ out[index8++] = 32;
+ } else if (b == escape8) {
+ if (i + 2 <= utf8.length) {
+ b = (byte)(fromHex(utf8[i]) << 4 | fromHex(utf8[i + 1]));
+ i += 2;
+ }
+ }
+ out[index8++] = b;
+ }
+ return new String(out, 0, index8, utf8Charset);
+ } catch (Exception e) {
+ return in;
+ }
+ }
+
+ private static String unescapeString(String in) {
+ return xunescapeString(in, '%', false);
+ }
+
+ private static byte fromHex(byte b) throws NumberFormatException {
+ if (b >= 48 && b <= 57)
+ return (byte)(b - 48);
+ if (b >= 97 && b <= 102)
+ return (byte)(10 + b - 97);
+ if (b >= 65 && b <= 70)
+ return (byte)(10 + b - 65);
+ throw new NumberFormatException("Illegal hex character: " + b);
+ }
+
+ private static final Pattern p = Pattern.compile("([\\w]+)://([.\\w]+(:[\\d]+)?)([/][^?#])?([?][^#]*)?([#].*)?");
+
+ public static String escapeURL(String surl) {
+ String protocol = null;
+ String authority = null;
+ String path = null;
+ String query = null;
+ String fragment = null;
+ URL u = null;
+ try {
+ u = new URL(surl);
+ } catch (MalformedURLException e) {
+ return null;
+ }
+ protocol = u.getProtocol();
+ authority = u.getAuthority();
+ path = u.getPath();
+ query = u.getQuery();
+ fragment = u.getRef();
+ StringBuilder url = new StringBuilder();
+ url.append(protocol);
+ url.append("://");
+ url.append(authority);
+ if (path != null && path.length() > 0) {
+ String[] pieces = path.split("[/]", -1);
+ for (int i = 0; i < pieces.length; i++) {
+ String p = pieces[i];
+ if (p == null)
+ p = "";
+ if (i > 0)
+ url.append("/");
+ url.append(urlEncode(p));
+ }
+ }
+ if (query != null && query.length() > 0) {
+ url.append("?");
+ url.append(escapeURLQuery(query));
+ }
+ if (fragment != null && fragment.length() > 0) {
+ url.append("#");
+ url.append(urlEncode(fragment));
+ }
+ return url.toString();
+ }
+
+ static int nextpiece(String s, int index, String sep) {
+ index = s.indexOf(sep, index);
+ if (index < 0)
+ index = s.length();
+ return index;
+ }
+
+ public static String escapeURLQuery(String ce) {
+ try {
+ ce = escapeString(ce, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&'()*+,-./:;=?@_~");
+ } catch (Exception e) {
+ ce = null;
+ }
+ return ce;
+ }
+
+ public static String unescapeURLQuery(String ce) {
+ try {
+ ce = unescapeString(ce);
+ } catch (Exception e) {
+ ce = null;
+ }
+ return ce;
+ }
+
+ public static String urlEncode(String s) {
+ s = escapeString(s, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$&'()*+,-./:;=?@_~");
+ return s;
+ }
+
+ public static String urlDecode(String s) {
+ try {
+ s = URLDecoder.decode(s, "UTF-8");
+ } catch (Exception e) {
+ s = null;
+ }
+ return s;
+ }
+}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/PropertyTools.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/PropertyTools.java
index 1cc16e9384b5f0616043db6e20f62d1ce3730008..b1acab557970a011c4de125ad65ea0ee88cbdb24 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/PropertyTools.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/PropertyTools.java
@@ -1,16 +1,35 @@
package com.x.base.core.project.tools;
+import java.lang.reflect.Field;
+
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
public class PropertyTools {
@SuppressWarnings("unchecked")
public static T getOrElse(Object bean, String name, Class cls, T defaultObject) throws Exception {
- if ((null != bean) && PropertyUtils.isReadable(bean, name)) {
- Object o = PropertyUtils.getProperty(bean, name);
- if (null != o) {
- return (T) o;
+ if (null != bean) {
+ try {
+ // 如果使用PropertyUtils.isReadable那么Nested就会失效,无法获取map类型中的值.
+ // Object o = PropertyUtils.getNestedProperty(bean, name);
+ Object o = PropertyUtils.getProperty(bean, name);
+ if (null != o) {
+ return (T) o;
+ }
+ } catch (NoSuchMethodException e) {
+ // java.lang.NoSuchMethodException: Unknown property 'abc' on class 'class
+ // java.lang.Object'
+ // nothing pass
+ }
+ Field field = FieldUtils.getField(bean.getClass(), name, true);
+ if (null != field) {
+ Object o = FieldUtils.readField(field, bean, true);
+ if (null != o) {
+ return (T) o;
+ }
}
}
return defaultObject;
}
-}
+
+}
\ No newline at end of file
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/StringTools.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/StringTools.java
index 269404ce5e2e1a7a137a00e1aff5161475a86617..c1ff3da8d4464600df6de3bf838918d90ab298c4 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/StringTools.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/StringTools.java
@@ -1,5 +1,7 @@
package com.x.base.core.project.tools;
+import static java.util.Locale.ENGLISH;
+
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
@@ -29,6 +31,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.slf4j.helpers.MessageFormatter;
+import com.alibaba.druid.sql.visitor.functions.Char;
+
public class StringTools {
// 脚本文本
@@ -365,28 +369,6 @@ public class StringTools {
public static boolean matchWildcard(String str, String pattern) {
return Objects.toString(str, "").matches(Objects.toString(pattern, "").replace("?", ".?").replace("*", ".*?"));
- // if (StringUtils.isNotEmpty(str) && StringUtils.isNotEmpty(pattern) &&
- // StringUtils.contains(pattern, "*")) {
- // if (StringUtils.equals(pattern, "*")) {
- // return true;
- // }
- // if (StringUtils.startsWith(pattern, "*")) {
- // return StringUtils.endsWith(str, StringUtils.substringAfter(pattern, "*"));
- // }
- // if (StringUtils.endsWith(pattern, "*")) {
- // return StringUtils.startsWith(str, StringUtils.substringBeforeLast(pattern,
- // "*"));
- // }
- // String[] parts = StringUtils.split(pattern, "*", 2);
- // if (StringUtils.startsWith(str, parts[0]) && StringUtils.endsWith(str,
- // parts[1])) {
- // return true;
- // } else {
- // return false;
- // }
- // } else {
- // return StringUtils.equals(str, pattern);
- // }
}
public static List includesExcludesWithWildcard(List list, Collection includes,
@@ -544,4 +526,26 @@ public class StringTools {
return result.toArray(new String[result.size()]);
}
+ public static String getMethodName(String name) {
+ return methodName("get", name);
+ }
+
+ public static String setMethodName(String name) {
+ return methodName("set", name);
+ }
+
+ private static String methodName(String getOrSet, String name) {
+ if (StringUtils.isEmpty(name) || StringUtils.isEmpty(getOrSet)) {
+ return name;
+ }
+ StringBuilder sb = new StringBuilder();
+ sb.append(getOrSet);
+ if ((name.length() > 1) && (StringUtils.isAllLowerCase(name.substring(0, 1))
+ && StringUtils.isAllUpperCase(name.substring(1, 2)))) {
+ sb.append(name);
+ } else {
+ sb.append(StringUtils.capitalize(name));
+ }
+ return sb.toString();
+ }
}
\ No newline at end of file
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/utils/time/WorkTime.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/utils/time/WorkTime.java
index 173a536df8a6b9e6905e449628a918717ebf3ff6..b0cec4fa89e97aa3c878f76cdc5d694375dc5631 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/utils/time/WorkTime.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/utils/time/WorkTime.java
@@ -85,4 +85,12 @@ public class WorkTime extends BaseWorkTime {
return false;
}
+ public boolean isWorkDay(Date d) {
+ return !this.isHoliday(DateUtils.toCalendar(d));
+ }
+
+ public boolean isWorkDay(Calendar c) {
+ return !this.isHoliday(c);
+ }
+
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java
index 236f8b7faeb48af32a245af94f22bc520aa92fbd..7bd6d44e940e7e71ce5961bd515bccf10006b659 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java
@@ -1,5 +1,6 @@
package com.x.base.core.project;
+import com.x.base.core.entity.StorageType;
import com.x.base.core.project.annotation.Module;
import com.x.base.core.project.annotation.ModuleCategory;
import com.x.base.core.project.annotation.ModuleType;
@@ -10,6 +11,6 @@ import com.x.base.core.project.annotation.ModuleType;
"com.x.organization.core.entity.Identity", "com.x.organization.core.entity.PersonAttribute",
"com.x.organization.core.entity.Unit", "com.x.organization.core.entity.UnitAttribute",
"com.x.organization.core.entity.PersonCard","com.x.organization.core.entity.PermissionSetting",
- "com.x.organization.core.entity.UnitDuty" }, storeJars = { "x_organization_core_entity" })
+ "com.x.organization.core.entity.UnitDuty", "com.x.general.core.entity.file.GeneralFile" },storageTypes = { StorageType.general}, storeJars = { "x_organization_core_entity" ,"x_general_core_entity"})
public class x_organization_assemble_control extends Deployable {
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java
index 0368978539ae1a490a361ea4e58ee07d9c8cd148..8b3737d511ebccc7503b4b5ef4bab2ecae74e743 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java
@@ -7,7 +7,8 @@ import com.x.base.core.project.annotation.ModuleType;
@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "门户设计", packageName = "com.x.portal.assemble.designer", containerEntities = {
"com.x.portal.core.entity.Portal", "com.x.portal.core.entity.Widget", "com.x.portal.core.entity.Page",
"com.x.portal.core.entity.Script", "com.x.portal.core.entity.File",
- "com.x.portal.core.entity.TemplatePage" }, storeJars = { "x_organization_core_entity",
- "x_organization_core_express", "x_portal_core_entity" })
+ "com.x.portal.core.entity.TemplatePage", "com.x.cms.core.entity.element.Script",
+ "com.x.processplatform.core.entity.element.Script" }, storeJars = { "x_organization_core_entity",
+ "x_organization_core_express", "x_portal_core_entity", "x_cms_core_entity", "x_processplatform_core_entity" })
public class x_portal_assemble_designer extends Deployable {
}
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java
index a02590710e08a087d28d871edbb8fb465c98857b..5b312f5123389c151cac0f7442a1450523f512bc 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java
@@ -6,7 +6,9 @@ import com.x.base.core.project.annotation.ModuleType;
@Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "门户", packageName = "com.x.portal.assemble.surface", containerEntities = {
"com.x.portal.core.entity.Portal", "com.x.portal.core.entity.Widget", "com.x.portal.core.entity.Page",
- "com.x.portal.core.entity.Script", "com.x.portal.core.entity.File" }, storeJars = {
- "x_organization_core_entity", "x_organization_core_express", "x_portal_core_entity" })
+ "com.x.portal.core.entity.Script", "com.x.portal.core.entity.File", "com.x.cms.core.entity.element.Script",
+ "com.x.processplatform.core.entity.element.Script" }, storeJars = {
+ "x_organization_core_entity", "x_organization_core_express", "x_portal_core_entity", "x_cms_core_entity",
+ "x_processplatform_core_entity" })
public class x_portal_assemble_surface extends Deployable {
}
\ No newline at end of file
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java
index 26b23861657506546f25cf8a19a3c6363959d5ac..105c8de3c79560df8637556d3fc5e429c4cceb63 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java
@@ -29,9 +29,11 @@ import com.x.base.core.project.annotation.ModuleType;
"com.x.processplatform.core.entity.element.Form", "com.x.processplatform.core.entity.element.FormField",
"com.x.processplatform.core.entity.element.Embed", "com.x.processplatform.core.entity.element.Mapping",
"com.x.processplatform.core.entity.log.SignalStackLog", "com.x.query.core.entity.Item",
+ "com.x.cms.core.entity.element.Script", "com.x.portal.core.entity.Script",
"com.x.query.dynamic.entity.*" }, storageTypes = { StorageType.processPlatform }, storeJars = {
"x_organization_core_entity", "x_organization_core_express", "x_processplatform_core_entity",
- "x_processplatform_core_express", "x_query_core_entity" }, dynamicJars = { "x_query_dynamic_entity" })
+ "x_processplatform_core_express", "x_query_core_entity", "x_cms_core_entity",
+ "x_portal_core_entity" }, dynamicJars = { "x_query_dynamic_entity" })
public class x_processplatform_service_processing extends Deployable {
}
diff --git a/o2server/x_bbs_assemble_control/pom.xml b/o2server/x_bbs_assemble_control/pom.xml
index bf702d6ee90e2778329f350628232e80e05131fe..3fc49942570e67a63d7c517326145f5e04714f69 100644
--- a/o2server/x_bbs_assemble_control/pom.xml
+++ b/o2server/x_bbs_assemble_control/pom.xml
@@ -124,6 +124,12 @@
+
+ maven-deploy-plugin
+
+ true
+
+
diff --git a/o2server/x_calendar_assemble_control/pom.xml b/o2server/x_calendar_assemble_control/pom.xml
index a2b2e353e29a68d2894c821db8286c8b6a398ee8..c2e476aaf8385e0cc457a46a91f9d0d584a59fa5 100644
--- a/o2server/x_calendar_assemble_control/pom.xml
+++ b/o2server/x_calendar_assemble_control/pom.xml
@@ -124,6 +124,12 @@
+
+ maven-deploy-plugin
+
+ true
+
+
diff --git a/o2server/x_cms_assemble_control/pom.xml b/o2server/x_cms_assemble_control/pom.xml
index 24830d30c7fbe180ec5b951dfddc0da52a5d84b9..ef9727298fe47bb318f6ba55929492c28a8ee10e 100644
--- a/o2server/x_cms_assemble_control/pom.xml
+++ b/o2server/x_cms_assemble_control/pom.xml
@@ -144,6 +144,12 @@
+
+ maven-deploy-plugin
+
+ true
+
+
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/ActionApplication.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/ActionApplication.java
index 753778ead20042cc9a43b9eed22b75deabdc0647..21886ae33aeae6911b874a8beb2be2ed631fcaab 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/ActionApplication.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/ActionApplication.java
@@ -9,6 +9,7 @@ import com.x.cms.assemble.control.jaxrs.appinfo.AppInfoAnonymousAction;
import com.x.cms.assemble.control.jaxrs.appinfo.AppInfoConfigAction;
import com.x.cms.assemble.control.jaxrs.categoryinfo.CategoryInfoAction;
import com.x.cms.assemble.control.jaxrs.categoryinfo.CategoryInfoAnonymousAction;
+import com.x.cms.assemble.control.jaxrs.commend.DocumentCommendAction;
import com.x.cms.assemble.control.jaxrs.comment.DocumentCommentInfoAction;
import com.x.cms.assemble.control.jaxrs.data.DataAction;
import com.x.cms.assemble.control.jaxrs.document.DocumentAction;
@@ -85,6 +86,7 @@ public class ActionApplication extends AbstractActionApplication {
this.classes.add(FormAnonymousAction.class);
this.classes.add(ScriptAnonymousAction.class);
this.classes.add(DocumentCommentInfoAction.class);
+ this.classes.add(DocumentCommendAction.class);
return this.classes;
}
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/CmsJaxrsFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/CmsJaxrsFilter.java
index bbc9c0f9925c20e7b01fcc91b18c930038271cd3..b97d1fcea56f702501fd5ab3ad47cc1373fa56fa 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/CmsJaxrsFilter.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/CmsJaxrsFilter.java
@@ -1,6 +1,6 @@
package com.x.cms.assemble.control.jaxrs;
-import com.x.base.core.project.jaxrs.ManagerUserJaxrsFilter;
+import com.x.base.core.project.jaxrs.CipherManagerUserJaxrsFilter;
import javax.servlet.annotation.WebFilter;
@@ -37,8 +37,9 @@ import javax.servlet.annotation.WebFilter;
"/jaxrs/permission/*",
"/jaxrs/docpermission/*",
"/jaxrs/comment/*",
+ "/jaxrs/commend/*",
"/servlet/*"
}, asyncSupported = true)
-public class CmsJaxrsFilter extends ManagerUserJaxrsFilter {
+public class CmsJaxrsFilter extends CipherManagerUserJaxrsFilter {
}
\ No newline at end of file
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java
index 40892537f975cf7f6c1507d96cc221481d774452..da23a8a51511a3424ebd158f77deb195ed295d0a 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java
@@ -13,6 +13,7 @@ import com.x.base.core.entity.dataitem.ItemCategory;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -47,7 +48,7 @@ class ActionCreate extends BaseAction {
emc.persist(o, CheckPersistType.all);
}
emc.commit();
- ApplicationCache.notify(AppDict.class);
+ CacheManager.notify(AppDict.class);
Wo wo = new Wo();
wo.setId(appInfoDict.getId());
result.setData(wo);
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java
index 38aeb22ea8c1e7b5bd6018f8399eab72098d4c04..c69650179092948ab8df09f6397be51ef82fa6ad 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java
@@ -6,6 +6,7 @@ import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.annotation.CheckRemoveType;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -37,7 +38,7 @@ class ActionDelete extends BaseAction {
emc.beginTransaction(AppDict.class);
emc.remove(dict, CheckRemoveType.all);
emc.commit();
- ApplicationCache.notify(AppDict.class);
+ CacheManager.notify(AppDict.class);
Wo wo = new Wo();
wo.setId(dict.getId());
result.setData(wo);
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java
index d55a2cb15edca007624e17f847ca1e745688929c..ba187a15143a9c33c64ae64d60e7653f65692af1 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java
@@ -13,6 +13,7 @@ import com.x.base.core.entity.dataitem.ItemCategory;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -63,7 +64,7 @@ class ActionEdit extends BaseAction {
emc.persist(o, CheckPersistType.all);
}
emc.commit();
- ApplicationCache.notify(AppDict.class);
+ CacheManager.notify(AppDict.class);
Wo wo = new Wo();
wo.setId(dict.getId());
result.setData(wo);
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAction.java
index b80348ff8d4eb53757cbb9f89eb179bc259693b6..bdac6a3140426a1c7f5843fcaa35dd78905b4438 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAction.java
@@ -9,10 +9,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -28,7 +26,6 @@ import java.util.List;
@JaxrsDescribe("信息发布(CMS)-栏目(APPINFO)管理服务")
public class AppInfoAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger(AppInfoAction.class);
@JaxrsMethodDescribe(value = "创建新的栏目信息或者更新已存在的栏目信息。", action = ActionSave.class)
@@ -41,7 +38,7 @@ public class AppInfoAction extends StandardJaxrsAction {
Boolean check = true;
if (check) {
try {
- result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute( request, effectivePerson, jsonElement );
+ result = new ActionSave().execute( request, effectivePerson, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "栏目信息保存时发生异常。");
@@ -62,7 +59,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute(request, effectivePerson, id);
+ result = new ActionDelete().execute(request, effectivePerson, id);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据ID删除CMS应用信息对象发生未知异常，ID:" + id);
@@ -84,7 +81,7 @@ public class AppInfoAction extends StandardJaxrsAction {
Boolean check = true;
if( check ){
try {
- result = ((ActionQueryGetControl)proxy.getProxy(ActionQueryGetControl.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryGetControl().execute( request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
result.error( e );
@@ -104,7 +101,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionEraseDocumentWithAppInfo)proxy.getProxy(ActionEraseDocumentWithAppInfo.class)).execute(request, id, effectivePerson );
+ result = new ActionEraseDocumentWithAppInfo().execute(request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据栏目ID删除所有的信息文档发生未知异常，ID:" + id);
@@ -124,7 +121,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, flag );
+ result = new ActionGet().execute( request, effectivePerson, flag );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID查询应用栏目信息对象时发生异常。flag:" + flag );
@@ -143,7 +140,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGetByAlias)proxy.getProxy(ActionGetByAlias.class)).execute(request, effectivePerson, alias);
+ result = new ActionGetByAlias().execute(request, effectivePerson, alias);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据指定应用唯一标识查询应用栏目信息对象时发生异常。ALIAS:" + alias);
@@ -163,7 +160,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanViewArticle_WithAppType)proxy.getProxy(ActionListWhatICanViewArticle_WithAppType.class)).execute(request, effectivePerson, appType );
+ result = new ActionListWhatICanViewArticle_WithAppType().execute(request, effectivePerson, appType );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -183,7 +180,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanViewArticle)proxy.getProxy(ActionListWhatICanViewArticle.class)).execute(request, effectivePerson);
+ result = new ActionListWhatICanViewArticle().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -203,7 +200,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanViewData)proxy.getProxy(ActionListWhatICanViewData.class)).execute(request, effectivePerson);
+ result = new ActionListWhatICanViewData().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -224,7 +221,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanViewData_WithAppType)proxy.getProxy(ActionListWhatICanViewData_WithAppType.class)).execute(request, effectivePerson, appType );
+ result = new ActionListWhatICanViewData_WithAppType().execute(request, effectivePerson, appType );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -245,7 +242,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanViewAllDocType_WithAppType)proxy.getProxy(ActionListWhatICanViewAllDocType_WithAppType.class)).execute( request, effectivePerson, appType );
+ result = new ActionListWhatICanViewAllDocType_WithAppType().execute( request, effectivePerson, appType );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -265,7 +262,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanViewAllDocType)proxy.getProxy(ActionListWhatICanViewAllDocType.class)).execute(request, effectivePerson);
+ result = new ActionListWhatICanViewAllDocType().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -285,7 +282,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanPublish)proxy.getProxy(ActionListWhatICanPublish.class)).execute(request, effectivePerson);
+ result = new ActionListWhatICanPublish().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -306,8 +303,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanPublish_WithAppType)proxy.getProxy(ActionListWhatICanPublish_WithAppType.class))
- .execute(request, effectivePerson, appType );
+ result = new ActionListWhatICanPublish_WithAppType().execute(request, effectivePerson, appType );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -328,7 +324,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGetPublishableAppInfo)proxy.getProxy(ActionGetPublishableAppInfo.class)).execute(request, effectivePerson, appId );
+ result = new ActionGetPublishableAppInfo().execute(request, effectivePerson, appId );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -348,7 +344,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListAllAppType)proxy.getProxy(ActionListAllAppType.class)).execute(request, effectivePerson);
+ result = new ActionListAllAppType().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -368,7 +364,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListAllManageableAppType)proxy.getProxy(ActionListAllManageableAppType.class)).execute(request, effectivePerson);
+ result = new ActionListAllManageableAppType().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -388,8 +384,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanManage)proxy.getProxy(ActionListWhatICanManage.class))
- .execute(request, effectivePerson);
+ result = new ActionListWhatICanManage().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -410,8 +405,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanManage_WithAppType)proxy.getProxy(ActionListWhatICanManage_WithAppType.class))
- .execute(request, effectivePerson, appType);
+ result = new ActionListWhatICanManage_WithAppType().execute(request, effectivePerson, appType);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e,
@@ -431,7 +425,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListAll)proxy.getProxy(ActionListAll.class)).execute(request, effectivePerson);
+ result = new ActionListAll().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "查询所有应用栏目信息对象时发生异常");
@@ -453,7 +447,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListNextWithFilter)proxy.getProxy(ActionListNextWithFilter.class)).execute(request, effectivePerson, id, count, jsonElement );
+ result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "查询栏目信息对象时发生异常");
@@ -475,7 +469,7 @@ public class AppInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListPrevWithFilter)proxy.getProxy(ActionListPrevWithFilter.class)).execute(request, effectivePerson, id, count, jsonElement);
+ result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "查询栏目信息对象时发生异常");
@@ -499,7 +493,7 @@ public class AppInfoAction extends StandardJaxrsAction {
ActionResult result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionAppIconUpload)proxy.getProxy(ActionAppIconUpload.class)).execute(request, effectivePerson, appId, size, bytes, disposition );
+ result = new ActionAppIconUpload().execute(request, effectivePerson, appId, size, bytes, disposition );
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAnonymousAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAnonymousAction.java
index e32cf363f4502fcf63573224f1fac036f8340f31..74ea6862d4cd8747b347c7294989dd5a50bf2ab0 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAnonymousAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoAnonymousAction.java
@@ -9,10 +9,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import java.util.List;
@Path("anonymous/appinfo")
public class AppInfoAnonymousAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger(AppInfoAnonymousAction.class);
@JaxrsMethodDescribe(value = "根据标识获取信息栏目信息对象.", action = ActionGetAnonymous.class)
@@ -38,7 +35,7 @@ public class AppInfoAnonymousAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGetAnonymous)proxy.getProxy(ActionGetAnonymous.class)).execute( request, effectivePerson, flag );
+ result = new ActionGetAnonymous().execute( request, effectivePerson, flag );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID查询应用栏目信息对象时发生异常。flag:" + flag );
@@ -60,8 +57,7 @@ public class AppInfoAnonymousAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListNextWithFilterAnonymous)proxy.getProxy(ActionListNextWithFilterAnonymous.class))
- .execute(request, effectivePerson, id, count, jsonElement );
+ result = new ActionListNextWithFilterAnonymous().execute(request, effectivePerson, id, count, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "查询栏目信息对象时发生异常");
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoConfigAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoConfigAction.java
index bad42f5d0d8dd1f8791433fc4d850d483ec78ac9..6caa9aae96702b029daba06d900665f363233fc9 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoConfigAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoConfigAction.java
@@ -10,10 +10,8 @@ import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
import com.x.base.core.project.jaxrs.WoText;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import javax.ws.rs.core.MediaType;
@JaxrsDescribe("信息发布(CMS)-栏目配置支持信息(APPINFOCONFIG)管理服务")
public class AppInfoConfigAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger(AppInfoConfigAction.class);
@JaxrsMethodDescribe(value = "更新栏目配置支持信息，JSON格式。", action = ActionSaveConfig.class)
@@ -42,7 +39,7 @@ public class AppInfoConfigAction extends StandardJaxrsAction {
Boolean check = true;
if (check) {
try {
- result = ((ActionSaveConfig)proxy.getProxy(ActionSaveConfig.class)).execute( request, effectivePerson, appId, jsonElement );
+ result = new ActionSaveConfig().execute( request, effectivePerson, appId, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "栏目信息保存时发生异常。");
@@ -63,7 +60,7 @@ public class AppInfoConfigAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGetConfig)proxy.getProxy(ActionGetConfig.class)).execute( request, effectivePerson, id );
+ result = new ActionGetConfig().execute( request, effectivePerson, id );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID查询应用栏目配置支持信息时发生异常。id:" + id );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoExportAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoExportAction.java
index bc37f7ed7e00b674b11d7ac1212c1bd965c4a20c..c7824f435d3fb308cc8bdff6535193c01b21247e 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoExportAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoExportAction.java
@@ -8,10 +8,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -24,7 +22,6 @@ import javax.ws.rs.core.MediaType;
@JaxrsDescribe("信息发布栏目导出服务")
public class AppInfoExportAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger(AppInfoExportAction.class);
@JaxrsMethodDescribe(value = "根据ID导出栏目信息对象所有设计.", action = ActionAppInfoExport.class)
@@ -36,7 +33,7 @@ public class AppInfoExportAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionAppInfoExport)proxy.getProxy(ActionAppInfoExport.class)).execute( request, effectivePerson, id );
+ result = new ActionAppInfoExport().execute( request, effectivePerson, id );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据指定ID导出栏目信息对象时发生异常。ID:" + id );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoImportAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoImportAction.java
index cde15b00d35f022dfa1c609fa9f5259cdc857e13..0ba97034ec4e294ce0580fadc687d0502a768cd3 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoImportAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/AppInfoImportAction.java
@@ -8,10 +8,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -24,7 +22,6 @@ import javax.ws.rs.core.MediaType;
@JaxrsDescribe("信息发布栏目导入服务")
public class AppInfoImportAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger(AppInfoImportAction.class);
@JaxrsMethodDescribe(value = "根据别名获取信息栏目信息对象.", action = ActionGetByAlias.class)
@@ -36,7 +33,7 @@ public class AppInfoImportAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGetByAlias)proxy.getProxy(ActionGetByAlias.class)).execute(request, effectivePerson, id);
+ result = new ActionGetByAlias().execute(request, effectivePerson, id);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionAppInfoProcess(e, "根据指定应用唯一标识查询应用栏目信息对象时发生异常。ALIAS:" + id);
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java
index 843758a88fb64cc5ffaa5577349d93f7866e8055..b120fec5bd0da1b957b38b6b74b53c4427a05fc7 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java
@@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo;
import com.x.base.core.project.annotation.AuditLog;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -71,10 +72,10 @@ public class ActionDelete extends BaseAction {
CmsBatchOperationProcessService.OPT_TYPE_DELETE, id, id, "删除分类：ID=" + id );
new LogService().log(null, effectivePerson.getDistinguishedName(), categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName(), id, "", "", "", "CATEGORY", "删除");
-
- ApplicationCache.notify( AppInfo.class );
- ApplicationCache.notify( CategoryInfo.class );
- ApplicationCache.notify( ViewCategory.class );
+
+ CacheManager.notify( AppInfo.class );
+ CacheManager.notify( CategoryInfo.class );
+ CacheManager.notify( ViewCategory.class );
} catch (Exception e) {
Exception exception = new ExceptionCategoryInfoProcess(e, "分类信息在删除时发生异常。ID:" + id);
result.error(exception);
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java
index e6bf9a0d5052c9cae9c180a33c666309fbe09423..5e2167129f958438e264916dd937298861b852c6 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java
@@ -7,6 +7,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -190,11 +191,11 @@ public class ActionSave extends BaseAction {
}else {
new LogService().log(null, effectivePerson.getDistinguishedName(), categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName(), categoryInfo.getId(), "", "", "", "CATEGORY", "新增");
}
-
- ApplicationCache.notify(AppInfo.class);
- ApplicationCache.notify(CategoryInfo.class);
- ApplicationCache.notify(ViewCategory.class);
- ApplicationCache.notify(Document.class);
+
+ CacheManager.notify(AppInfo.class);
+ CacheManager.notify(CategoryInfo.class);
+ CacheManager.notify(ViewCategory.class);
+ CacheManager.notify(Document.class);
} catch (Exception e) {
check = false;
Exception exception = new ExceptionCategoryInfoProcess(e, "分类信息在保存时发生异常.");
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAction.java
index 8cd4f89fce2be3d5e2ba007eaad3df8975aa90d5..21ea911247c0f30660e2143dd22844a956436518 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAction.java
@@ -9,10 +9,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -27,7 +25,6 @@ import java.util.List;
@JaxrsDescribe("信息发布内容分类管理")
public class CategoryInfoAction extends StandardJaxrsAction{
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger( CategoryInfoAction.class );
@JaxrsMethodDescribe(value = "创建或者更新信息分类信息对象.", action = ActionSave.class)
@@ -40,7 +37,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
Boolean check = true;
if( check ){
try {
- result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute( request, effectivePerson, jsonElement );
+ result = new ActionSave().execute( request, effectivePerson, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "分类信息在保存时发生异常." );
@@ -62,7 +59,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult result = null;
try {
- result = ((ActionSaveImportView)proxy.getProxy(ActionSaveImportView.class)).execute( request, effectivePerson, categoryId, jsonElement );
+ result = new ActionSaveImportView().execute( request, effectivePerson, categoryId, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "为分类绑定导入数据的列表ID时发生异常。categoryId:"+ categoryId );
@@ -83,7 +80,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
Boolean check = true;
if( check ){
try {
- result = ((ActionSaveExtContent)proxy.getProxy(ActionSaveExtContent.class)).execute( request, effectivePerson, jsonElement );
+ result = new ActionSaveExtContent().execute( request, effectivePerson, jsonElement );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "分类扩展信息在保存时发生异常." );
@@ -104,7 +101,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult result = new ActionResult<>();
try {
- result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute( request, id, effectivePerson );
+ result = new ActionDelete().execute( request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "分类信息在删除时发生异常。ID:" + id );
@@ -124,7 +121,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionEraseDocumentWithCategory)proxy.getProxy(ActionEraseDocumentWithCategory.class)).execute(request, id, effectivePerson );
+ result = new ActionEraseDocumentWithCategory().execute(request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess(e, "根据分类ID删除所有的信息文档发生未知异常，ID:" + id);
@@ -144,7 +141,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanView_Article)proxy.getProxy(ActionListWhatICanView_Article.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanView_Article().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -164,7 +161,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanView_Data)proxy.getProxy(ActionListWhatICanView_Data.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanView_Data().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -184,7 +181,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanView_AllType)proxy.getProxy(ActionListWhatICanView_AllType.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanView_AllType().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -204,7 +201,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanPublish)proxy.getProxy(ActionListWhatICanPublish.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanPublish().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据应用栏目ID查询分类信息对象时发生异常。AppId:" + appId );
@@ -223,7 +220,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = null;
try {
- result = ((ActionListAll)proxy.getProxy(ActionListAll.class)).execute( request, effectivePerson );
+ result = new ActionListAll().execute( request, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "查询所有分类信息对象时发生异常。" );
@@ -243,7 +240,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult result = null;
try {
- result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, flag, effectivePerson );
+ result = new ActionGet().execute( request, flag, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据ID查询分类信息对象时发生异常。flag:" + flag );
@@ -265,7 +262,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
Boolean check = true;
if( check ){
try {
- result = ((ActionQueryGetControl)proxy.getProxy(ActionQueryGetControl.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryGetControl().execute( request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
result.error( e );
@@ -285,7 +282,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult result = null;
try {
- result = ((ActionGetByAlias)proxy.getProxy(ActionGetByAlias.class)).execute( request, alias, effectivePerson );
+ result = new ActionGetByAlias().execute( request, alias, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据标识查询分类信息对象时发生异常。ALIAS:"+ alias );
@@ -308,7 +305,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = null;
try {
- result = ((ActionListNextWithFilter)proxy.getProxy(ActionListNextWithFilter.class)).execute( request, effectivePerson, id, count, jsonElement);
+ result = new ActionListNextWithFilter().execute( request, effectivePerson, id, count, jsonElement);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "列示根据过滤条件的信息分类时发生异常。" );
@@ -331,7 +328,7 @@ public class CategoryInfoAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = null;
try {
- result = ((ActionListPrevWithFilter)proxy.getProxy(ActionListPrevWithFilter.class)).execute( request, effectivePerson, id, count, jsonElement);
+ result = new ActionListPrevWithFilter().execute( request, effectivePerson, id, count, jsonElement);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "列示根据过滤条件的信息分类时发生异常。" );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAnonymousAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAnonymousAction.java
index a8d8e46238b722647d3e109fd62248b1a68c2959..d22bbe49651b2fbfc77ed867a2b6332230df180d 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAnonymousAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/CategoryInfoAnonymousAction.java
@@ -9,10 +9,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -27,7 +25,6 @@ import java.util.List;
@JaxrsDescribe("可匿名访问的信息发布内容分类管理服务")
public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private static Logger logger = LoggerFactory.getLogger( CategoryInfoAnonymousAction.class );
@JaxrsMethodDescribe(value = "根据Flag获取分类信息对象.", action = ActionGetAnonymous.class)
@@ -40,7 +37,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult result = null;
try {
- result = ((ActionGetAnonymous)proxy.getProxy(ActionGetAnonymous.class)).execute( request, flag, effectivePerson );
+ result = new ActionGetAnonymous().execute( request, flag, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据ID查询分类信息对象时发生异常。flag:" + flag );
@@ -63,7 +60,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = null;
try {
- result = ((ActionListNextWithFilterAnonymous)proxy.getProxy(ActionListNextWithFilterAnonymous.class)).execute( request, effectivePerson, id, count, jsonElement);
+ result = new ActionListNextWithFilterAnonymous().execute( request, effectivePerson, id, count, jsonElement);
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "列示根据过滤条件的信息分类时发生异常。" );
@@ -83,7 +80,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanView_Article)proxy.getProxy(ActionListWhatICanView_Article.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanView_Article().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -103,7 +100,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanView_Data)proxy.getProxy(ActionListWhatICanView_Data.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanView_Data().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -123,7 +120,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanView_AllType)proxy.getProxy(ActionListWhatICanView_AllType.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanView_AllType().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据指定应用栏目ID查询分类信息列表时发生异常。ID:" + appId );
@@ -143,7 +140,7 @@ public class CategoryInfoAnonymousAction extends StandardJaxrsAction{
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionListWhatICanPublish)proxy.getProxy(ActionListWhatICanPublish.class)).execute( request, appId, effectivePerson );
+ result = new ActionListWhatICanPublish().execute( request, appId, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCategoryInfoProcess( e, "根据应用栏目ID查询分类信息对象时发生异常。AppId:" + appId );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/ActionGet.java
new file mode 100644
index 0000000000000000000000000000000000000000..578d886f71b3f7148f059b1f3246e7b8f2d776f3
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/ActionGet.java
@@ -0,0 +1,53 @@
+package com.x.cms.assemble.control.jaxrs.commend;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.bean.WrapCopier;
+import com.x.base.core.project.bean.WrapCopierFactory;
+import com.x.base.core.project.cache.Cache;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionEntityNotExist;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
+import com.x.cms.core.entity.DocumentCommend;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Optional;
+
+public class ActionGet extends BaseAction {
+
+ private static Logger logger = LoggerFactory.getLogger( ActionGet.class );
+
+ protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception {
+ ActionResult result = new ActionResult<>();
+ Wo wo = null;
+ Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id );
+ Optional optional = CacheManager.get(cacheCategory, cacheKey );
+
+ if (optional.isPresent()) {
+ result.setData((Wo)optional.get());
+ } else {
+ try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+ DocumentCommend dc = emc.find(id, DocumentCommend.class);
+ if (null == dc) {
+ throw new ExceptionEntityNotExist(id, DocumentCommend.class);
+ }
+ wo = Wo.copier.copy( dc );
+ CacheManager.put(cacheCategory, cacheKey, wo);
+ result.setData( wo );
+ }
+ }
+
+ return result;
+ }
+
+ public static class Wo extends DocumentCommend {
+
+ static WrapCopier copier = WrapCopierFactory.wo( DocumentCommend.class, Wo.class, null, ListTools.toList(JpaObject.FieldsInvisible));
+
+ }
+}
\ No newline at end of file
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/ActionListPaging.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/ActionListPaging.java
new file mode 100644
index 0000000000000000000000000000000000000000..c75153cdbf2f1380b43fef30840d76c1b8059ab8
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/ActionListPaging.java
@@ -0,0 +1,61 @@
+package com.x.cms.assemble.control.jaxrs.commend;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.bean.WrapCopier;
+import com.x.base.core.project.bean.WrapCopierFactory;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.cms.core.entity.DocumentCommend;
+import com.x.cms.core.entity.DocumentCommend_;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.List;
+
+class ActionListPaging extends BaseAction {
+ ActionResult> execute(EffectivePerson effectivePerson, Integer page, Integer size, JsonElement jsonElement) throws Exception {
+ try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+ ActionResult> result = new ActionResult<>();
+ Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
+ EntityManager em = emc.get(DocumentCommend.class);
+ CriteriaBuilder cb = em.getCriteriaBuilder();
+ CriteriaQuery cq = cb.createQuery(DocumentCommend.class);
+ Root root = cq.from(DocumentCommend.class);
+ Predicate p = cb.conjunction();
+ if (StringUtils.isNotBlank(wi.getDocumentId())){
+ p = cb.and(p, root.get(DocumentCommend_.documentId).in(wi.getDocumentId()));
+ }
+ if (StringUtils.isNotBlank(wi.getCommendPerson())){
+ p = cb.and(p, root.get(DocumentCommend_.commendPerson).in(wi.getCommendPerson()));
+ }
+ List wos = emc.fetchDescPaging(DocumentCommend.class, Wo.copier, p, page, size, DocumentCommend.sequence_FIELDNAME);
+ result.setData(wos);
+ result.setCount(emc.count(DocumentCommend.class, p));
+ return result;
+ }
+ }
+
+ public static class Wi extends DocumentCommend{
+
+ private static final long serialVersionUID = 8042740393049682505L;
+
+ static WrapCopier copier = WrapCopierFactory.wi(Wi.class, DocumentCommend.class, null,
+ JpaObject.FieldsUnmodify);
+ }
+
+ public static class Wo extends DocumentCommend {
+
+ private static final long serialVersionUID = -1828627584254370972L;
+
+ static WrapCopier copier = WrapCopierFactory.wo(DocumentCommend.class, Wo.class, null,
+ JpaObject.FieldsInvisible);
+
+ }
+}
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/BaseAction.java
new file mode 100644
index 0000000000000000000000000000000000000000..11b4b35f9c64ef08f3773e1e97490f8930e65f91
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/BaseAction.java
@@ -0,0 +1,12 @@
+package com.x.cms.assemble.control.jaxrs.commend;
+
+import com.x.base.core.project.cache.Cache;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.cms.core.entity.Document;
+import com.x.cms.core.entity.DocumentCommend;
+
+public class BaseAction extends StandardJaxrsAction {
+
+ protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(DocumentCommend.class, Document.class);
+
+}
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/DocumentCommendAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/DocumentCommendAction.java
new file mode 100644
index 0000000000000000000000000000000000000000..422e42b0c73e0d6e285c0211313d407e23b2c652
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/commend/DocumentCommendAction.java
@@ -0,0 +1,64 @@
+package com.x.cms.assemble.control.jaxrs.commend;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.project.annotation.JaxrsDescribe;
+import com.x.base.core.project.annotation.JaxrsMethodDescribe;
+import com.x.base.core.project.annotation.JaxrsParameterDescribe;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.http.HttpMediaType;
+import com.x.base.core.project.jaxrs.ResponseFactory;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+@Path("commend")
+@JaxrsDescribe("点赞信息管理")
+public class DocumentCommendAction extends StandardJaxrsAction {
+
+ private Logger logger = LoggerFactory.getLogger(DocumentCommendAction.class);
+
+ @JaxrsMethodDescribe(value = "根据标识获取点赞对象.", action = ActionGet.class)
+ @GET
+ @Path("{id}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void get( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("评论ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionGet().execute( request, effectivePerson, id );
+ } catch (Exception e) {
+ logger.error(e, effectivePerson, request, null);
+ result.error(e);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "分页列示点赞对象.", action = ActionListPaging.class)
+ @POST
+ @Path("list/paging/{page}/size/{size}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void listPaging(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("分页") @PathParam("page") Integer page,
+ @JaxrsParameterDescribe("每页数量") @PathParam("size") Integer size, JsonElement jsonElement) {
+ ActionResult> result = new ActionResult<>();
+ EffectivePerson effectivePerson = this.effectivePerson(request);
+ try {
+ result = new ActionListPaging().execute(effectivePerson, page, size, jsonElement);
+ } catch (Exception e) {
+ logger.error(e, effectivePerson, request, jsonElement);
+ result.error(e);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+}
\ No newline at end of file
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java
index fb7cc48b6843ea62e77d4c88aaebc14551e80378..43fdd9207bed2731e7d5ab8946a12d6c165a750c 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java
@@ -7,6 +7,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -64,8 +65,8 @@ public class ActionSave extends BaseAction {
documentCommentInfo = documentCommentInfoPersistService.save( documentCommentInfo, wi.getContent(), effectivePerson );
// 更新缓存
- ApplicationCache.notify( Document.class );
- ApplicationCache.notify( DocumentCommentInfo.class );
+ CacheManager.notify( Document.class );
+ CacheManager.notify( DocumentCommentInfo.class );
Wo wo = new Wo();
wo.setId( documentCommentInfo.getId() );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/DocumentCommentInfoAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/DocumentCommentInfoAction.java
index f1f717372d767851d10ec5be6228ac84596d8e2c..60c90e043435c0593270a244ecd52d0176664c7c 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/DocumentCommentInfoAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/DocumentCommentInfoAction.java
@@ -9,10 +9,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
@@ -26,7 +24,6 @@ import java.util.List;
@JaxrsDescribe("评论信息管理")
public class DocumentCommentInfoAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
private Logger logger = LoggerFactory.getLogger(DocumentCommentInfoAction.class);
@JaxrsMethodDescribe(value = "根据标识获取评论信息对象.", action = ActionGet.class)
@@ -38,7 +35,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
EffectivePerson effectivePerson = this.effectivePerson( request );
ActionResult result = new ActionResult<>();
try {
- result = ((ActionGet)proxy.getProxy(ActionGet.class)).execute( request, effectivePerson, id );
+ result = new ActionGet().execute( request, effectivePerson, id );
} catch (Exception e) {
result = new ActionResult<>();
Exception exception = new ExceptionCommentQuery(e, "根据指定ID查询评论信息对象时发生异常。id:" + id );
@@ -60,7 +57,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
ActionResult> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionListPageWithFilter)proxy.getProxy(ActionListPageWithFilter.class)).execute(request, effectivePerson, page, size, jsonElement );
+ result = new ActionListPageWithFilter().execute(request, effectivePerson, page, size, jsonElement );
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
@@ -80,7 +77,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
ActionResult> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionListPrevWithFilter)proxy.getProxy(ActionListPrevWithFilter.class)).execute(request, effectivePerson, id, count, jsonElement);
+ result = new ActionListPrevWithFilter().execute(request, effectivePerson, id, count, jsonElement);
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
@@ -100,7 +97,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
ActionResult> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionListNextWithFilter)proxy.getProxy(ActionListNextWithFilter.class)).execute(request, effectivePerson, id, count, jsonElement);
+ result = new ActionListNextWithFilter().execute(request, effectivePerson, id, count, jsonElement);
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
@@ -118,7 +115,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
ActionResult result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionSave)proxy.getProxy(ActionSave.class)).execute(request, effectivePerson, jsonElement);
+ result = new ActionSave().execute(request, effectivePerson, jsonElement);
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
@@ -137,7 +134,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
ActionResult result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionDelete)proxy.getProxy(ActionDelete.class)).execute(request, effectivePerson, id);
+ result = new ActionDelete().execute(request, effectivePerson, id);
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
@@ -157,7 +154,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
Boolean check = true;
if( check ){
try {
- result = ((ActionPersistCommend)proxy.getProxy(ActionPersistCommend.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistCommend().execute( request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
result.error( e );
@@ -179,7 +176,7 @@ public class DocumentCommentInfoAction extends StandardJaxrsAction {
Boolean check = true;
if( check ){
try {
- result = ((ActionPersistUnCommend)proxy.getProxy(ActionPersistUnCommend.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistUnCommend().execute( request, id, effectivePerson );
} catch (Exception e) {
result = new ActionResult<>();
result.error( e );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java
index 938db6e6cea3710bd3e2ba026dd0c04aa0cd7bca..3a89adbfb5d0d529fc3d2764446cb9ed92c4ae42 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java
@@ -4,6 +4,7 @@ import com.google.gson.JsonElement;
import com.x.base.core.project.annotation.AuditLog;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.gson.GsonPropertyObject;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
@@ -123,7 +124,7 @@ public class ActionPersistChangeCategory extends BaseAction {
}
wo.setFailtureList( failture );
wo.setSuccessList( success );
- ApplicationCache.notify(Document.class);
+ CacheManager.notify(Document.class);
}
}
result.setCount(Long.parseLong( wo.getTotal().toString() ) );
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java
index 7038cbc04df5e69ed48f5e9372da3d0874daed9c..610e9dc8de11d8d3800a337d075459c3b634ef6b 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java
@@ -9,6 +9,7 @@ import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WoId;
@@ -214,7 +215,7 @@ public class ActionPersistPublishAndNotify extends BaseAction {
}
}
- ApplicationCache.notify( Document.class );
+ CacheManager.notify( Document.class );
return result;
}
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
index ea518549e6cd5cfbba1039ff63bc0fe9c4680dbb..292e9ba74544d3e3f51c7e4685ee30e662486daa 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
@@ -7,6 +7,7 @@ import java.util.*;
import javax.servlet.http.HttpServletRequest;
import com.x.base.core.entity.annotation.CheckPersistType;
+import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.StorageMapping;
import com.x.base.core.project.exception.ExceptionWhen;
import com.x.processplatform.core.entity.content.Attachment;
@@ -16,12 +17,10 @@ import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
-import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.AuditLog;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
-import com.x.base.core.project.cache.ApplicationCache;
import com.x.base.core.project.gson.XGsonBuilder;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
@@ -416,8 +415,8 @@ public class ActionPersistPublishContent extends BaseAction {
}
}
- ApplicationCache.notify(FileInfo.class);
- ApplicationCache.notify(Document.class);
+ CacheManager.notify(FileInfo.class);
+ CacheManager.notify(Document.class);
return result;
}
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java
new file mode 100644
index 0000000000000000000000000000000000000000..921dfaca443b7313eef687ed5687482f5c46b191
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java
@@ -0,0 +1,100 @@
+package com.x.cms.assemble.control.jaxrs.document;
+
+import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.bean.WrapCopier;
+import com.x.base.core.project.bean.WrapCopierFactory;
+import com.x.base.core.project.cache.Cache;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.cms.core.entity.Document;
+import com.x.cms.core.entity.content.Data;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class ActionQueryGetDocumentData extends BaseAction {
+
+ private static Logger logger = LoggerFactory.getLogger(ActionQueryGetDocumentData.class);
+
+ protected ActionResult execute(HttpServletRequest request, EffectivePerson effectivePerson, String id) throws Exception {
+ ActionResult result = new ActionResult<>();
+ Wo wo = getDocumentQueryResult(id);
+ result.setData(wo);
+ return result;
+ }
+
+ private Wo getDocumentQueryResult(String id) throws Exception {
+ Wo wo = null;
+
+ Cache.CacheKey cacheKey = new Cache.CacheKey(this.getClass(), id);
+ Optional optional = CacheManager.get(cacheCategory, cacheKey);
+ if (optional.isPresent()) {
+ wo = (Wo)optional.get();
+ } else {
+ Document document = documentQueryService.get(id);
+ wo = new Wo();
+ if(document!=null) {
+ WoDocument woOutDocument = WoDocument.copier.copy(document);
+ wo.setDocId(document.getId());
+ wo.setDocument(woOutDocument);
+ wo.setData(documentQueryService.getDocumentData(document));
+ CacheManager.put(cacheCategory, cacheKey, wo);
+ }
+ }
+ return wo;
+ }
+
+ public static class Wo extends GsonPropertyObject {
+ @FieldDescribe( "文档ID." )
+ private String docId;
+
+ @FieldDescribe( "作为输出的CMS文档数据对象." )
+ private WoDocument document;
+
+ @FieldDescribe( "文档所有数据信息." )
+ private Data data;
+
+ public String getDocId() {
+ return docId;
+ }
+
+ public void setDocId(String docId) {
+ this.docId = docId;
+ }
+
+ public WoDocument getDocument() {
+ return document;
+ }
+
+ public void setDocument( WoDocument document) {
+ this.document = document;
+ }
+
+ public Data getData() {
+ return data;
+ }
+
+ public void setData(Data data) {
+ this.data = data;
+ }
+
+ }
+
+ public static class WoDocument extends Document {
+
+ private static final long serialVersionUID = -5076990764713538973L;
+
+ public static List Excludes = new ArrayList();
+
+ public static WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible);
+
+ }
+
+}
\ No newline at end of file
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java
new file mode 100644
index 0000000000000000000000000000000000000000..1bae77793e53bc90a441578c093ad6fea5083c77
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java
@@ -0,0 +1,131 @@
+package com.x.cms.assemble.control.jaxrs.document;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
+import com.x.base.core.project.bean.WrapCopier;
+import com.x.base.core.project.bean.WrapCopierFactory;
+import com.x.base.core.project.cache.Cache;
+import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.gson.GsonPropertyObject;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.cms.assemble.control.Business;
+import com.x.cms.core.entity.Document;
+import com.x.cms.core.entity.content.Data;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class ActionQueryListDocumentData extends BaseAction {
+
+ private static Logger logger = LoggerFactory.getLogger(ActionQueryListDocumentData.class);
+
+ protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
+ ActionResult> result = new ActionResult<>();
+ Wi wi = this.convertToWrapIn( jsonElement, Wi.class );
+ Business business = null;
+ try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+ business = new Business(emc);
+ }
+ List wos = new ArrayList<>();
+ if(wi.getDocIds()!=null && !wi.getDocIds().isEmpty()) {
+ wos = getDocumentQueryResult(business, wi.getDocIds(), effectivePerson);
+ }
+ result.setData(wos);
+ return result;
+ }
+
+ private List getDocumentQueryResult(Business business, List ids, EffectivePerson effectivePerson) throws Exception {
+ List wos = new ArrayList<>();
+ Wo wo = null;
+ List docs = documentQueryService.list(ids);
+ //先不考虑阅读权限的问题
+ /*List unitNames = userManagerService.listUnitNamesWithPerson(effectivePerson.getDistinguishedName());
+ List groupNames = userManagerService.listGroupNamesByPerson(effectivePerson.getDistinguishedName());*/
+ for (Document document : docs){
+ //if(this.hasReadPermission(business, document, unitNames, groupNames, effectivePerson, null)) {
+ Cache.CacheKey cacheKey = new Cache.CacheKey(this.getClass(), document.getId());
+ Optional optional = CacheManager.get(cacheCategory, cacheKey);
+ if (optional.isPresent()) {
+ wo = (Wo)optional.get();
+ } else {
+ wo = new Wo();
+ WoDocument woOutDocument = WoDocument.copier.copy(document);
+ wo.setDocId(document.getId());
+ wo.setDocument(woOutDocument);
+ wo.setData(documentQueryService.getDocumentData(document));
+ CacheManager.put(cacheCategory, cacheKey, wo);
+ }
+ wos.add(wo);
+ //}
+ }
+
+ return wos;
+ }
+
+ public static class Wo extends GsonPropertyObject {
+ @FieldDescribe( "文档ID." )
+ private String docId;
+
+ @FieldDescribe( "作为输出的CMS文档数据对象." )
+ private WoDocument document;
+
+ @FieldDescribe( "文档所有数据信息." )
+ private Data data;
+
+ public String getDocId() {
+ return docId;
+ }
+
+ public void setDocId(String docId) {
+ this.docId = docId;
+ }
+
+ public WoDocument getDocument() {
+ return document;
+ }
+
+ public void setDocument( WoDocument document) {
+ this.document = document;
+ }
+
+ public Data getData() {
+ return data;
+ }
+
+ public void setData(Data data) {
+ this.data = data;
+ }
+
+ }
+
+ public static class WoDocument extends Document {
+
+ private static final long serialVersionUID = -5076990764713538973L;
+
+ public static List Excludes = new ArrayList();
+
+ public static WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible);
+
+ }
+
+ public static class Wi extends GsonPropertyObject {
+ @FieldDescribe( "文档id" )
+ private List docIds = new ArrayList<>();
+
+ public List getDocIds() {
+ return docIds;
+ }
+
+ public void setDocIds(List docIds) {
+ this.docIds = docIds;
+ }
+ }
+}
\ No newline at end of file
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryPermissionReadDocument.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryPermissionReadDocument.java
index cafda35cd22a80c61530a4a52a0e5d7b648c16fd..9c77b1a6792cb9531ee2313451b02683344022c2 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryPermissionReadDocument.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryPermissionReadDocument.java
@@ -1,17 +1,14 @@
package com.x.cms.assemble.control.jaxrs.document;
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
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.organization.Person;
-import com.x.base.core.project.tools.ListTools;
-import com.x.cms.core.entity.AppInfo;
-import com.x.cms.core.entity.CategoryInfo;
+import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.Document;
-import org.apache.commons.lang3.StringUtils;
-import java.util.List;
public class ActionQueryPermissionReadDocument extends BaseAction {
@@ -19,6 +16,10 @@ public class ActionQueryPermissionReadDocument extends BaseAction {
protected ActionResult execute(EffectivePerson effectivePerson, String id, String queryPerson) throws Exception {
ActionResult result = new ActionResult<>();
+ Business business = null;
+ try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+ business = new Business(emc);
+ }
Wo wo = new Wo();
wo.setValue(false);
result.setData(wo);
@@ -26,115 +27,10 @@ public class ActionQueryPermissionReadDocument extends BaseAction {
if(document == null){
return result;
}
- //匿名用户是否可读
- if(effectivePerson.isAnonymous()){
- AppInfo appInfo = appInfoServiceAdv.get( document.getAppId() );
- CategoryInfo categoryInfo = categoryInfoServiceAdv.get(document.getCategoryId());
- if(appInfo!=null && categoryInfo!=null){
- boolean flag = true;
- //检查这个文档所在的栏目和分类是否都是全员可见
- if( ( ListTools.isNotEmpty( document.getReadPersonList() ) && !document.getReadPersonList().contains( "所有人" ) )
- || ListTools.isNotEmpty( document.getReadUnitList() ) || ListTools.isNotEmpty( document.getReadGroupList() ) ) {
- flag = false;
- }
- //检查这个文档所在的栏目和分类是否都是全员可见
- if( !appInfo.getAllPeopleView() ) {
- //栏目不可见
- flag = false;
- }
- //检查这个文档所在的栏目和分类是否都是全员可见
- if( !categoryInfo.getAllPeopleView() ) {
- //分类不可见
- flag = false;
- }
- wo.setValue(flag);
- return result;
- }
- }else{
- String personName = effectivePerson.getDistinguishedName();
- if(effectivePerson.isManager()){
- if(StringUtils.isNotEmpty(queryPerson)){
- Person person = userManagerService.getPerson(queryPerson);
- if(person!=null){
- personName = person.getDistinguishedName();
- }else{
- return result;
- }
- }else{
- wo.setValue(true);
- return result;
- }
- }
- List unitNames = userManagerService.listUnitNamesWithPerson(personName);
- List groupNames = userManagerService.listGroupNamesByPerson(personName);
- //是否是读者
- if(ListTools.contains(document.getReadPersonList(), getShortTargetFlag(personName)) ||
- ListTools.contains(document.getReadPersonList(), "所有人")){
- wo.setValue(true);
- return result;
- }
- for(String unitName : unitNames){
- if(ListTools.contains(document.getReadUnitList(), getShortTargetFlag(unitName))){
- wo.setValue(true);
- return result;
- }
- }
- for(String groupName : groupNames){
- if(ListTools.contains(document.getReadGroupList(), getShortTargetFlag(groupName))){
- wo.setValue(true);
- return result;
- }
- }
- //是否是作者
- if( ListTools.isNotEmpty( document.getAuthorPersonList() )) {
- if( document.getAuthorPersonList().contains( personName ) ) {
- wo.setValue(true);
- return result;
- }
- }
- if( ListTools.isNotEmpty( document.getAuthorUnitList() )) {
- if( ListTools.containsAny( unitNames, document.getAuthorUnitList())) {
- wo.setValue(true);
- return result;
- }
- }
- if( ListTools.isNotEmpty( document.getAuthorGroupList() )) {
- if( ListTools.containsAny( groupNames, document.getAuthorGroupList())) {
- wo.setValue(true);
- return result;
- }
- }
- //是否是分类的管理者
- CategoryInfo categoryInfo = categoryInfoServiceAdv.get(document.getCategoryId());
- if ( categoryInfoServiceAdv.isCategoryInfoManager( categoryInfo, personName, unitNames, groupNames )) {
- wo.setValue(true);
- return result;
- }
- //是否是栏目的管理者
- AppInfo appInfo = appInfoServiceAdv.get( document.getAppId() );
- if (appInfoServiceAdv.isAppInfoManager( appInfo, personName, unitNames, groupNames )) {
- wo.setValue(true);
- return result;
- }
- }
- return result;
- }
+ wo.setValue(this.hasReadPermission(business, document, null, null, effectivePerson, queryPerson));
- private String getShortTargetFlag(String distinguishedName) {
- String target = null;
- if( StringUtils.isNotEmpty( distinguishedName ) ){
- String[] array = distinguishedName.split("@");
- StringBuffer sb = new StringBuffer();
- if( array.length == 3 ){
- target = sb.append(array[1]).append("@").append(array[2]).toString();
- }else if( array.length == 2 ){
- //2段
- target = sb.append(array[0]).append("@").append(array[1]).toString();
- }else{
- target = array[0];
- }
- }
- return target;
+
+ return result;
}
public static class Wo extends WrapBoolean {
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java
index de3148c5bcec0c0148857c2cde7c8e0f66e36a6e..21aad8f4901e5e34ca6ef51b8bf36d63b0fca366 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java
@@ -6,9 +6,12 @@ import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.annotation.CheckPersistType;
import com.x.base.core.project.cache.Cache;
+import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.base.core.project.organization.Person;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.Business;
+import com.x.cms.assemble.control.ThisApplication;
import com.x.cms.assemble.control.service.AppInfoServiceAdv;
import com.x.cms.assemble.control.service.CategoryInfoServiceAdv;
import com.x.cms.assemble.control.service.DocCommendPersistService;
@@ -23,6 +26,7 @@ import com.x.cms.assemble.control.service.QueryViewService;
import com.x.cms.assemble.control.service.UserManagerService;
import com.x.cms.core.entity.*;
import com.x.query.core.entity.Item;
+import org.apache.commons.lang3.StringUtils;
public class BaseAction extends StandardJaxrsAction {
@@ -208,6 +212,82 @@ public class BaseAction extends StandardJaxrsAction {
return false;
}
+ protected boolean hasReadPermission(Business business, Document document, List unitNames, List groupNames, EffectivePerson effectivePerson, String queryPerson) throws Exception{
+ String personName = effectivePerson.getDistinguishedName();
+ if(effectivePerson.isManager()){
+ if(StringUtils.isNotEmpty(queryPerson)){
+ Person person = userManagerService.getPerson(queryPerson);
+ if(person!=null){
+ personName = person.getDistinguishedName();
+ }else{
+ return false;
+ }
+ }else {
+ return true;
+ }
+ }
+ //是否是读者
+ if(ListTools.contains(document.getReadPersonList(), getShortTargetFlag(personName)) ||
+ ListTools.contains(document.getReadPersonList(), "所有人")){
+ return true;
+ }
+ if(unitNames == null){
+ unitNames = userManagerService.listUnitNamesWithPerson(personName);
+ }
+ for(String unitName : unitNames){
+ if(ListTools.contains(document.getReadUnitList(), getShortTargetFlag(unitName))){
+ return true;
+ }
+ }
+ if (groupNames == null){
+ groupNames = userManagerService.listGroupNamesByPerson(personName);
+ }
+ for(String groupName : groupNames){
+ if(ListTools.contains(document.getReadGroupList(), getShortTargetFlag(groupName))){
+ return true;
+ }
+ }
+ //是否是作者
+ if( ListTools.isNotEmpty( document.getAuthorPersonList() )) {
+ if( document.getAuthorPersonList().contains( personName ) ) {
+ return true;
+ }
+ }
+ if( ListTools.isNotEmpty( document.getAuthorUnitList() )) {
+ if( ListTools.containsAny( unitNames, document.getAuthorUnitList())) {
+ return true;
+ }
+ }
+ if( ListTools.isNotEmpty( document.getAuthorGroupList() )) {
+ if( ListTools.containsAny( groupNames, document.getAuthorGroupList())) {
+ return true;
+ }
+ }
+
+ if(business.isHasPlatformRole(personName, ThisApplication.ROLE_CMSManager)){
+ return true;
+ }
+
+ return false;
+ }
+
+ protected String getShortTargetFlag(String distinguishedName) {
+ String target = null;
+ if( StringUtils.isNotEmpty( distinguishedName ) ){
+ String[] array = distinguishedName.split("@");
+ StringBuffer sb = new StringBuffer();
+ if( array.length == 3 ){
+ target = sb.append(array[1]).append("@").append(array[2]).toString();
+ }else if( array.length == 2 ){
+ //2段
+ target = sb.append(array[0]).append("@").append(array[1]).toString();
+ }else{
+ target = array[0];
+ }
+ }
+ return target;
+ }
+
// /**
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java
index 6b404ad3ae34ab8e46d632fe123ddc6d24e48c41..28e2725d9ad2d9d744e33b8b33b1453ed65d4659 100644
--- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java
@@ -9,10 +9,8 @@ import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.HttpMediaType;
import com.x.base.core.project.jaxrs.ResponseFactory;
import com.x.base.core.project.jaxrs.StandardJaxrsAction;
-import com.x.base.core.project.jaxrs.proxy.StandardJaxrsActionProxy;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
-import com.x.cms.assemble.control.ThisApplication;
import com.x.cms.assemble.control.queue.DataImportStatus;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -27,334 +25,341 @@ import java.util.List;
@Path("document")
@JaxrsDescribe("信息发布信息文档管理")
-public class DocumentAction extends StandardJaxrsAction{
+public class DocumentAction extends StandardJaxrsAction {
- private StandardJaxrsActionProxy proxy = new StandardJaxrsActionProxy(ThisApplication.context());
- private static Logger logger = LoggerFactory.getLogger( DocumentAction.class );
+ private static Logger logger = LoggerFactory.getLogger(DocumentAction.class);
@JaxrsMethodDescribe(value = "变更指定文档的分类信息.", action = ActionPersistChangeCategory.class)
@PUT
@Path("category/change")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_changeCategory( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_changeCategory(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
-
- if( check ){
+
+ if (check) {
try {
- result = ((ActionPersistChangeCategory)proxy.getProxy(ActionPersistChangeCategory.class)).execute( request, jsonElement, effectivePerson );
+ result = new ActionPersistChangeCategory().execute(request, jsonElement, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
-
+
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "指修改指定文档的数据。", action = ActionPersistBatchModifyData.class)
@PUT
@Path("batch/data/modify")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_batchDataModify( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_batchDataModify(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionPersistBatchModifyData)proxy.getProxy(ActionPersistBatchModifyData.class)).execute( request, jsonElement, effectivePerson );
+ result = new ActionPersistBatchModifyData().execute(request, jsonElement, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据导入批次号查询导入状态信息.", action = ActionQueryImportStatusWithName.class)
@GET
@Path("batch/{batchName}/status")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_checkImportStatus( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ public void query_checkImportStatus(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
@JaxrsParameterDescribe("导入批次号") @PathParam("batchName") String batchName) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionQueryImportStatusWithName)proxy.getProxy(ActionQueryImportStatusWithName.class)).execute( request, effectivePerson, batchName );
+ result = new ActionQueryImportStatusWithName().execute(request, effectivePerson, batchName);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "查询所有的导入状态信息.", action = ActionQueryAllImportStatus.class)
@GET
@Path("batch/status")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_checkAllImportStatus( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_checkAllImportStatus(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
try {
- result = ((ActionQueryAllImportStatus)proxy.getProxy(ActionQueryAllImportStatus.class)).execute( request, effectivePerson );
+ result = new ActionQueryAllImportStatus().execute(request, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据ID获取信息发布文档信息对象详细信息，包括附件列表，数据信息.", action = ActionQueryGetDocument.class)
@GET
@Path("{id}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_get( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ public void query_get(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
@JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionQueryGetDocument)proxy.getProxy(ActionQueryGetDocument.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryGetDocument().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "列示文档对象可供排序和展示使用的列名.", action = ActionQueryListDocumentFields.class)
@GET
@Path("document/fields")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listDocumentFields( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listDocumentFields(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionQueryListDocumentFields)proxy.getProxy(ActionQueryListDocumentFields.class)).execute( request );
+ result = new ActionQueryListDocumentFields().execute(request);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
-
+
@JaxrsMethodDescribe(value = "根据ID访问信息发布文档信息对象详细信息，包括附件列表，数据信息.", action = ActionQueryViewDocument.class)
@GET
@Path("{id}/view")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_view( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ public void query_view(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
@JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionQueryViewDocument)proxy.getProxy(ActionQueryViewDocument.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryViewDocument().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据ID获取信息发布文档信息被访问次数.", action = ActionQueryCountViewTimes.class)
@GET
@Path("{id}/view/count")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_getViewCount( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ public void query_getViewCount(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
@JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionQueryCountViewTimes)proxy.getProxy(ActionQueryCountViewTimes.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryCountViewTimes().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "查询符合过滤条件的已发布的信息数量.", action = ActionQueryCountWithFilter.class)
@PUT
@Path("filter/count")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_countDocumentWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_countDocumentWithFilter(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryCountWithFilter)proxy.getProxy(ActionQueryCountWithFilter.class)).execute( request, jsonElement, effectivePerson );
+ result = new ActionQueryCountWithFilter().execute(request, jsonElement, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据ID删除信息发布文档信息.", action = ActionPersistDeleteDocument.class)
@DELETE
@Path("{id}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_delete( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionPersistDeleteDocument)proxy.getProxy(ActionPersistDeleteDocument.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistDeleteDocument().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据批次号删除信息发布文档信息.", action = ActionPersistDeleteWithBatch.class)
@DELETE
@Path("batch/{batchId}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_deleteWithBatchName( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("batchId") String batchId) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_deleteWithBatchName(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("batchId") String batchId) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionPersistDeleteWithBatch)proxy.getProxy(ActionPersistDeleteWithBatch.class)).execute( request, batchId, effectivePerson );
+ result = new ActionPersistDeleteWithBatch().execute(request, batchId, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据ID归档信息发布文档信息.", action = ActionPersistArchive.class)
@GET
@Path("achive/{id}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_achive( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_achive(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionPersistArchive)proxy.getProxy(ActionPersistArchive.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistArchive().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据文档ID正式发布文档，并且使用Message通知所有的阅读者。", action = ActionPersistPublishAndNotify.class)
@PUT
@Path("publish/{id}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_publishAndNotify( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("文档ID") @PathParam("id") String id, JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_publishAndNotify(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, @JaxrsParameterDescribe("文档ID") @PathParam("id") String id,
+ JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionPersistPublishAndNotify)proxy.getProxy(ActionPersistPublishAndNotify.class)).execute( request, id, effectivePerson, jsonElement );
+ result = new ActionPersistPublishAndNotify().execute(request, id, effectivePerson, jsonElement);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
-
+
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "直接发布信息内容，创建新的信息发布文档并且直接发布.", action = ActionPersistPublishContent.class)
@PUT
@Path("publish/content")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_publishContent( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_publishContent(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
-
- if( check ){
- System.out.println( "please wait, system try to publish content......" );
+
+ if (check) {
+ System.out.println("please wait, system try to publish content......");
try {
- result = ((ActionPersistPublishContent)proxy.getProxy(ActionPersistPublishContent.class)).execute( request, jsonElement, effectivePerson );
- System.out.println( "system publish content successful!" );
+ result = new ActionPersistPublishContent().execute(request, jsonElement, effectivePerson);
+ System.out.println("system publish content successful!");
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "根据ID取消信息内容发布状态，修改为草稿.", action = ActionPersistPublishCancel.class)
@PUT
@Path("publish/{id}/cancel")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_publishCancel( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_publishCancel(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
try {
- result = ((ActionPersistPublishCancel)proxy.getProxy(ActionPersistPublishCancel.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistPublishCancel().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "列示符合过滤条件的已发布的信息内容, 下一页.", action = ActionQueryListNextWithFilter.class)
@PUT
@Path("filter/list/{id}/next/{count}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listNextWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
- @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count,
- JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listNextWithFilter(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
+ @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryListNextWithFilter)proxy.getProxy(ActionQueryListNextWithFilter.class)).execute( request, id, count, jsonElement, effectivePerson );
+ result = new ActionQueryListNextWithFilter().execute(request, id, count, jsonElement, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
@@ -365,46 +370,47 @@ public class DocumentAction extends StandardJaxrsAction{
@Path("filter/list/{id}/prev/{count}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listPrevWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
- @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count,
- JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listPrevWithFilter(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
+ @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryListPrevWithFilter)proxy.getProxy(ActionQueryListPrevWithFilter.class)).execute( request, id, count, jsonElement, effectivePerson );
+ result = new ActionQueryListPrevWithFilter().execute(request, id, count, jsonElement, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "列示符合过滤条件的草稿信息内容, 下一页.", action = ActionQueryListDraftNextWithFilter.class)
@PUT
@Path("draft/list/{id}/next/{count}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listDraftNextWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
- @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count,
- JsonElement jsonElement) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listDraftNextWithFilter(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
+ @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryListDraftNextWithFilter)proxy.getProxy(ActionQueryListDraftNextWithFilter.class)).execute( request, id, count, jsonElement, effectivePerson );
+ result = new ActionQueryListDraftNextWithFilter().execute(request, id, count, jsonElement,
+ effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
@@ -415,18 +421,18 @@ public class DocumentAction extends StandardJaxrsAction{
@Path("pictures/{id}/first")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listFirstPictures( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listFirstPictures(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryGetFirstPicture)proxy.getProxy(ActionQueryGetFirstPicture.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryGetFirstPicture().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
@@ -437,38 +443,39 @@ public class DocumentAction extends StandardJaxrsAction{
@Path("pictures/{id}/all")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listAllPictures( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listAllPictures(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryListAllPictures)proxy.getProxy(ActionQueryListAllPictures.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryListAllPictures().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "从Excel文件导入文档数据.", action = ActionPersistImportDataExcel.class)
@POST
@Path("import/category/{categoryId}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.MULTIPART_FORM_DATA)
- public void persist_importDocumentFormExcel(@Suspended final AsyncResponse asyncResponse,
- @Context HttpServletRequest request,
- @JaxrsParameterDescribe("分类ID") @PathParam("categoryId") String categoryId,
+ public void persist_importDocumentFormExcel(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("分类ID") @PathParam("categoryId") String categoryId,
@JaxrsParameterDescribe("作为参数的JSON字符串") @FormDataParam("json_data") String json_data,
@FormDataParam(FILE_FIELD) final byte[] bytes,
@FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) {
ActionResult result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
- result = ((ActionPersistImportDataExcel)proxy.getProxy(ActionPersistImportDataExcel.class)).execute(request, effectivePerson, categoryId, bytes, json_data, disposition);
+ result = new ActionPersistImportDataExcel().execute(request, effectivePerson, categoryId, bytes, json_data,
+ disposition);
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
@@ -480,107 +487,108 @@ public class DocumentAction extends StandardJaxrsAction{
@POST
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_save( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_save(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
-
- if( check ){
+
+ if (check) {
try {
- result = ((ActionPersistSaveDocument)proxy.getProxy(ActionPersistSaveDocument.class)).execute( request, jsonElement, effectivePerson );
+ result = new ActionPersistSaveDocument().execute(request, jsonElement, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
-
+
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "文档点赞.", action = ActionPersistCommend.class)
@GET
@Path("{id}/commend")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_commend( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_commend(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionPersistCommend)proxy.getProxy(ActionPersistCommend.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistCommend().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "取消文档点赞.", action = ActionPersistUnCommend.class)
@GET
@Path("{id}/uncommend")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_unCommend( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_unCommend(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionPersistUnCommend)proxy.getProxy(ActionPersistUnCommend.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistUnCommend().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "文档置顶.", action = ActionPersistTopDocument.class)
@GET
@Path("{id}/top")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_top( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_top(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionPersistTopDocument)proxy.getProxy(ActionPersistTopDocument.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistTopDocument().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "取消文档置顶.", action = ActionPersistUnTopDocument.class)
@GET
@Path("{id}/unTop")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void persist_unTop( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void persist_unTop(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionPersistUnTopDocument)proxy.getProxy(ActionPersistUnTopDocument.class)).execute( request, id, effectivePerson );
+ result = new ActionPersistUnTopDocument().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
@@ -591,64 +599,65 @@ public class DocumentAction extends StandardJaxrsAction{
@Path("filter/list/{page}/size/{size}")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_listWithFilterPaging( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("分页") @PathParam("page") Integer page,
- @JaxrsParameterDescribe("数量") @PathParam("size") Integer size, JsonElement jsonElement) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_listWithFilterPaging(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, @JaxrsParameterDescribe("分页") @PathParam("page") Integer page,
+ @JaxrsParameterDescribe("数量") @PathParam("size") Integer size, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult> result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryListWithFilterPaging)proxy.getProxy(ActionQueryListWithFilterPaging.class)).execute( request, page, size, jsonElement, effectivePerson );
+ result = new ActionQueryListWithFilterPaging().execute(request, page, size, jsonElement,
+ effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "获取文件访问控制信息.", action = ActionQueryGetControl.class)
@GET
@Path("{id}/control")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_getControl( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_getControl(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryGetControl)proxy.getProxy(ActionQueryGetControl.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryGetControl().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
-
+
@JaxrsMethodDescribe(value = "获取文件可见范围内的所有人员.", action = ActionQueryListVisiblePersons.class)
@GET
@Path("{id}/persons")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_getVisiblePersons( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_getVisiblePersons(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
- result = ((ActionQueryListVisiblePersons)proxy.getProxy(ActionQueryListVisiblePersons.class)).execute( request, id, effectivePerson );
+ result = new ActionQueryListVisiblePersons().execute(request, id, effectivePerson);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
@@ -659,19 +668,62 @@ public class DocumentAction extends StandardJaxrsAction{
@Path("{id}/permission/read")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
- public void query_PermissionReadDocument( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
- @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
- EffectivePerson effectivePerson = this.effectivePerson( request );
+ public void query_PermissionReadDocument(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
ActionResult result = new ActionResult<>();
Boolean check = true;
- if( check ){
+ if (check) {
try {
result = new ActionQueryPermissionReadDocument().execute(effectivePerson, id, null);
} catch (Exception e) {
result = new ActionResult<>();
- result.error( e );
- logger.error( e, effectivePerson, request, null);
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "列示文档数据.", action = ActionQueryListDocumentData.class)
+ @POST
+ @Path("list/document/data")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listDocumentData(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request, JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
+ ActionResult> result = new ActionResult<>();
+
+ try {
+ result = new ActionQueryListDocumentData().execute(request, effectivePerson, jsonElement);
+ } catch (Exception e) {
+ result.error(e);
+ logger.error(e, effectivePerson, request, jsonElement);
+ }
+
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "查看文档数据.", action = ActionQueryGetDocumentData.class)
+ @GET
+ @Path("{id}/document/data")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_getDocumentData(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson(request);
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+
+ if (check) {
+ try {
+ result = new ActionQueryGetDocumentData().execute(request, effectivePerson, id);
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error(e);
+ logger.error(e, effectivePerson, request, null);
}
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e6af091ac155571ea4fbc8b4d2ec9916955f92d
--- /dev/null
+++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java
@@ -0,0 +1,718 @@
+package com.x.cms.assemble.control.jaxrs.document;
+
+import com.google.gson.JsonElement;
+import com.x.base.core.project.annotation.JaxrsDescribe;
+import com.x.base.core.project.annotation.JaxrsMethodDescribe;
+import com.x.base.core.project.annotation.JaxrsParameterDescribe;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.http.HttpMediaType;
+import com.x.base.core.project.jaxrs.ResponseFactory;
+import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.cms.assemble.control.queue.DataImportStatus;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+@Path("document")
+@JaxrsDescribe("信息发布信息文档管理")
+public class DocumentAction2 extends StandardJaxrsAction{
+
+ private static Logger logger = LoggerFactory.getLogger( DocumentAction2.class );
+
+ @JaxrsMethodDescribe(value = "变更指定文档的分类信息.", action = ActionPersistChangeCategory.class)
+ @PUT
+ @Path("category/change")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_changeCategory( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionPersistChangeCategory().execute( request, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "指修改指定文档的数据。", action = ActionPersistBatchModifyData.class)
+ @PUT
+ @Path("batch/data/modify")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_batchDataModify( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+ if( check ){
+ try {
+ result = new ActionPersistBatchModifyData().execute( request, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据导入批次号查询导入状态信息.", action = ActionQueryImportStatusWithName.class)
+ @GET
+ @Path("batch/{batchName}/status")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_checkImportStatus( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("导入批次号") @PathParam("batchName") String batchName) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionQueryImportStatusWithName().execute( request, effectivePerson, batchName );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "查询所有的导入状态信息.", action = ActionQueryAllImportStatus.class)
+ @GET
+ @Path("batch/status")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_checkAllImportStatus( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult> result = new ActionResult<>();
+ try {
+ result = new ActionQueryAllImportStatus().execute( request, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据ID获取信息发布文档信息对象详细信息，包括附件列表，数据信息.", action = ActionQueryGetDocument.class)
+ @GET
+ @Path("{id}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_get( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionQueryGetDocument().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "列示文档对象可供排序和展示使用的列名.", action = ActionQueryListDocumentFields.class)
+ @GET
+ @Path("document/fields")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listDocumentFields( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionQueryListDocumentFields().execute( request );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+
+ @JaxrsMethodDescribe(value = "根据ID访问信息发布文档信息对象详细信息，包括附件列表，数据信息.", action = ActionQueryViewDocument.class)
+ @GET
+ @Path("{id}/view")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_view( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionQueryViewDocument().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据ID获取信息发布文档信息被访问次数.", action = ActionQueryCountViewTimes.class)
+ @GET
+ @Path("{id}/view/count")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_getViewCount( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionQueryCountViewTimes().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "查询符合过滤条件的已发布的信息数量.", action = ActionQueryCountWithFilter.class)
+ @PUT
+ @Path("filter/count")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_countDocumentWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionQueryCountWithFilter().execute( request, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据ID删除信息发布文档信息.", action = ActionPersistDeleteDocument.class)
+ @DELETE
+ @Path("{id}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_delete( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionPersistDeleteDocument().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据批次号删除信息发布文档信息.", action = ActionPersistDeleteWithBatch.class)
+ @DELETE
+ @Path("batch/{batchId}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_deleteWithBatchName( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("batchId") String batchId) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionPersistDeleteWithBatch().execute( request, batchId, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据ID归档信息发布文档信息.", action = ActionPersistArchive.class)
+ @GET
+ @Path("achive/{id}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_achive( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionPersistArchive().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据文档ID正式发布文档，并且使用Message通知所有的阅读者。", action = ActionPersistPublishAndNotify.class)
+ @PUT
+ @Path("publish/{id}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_publishAndNotify( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("文档ID") @PathParam("id") String id, JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionPersistPublishAndNotify().execute( request, id, effectivePerson, jsonElement );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "直接发布信息内容，创建新的信息发布文档并且直接发布.", action = ActionPersistPublishContent.class)
+ @PUT
+ @Path("publish/content")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_publishContent( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ System.out.println( "please wait, system try to publish content......" );
+ try {
+ result = new ActionPersistPublishContent().execute( request, jsonElement, effectivePerson );
+ System.out.println( "system publish content successful!" );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据ID取消信息内容发布状态，修改为草稿.", action = ActionPersistPublishCancel.class)
+ @PUT
+ @Path("publish/{id}/cancel")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_publishCancel( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ try {
+ result = new ActionPersistPublishCancel().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "列示符合过滤条件的已发布的信息内容, 下一页.", action = ActionQueryListNextWithFilter.class)
+ @PUT
+ @Path("filter/list/{id}/next/{count}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listNextWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
+ @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count,
+ JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult> result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionQueryListNextWithFilter().execute( request, id, count, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "列示符合过滤条件的已发布的信息内容, 上一页.", action = ActionQueryListPrevWithFilter.class)
+ @PUT
+ @Path("filter/list/{id}/prev/{count}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listPrevWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
+ @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count,
+ JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult> result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionQueryListPrevWithFilter().execute( request, id, count, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "列示符合过滤条件的草稿信息内容, 下一页.", action = ActionQueryListDraftNextWithFilter.class)
+ @PUT
+ @Path("draft/list/{id}/next/{count}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listDraftNextWithFilter( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("最后一条信息ID，如果是第一页，则可以用(0)代替") @PathParam("id") String id,
+ @JaxrsParameterDescribe("每页显示的条目数量") @PathParam("count") Integer count,
+ JsonElement jsonElement) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult> result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionQueryListDraftNextWithFilter().execute( request, id, count, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据信息发布文档ID查询文档第一张图片信息列表.", action = ActionQueryGetFirstPicture.class)
+ @GET
+ @Path("pictures/{id}/first")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listFirstPictures( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+ if( check ){
+ try {
+ result = new ActionQueryGetFirstPicture().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "根据信息发布文档ID查询文档所有的图片信息列表.", action = ActionQueryListAllPictures.class)
+ @GET
+ @Path("pictures/{id}/all")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void query_listAllPictures( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult> result = new ActionResult<>();
+ Boolean check = true;
+ if( check ){
+ try {
+ result = new ActionQueryListAllPictures().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "从Excel文件导入文档数据.", action = ActionPersistImportDataExcel.class)
+ @POST
+ @Path("import/category/{categoryId}")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ public void persist_importDocumentFormExcel(@Suspended final AsyncResponse asyncResponse,
+ @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("分类ID") @PathParam("categoryId") String categoryId,
+ @JaxrsParameterDescribe("作为参数的JSON字符串") @FormDataParam("json_data") String json_data,
+ @FormDataParam(FILE_FIELD) final byte[] bytes,
+ @FormDataParam(FILE_FIELD) final FormDataContentDisposition disposition) {
+ ActionResult result = new ActionResult<>();
+ EffectivePerson effectivePerson = this.effectivePerson(request);
+ try {
+ result = new ActionPersistImportDataExcel().execute(request, effectivePerson, categoryId, bytes, json_data, disposition);
+ } catch (Exception e) {
+ logger.error(e, effectivePerson, request, null);
+ result.error(e);
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "保存信息发布文档信息对象.", action = ActionPersistSaveDocument.class)
+ @POST
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_save( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+
+ if( check ){
+ try {
+ result = new ActionPersistSaveDocument().execute( request, jsonElement, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "文档点赞.", action = ActionPersistCommend.class)
+ @GET
+ @Path("{id}/commend")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_commend( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+ if( check ){
+ try {
+ result = new ActionPersistCommend().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "取消文档点赞.", action = ActionPersistUnCommend.class)
+ @GET
+ @Path("{id}/uncommend")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_unCommend( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+ if( check ){
+ try {
+ result = new ActionPersistUnCommend().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "文档置顶.", action = ActionPersistTopDocument.class)
+ @GET
+ @Path("{id}/top")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_top( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult result = new ActionResult<>();
+ Boolean check = true;
+ if( check ){
+ try {
+ result = new ActionPersistTopDocument().execute( request, id, effectivePerson );
+ } catch (Exception e) {
+ result = new ActionResult<>();
+ result.error( e );
+ logger.error( e, effectivePerson, request, null);
+ }
+ }
+ asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+ }
+
+ @JaxrsMethodDescribe(value = "取消文档置顶.", action = ActionPersistUnTopDocument.class)
+ @GET
+ @Path("{id}/unTop")
+ @Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void persist_unTop( @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+ @JaxrsParameterDescribe("信息文档ID") @PathParam("id") String id ) {
+ EffectivePerson effectivePerson = this.effectivePerson( request );
+ ActionResult