Skip to content

o2oa
o2oa

fuyue82 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 2a2b146b 编写于 作者: NoSubject's avatar NoSubject
浏览文件
操作

Merge branch 'wrdp' into 'develop' 

Wrdp

See merge request o2oa/o2oa!3493
上级 5cc15a9a c6c5a690
展开全部 隐藏空白更改
内联 并排
Showing with 1123 addition and 916 deletion
o2server/commons/language/platform.properties
浏览文件 @ 2a2b146b
com.x.base.core.project.exception.ExceptionAccessDenied=\u7528\u6237:{} \u6743\u9650\u4E0D\u8DB3.
com.x.base.core.project.exception.ExceptionAccessDenied_1=\u7528\u6237:{} \u8BBF\u95EE\u5BF9\u8C61 class:{}, id:{}, \u6743\u9650\u4E0D\u8DB3.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist=\u7528\u6237:{} \u6743\u9650\u4E0D\u8DB3\u6216\u8005\u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist_1=\u7528\u6237:{} \u6743\u9650\u4E0D\u8DB3\u6216\u8005\u5BF9\u8C61\u4E0D\u5B58\u5728, {}.
com.x.base.core.project.exception.ExceptionEntityNotExist=\u6807\u8BC6\u4E3A:{} \u7684 {} \u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionEntityNotExist_1=\u6807\u8BC6\u4E3A:{} \u7684\u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionEntityNotExist_2=\u7C7B\u578B\u4E3A: {} \u7684\u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionAccessDenied=用户:{} 权限不足.
com.x.base.core.project.exception.ExceptionAccessDenied_1=用户:{} 访问对象 class:{}, id:{}, 权限不足.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist=用户:{} 权限不足或者对象不存在.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist_1=用户:{} 权限不足或者对象不存在, {}.
com.x.base.core.project.exception.ExceptionCollectConnectError=云服务器连接错误.
com.x.base.core.project.exception.ExceptionCollectDisable=禁用云服务.
com.x.base.core.project.exception.ExceptionCollectValidateFailure=云服务器认证失败.
com.x.base.core.project.exception.ExceptionDuplicateFlag=实体类:{}, 标识:{}, 与已有值重复.
com.x.base.core.project.exception.ExceptionDuplicateRestrictFlag=实体类:{}, 标识:{}, 与指定类型下的已有值重复.
com.x.base.core.project.exception.ExceptionEntityFieldEmpty=实体类: {} , 字段: {} 值无效.
com.x.base.core.project.exception.ExceptionEntityNotExist=标识为:{} 的 {} 对象不存在.
com.x.base.core.project.exception.ExceptionEntityNotExist_1=标识为:{} 的对象不存在.
com.x.base.core.project.exception.ExceptionEntityNotExist_2=类型为: {} 的对象不存在.
com.x.base.core.project.exception.ExceptionPersonNotExist=用户不存在:{}.
com.x.base.core.project.exception.ExceptionUnsupportedMediaType=不支持的文件类型:{}.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionCaptchaEmpty=图片验证码不能为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionCodeEmpty=短信验证码不可为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionCredentialEmpty=用户名不能为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionDisableCollect=系统没有启用节点连接.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionFailureLocked=用户:{} 已经被锁定, 锁定时间 {} 分钟.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidCaptcha=图片验证码错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidCode=手机验证码错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidIpAddress=客户端IP限制，当前IP：{}.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidPassword=用户名,密码不正确.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthBindDisable=绑定已经禁用.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyAccessToken=无法获取访问令牌.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyCredential=无法获取用户凭证.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyInfo=请求信息返回值为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyToken=请求令牌返回值为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthNotExist=无法找到名为:{} 的OauthClient登录配置.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionPasswordEmpty=密码不能为空或者密码解密错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionPersonNotExistOrInvalidPassword=用户不存在或者密码错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionPersonNotLogin=用户未登录.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionClientEmpty=sso配置client不能为空.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionClientNotExist={} sso 配置不存在.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionEmptyCredential=名称为空.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionEmptyKey=sso 配置token不能为空.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionEmptyToken=sso 没有提供解码令牌.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionReadToken=无效token, client:{}, token:{}.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionTokenExpired=token超时.
com.x.organization.assemble.control.jaxrs.export.ExceptionResultNotFound=找不到导入结果:{}.
com.x.organization.assemble.control.jaxrs.group.ExceptionDenyCreateGroup={} 不能创建群组:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.group.ExceptionDenyDeleteGroup={}不能删除群组:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.group.ExceptionDenyEditGroup={}不能编辑群组:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.group.ExceptionDuplicateUnique=群组 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.group.ExceptionGroupNotExist=群组: {} 不存在.
com.x.organization.assemble.control.jaxrs.group.ExceptionNameEmpty=群组名称不能为空.
com.x.organization.assemble.control.jaxrs.group.ExceptionPersonNotExist=个人: {} 不存在.
com.x.organization.assemble.control.jaxrs.group.ExceptionRoleNotExist=角色: {} 不存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionDuplicateUnique=身份 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.identity.ExceptionExistInUnit=人员:{}, 在组织:{} 中的身份已存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionIdentityNotExist=身份:{}, 不存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionNameEmpty=身份名称不能为空.
com.x.organization.assemble.control.jaxrs.identity.ExceptionPersonNotExist=人员:{}, 不存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionSameNotOrder=无法对同一个身份进行排序:{}, :{}.
com.x.organization.assemble.control.jaxrs.identity.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.permissionsetting.ExceptionPersonCardNotExist=通讯录设置配置, 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyChangeInitialManagerPassword=请通过控制台修改初始管理员密码.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyDeleteInitialManager=不能删除初始管理员.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyEditPerson={} 不能编辑个人:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyResetInitialManagerPassword=无法重置初始管理员密码.
com.x.organization.assemble.control.jaxrs.person.ExceptionEmployeeDuplicate=用户员工号错误:{}, {}已有值重复.
com.x.organization.assemble.control.jaxrs.person.ExceptionGroupNotExist=群组: {} 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidMail=邮件地址错误:不符合格式要求:{}.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidName=用户名错误,不能为空,不能使用保留字串,且不能使用特殊字符:{}.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.control.jaxrs.person.ExceptionMobileDuplicate=手机号错误:{}, {}已有值重复.
com.x.organization.assemble.control.jaxrs.person.ExceptionPasswordEmpty=密码不能为空.
com.x.organization.assemble.control.jaxrs.person.ExceptionRoleNotExist=角色: {} 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionSuperiorNotExist=指定的上级住主管: {} 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionUniqueDuplicate=用户唯一编码错误:{}, {}已有值重复.
com.x.organization.assemble.control.jaxrs.person.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionDenyEditPerson={} 不能编辑个人:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionDuplicateUnique=个人属性 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionNameEmpty=个人属性名称不能为空.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionNameExistWithPerson={} 已有名为: {} 的属性.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionPersonAttributeNotExist=个人属性: {} 不存在.
com.x.organization.assemble.control.jaxrs.personcard.ExceptionNameEmpty=姓名不能为空.
com.x.organization.assemble.control.jaxrs.personcard.ExceptionPersonCardNotExist=个人名片:{}, 不存在.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyCreateRole={} 不能创建角色:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyDeleteDefaultRole=不能删除系统默认角色:{}.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyDeleteRole={} 不能删除角色:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyEditRole={} 不能编辑角色:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.role.ExceptionDuplicateUnique=角色 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.role.ExceptionGroupNotExist=群组:{}, 不存在.
com.x.organization.assemble.control.jaxrs.role.ExceptionNameEmpty=角色名称不能为空.
com.x.organization.assemble.control.jaxrs.role.ExceptionRoleNotExist=角色:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionDenyEditUnit={} 不能编辑组织:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.unit.ExceptionDuplicateUnique=组织 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.unit.ExceptionIdentityNotExist=身份:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionNameEmpty=组织名称不能为空.
com.x.organization.assemble.control.jaxrs.unit.ExceptionNameInvalid=组织 {} 名称不符合要求.
com.x.organization.assemble.control.jaxrs.unit.ExceptionSuperiorNotExist=组织:{}, 的上级组织: {}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionUnitNotExistOrNotUniqueUnitId=组织:{}, 不存在，或者组织uuid不唯一.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionDenyEditUnit={} 不能编辑组织:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionDuplicateOnUnit=组织属性名称 {} 在同一个组织 {} 中必须唯一.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionDuplicateUnique=组织属性 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionNameEmpty=组织属性名称不能为空.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionUnitAttributeNotExist=组织属性:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionDenyEditUnit={} 不能编辑组织:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionDuplicateOnUnit=组织职务名称 {} 在同一个组织 {} 中必须唯一.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionDuplicateUnique=组织职务 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionIdentityNotExist=身份:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionNameEmpty=组织职务名称不能为空.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionUnitDutyNotExist=组织职务:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionEmptyFromIdentity=委托身份为空.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionEmptyToIdentity=被委托身份为空.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionPersonNotExistWithIdentity=无法定位 {} 的人员.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeAllExist=身份 {} 的全局设置已经存在.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeApplicationExist=身份 {} 在指定应用 {} 的授权已经存在.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeFilter=身份 {} 在指定的过滤条件授权错误.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeProcessExist=身份 {} 在指定的流程 {} 的授权已经存在.
com.x.organization.assemble.personal.jaxrs.exmail.ExceptionExmailDisable=没有启用腾讯企业邮.
com.x.organization.assemble.personal.jaxrs.exmail.ExceptionNewCount=获取新邮件数量失败:{}.
com.x.organization.assemble.personal.jaxrs.password.ConfirmPasswordEmptyException=确认密码不能为空.
com.x.organization.assemble.personal.jaxrs.password.ExceptionEditInitialManagerDeny=不能更新初始管理员.
com.x.organization.assemble.personal.jaxrs.password.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.personal.jaxrs.password.ExceptionNewPasswordEmpty=新密码不能为空.
com.x.organization.assemble.personal.jaxrs.password.ExceptionNewPasswordSameAsOldPassword=新密码不能和旧密码相同.
com.x.organization.assemble.personal.jaxrs.password.ExceptionOldPasswordEmpty=原密码不能为空.
com.x.organization.assemble.personal.jaxrs.password.ExceptionOldPasswordNotMatch=原密码错误.
com.x.organization.assemble.personal.jaxrs.password.ExceptionTwicePasswordNotMatch=两次输入的新密码不匹配.
com.x.organization.assemble.personal.jaxrs.person.ExceptionConfirmPasswordEmpty=确认密码不能为空.
com.x.organization.assemble.personal.jaxrs.person.ExceptionEditInitialManagerDeny=不能更新初始管理员.
com.x.organization.assemble.personal.jaxrs.person.ExceptionEmployeeDuplicate=用户名错误:{}, {}已有值重复.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidEmployee=员工号不能为空,且不能使用特殊字符:{}.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidMail=邮件地址错误:不符合格式要求:{}.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidName=用户名错误,不能为空,不能使用保留字串,且不能使用特殊字符:{}.
com.x.organization.assemble.personal.jaxrs.person.ExceptionMobileDuplicate=手机号错误:{}，{}已有值重复
com.x.organization.assemble.personal.jaxrs.person.ExceptionNewPasswordEmpty=新密码不能为空.
com.x.organization.assemble.personal.jaxrs.person.ExceptionNewPasswordSameAsOldPassword=新密码不能和旧密码相同.
com.x.organization.assemble.personal.jaxrs.person.ExceptionOldPasswordEmpty=原密码不能为空.
com.x.organization.assemble.personal.jaxrs.person.ExceptionOldPasswordNotMatch=原密码错误.
com.x.organization.assemble.personal.jaxrs.person.ExceptionTwicePasswordNotMatch=两次输入的新密码不匹配.
com.x.organization.assemble.personal.jaxrs.person.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableCaptcha=系统不允许通过图片验证码注册人员.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableCode=系统不允许通过手机验证注册人员.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableCollect=系统没有启用节点连接,无法发送短信.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableRegist=系统不允许人员注册.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidCaptcha=图片验证码错误.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidCode=手机验证码错误.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidGenderType=性别不可为空.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidName=用户名错误,不能空,且不能使用特殊字符:{}.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionMobileExist=手机:{}已注册.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionNameExist=用户:{}已注册.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionCodeEmpty=短信验证码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionConfirmPasswordEmpty=确认密码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionCredentialEmpty=用户标识不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionDisableCollect=系统没有启用节点连接.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionEditInitialManagerDeny=不能更新初始管理员.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidCode=手机验证码错误.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionNewPasswordSameAsOldPassword=新密码不能和旧密码相同.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionOldPasswordEmpty=原密码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionOldPasswordNotMatch=原密码错误.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionPasswordEmpty=密码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionTwicePasswordNotMatch=两次输入的新密码不匹配.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionUserNameEmpty=用户名不能为空.
o2server/commons/language/platform_zh_CN.properties
浏览文件 @ 2a2b146b
com.x.base.core.project.exception.ExceptionAccessDenied=\u7528\u6237:{} \u6743\u9650\u4E0D\u8DB3.
com.x.base.core.project.exception.ExceptionAccessDenied_1=\u7528\u6237:{} \u8BBF\u95EE\u5BF9\u8C61 class:{}, id:{}, \u6743\u9650\u4E0D\u8DB3.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist=\u7528\u6237:{} \u6743\u9650\u4E0D\u8DB3\u6216\u8005\u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist_1=\u7528\u6237:{} \u6743\u9650\u4E0D\u8DB3\u6216\u8005\u5BF9\u8C61\u4E0D\u5B58\u5728, {}.
com.x.base.core.project.exception.ExceptionEntityNotExist=\u6807\u8BC6\u4E3A:{} \u7684 {} \u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionEntityNotExist_1=\u6807\u8BC6\u4E3A:{} \u7684\u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionEntityNotExist_2=\u7C7B\u578B\u4E3A: {} \u7684\u5BF9\u8C61\u4E0D\u5B58\u5728.
com.x.base.core.project.exception.ExceptionAccessDenied=用户:{} 权限不足.
com.x.base.core.project.exception.ExceptionAccessDenied_1=用户:{} 访问对象 class:{}, id:{}, 权限不足.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist=用户:{} 权限不足或者对象不存在.
com.x.base.core.project.exception.ExceptionAccessDeniedOrEntityNotExist_1=用户:{} 权限不足或者对象不存在, {}.
com.x.base.core.project.exception.ExceptionCollectConnectError=云服务器连接错误.
com.x.base.core.project.exception.ExceptionCollectDisable=禁用云服务.
com.x.base.core.project.exception.ExceptionCollectValidateFailure=云服务器认证失败.
com.x.base.core.project.exception.ExceptionDuplicateFlag=实体类:{}, 标识:{}, 与已有值重复.
com.x.base.core.project.exception.ExceptionDuplicateRestrictFlag=实体类:{}, 标识:{}, 与指定类型下的已有值重复.
com.x.base.core.project.exception.ExceptionEntityFieldEmpty=实体类: {} , 字段: {} 值无效.
com.x.base.core.project.exception.ExceptionEntityNotExist=标识为:{} 的 {} 对象不存在.
com.x.base.core.project.exception.ExceptionEntityNotExist_1=标识为:{} 的对象不存在.
com.x.base.core.project.exception.ExceptionEntityNotExist_2=类型为: {} 的对象不存在.
com.x.base.core.project.exception.ExceptionPersonNotExist=用户不存在:{}.
com.x.base.core.project.exception.ExceptionUnsupportedMediaType=不支持的文件类型:{}.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionCaptchaEmpty=图片验证码不能为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionCodeEmpty=短信验证码不可为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionCredentialEmpty=用户名不能为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionDisableCollect=系统没有启用节点连接.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionFailureLocked=用户:{} 已经被锁定, 锁定时间 {} 分钟.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidCaptcha=图片验证码错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidCode=手机验证码错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidIpAddress=客户端IP限制，当前IP：{}.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionInvalidPassword=用户名,密码不正确.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthBindDisable=绑定已经禁用.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyAccessToken=无法获取访问令牌.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyCredential=无法获取用户凭证.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyInfo=请求信息返回值为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthEmptyToken=请求令牌返回值为空.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionOauthNotExist=无法找到名为:{} 的OauthClient登录配置.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionPasswordEmpty=密码不能为空或者密码解密错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionPersonNotExistOrInvalidPassword=用户不存在或者密码错误.
com.x.organization.assemble.authentication.jaxrs.authentication.ExceptionPersonNotLogin=用户未登录.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionClientEmpty=sso配置client不能为空.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionClientNotExist={} sso 配置不存在.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionEmptyCredential=名称为空.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionEmptyKey=sso 配置token不能为空.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionEmptyToken=sso 没有提供解码令牌.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionReadToken=无效token, client:{}, token:{}.
com.x.organization.assemble.authentication.jaxrs.sso.ExceptionTokenExpired=token超时.
com.x.organization.assemble.control.jaxrs.export.ExceptionResultNotFound=找不到导入结果:{}.
com.x.organization.assemble.control.jaxrs.group.ExceptionDenyCreateGroup={} 不能创建群组:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.group.ExceptionDenyDeleteGroup={}不能删除群组:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.group.ExceptionDenyEditGroup={}不能编辑群组:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.group.ExceptionDuplicateUnique=群组 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.group.ExceptionGroupNotExist=群组: {} 不存在.
com.x.organization.assemble.control.jaxrs.group.ExceptionNameEmpty=群组名称不能为空.
com.x.organization.assemble.control.jaxrs.group.ExceptionPersonNotExist=个人: {} 不存在.
com.x.organization.assemble.control.jaxrs.group.ExceptionRoleNotExist=角色: {} 不存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionDuplicateUnique=身份 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.identity.ExceptionExistInUnit=人员:{}, 在组织:{} 中的身份已存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionIdentityNotExist=身份:{}, 不存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionNameEmpty=身份名称不能为空.
com.x.organization.assemble.control.jaxrs.identity.ExceptionPersonNotExist=人员:{}, 不存在.
com.x.organization.assemble.control.jaxrs.identity.ExceptionSameNotOrder=无法对同一个身份进行排序:{}, :{}.
com.x.organization.assemble.control.jaxrs.identity.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.permissionsetting.ExceptionPersonCardNotExist=通讯录设置配置, 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyChangeInitialManagerPassword=请通过控制台修改初始管理员密码.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyDeleteInitialManager=不能删除初始管理员.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyEditPerson={} 不能编辑个人:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.person.ExceptionDenyResetInitialManagerPassword=无法重置初始管理员密码.
com.x.organization.assemble.control.jaxrs.person.ExceptionEmployeeDuplicate=用户员工号错误:{}, {}已有值重复.
com.x.organization.assemble.control.jaxrs.person.ExceptionGroupNotExist=群组: {} 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidMail=邮件地址错误:不符合格式要求:{}.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidName=用户名错误,不能为空,不能使用保留字串,且不能使用特殊字符:{}.
com.x.organization.assemble.control.jaxrs.person.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.control.jaxrs.person.ExceptionMobileDuplicate=手机号错误:{}, {}已有值重复.
com.x.organization.assemble.control.jaxrs.person.ExceptionPasswordEmpty=密码不能为空.
com.x.organization.assemble.control.jaxrs.person.ExceptionRoleNotExist=角色: {} 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionSuperiorNotExist=指定的上级住主管: {} 不存在.
com.x.organization.assemble.control.jaxrs.person.ExceptionUniqueDuplicate=用户唯一编码错误:{}, {}已有值重复.
com.x.organization.assemble.control.jaxrs.person.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionDenyEditPerson={} 不能编辑个人:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionDuplicateUnique=个人属性 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionNameEmpty=个人属性名称不能为空.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionNameExistWithPerson={} 已有名为: {} 的属性.
com.x.organization.assemble.control.jaxrs.personattribute.ExceptionPersonAttributeNotExist=个人属性: {} 不存在.
com.x.organization.assemble.control.jaxrs.personcard.ExceptionNameEmpty=姓名不能为空.
com.x.organization.assemble.control.jaxrs.personcard.ExceptionPersonCardNotExist=个人名片:{}, 不存在.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyCreateRole={} 不能创建角色:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyDeleteDefaultRole=不能删除系统默认角色:{}.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyDeleteRole={} 不能删除角色:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.role.ExceptionDenyEditRole={} 不能编辑角色:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.role.ExceptionDuplicateUnique=角色 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.role.ExceptionGroupNotExist=群组:{}, 不存在.
com.x.organization.assemble.control.jaxrs.role.ExceptionNameEmpty=角色名称不能为空.
com.x.organization.assemble.control.jaxrs.role.ExceptionRoleNotExist=角色:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionDenyEditUnit={} 不能编辑组织:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.unit.ExceptionDuplicateUnique=组织 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.unit.ExceptionIdentityNotExist=身份:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionNameEmpty=组织名称不能为空.
com.x.organization.assemble.control.jaxrs.unit.ExceptionNameInvalid=组织 {} 名称不符合要求.
com.x.organization.assemble.control.jaxrs.unit.ExceptionSuperiorNotExist=组织:{}, 的上级组织: {}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unit.ExceptionUnitNotExistOrNotUniqueUnitId=组织:{}, 不存在，或者组织uuid不唯一.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionDenyEditUnit={} 不能编辑组织:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionDuplicateOnUnit=组织属性名称 {} 在同一个组织 {} 中必须唯一.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionDuplicateUnique=组织属性 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionNameEmpty=组织属性名称不能为空.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionUnitAttributeNotExist=组织属性:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitattribute.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionDenyEditUnit={} 不能编辑组织:{}, 权限不足.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionDuplicateOnUnit=组织职务名称 {} 在同一个组织 {} 中必须唯一.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionDuplicateUnique=组织职务 {} 的唯一标识:{},不能和已有的标识冲突.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionIdentityNotExist=身份:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionNameEmpty=组织职务名称不能为空.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionUnitDutyNotExist=组织职务:{}, 不存在.
com.x.organization.assemble.control.jaxrs.unitduty.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionEmptyFromIdentity=委托身份为空.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionEmptyToIdentity=被委托身份为空.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionPersonNotExistWithIdentity=无法定位 {} 的人员.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeAllExist=身份 {} 的全局设置已经存在.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeApplicationExist=身份 {} 在指定应用 {} 的授权已经存在.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeFilter=身份 {} 在指定的过滤条件授权错误.
com.x.organization.assemble.personal.jaxrs.empower.ExceptionTypeProcessExist=身份 {} 在指定的流程 {} 的授权已经存在.
com.x.organization.assemble.personal.jaxrs.exmail.ExceptionExmailDisable=没有启用腾讯企业邮.
com.x.organization.assemble.personal.jaxrs.exmail.ExceptionNewCount=获取新邮件数量失败:{}.
com.x.organization.assemble.personal.jaxrs.password.ConfirmPasswordEmptyException=确认密码不能为空.
com.x.organization.assemble.personal.jaxrs.password.ExceptionEditInitialManagerDeny=不能更新初始管理员.
com.x.organization.assemble.personal.jaxrs.password.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.personal.jaxrs.password.ExceptionNewPasswordEmpty=新密码不能为空.
com.x.organization.assemble.personal.jaxrs.password.ExceptionNewPasswordSameAsOldPassword=新密码不能和旧密码相同.
com.x.organization.assemble.personal.jaxrs.password.ExceptionOldPasswordEmpty=原密码不能为空.
com.x.organization.assemble.personal.jaxrs.password.ExceptionOldPasswordNotMatch=原密码错误.
com.x.organization.assemble.personal.jaxrs.password.ExceptionTwicePasswordNotMatch=两次输入的新密码不匹配.
com.x.organization.assemble.personal.jaxrs.person.ExceptionConfirmPasswordEmpty=确认密码不能为空.
com.x.organization.assemble.personal.jaxrs.person.ExceptionEditInitialManagerDeny=不能更新初始管理员.
com.x.organization.assemble.personal.jaxrs.person.ExceptionEmployeeDuplicate=用户名错误:{}, {}已有值重复.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidEmployee=员工号不能为空,且不能使用特殊字符:{}.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidMail=邮件地址错误:不符合格式要求:{}.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.personal.jaxrs.person.ExceptionInvalidName=用户名错误,不能为空,不能使用保留字串,且不能使用特殊字符:{}.
com.x.organization.assemble.personal.jaxrs.person.ExceptionMobileDuplicate=手机号错误:{}，{}已有值重复
com.x.organization.assemble.personal.jaxrs.person.ExceptionNewPasswordEmpty=新密码不能为空.
com.x.organization.assemble.personal.jaxrs.person.ExceptionNewPasswordSameAsOldPassword=新密码不能和旧密码相同.
com.x.organization.assemble.personal.jaxrs.person.ExceptionOldPasswordEmpty=原密码不能为空.
com.x.organization.assemble.personal.jaxrs.person.ExceptionOldPasswordNotMatch=原密码错误.
com.x.organization.assemble.personal.jaxrs.person.ExceptionTwicePasswordNotMatch=两次输入的新密码不匹配.
com.x.organization.assemble.personal.jaxrs.person.ExceptionUnitNotExist=组织:{}, 不存在.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableCaptcha=系统不允许通过图片验证码注册人员.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableCode=系统不允许通过手机验证注册人员.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableCollect=系统没有启用节点连接,无法发送短信.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionDisableRegist=系统不允许人员注册.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidCaptcha=图片验证码错误.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidCode=手机验证码错误.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidGenderType=性别不可为空.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidName=用户名错误,不能空,且不能使用特殊字符:{}.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionMobileExist=手机:{}已注册.
com.x.organization.assemble.personal.jaxrs.regist.ExceptionNameExist=用户:{}已注册.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionCodeEmpty=短信验证码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionConfirmPasswordEmpty=确认密码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionCredentialEmpty=用户标识不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionDisableCollect=系统没有启用节点连接.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionEditInitialManagerDeny=不能更新初始管理员.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidCode=手机验证码错误.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidMobile=手机号 {} 错误,不能为空,且必须符合指定格式.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionInvalidPassword=不符合密码规则:{}.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionNewPasswordSameAsOldPassword=新密码不能和旧密码相同.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionOldPasswordEmpty=原密码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionOldPasswordNotMatch=原密码错误.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionPasswordEmpty=密码不能为空.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionTwicePasswordNotMatch=两次输入的新密码不匹配.
com.x.organization.assemble.personal.jaxrs.reset.ExceptionUserNameEmpty=用户名不能为空.
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Person.java
浏览文件 @ 2a2b146b
......@@ -45,7 +45,7 @@ public class Person extends ConfigObject {
public static final String DEFAULT_PASSWORDREGEX = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,}$";
public static final String DEFAULT_PASSWORDREGEXHINT = "6位以上,包含数字和字母.";
public static final String DEFAULT_LANGUAGE = "zh_CN";
public static final String DEFAULT_LANGUAGE = "zh-CN";
public Person() {
this.captchaLogin = DEFAULT_CAPTCHALOGIN;
......@@ -120,7 +120,7 @@ public class Person extends ConfigObject {
@FieldDescribe("人员组织排序是否为升序，true为升序(默认)，false为降序")
private Boolean personUnitOrderByAsc;
@FieldDescribe("平台语言：zh_CN(中文，默认)、en(英语)")
@FieldDescribe("平台语言：zh-CN(中文，默认)、en(英语)")
private String language;
public Boolean getTokenCookieHttpOnly() {
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionCollectConnectError.java
浏览文件 @ 2a2b146b
package com.x.base.core.project.exception;
public class ExceptionCollectConnectError extends PromptException {
public class ExceptionCollectConnectError extends LanguagePromptException {
private static final long serialVersionUID = 7551134321893884285L;
public static String defaultMessage = "云服务器连接错误.";
public ExceptionCollectConnectError() {
super("云服务器连接错误.");
super(defaultMessage);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionCollectDisable.java
浏览文件 @ 2a2b146b
package com.x.base.core.project.exception;
public class ExceptionCollectDisable extends PromptException {
public class ExceptionCollectDisable extends LanguagePromptException {
private static final long serialVersionUID = 7551134321893884285L;
public static String defaultMessage = "禁用云服务.";
public ExceptionCollectDisable() {
super("禁用云服务.");
super(defaultMessage);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionCollectValidateFailure.java
浏览文件 @ 2a2b146b
package com.x.base.core.project.exception;
public class ExceptionCollectValidateFailure extends PromptException {
public class ExceptionCollectValidateFailure extends LanguagePromptException {
private static final long serialVersionUID = 7551134321893884285L;
public static String defaultMessage = "云服务器认证失败.";
public ExceptionCollectValidateFailure() {
super("云服务器认证失败.");
super(defaultMessage);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionDuplicateFlag.java
浏览文件 @ 2a2b146b
......@@ -6,16 +6,18 @@ import org.apache.commons.lang3.StringUtils;
import com.x.base.core.entity.JpaObject;
public class ExceptionDuplicateFlag extends PromptException {
public class ExceptionDuplicateFlag extends LanguagePromptException {
private static final long serialVersionUID = 1051687204485351261L;
public static String defaultMessage = "实体类:{}, 标识:{}, 与已有值重复.";
public <T extends JpaObject> ExceptionDuplicateFlag(Class<T> cls, String value) {
super("实体类:{}, 标识:{}, 与已有值重复.", cls.getName(), value);
super(defaultMessage, cls.getName(), value);
}
public <T extends JpaObject> ExceptionDuplicateFlag(Class<T> cls, List<String> values) {
super("实体类:{}, 标识:{}, 与已有值重复.", cls.getName(), StringUtils.join(values, ","));
super(defaultMessage, cls.getName(), StringUtils.join(values, ","));
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionDuplicateRestrictFlag.java
浏览文件 @ 2a2b146b
......@@ -6,16 +6,18 @@ import org.apache.commons.lang3.StringUtils;
import com.x.base.core.entity.JpaObject;
public class ExceptionDuplicateRestrictFlag extends PromptException {
public class ExceptionDuplicateRestrictFlag extends LanguagePromptException {
private static final long serialVersionUID = 1051687204485351261L;
public static String defaultMessage = "实体类:{}, 标识:{}, 与指定类型下的已有值重复.";
public <T extends JpaObject> ExceptionDuplicateRestrictFlag(Class<T> cls, String value) {
super("实体类:{}, 标识:{}, 与指定类型下的已有值重复.", cls.getName(), value);
super(defaultMessage, cls.getName(), value);
}
public <T extends JpaObject> ExceptionDuplicateRestrictFlag(Class<T> cls, List<String> values) {
super("实体类:{}, 标识:{}, 与指定类型下的已有值重复.", cls.getName(), StringUtils.join(values, ","));
super(defaultMessage, cls.getName(), StringUtils.join(values, ","));
}
}
\ No newline at end of file
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionEntityFieldEmpty.java
浏览文件 @ 2a2b146b
......@@ -2,15 +2,14 @@ package com.x.base.core.project.exception;
import com.x.base.core.entity.JpaObject;
public class ExceptionEntityFieldEmpty extends PromptException {
public class ExceptionEntityFieldEmpty extends LanguagePromptException {
private static final long serialVersionUID = -5285504041469792111L;
public static String defaultMessage = "实体类: {} , 字段: {} 值无效.";
public <T extends JpaObject> ExceptionEntityFieldEmpty(Class<T> cls, String field) {
super("实体类: {} , 字段: {} 值无效.", cls.getName(), field);
super(defaultMessage, cls.getName(), field);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionPersonNotExist.java
浏览文件 @ 2a2b146b
package com.x.base.core.project.exception;
public class ExceptionPersonNotExist extends PromptException {
public class ExceptionPersonNotExist extends LanguagePromptException {
private static final long serialVersionUID = -7354813827434276962L;
public static String defaultMessage = "用户不存在:{}.";
public ExceptionPersonNotExist(String flag) {
super("指定的用户不存在:{}.", flag);
super(defaultMessage, flag);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionScriptEval.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.base.core.project.exception;
public class ExceptionScriptEval extends PromptException {
private static final long serialVersionUID = 7551134321893884285L;
public ExceptionScriptEval(Throwable cause, String message) {
super(cause, message);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionUnknowValue.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.base.core.project.exception;
public class ExceptionUnknowValue extends PromptException {
private static final long serialVersionUID = -7354813827434276962L;
public ExceptionUnknowValue(Object value) {
super("未知的值:{}.", value);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionUnsupportedMediaType.java
浏览文件 @ 2a2b146b
......@@ -2,12 +2,14 @@ package com.x.base.core.project.exception;
import com.x.base.core.entity.JpaObject;
public class ExceptionUnsupportedMediaType extends PromptException {
public class ExceptionUnsupportedMediaType extends LanguagePromptException {
private static final long serialVersionUID = 1051687204485351261L;
public static String defaultMessage = "不支持的文件类型:{}.";
public <T extends JpaObject> ExceptionUnsupportedMediaType(String type) {
super("不支持的文件类型:{}.",type);
super(defaultMessage,type);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/LanguageTools.java
浏览文件 @ 2a2b146b
......@@ -19,6 +19,29 @@ public class LanguageTools {
}
public static String getValue(String key, String locale) {
if(StringUtils.isBlank(key)){
return null;
}
if(StringUtils.isBlank(locale)){
try {
locale = Config.person().getLanguage();
} catch (Exception e) {
}
}
if(StringUtils.isNotBlank(locale)) {
locale = StringUtils.replace(locale, "-", "_");
}
String baseName = LANGUAGE_PLATFORM;
String[] keys = StringUtils.split(key,".");
if(keys.length>2){
if(!"base".equals(keys[2].toLowerCase())) {
baseName = "language." + keys[2].toLowerCase();
}
}
return getValue(baseName, key, locale);
}
public static String getValue(String baseName ,String key, String locale) {
String message = null;
if(StringUtils.isBlank(key)){
return null;
......@@ -31,26 +54,37 @@ public class LanguageTools {
} catch (Exception e) {
}
}
if(StringUtils.isNotBlank(locale)) {
locale = StringUtils.replace(locale, "-", "_");
}
if(StringUtils.isBlank(locale)){
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.getDefault());
resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault());
}else if("zh".equalsIgnoreCase(locale) || "zh_CN".equalsIgnoreCase(locale)) {
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.SIMPLIFIED_CHINESE);
resourceBundle = ResourceBundle.getBundle(baseName, Locale.SIMPLIFIED_CHINESE);
}else if(locale.toLowerCase().startsWith("en")) {
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.ENGLISH);
}else if("zh_HK".equalsIgnoreCase(locale) || "zh_TW".equalsIgnoreCase(locale)) {
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.TRADITIONAL_CHINESE);
}else{
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.getDefault());
resourceBundle = ResourceBundle.getBundle(baseName, Locale.ENGLISH);
}else {
String[] locals = StringUtils.split(locale, "_");
Locale locale1 = null;
if(locals.length>1){
locale1 = new Locale(locals[0].toLowerCase(), locals[1].toUpperCase());
}else{
locale1 = new Locale(locals[0].toLowerCase());
}
resourceBundle = ResourceBundle.getBundle(baseName, locale1);
}
if(resourceBundle == null){
resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault());
}
message = resourceBundle.getString(key);
} catch (Exception e) {
logger.print("LanguageTools resourceBundle error:"+e.getMessage());
return getValueFromBase(key, locale);
}
return message;
}
public static String getValue(String baseName ,String key, String locale) {
public static String getValueFromBase(String key, String locale) {
String message = null;
if(StringUtils.isBlank(key)){
return null;
......@@ -63,20 +97,28 @@ public class LanguageTools {
} catch (Exception e) {
}
}
if(StringUtils.isNotBlank(locale)) {
locale = StringUtils.replace(locale, "-", "_");
}
if(StringUtils.isBlank(locale)){
resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault());
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.getDefault());
}else if("zh".equalsIgnoreCase(locale) || "zh_CN".equalsIgnoreCase(locale)) {
resourceBundle = ResourceBundle.getBundle(baseName, Locale.SIMPLIFIED_CHINESE);
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.SIMPLIFIED_CHINESE);
}else if(locale.toLowerCase().startsWith("en")) {
resourceBundle = ResourceBundle.getBundle(baseName, Locale.ENGLISH);
}else if("zh_HK".equalsIgnoreCase(locale) || "zh_TW".equalsIgnoreCase(locale)) {
resourceBundle = ResourceBundle.getBundle(baseName, Locale.TRADITIONAL_CHINESE);
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, Locale.ENGLISH);
}else{
resourceBundle = ResourceBundle.getBundle(baseName, Locale.getDefault());
String[] locals = StringUtils.split(locale, "_");
Locale locale1 = null;
if(locals.length>1){
locale1 = new Locale(locals[0].toLowerCase(), locals[1].toUpperCase());
}else{
locale1 = new Locale(locals[0].toLowerCase());
}
resourceBundle = ResourceBundle.getBundle(LANGUAGE_PLATFORM, locale1);
}
message = resourceBundle.getString(key);
} catch (Exception e) {
logger.print("LanguageTools resourceBundle error:"+e.getMessage());
logger.print("LanguageTools resourceBundle2 error:"+e.getMessage());
}
return message;
......
o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java
浏览文件 @ 2a2b146b
......@@ -328,16 +328,16 @@ public class ApplicationServerTools extends JettySeverTools {
}
FileUtils.writeStringToFile(lastModified.toFile(), Files.getLastModifiedTime(war).toMillis() + "",
DefaultCharset.charset_utf_8, false);
File commonLang = new File(Config.DIR_COMMONS_LANGUAGE);
if(commonLang.exists() && commonLang.isDirectory()){
File languageDir = new File(dir.toString(), PathTools.WEB_INF_CLASSES_LANGUAGE);
FileTools.forceMkdir(languageDir);
File[] files = commonLang.listFiles();
for(File file : files){
if(!file.isDirectory()){
File languageFile = new File(languageDir, file.getName());
FileUtils.copyFile(file, languageFile);
}
}
File commonLang = new File(Config.DIR_COMMONS_LANGUAGE);
if(commonLang.exists() && commonLang.isDirectory()){
File languageDir = new File(dir.toString(), PathTools.WEB_INF_CLASSES_LANGUAGE);
FileTools.forceMkdir(languageDir);
File[] files = commonLang.listFiles();
for(File file : files){
if(!file.isDirectory()){
File languageFile = new File(languageDir, file.getName());
FileUtils.copyFile(file, languageFile);
}
}
}
......
o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java
浏览文件 @ 2a2b146b
......@@ -9,6 +9,7 @@ import java.util.EnumSet;
import javax.servlet.DispatcherType;
import com.x.base.core.project.tools.FileTools;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.file.PathUtils;
import org.apache.commons.lang3.BooleanUtils;
......@@ -119,7 +120,7 @@ public class CenterServerTools extends JettySeverTools {
}
}
private static void modified(Path war, Path dir) throws IOException {
private static void modified(Path war, Path dir) throws Exception {
Path lastModified = Paths.get(dir.toString(), PathTools.WEB_INF_LASTMODIFIED);
if ((!Files.exists(lastModified)) || Files.isDirectory(lastModified)
|| (Files.getLastModifiedTime(war).toMillis() != NumberUtils
......@@ -136,5 +137,17 @@ public class CenterServerTools extends JettySeverTools {
FileUtils.writeStringToFile(lastModified.toFile(), Files.getLastModifiedTime(war).toMillis() + "",
DefaultCharset.charset_utf_8, false);
}
File commonLang = new File(Config.DIR_COMMONS_LANGUAGE);
if(commonLang.exists() && commonLang.isDirectory()){
File languageDir = new File(dir.toString(), PathTools.WEB_INF_CLASSES_LANGUAGE);
FileTools.forceMkdir(languageDir);
File[] files = commonLang.listFiles();
for(File file : files){
if(!file.isDirectory()){
File languageFile = new File(languageDir, file.getName());
FileUtils.copyFile(file, languageFile);
}
}
}
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionBindMeta.java
浏览文件 @ 2a2b146b
......@@ -5,6 +5,7 @@ import java.util.Objects;
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.exception.ExceptionPersonNotExist;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.http.TokenType;
......@@ -50,4 +51,4 @@ class ActionBindMeta extends BaseAction {
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionCode.java
浏览文件 @ 2a2b146b
......@@ -2,6 +2,7 @@ package com.x.organization.assemble.authentication.jaxrs.authentication;
import java.util.Objects;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionWho.java
浏览文件 @ 2a2b146b
......@@ -5,6 +5,7 @@ import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
......@@ -91,4 +92,4 @@ class ActionWho extends BaseAction {
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionCaptchaEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionCaptchaEmpty extends PromptException {
class ExceptionCaptchaEmpty extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "图片验证码不能为空.";
ExceptionCaptchaEmpty() {
super("图片验证码不能为空.");
super(defaultMessage);
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionCodeEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionCodeEmpty extends PromptException {
class ExceptionCodeEmpty extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "短信验证码不可为空.";
ExceptionCodeEmpty() {
super("短信验证码不可为空.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionCredentialEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionCredentialEmpty extends PromptException {
class ExceptionCredentialEmpty extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "用户名不能为空.";
ExceptionCredentialEmpty() {
super("用户名不能为空.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionDisableCollect.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionDisableCollect extends PromptException {
class ExceptionDisableCollect extends LanguagePromptException {
private static final long serialVersionUID = 6351023802034208595L;
public static String defaultMessage = "系统没有启用节点连接.";
ExceptionDisableCollect() {
super("系统没有启用节点连接.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionFailureLocked.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionFailureLocked extends PromptException {
class ExceptionFailureLocked extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "用户:{} 已经被锁定, 锁定时间 {} 分钟.";
ExceptionFailureLocked(String name, Integer minutes) {
super("用户:{} 已经被锁定, 锁定时间 {} 分钟.", name, minutes);
super(defaultMessage, name, minutes);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionInvalidCaptcha.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidCaptcha extends PromptException {
class ExceptionInvalidCaptcha extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "图片验证码错误.";
ExceptionInvalidCaptcha() {
super("图片验证码错误.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionInvalidCode.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidCode extends PromptException {
class ExceptionInvalidCode extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "手机验证码错误.";
ExceptionInvalidCode() {
super("手机验证码错误.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionInvalidIpAddress.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidIpAddress extends PromptException {
class ExceptionInvalidIpAddress extends LanguagePromptException {
private static final long serialVersionUID = -4915257511363100070L;
public static String defaultMessage = "客户端IP限制，当前IP：{}.";
ExceptionInvalidIpAddress(String ip) {
super("客户端IP限制，当前IP：{}.", ip);
super(defaultMessage, ip);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionInvalidMobile.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidMobile extends PromptException {
class ExceptionInvalidMobile extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "手机号 {} 错误,不能为空,且必须符合指定格式.";
ExceptionInvalidMobile(String mobile) {
super("手机号 {} 错误,不能为空,且必须符合指定格式.", mobile);
super(defaultMessage, mobile);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionInvalidPassword.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidPassword extends PromptException {
class ExceptionInvalidPassword extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "用户名,密码不正确.";
ExceptionInvalidPassword() {
super("用户名,密码不正确.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthBindDisable.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthBindDisable extends PromptException {
class ExceptionOauthBindDisable extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "绑定已经禁用.";
ExceptionOauthBindDisable() {
super("绑定已经禁用.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthDingdingErrorInfo.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthDingdingErrorInfo extends PromptException {
class ExceptionOauthDingdingErrorInfo extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthEmptyAccessToken.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthEmptyAccessToken extends PromptException {
class ExceptionOauthEmptyAccessToken extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "无法获取访问令牌.";
ExceptionOauthEmptyAccessToken() {
super("无法获取访问令牌.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthEmptyCredential.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthEmptyCredential extends PromptException {
class ExceptionOauthEmptyCredential extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "无法获取用户凭证.";
ExceptionOauthEmptyCredential() {
super("无法获取用户凭证.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthEmptyInfo.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthEmptyInfo extends PromptException {
class ExceptionOauthEmptyInfo extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "请求信息返回值为空.";
ExceptionOauthEmptyInfo() {
super("请求信息返回值为空.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthEmptyToken.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthEmptyToken extends PromptException {
class ExceptionOauthEmptyToken extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "请求令牌返回值为空.";
ExceptionOauthEmptyToken() {
super("请求令牌返回值为空.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionOauthNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionOauthNotExist extends PromptException {
class ExceptionOauthNotExist extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "无法找到名为:{} 的OauthClient登录配置.";
ExceptionOauthNotExist(String name) {
super("无法找到名为:{} 的OauthClient登录配置.", name);
super(defaultMessage, name);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPasswordEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionPasswordEmpty extends PromptException {
class ExceptionPasswordEmpty extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
public static String defaultMessage = "密码不能为空或者密码解密错误.";
ExceptionPasswordEmpty() {
super("密码不能为空或者密码解密错误.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPersonNotExist.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
class ExceptionPersonNotExist extends PromptException {
private static final long serialVersionUID = -6124481323896411121L;
ExceptionPersonNotExist(String name) {
super("用户 {} 不存在.");
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPersonNotExistOrInvalidPassword.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionPersonNotExistOrInvalidPassword extends PromptException {
class ExceptionPersonNotExistOrInvalidPassword extends LanguagePromptException {
private static final long serialVersionUID = -6124481323896411121L;
public static String defaultMessage = "用户不存在或者密码错误.";
ExceptionPersonNotExistOrInvalidPassword( ) {
super("用户不存在或者密码错误.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPersonNotLogin.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.authentication;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionPersonNotLogin extends PromptException {
class ExceptionPersonNotLogin extends LanguagePromptException {
private static final long serialVersionUID = -6124481323896411121L;
public static String defaultMessage = "用户未登录.";
ExceptionPersonNotLogin() {
super("用户未登录.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ActionLogin.java
浏览文件 @ 2a2b146b
......@@ -6,6 +6,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import com.x.base.core.project.logger.Audit;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
......
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ExceptionCodeEmpty.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.authentication.jaxrs.dingding;
import com.x.base.core.project.exception.PromptException;
class ExceptionCodeEmpty extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionCodeEmpty() {
super("code不能为空.");
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ExceptionDingding.java
浏览文件 @ 2a2b146b
......@@ -6,7 +6,7 @@ class ExceptionDingding extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionDingding(Integer errcode, String errmsg) {
super("钉钉返回错误: errcode: {}, errmsg:{}.", errcode, errmsg);
ExceptionDingding(Integer errCode, String errMsg) {
super("ding ding error: errCode: {}, errMsg:{}.", errCode, errMsg);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ExceptionPersonNotExist.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.authentication.jaxrs.dingding;
import com.x.base.core.project.exception.PromptException;
class ExceptionPersonNotExist extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionPersonNotExist(String name) {
super("person:{} not exist.", name);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/dingding/ExceptionQywexinNotConfigured.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.authentication.jaxrs.dingding;
import com.x.base.core.project.exception.PromptException;
class ExceptionQywexinNotConfigured extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionQywexinNotConfigured() {
super("没有配置企业微信登录.");
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ExceptionGetAccessTokenFail.java
浏览文件 @ 2a2b146b
......@@ -12,6 +12,6 @@ public class ExceptionGetAccessTokenFail extends PromptException {
private static final long serialVersionUID = 8183666222562959262L;
public ExceptionGetAccessTokenFail() {
super("获取微信accessToken 失败！");
super("获取微信accessToken失败！");
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/mpweixin/ExceptionNoConfigArguments.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.authentication.jaxrs.mpweixin;
import com.x.base.core.project.exception.PromptException;
/**
* Created by fancyLou on 3/3/21.
* Copyright © 2021 O2. All rights reserved.
*/
public class ExceptionNoConfigArguments extends PromptException {
private static final long serialVersionUID = 1151495856256067183L;
public ExceptionNoConfigArguments(String error) {
super(error);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetLogin.java
浏览文件 @ 2a2b146b
......@@ -8,6 +8,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
......@@ -133,4 +134,4 @@ class ActionGetLogin extends BaseAction {
}
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostLogin.java
浏览文件 @ 2a2b146b
......@@ -8,6 +8,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
......@@ -158,4 +159,4 @@ class ActionPostLogin extends BaseAction {
}
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionClientEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionClientEmpty extends PromptException {
class ExceptionClientEmpty extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "sso配置client不能为空.";
ExceptionClientEmpty() {
super("sso 配置client不能为空.");
}
ExceptionClientEmpty() { super(defaultMessage); }
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionClientNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionClientNotExist extends PromptException {
class ExceptionClientNotExist extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "{} sso 配置不存在.";
ExceptionClientNotExist(String client) {
super("{} sso 配置不存在.", client);
super(defaultMessage, client);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionEmptyCredential.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionEmptyCredential extends PromptException {
class ExceptionEmptyCredential extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "名称为空.";
ExceptionEmptyCredential() {
super("名称为空.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionEmptyKey.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionEmptyKey extends PromptException {
class ExceptionEmptyKey extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "sso 配置token不能为空.";
ExceptionEmptyKey() {
super("sso 配置token不能为空.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionEmptyToken.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionEmptyToken extends PromptException {
class ExceptionEmptyToken extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "sso 没有提供解码令牌.";
ExceptionEmptyToken() {
super("sso 没有提供解码令牌.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionPersonNotExist.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
class ExceptionPersonNotExist extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionPersonNotExist(String flag) {
super("用户:{}不存在.", flag);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionReadToken.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionReadToken extends PromptException {
class ExceptionReadToken extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "无效token, client:{}, token:{}.";
ExceptionReadToken(String client, String token) {
super("can not read sso token, client:{}, token:{}.", client, token);
super(defaultMessage, client, token);
}
}
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ExceptionTokenExpired.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.authentication.jaxrs.sso;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionTokenExpired extends PromptException {
class ExceptionTokenExpired extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
public static String defaultMessage = "token超时.";
ExceptionTokenExpired() {
super("token超时.");
super(defaultMessage);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/export/ExceptionResultNotFound.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.export;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionResultNotFound extends PromptException {
class ExceptionResultNotFound extends LanguagePromptException {
private static final long serialVersionUID = -2139584911736169462L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionDenyCreateGroup.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyCreateGroup extends PromptException {
class ExceptionDenyCreateGroup extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
ExceptionDenyCreateGroup(EffectivePerson effectivePerson, String name) {
super("{} 不能创建群组:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionDenyDeleteGroup.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyDeleteGroup extends PromptException {
class ExceptionDenyDeleteGroup extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
ExceptionDenyDeleteGroup(EffectivePerson effectivePerson, String name) {
super("{} 不能删除群组:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
super("{}不能删除群组:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionDenyEditGroup.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyEditGroup extends PromptException {
class ExceptionDenyEditGroup extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
ExceptionDenyEditGroup(EffectivePerson effectivePerson, String name) {
super("{} 不能编辑群组:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
super("{}不能编辑群组:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionDuplicateUnique.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionDuplicateUnique extends PromptException {
class ExceptionDuplicateUnique extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionGroupNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionGroupNotExist extends PromptException {
class ExceptionGroupNotExist extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionNameEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionNameEmpty extends PromptException {
class ExceptionNameEmpty extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionPersonNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionPersonNotExist extends PromptException {
class ExceptionPersonNotExist extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/group/ExceptionRoleNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.group;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionRoleNotExist extends PromptException {
class ExceptionRoleNotExist extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionDuplicateUnique.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionDuplicateUnique extends PromptException {
class ExceptionDuplicateUnique extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionExistInUnit.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.organization.core.entity.Person;
import com.x.organization.core.entity.Unit;
class ExceptionExistInUnit extends PromptException {
class ExceptionExistInUnit extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionIdentityNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionIdentityNotExist extends PromptException {
class ExceptionIdentityNotExist extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionNameEmpty.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionNameEmpty extends PromptException {
class ExceptionNameEmpty extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionPersonNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionPersonNotExist extends PromptException {
class ExceptionPersonNotExist extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionSameNotOrder.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionSameNotOrder extends PromptException {
class ExceptionSameNotOrder extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/identity/ExceptionUnitNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.identity;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionUnitNotExist extends PromptException {
class ExceptionUnitNotExist extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/permissionsetting/ExceptionDenyCreateRole.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.control.jaxrs.permissionsetting;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyCreateRole extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionDenyCreateRole(EffectivePerson effectivePerson, String name) {
super("{} 不能创建角色:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/permissionsetting/ExceptionPersonCardNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.permissionsetting;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionPersonCardNotExist extends PromptException {
class ExceptionPersonCardNotExist extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionEdit.java
浏览文件 @ 2a2b146b
......@@ -10,6 +10,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.entity.annotation.CheckPersistType;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import com.x.base.core.project.x_message_assemble_communicate;
import com.x.base.core.project.bean.WrapCopier;
import com.x.base.core.project.bean.WrapCopierFactory;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionGet.java
浏览文件 @ 2a2b146b
......@@ -12,6 +12,7 @@ import javax.persistence.criteria.Root;
import com.x.base.core.project.cache.Cache;
import com.x.base.core.project.cache.Cache.CacheKey;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.collections4.set.ListOrderedSet;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionGetIconWithPerson.java
浏览文件 @ 2a2b146b
......@@ -3,6 +3,7 @@ package com.x.organization.assemble.control.jaxrs.person;
import java.util.Objects;
import java.util.Optional;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java
浏览文件 @ 2a2b146b
......@@ -3,6 +3,7 @@ package com.x.organization.assemble.control.jaxrs.person;
import java.util.List;
import java.util.Optional;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import com.x.base.core.project.organization.OrganizationDefinition;
import com.x.base.core.project.tools.ListTools;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java
浏览文件 @ 2a2b146b
......@@ -3,6 +3,7 @@ package com.x.organization.assemble.control.jaxrs.person;
import java.util.List;
import java.util.Optional;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import com.x.base.core.project.organization.OrganizationDefinition;
import com.x.base.core.project.tools.ListTools;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionResetPassword.java
浏览文件 @ 2a2b146b
......@@ -5,6 +5,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.annotation.CheckPersistType;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.config.Config;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WrapBoolean;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionSetIcon.java
浏览文件 @ 2a2b146b
......@@ -7,6 +7,7 @@ import java.io.ByteArrayOutputStream;
import javax.imageio.ImageIO;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.codec.binary.Base64;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.imgscalr.Scalr;
......@@ -73,4 +74,4 @@ class ActionSetIcon extends BaseAction {
public static class Wo extends WrapBoolean {
}
}
\ No newline at end of file
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionSetPassword.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionUnlock.java
浏览文件 @ 2a2b146b
......@@ -5,6 +5,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.annotation.CheckPersistType;
import com.x.base.core.project.cache.CacheManager;
import com.x.base.core.project.exception.ExceptionAccessDenied;
import com.x.base.core.project.exception.ExceptionPersonNotExist;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WrapBoolean;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDenyChangeInitialManagerPassword.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionDenyChangeInitialManagerPassword extends PromptException {
class ExceptionDenyChangeInitialManagerPassword extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDenyCreatePerson.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyCreatePerson extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionDenyCreatePerson(EffectivePerson effectivePerson, String name) {
super("{} 不能创建个人:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDenyDeleteInitialManager.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionDenyDeleteInitialManager extends PromptException {
class ExceptionDenyDeleteInitialManager extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDenyDeletePerson.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyDeletePerson extends PromptException {
private static final long serialVersionUID = 4132300948670472899L;
ExceptionDenyDeletePerson(EffectivePerson effectivePerson, String name) {
super("{} 不能删除个人:{}, 权限不足.", effectivePerson.getDistinguishedName(), name);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDenyEditPerson.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.base.core.project.http.EffectivePerson;
class ExceptionDenyEditPerson extends PromptException {
class ExceptionDenyEditPerson extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDenyResetInitialManagerPassword.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionDenyResetInitialManagerPassword extends PromptException {
class ExceptionDenyResetInitialManagerPassword extends LanguagePromptException {
private static final long serialVersionUID = 4132300948670472899L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionDisplayDuplicate.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
class ExceptionDisplayDuplicate extends PromptException {
private static final long serialVersionUID = 4433998001143598936L;
ExceptionDisplayDuplicate(String display, String fieldName) {
super("显示名错误:" + display + ", " + fieldName + "已有值重复.");
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionEmployeeDuplicate.java
浏览文件 @ 2a2b146b
......@@ -7,6 +7,6 @@ class ExceptionEmployeeDuplicate extends PromptException {
private static final long serialVersionUID = -3439770681867963457L;
ExceptionEmployeeDuplicate(String name, String fieldName) {
super("用户员工号错误:" + name + ", " + fieldName + "已有值重复.");
super("用户员工号错误:{}, {}已有值重复.", name, fieldName);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionGroupNotExist.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionGroupNotExist extends PromptException {
class ExceptionGroupNotExist extends LanguagePromptException {
private static final long serialVersionUID = -3439770681867963457L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionInvalidDisplay.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.control.jaxrs.person;
import java.util.Objects;
import com.x.base.core.project.exception.PromptException;
class ExceptionInvalidDisplay extends PromptException {
private static final long serialVersionUID = 4622760821556680073L;
ExceptionInvalidDisplay(String unique) {
super("显示名错误,不能使用特殊字符:" + Objects.toString(unique) + ".");
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionInvalidMail.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import java.util.Objects;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.base.core.project.exception.PromptException;
class ExceptionInvalidMail extends PromptException {
class ExceptionInvalidMail extends LanguagePromptException {
private static final long serialVersionUID = 4622760821556680073L;
ExceptionInvalidMail(String mail) {
super("邮件地址错误:不符合格式要求:" + Objects.toString(mail) + ".");
super("邮件地址错误:不符合格式要求:{}.", mail);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionInvalidMobile.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidMobile extends PromptException {
class ExceptionInvalidMobile extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
......
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionInvalidName.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import java.util.Objects;
import com.x.base.core.project.exception.LanguagePromptException;
import com.x.base.core.project.exception.PromptException;
class ExceptionInvalidName extends PromptException {
class ExceptionInvalidName extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
ExceptionInvalidName(String name) {
super("用户名错误,不能为空,不能使用保留字串,且不能使用特殊字符:" + Objects.toString(name) + ".");
super("用户名错误,不能为空,不能使用保留字串,且不能使用特殊字符:{}.", name);
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionInvalidOperation.java 已删除 100644 → 0
浏览文件 @ 5cc15a9a
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
class ExceptionInvalidOperation extends PromptException {
private static final long serialVersionUID = -3439770681867963457L;
ExceptionInvalidOperation() {
super("无效的操作.");
}
}
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ExceptionInvalidPassword.java
浏览文件 @ 2a2b146b
package com.x.organization.assemble.control.jaxrs.person;
import com.x.base.core.project.exception.PromptException;
import com.x.base.core.project.exception.LanguagePromptException;
class ExceptionInvalidPassword extends PromptException {
class ExceptionInvalidPassword extends LanguagePromptException {
private static final long serialVersionUID = 1859164370743532895L;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或