mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-13 21:32:07 +08:00
1、新增组织、用户、角色、短信日志、短信模版、token管理easyexcel导出国际化，i18n文件整理；2、新增字典cache支持多语言；
This commit is contained in:
gaoqr
+11
@@ -31,4 +31,15 @@
|
||||
where d.deleted = false
|
||||
and d.dict_type = #{dictType}
|
||||
</select>
|
||||
|
||||
<select id="selectI18nByDictTypeAndValue" resultType="com.cf.imes.module.system.dal.dataobject.dict.DictDataDO">
|
||||
select
|
||||
coalesce(i.label, d.label) as label
|
||||
from system_dict_data d
|
||||
left join system_dict_data_i18n i
|
||||
on d.id = i.dict_data_id and i.locale = #{locale}
|
||||
where d.deleted = false
|
||||
and d.dict_type = #{dictType}
|
||||
and d.value = #{value}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -45,4 +45,62 @@ excel.export.head.purchase.record.total.amount=订单总额
|
||||
excel.export.head.purchase.record.external.spent=扫码支付
|
||||
excel.export.head.purchase.record.create.time=购买时间
|
||||
excel.export.head.purchase.record.creator=操作人
|
||||
excel.export.head.purchase.record.end.time=产品有效时间
|
||||
excel.export.head.purchase.record.end.time=产品有效时间
|
||||
|
||||
excel.export.head.token.config.id=配置编号
|
||||
excel.export.head.token.config.appName=应用名称
|
||||
excel.export.head.token.config.organName=组织名称
|
||||
excel.export.head.token.config.appToken=应用token
|
||||
excel.export.head.token.config.expiresTime=过期时间
|
||||
excel.export.head.token.config.remark=备注
|
||||
excel.export.head.token.config.createTime=创建时间
|
||||
|
||||
excel.export.head.organ.id=组织编号
|
||||
excel.export.head.organ.name=组织名称
|
||||
excel.export.head.organ.contactName=联系人
|
||||
excel.export.head.organ.contactMobile=联系手机
|
||||
excel.export.head.organ.status=状态
|
||||
excel.export.head.organ.website=绑定域名
|
||||
excel.export.head.organ.usernames=管理员账号
|
||||
excel.export.head.organ.accountCount=账号数量
|
||||
excel.export.head.organ.expireTime=过期时间
|
||||
excel.export.head.organ.createTime=创建时间
|
||||
excel.export.head.organ.address=地址
|
||||
|
||||
excel.export.head.user.id=用户编号
|
||||
excel.export.head.user.username=用户账号
|
||||
excel.export.head.user.nickname==用户昵称
|
||||
excel.export.head.user.remark=备注
|
||||
excel.export.head.user.deptName=部门名称
|
||||
excel.export.head.user.email=邮箱
|
||||
excel.export.head.user.mobile=手机号码
|
||||
excel.export.head.user.sex=性别
|
||||
excel.export.head.user.status=账号状态
|
||||
|
||||
excel.export.head.role.id=角色编号
|
||||
excel.export.head.role.name=角色名称
|
||||
excel.export.head.role.code=角色标志
|
||||
excel.export.head.role.sort=角色排序
|
||||
excel.export.head.role.status=角色状态
|
||||
excel.export.head.role.type=角色类型
|
||||
excel.export.head.role.remark=备注
|
||||
excel.export.head.role.createTime=创建时间
|
||||
|
||||
excel.export.head.sms.template.id=模板编号
|
||||
excel.export.head.sms.template.type=短信类型
|
||||
excel.export.head.sms.template.status=模板状态
|
||||
excel.export.head.sms.template.code=模板编码
|
||||
excel.export.head.sms.template.name=模板名称
|
||||
excel.export.head.sms.template.content=模板内容
|
||||
excel.export.head.sms.template.remark=模板备注
|
||||
excel.export.head.sms.template.apiTemplateId=短信 API 的模板编号
|
||||
excel.export.head.sms.template.createTime=创建时间
|
||||
|
||||
excel.export.head.sms.log.id=日志编号
|
||||
excel.export.head.sms.log.createTime=创建时间
|
||||
excel.export.head.sms.log.mobile=手机号
|
||||
excel.export.head.sms.log.templateContent=短信内容
|
||||
excel.export.head.sms.log.sendStatus=发送状态
|
||||
excel.export.head.sms.log.templateId=模板编号
|
||||
excel.export.head.sms.log.templateCode=模板编码
|
||||
excel.export.head.sms.log.templateType=短信类型
|
||||
+58
-1
@@ -36,7 +36,6 @@ excel.export.head.sales.detail.createTime=交易時間
|
||||
excel.export.head.purchase.record.id=訂單號
|
||||
excel.export.head.purchase.record.organName=組織名稱
|
||||
excel.export.head.purchase.record.product.name=產品名稱
|
||||
excel.export.head.purchase.record.order.no=訂單號
|
||||
excel.export.head.purchase.record.purchase.duration=購買時長
|
||||
excel.export.head.purchase.record.purchase.duration.unit=購買時長單位
|
||||
excel.export.head.purchase.record.gift.duration=贈送時長
|
||||
@@ -47,3 +46,61 @@ excel.export.head.purchase.record.external.spent=掃碼支付
|
||||
excel.export.head.purchase.record.create.time=購買時間
|
||||
excel.export.head.purchase.record.creator=操作人
|
||||
excel.export.head.purchase.record.end.time=產品有效時間
|
||||
|
||||
excel.export.head.token.config.id=配置編號
|
||||
excel.export.head.token.config.appName=應用名稱
|
||||
excel.export.head.token.config.organName=組織名稱
|
||||
excel.export.head.token.config.appToken=應用 Token
|
||||
excel.export.head.token.config.expiresTime=過期時間
|
||||
excel.export.head.token.config.remark=備註
|
||||
excel.export.head.token.config.createTime=創建時間
|
||||
|
||||
excel.export.head.organ.id=組織編號
|
||||
excel.export.head.organ.name=組織名稱
|
||||
excel.export.head.organ.contactName=聯絡人
|
||||
excel.export.head.organ.contactMobile=聯絡手機
|
||||
excel.export.head.organ.status=狀態
|
||||
excel.export.head.organ.website=綁定域名
|
||||
excel.export.head.organ.usernames=管理員帳號
|
||||
excel.export.head.organ.accountCount=帳號數量
|
||||
excel.export.head.organ.expireTime=過期時間
|
||||
excel.export.head.organ.createTime=創建時間
|
||||
excel.export.head.organ.address=地址
|
||||
|
||||
excel.export.head.user.id=使用者編號
|
||||
excel.export.head.user.username=使用者帳號
|
||||
excel.export.head.user.nickname=使用者暱稱
|
||||
excel.export.head.user.remark=備註
|
||||
excel.export.head.user.deptName=部門名稱
|
||||
excel.export.head.user.email=電子郵件
|
||||
excel.export.head.user.mobile=手機號碼
|
||||
excel.export.head.user.sex=性別
|
||||
excel.export.head.user.status=帳號狀態
|
||||
|
||||
excel.export.head.role.id=角色編號
|
||||
excel.export.head.role.name=角色名稱
|
||||
excel.export.head.role.code=角色標識
|
||||
excel.export.head.role.sort=角色排序
|
||||
excel.export.head.role.status=角色狀態
|
||||
excel.export.head.role.type=角色類型
|
||||
excel.export.head.role.remark=備註
|
||||
excel.export.head.role.createTime=創建時間
|
||||
|
||||
excel.export.head.sms.template.id=模板編號
|
||||
excel.export.head.sms.template.type=模板類型
|
||||
excel.export.head.sms.template.status=模板狀態
|
||||
excel.export.head.sms.template.code=模板編碼
|
||||
excel.export.head.sms.template.name=模板名稱
|
||||
excel.export.head.sms.template.content=模板內容
|
||||
excel.export.head.sms.template.remark=模板備註
|
||||
excel.export.head.sms.template.apiTemplateId=短信 API 的模板編號
|
||||
excel.export.head.sms.template.createTime=創建時間
|
||||
|
||||
excel.export.head.sms.log.id=日誌編號
|
||||
excel.export.head.sms.log.createTime=創建時間
|
||||
excel.export.head.sms.log.mobile=手機號碼
|
||||
excel.export.head.sms.log.templateContent=短信內容
|
||||
excel.export.head.sms.log.sendStatus=發送狀態
|
||||
excel.export.head.sms.log.templateId=模板編號
|
||||
excel.export.head.sms.log.templateCode=模板編碼
|
||||
excel.export.head.sms.log.templateType=短信類型
|
||||
+59
-2
@@ -36,7 +36,6 @@ excel.export.head.sales.detail.createTime=Transaction Time
|
||||
excel.export.head.purchase.record.id=Order Number
|
||||
excel.export.head.purchase.record.organName=Organization Name
|
||||
excel.export.head.purchase.record.product.name=Product Name
|
||||
excel.export.head.purchase.record.order.no=Order Number
|
||||
excel.export.head.purchase.record.purchase.duration=Purchase Duration
|
||||
excel.export.head.purchase.record.purchase.duration.unit=Purchase Duration Unit
|
||||
excel.export.head.purchase.record.gift.duration=Gift Duration
|
||||
@@ -46,4 +45,62 @@ excel.export.head.purchase.record.total.amount=Total Amount
|
||||
excel.export.head.purchase.record.external.spent=QR Payment Amount
|
||||
excel.export.head.purchase.record.create.time=Purchase Time
|
||||
excel.export.head.purchase.record.creator=Operator
|
||||
excel.export.head.purchase.record.end.time=Product Valid Until
|
||||
excel.export.head.purchase.record.end.time=Product Valid Until
|
||||
|
||||
excel.export.head.token.config.id=Config ID
|
||||
excel.export.head.token.config.appName=Application Name
|
||||
excel.export.head.token.config.organName=Organization Name
|
||||
excel.export.head.token.config.appToken=Application Token
|
||||
excel.export.head.token.config.expiresTime=Expiration Time
|
||||
excel.export.head.token.config.remark=Remark
|
||||
excel.export.head.token.config.createTime=Creation Time
|
||||
|
||||
excel.export.head.organ.id=Organization ID
|
||||
excel.export.head.organ.name=Organization Name
|
||||
excel.export.head.organ.contactName=Contact Person
|
||||
excel.export.head.organ.contactMobile=Contact Mobile
|
||||
excel.export.head.organ.status=Status
|
||||
excel.export.head.organ.website=Bound Domain
|
||||
excel.export.head.organ.usernames=Admin Accounts
|
||||
excel.export.head.organ.accountCount=Account Count
|
||||
excel.export.head.organ.expireTime=Expiration Time
|
||||
excel.export.head.organ.createTime=Creation Time
|
||||
excel.export.head.organ.address=Address
|
||||
|
||||
excel.export.head.user.id=User ID
|
||||
excel.export.head.user.username=Username
|
||||
excel.export.head.user.nickname=Nickname
|
||||
excel.export.head.user.remark=Remark
|
||||
excel.export.head.user.deptName=Department Name
|
||||
excel.export.head.user.email=Email
|
||||
excel.export.head.user.mobile=Mobile Number
|
||||
excel.export.head.user.sex=Gender
|
||||
excel.export.head.user.status=Account Status
|
||||
|
||||
excel.export.head.role.id=Role ID
|
||||
excel.export.head.role.name=Role Name
|
||||
excel.export.head.role.code=Role Code
|
||||
excel.export.head.role.sort=Role Sort
|
||||
excel.export.head.role.status=Role Status
|
||||
excel.export.head.role.type=Role Type
|
||||
excel.export.head.role.remark=Remark
|
||||
excel.export.head.role.createTime=Creation Time
|
||||
|
||||
excel.export.head.sms.template.id=Template ID
|
||||
excel.export.head.sms.template.type=Template Type
|
||||
excel.export.head.sms.template.status=Template Status
|
||||
excel.export.head.sms.template.code=Template Code
|
||||
excel.export.head.sms.template.name=Template Name
|
||||
excel.export.head.sms.template.content=Template Content
|
||||
excel.export.head.sms.template.remark=Template Remark
|
||||
excel.export.head.sms.template.apiTemplateId=SMS API Template ID
|
||||
excel.export.head.sms.template.createTime=Creation Time
|
||||
|
||||
excel.export.head.sms.log.id=Log ID
|
||||
excel.export.head.sms.log.createTime=Creation Time
|
||||
excel.export.head.sms.log.mobile=Mobile Number
|
||||
excel.export.head.sms.log.templateContent=SMS Content
|
||||
excel.export.head.sms.log.sendStatus=Send Status
|
||||
excel.export.head.sms.log.templateId=Template ID
|
||||
excel.export.head.sms.log.templateCode=Template Code
|
||||
excel.export.head.sms.log.templateType=SMS Type
|
||||
Reference in New Issue
Block a user