Commit a1132d22dd7d6f7c9fd08fca4e634e94375d7712

Authored by xp.Huang
2 parents ad92185d 79922644

Merge branch '2024-10-31' into 'master_dev'

fix:电话未注册国际化提示

See merge request yunteng/thingskit!468
... ... @@ -210,6 +210,7 @@ root.rule.chain.is.present = Another root rule chain is present in scope of curr
210 210 edge.root.rule.chain.is.present = Another edge template root rule chain is present in scope of current tenant!
211 211 app.openapi.api.isnull = The current application does not have a callable API. Please contact the administrator
212 212 device.profile.used.for.configuration.center = The product used for [%s] configuration center and cannot delete!!!
  213 +phone.is.not.registered = The phone number is not registered in the system. Please contact your administrator
213 214
214 215
215 216
... ...
... ... @@ -210,4 +210,5 @@ root.rule.chain.is.present =当前租户范围内存在另一个根规则链
210 210 edge.root.rule.chain.is.present =当前租户范围内存在另一个边缘模板根规则链
211 211 app.openapi.api.isnull = 当前应用不存在可调用api请联系管理员
212 212 device.profile.used.for.configuration.center = 产品被【%s】组态使用,不能删除!!!
  213 +phone.is.not.registered = 电话号码未在系统注册,请联系你的管理员
213 214
... ...
... ... @@ -197,13 +197,13 @@ public enum ErrorMessage {
197 197 OPENAPI_APP_ISNULL(400162,"应用不存在","openapi.app.isnull"),
198 198 OPENAPI_API_ISNULL(400163,"api不存在","openapi.api.isnull"),
199 199 METHOD_DOES_NOT_EXIST(400164,"调用方法【%s】不存在","method.does.not.exist"),
200   -
201 200 RULE_CHAIN_TO_TENANT(400165,"规则链应分配给租户","rule.chain.to.tenant"),
202 201 NON_EXISTENT_TENANT(400166,"规则链正在引用不存在的租户!","non.existent.tenant"),
203 202 ROOT_RULE_CHAIN_IS_PRESENT (400167,"当前租户范围内存在另一个根规则链!","root.rule.chain.is.present"),
204 203 EDGE_ROOT_RULE_CHAIN_IS_PRESENT(400168,"当前租户范围内存在另一个边缘模板根规则链!","edge.root.rule.chain.is.present"),
205 204 APP_OPENAPI_API_ISNULL(400169,"当前应用不存在可调用api请联系管理员","app.openapi.api.isnull"),
206 205 DEVICE_PROFILE_USED_FOR_CENTER(400170,"产品被【%s】组态使用,不能删除!!!","device.profile.used.for.configuration.center"),
  206 + PHONE_IS_NOT_REGISTERED(400171,"电话号码未在系统注册,请联系你的管理员","phone.is.not.registered"),
207 207
208 208 HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),
209 209 NOT_ALLOWED_ISOLATED_IN_MONOLITH(500003, "【monolith】模式下,不能选择【isolated】类型的租户配置", "not.allowed.isolated.in.monolith"),
... ...
... ... @@ -176,7 +176,7 @@ public class TkMessageServiceImpl implements TkMessageService {
176 176 .lambda()
177 177 .eq(SysUserEntity::getPhoneNumber, phoneNumber));
178 178 if (users.isEmpty()) {
179   - throw new TkDataValidationException("电话号码未在系统注册,请联系你的管理员");
  179 + throw new TkDataValidationException(MessageUtils.message(ErrorMessage.PHONE_IS_NOT_REGISTERED.getI18nCode()));
180 180 }
181 181 if (users.get(0).getAccountExpireTime() != null
182 182 && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())) {
... ...