From 466b323114e34d2df7205303852696c6261d0910 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 13 Dec 2018 22:31:02 +0800 Subject: [PATCH] update --- modules/core/src/main/resources/config/jeesite-core.yml | 6 +++--- .../main/resources/i18n/core/common/i18n_zh_CN.properties | 2 +- modules/core/src/main/resources/jta.properties | 1 + web/src/main/resources/config/application.yml | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 3e8866af..da382f7a 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -100,11 +100,11 @@ user: # 系统管理员角色编号（客户方管理员使用的角色） corpAdminRoleCode: corpAdmin - # 用户类型配置信息（employee员工，member会员，btype往来单位，persion个人，expert专家，...） - # JSON格式说明：{"用户类型":{"dao":"Dao的Bean名称","loginView":"登录视图","indexView":"主页框架面视图"}} + # 用户类型配置信息（employee员工，member会员，btype往来单位，persion个人，expert专家，...），JSON 格式说明如下： + # {"用户类型":{"dao":"Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}} userTypeMap: > { - "employee":{"dao":"employeeDao","loginView":"","indexView":""}, + "employee":{"dao":"employeeDao","loginView":"","indexView":"modules/sys/sysIndex"}, "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"}, "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"}, "persion":{"dao":"persionDao","loginView":"","indexView":"modules/sys/sysIndexPersion"}, diff --git a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties index f84d3b4f..c3440dfa 100644 --- a/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties +++ b/modules/core/src/main/resources/i18n/core/common/i18n_zh_CN.properties @@ -60,7 +60,7 @@ sys.error.returnButton=返回上一页 # =========== 文件上传相关 =========== -sys.file.uploadFileIsEmpty=没有需要上传的文件！ +sys.file.uploadFileIsEmpty=没有找到上传的文件！ sys.file.uploadValidNotBlank=文件校验码和文件名不能为空！ sys.file.uploadValidImage=只能上传图片（{0}） sys.file.uploadValidVideo=只能上传视频（{0}） diff --git a/modules/core/src/main/resources/jta.properties b/modules/core/src/main/resources/jta.properties index 8c397fb6..4009aaa8 100644 --- a/modules/core/src/main/resources/jta.properties +++ b/modules/core/src/main/resources/jta.properties @@ -2,6 +2,7 @@ com.atomikos.icatch.service=com.atomikos.icatch.standalone.UserTransactionServiceFactory com.atomikos.icatch.max_actives=-1 com.atomikos.icatch.enable_logging=false +com.atomikos.icatch.registered=true # 提示 oracle.jdbc.xa.OracleXAResource.recover 错误需要授权： #grant select on sys.dba_pending_transactions to jeesite; diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 9e7ffd42..f77751a9 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -200,11 +200,11 @@ logging: # # 系统管理员角色编号（客户方管理员使用的角色） # corpAdminRoleCode: corpAdmin # -# # 用户类型配置信息（employee员工，member会员，btype往来单位，persion个人，expert专家，...） -# # JSON格式说明：{"用户类型":{"dao":"Dao的Bean名称","loginView":"登录视图","indexView":"主页框架面视图"}} +# # 用户类型配置信息（employee员工，member会员，btype往来单位，persion个人，expert专家，...），JSON 格式说明如下： +# # {"用户类型":{"dao":"Dao的Bean名称","loginView":"登录页面视图","indexView":"主框架页面视图，支持 redirect: 前缀"}} # userTypeMap: > # { -# "employee":{"dao":"employeeDao","loginView":"","indexView":""}, +# "employee":{"dao":"employeeDao","loginView":"","indexView":"modules/sys/sysIndex"}, # "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"}, # "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"}, # "persion":{"dao":"persionDao","loginView":"","indexView":"modules/sys/sysIndexPersion"},