xie.kaifeng преди 7 месеца
родител
ревизия
a5ccacf278

+ 1 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganServiceImpl.java

@@ -1348,7 +1348,7 @@ public class OrganServiceImpl implements IOrganService {
                     vo.setPid("-2");
                 }
                 vo.setLevel(1);
-                vo.setName(StringUtils.isBlank(base.getAccountname()) ? AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")) : base.getAccountname());//分组名称
+                vo.setName(StringUtils.isBlank(base.getAccountname()) ? AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")) : base.getAccountname());//分组名称
                 vo.setUserid(base.getUserid());
                 vo.setTradetype(base.getTradetype());
                 result.add(vo);

+ 3 - 3
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemmanagerServiceImpl.java

@@ -94,9 +94,9 @@ public class SystemmanagerServiceImpl extends ServiceImpl<ISystemmanagerMapper,
             return AjaxResult.error(Constants.loginTradeManage, MessageType.LOGIN_ERROR_CODE_001.getCode(), request.getHeader("Accept-Language"), rsp);
         }
         //校验验证码
-        /*if (!verifyCode(loginReq.getKey(), loginReq.getVerifyCode())) {
-            return AjaxResult.error(Constants.Error_Code_Design, Constants.vcodeError_msg);
-        }*/
+        if (!verifyCode(loginReq.getKey(), loginReq.getVerifyCode())) {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM020.getCode(), request.getHeader("Accept-Language"));
+        }
         loginReq.setLoginIp(CommonUtil.getIpAddress(request));
         //ip黑名单
         Ipbacklist ip = iIpbacklistMapper.selectOne(new QueryWrapper<Ipbacklist>()

+ 6 - 6
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -1209,11 +1209,11 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         defaultVO.setId("z0");
         defaultVO.setPid("-1");
         defaultVO.setLevel(1);
-        defaultVO.setName(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
-        defaultVO.setNamevi(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
-        defaultVO.setNameen(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
-        defaultVO.setNametw(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
-        defaultVO.setNameth(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setName(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNamevi(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNameen(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNametw(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")));
+        defaultVO.setNameth(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")));
         defaultVO.setUsergroupid(0L);
         result.add(defaultVO);
 
@@ -1650,7 +1650,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     vo.setPid("-2");
                 }
                 vo.setLevel(1);
-                vo.setName(StringUtils.isBlank(base.getAccountname()) ? AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM030.getCode(), request.getHeader("Accept-Language")) : base.getAccountname());//分组名称
+                vo.setName(StringUtils.isBlank(base.getAccountname()) ? AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM031.getCode(), request.getHeader("Accept-Language")) : base.getAccountname());//分组名称
                 vo.setUserid(base.getUserid());
                 vo.setTradetype(base.getTradetype());
                 result.add(vo);

+ 1 - 0
mtp3-century/src/main/resources/message_en.properties

@@ -47,6 +47,7 @@ message_error_code_system016=The steps of the performance plan have been changed
 message_error_code_system017=Deposit transfer market, please select the issuer of the product\u3010{0}\u3011
 message_error_code_system018=Please execute when the system completes processing successfully at the end of the day
 message_error_code_system019=The role name is referenced, please remove the reference first
+message_error_code_system020=Verification code error
 login_error_code_001=Account or password error
 login_error_code_002=Unauthorized access is not allowed! Please contact the administrator to handle it!
 login_error_code_003=Login locked!

+ 1 - 0
mtp3-century/src/main/resources/message_th.properties

@@ -47,6 +47,7 @@ message_error_code_system016=\u0E02\u0E31\u0E49\u0E19\u0E15\u0E2D\u0E19\u0E01\u0
 message_error_code_system017=\u0E15\u0E25\u0E32\u0E14\u0E42\u0E2D\u0E19\u0E40\u0E07\u0E34\u0E19\u0E21\u0E31\u0E14\u0E08\u0E33 \u0E42\u0E1B\u0E23\u0E14\u0E40\u0E25\u0E37\u0E2D\u0E01\u0E1C\u0E39\u0E49\u0E2D\u0E2D\u0E01\u0E2A\u0E34\u0E19\u0E04\u0E49\u0E32\u3010{0}\u3011
 message_error_code_system018=\u0E42\u0E1B\u0E23\u0E14\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E40\u0E21\u0E37\u0E48\u0E2D\u0E01\u0E32\u0E23\u0E1B\u0E23\u0E30\u0E21\u0E27\u0E25\u0E1C\u0E25\u0E2A\u0E34\u0E49\u0E19\u0E2A\u0E38\u0E14\u0E27\u0E31\u0E19\u0E17\u0E35\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E2A\u0E33\u0E40\u0E23\u0E47\u0E08
 message_error_code_system019=\u0E0A\u0E37\u0E48\u0E2D\u0E15\u0E31\u0E27\u0E25\u0E30\u0E04\u0E23\u0E17\u0E35\u0E48\u0E16\u0E39\u0E01\u0E2D\u0E49\u0E32\u0E07\u0E2D\u0E34\u0E07\u0E42\u0E1B\u0E23\u0E14\u0E22\u0E01\u0E40\u0E25\u0E34\u0E01\u0E01\u0E32\u0E23\u0E2D\u0E49\u0E32\u0E07\u0E2D\u0E34\u0E07\u0E01\u0E48\u0E2D\u0E19
+message_error_code_system020=\u0E02\u0E49\u0E2D\u0E1C\u0E34\u0E14\u0E1E\u0E25\u0E32\u0E14\u0E02\u0E2D\u0E07\u0E23\u0E2B\u0E31\u0E2A\u0E22\u0E37\u0E19\u0E22\u0E31\u0E19
 login_error_code_001=\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E2B\u0E23\u0E37\u0E2D\u0E23\u0E2B\u0E31\u0E2A\u0E1C\u0E48\u0E32\u0E19\u0E44\u0E21\u0E48\u0E16\u0E39\u0E01\u0E15\u0E49\u0E2D\u0E07
 login_error_code_002=\u0E44\u0E21\u0E48\u0E2A\u0E32\u0E21\u0E32\u0E23\u0E16\u0E40\u0E02\u0E49\u0E32\u0E16\u0E36\u0E07\u0E44\u0E14\u0E49\u0E42\u0E14\u0E22\u0E44\u0E21\u0E48\u0E44\u0E14\u0E49\u0E23\u0E31\u0E1A\u0E2D\u0E19\u0E38\u0E0D\u0E32\u0E15! \u0E01\u0E23\u0E38\u0E13\u0E32\u0E15\u0E34\u0E14\u0E15\u0E48\u0E2D\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E23\u0E30\u0E1A\u0E1A\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E08\u0E31\u0E14\u0E01\u0E32\u0E23!
 login_error_code_003=\u0E25\u0E47\u0E2D\u0E01\u0E2D\u0E34\u0E19!

+ 1 - 0
mtp3-century/src/main/resources/message_vi.properties

@@ -47,6 +47,7 @@ message_error_code_system016=C\u00E1c b\u01B0\u1EDBc l\u1EADp k\u1EBF ho\u1EA1ch
 message_error_code_system017=th\u1ECB tr\u01B0\u1EDDng chuy\u1EC3n nh\u01B0\u1EE3ng ti\u1EC1n g\u1EEDi, vui l\u00F2ng ch\u1ECDn nh\u00E0 ph\u00E1t h\u00E0nh s\u1EA3n ph\u1EA9m [{0}]
 message_error_code_system018=Vui l\u00F2ng th\u1EF1c hi\u1EC7n khi h\u1EC7 th\u1ED1ng x\u1EED l\u00FD th\u00E0nh c\u00F4ng v\u00E0o cu\u1ED1i ng\u00E0y
 message_error_code_system019=T\u00EAn nh\u00E2n v\u1EADt \u0111\u00E3 \u0111\u01B0\u1EE3c tr\u00EDch d\u1EABn, vui l\u00F2ng h\u1EE7y tham chi\u1EBFu tr\u01B0\u1EDBc
+message_error_code_system020=L\u1ED7i CAPTCHA
 login_error_code_001=L\u1ED7i t\u00E0i kho\u1EA3n ho\u1EB7c m\u1EADt kh\u1EA9u
 login_error_code_002=Kh\u00F4ng \u0111\u01B0\u1EE3c ph\u00E9p, kh\u00F4ng th\u1EC3 truy c\u1EADp! Vui l\u00F2ng li\u00EAn h\u1EC7 v\u1EDBi qu\u1EA3n tr\u1ECB vi\u00EAn \u0111\u1EC3 x\u1EED l\u00FD!
 login_error_code_003=Kh\u00F3a \u0111\u0103ng nh\u1EADp!

+ 1 - 0
mtp3-century/src/main/resources/message_zh-cn.properties

@@ -47,6 +47,7 @@ message_error_code_system016=\u5C65\u7EA6\u8BA1\u5212\u6B65\u9AA4\u5DF2\u53D1\u7
 message_error_code_system017=\u5B9A\u91D1\u8F6C\u8BA9\u5E02\u573A\uFF0C\u8BF7\u9009\u62E9\u5546\u54C1\u53D1\u884C\u65B9\u3010{0}\u3011
 message_error_code_system018=\u8BF7\u4E8E\u7CFB\u7EDF\u65E5\u7EC8\u5904\u7406\u6210\u529F\u65F6\u6267\u884C
 message_error_code_system019=\u8BE5\u89D2\u8272\u540D\u79F0\u88AB\u5F15\u7528,\u8BF7\u5148\u89E3\u9664\u5F15\u7528
+message_error_code_system020=\u9A8C\u8BC1\u7801\u9519\u8BEF
 login_error_code_001=\u8D26\u6237\u6216\u5BC6\u7801\u9519\u8BEF
 login_error_code_002=\u672A\u7ECF\u5141\u8BB8\uFF0C\u4E0D\u53EF\u8BBF\u95EE\uFF01\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u5904\u7406\uFF01
 login_error_code_003=\u767B\u5F55\u9501\u5B9A\uFF01

+ 1 - 0
mtp3-century/src/main/resources/message_zh-hk.properties

@@ -47,6 +47,7 @@ message_error_code_system016=\u5C65\u7D04\u8A08\u756B\u6B65\u9A5F\u5DF2\u767C\u7
 message_error_code_system017=\u5B9A\u91D1\u8F49\u8B93\u5E02\u5834\uFF0C\u8ACB\u9078\u64C7\u5546\u54C1\u767C\u884C\u65B9\u3010{0}\u3011
 message_error_code_system018=\u8ACB\u65BC\u7CFB\u7D71\u65E5\u7D42\u8655\u7406\u6210\u529F\u6642\u57F7\u884C
 message_error_code_system019=\u8A72\u89D2\u8272\u540D\u7A31\u88AB\u5F15\u7528\uFF0C\u8ACB\u5148\u89E3\u9664\u5F15\u7528
+message_error_code_system020=\u9A57\u8B49\u78BC\u932F\u8AA4
 login_error_code_001=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
 login_error_code_002=\u672A\u7D93\u5141\u8A31\uFF0C\u4E0D\u53EF\u8A2A\u554F\uFF01 \u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u8655\u7406\uFF01
 login_error_code_003=\u767B\u5165\u9396\u5B9A\uFF01

+ 1 - 0
mtp3-century/src/main/resources/message_zh-tw.properties

@@ -47,6 +47,7 @@ message_error_code_system016=\u5C65\u7D04\u8A08\u756B\u6B65\u9A5F\u5DF2\u767C\u7
 message_error_code_system017=\u5B9A\u91D1\u8F49\u8B93\u5E02\u5834\uFF0C\u8ACB\u9078\u64C7\u5546\u54C1\u767C\u884C\u65B9\u3010{0}\u3011
 message_error_code_system018=\u8ACB\u65BC\u7CFB\u7D71\u65E5\u7D42\u8655\u7406\u6210\u529F\u6642\u57F7\u884C
 message_error_code_system019=\u8A72\u89D2\u8272\u540D\u7A31\u88AB\u5F15\u7528\uFF0C\u8ACB\u5148\u89E3\u9664\u5F15\u7528
+message_error_code_system020=\u9A57\u8B49\u78BC\u932F\u8AA4
 login_error_code_001=\u5E33\u6236\u6216\u5BC6\u78BC\u932F\u8AA4
 login_error_code_002=\u672A\u7D93\u5141\u8A31\uFF0C\u4E0D\u53EF\u8A2A\u554F\uFF01 \u8ACB\u806F\u7CFB\u7BA1\u7406\u54E1\u8655\u7406\uFF01
 login_error_code_003=\u767B\u5165\u9396\u5B9A\uFF01

+ 1 - 0
mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/MessageType.java

@@ -55,6 +55,7 @@ public enum MessageType {
     MESSAGE_ERROR_CODE_SYSTEM017("message_error_code_system017", "定金转让市场,请选择商品发行方【{0}】"),
     MESSAGE_ERROR_CODE_SYSTEM018("message_error_code_system018", "请于系统日终处理成功时执行"),
     MESSAGE_ERROR_CODE_SYSTEM019("message_error_code_system019", "该角色名称被引用,请先解除引用"),
+    MESSAGE_ERROR_CODE_SYSTEM020("message_error_code_system020", "验证码错误"),
 
     LOGIN_ERROR_CODE_001("login_error_code_001", "账户或密码错误"),
     LOGIN_ERROR_CODE_002("login_error_code_002", "未经允许,不可访问!请联系管理员处理"),