Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
b1d24cca 1 parent edc2d31b

biz-customer | 修改 | 文描处理 

mt
2024年12月25日10:13:01
Inline Side-by-side
Showing 7 changed files with 60 additions and 48 deletions
......@@ -19,14 +19,22 @@ system_exception_10005=登录已过期，请重新登录
#******************业务相关、需要做国际化******************
#*********用于字段描述使用，不单独使用**********
business_field_31001=发货人计费账号
business_field_31002=运单ID
business_field_31003=运单号
business_field_31004=原产国编码
business_field_31005=原产国名称
business_field_31006=目的国编码
business_field_31007=目的国全称
business_field_31008=文件业务类型
#business_field_31001=发货人计费账号
business_field_31001=shipper account
#business_field_31002=运单ID
business_field_31002=tracking number ID
#business_field_31003=运单号
business_field_31003=tracking number
#business_field_31004=始发国编码
business_field_31004=origin country ID
#business_field_31005=始发国名称
business_field_31005=origin country
#business_field_31006=目的国编码
business_field_31006=destination country ID
#business_field_31007=目的国全称
business_field_31007=destination country
#business_field_31008=文件业务类型
business_field_31008=upload file type
#*********具体响应到前端**********
business_exception_30001={0}必填字段未填写
......@@ -34,7 +42,7 @@ business_exception_30002=单次最多可查询1000个运单号码
business_exception_30003={0}不正确，请重新输入
business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
business_exception_30006=附件上传不符合标准
business_exception_30006=附件未上传
business_exception_30007=所有上传文件数量不超过{0}个文件
business_exception_30008=所有上传文件总大小不超过{0}M
business_exception_30009=运单或发票未上传
......@@ -43,9 +51,9 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
business_exception_30012=UUID不一致
business_exception_30013=文件名为：{0}，上传失败，请检查后重试
business_exception_30014=运单信息加载失败，请稍后重试
business_success_30015=上传成功
business_exception_30016=运单提交失败，请联系管理员!
business_exception_30017=运单号填写错误
business_success_30015=提交成功
business_exception_30016=提交失败，请稍后重试!
business_exception_30017=运单号填写错误，请检查!
business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试
business_exception_30019=Shipper Account填写错误
business_exception_30020=您的登录账号的shipperAccount与录入的shipperAccount不一致，请确认是否继续上传？
business_exception_30019=Shipper Account填写错误（Shipper Account是由9位数字组成）
business_exception_30020=您当前登录账号的shipper Account与您正在录入的shipperAccount不一致，请确认是否继续？
\ No newline at end of file
......
......@@ -19,14 +19,22 @@ system_exception_10005=登录已过期，请重新登录
#******************业务相关、需要做国际化******************
#*********用于字段描述使用，不单独使用**********
business_field_31001=发货人计费账号
business_field_31002=运单ID
business_field_31003=运单号
business_field_31004=原产国编码
business_field_31005=原产国名称
business_field_31006=目的国编码
business_field_31007=目的国全称
business_field_31008=文件业务类型
#business_field_31001=发货人计费账号
business_field_31001=shipper account
#business_field_31002=运单ID
business_field_31002=tracking number ID
#business_field_31003=运单号
business_field_31003=tracking number
#business_field_31004=始发国编码
business_field_31004=origin country ID
#business_field_31005=始发国名称
business_field_31005=origin country
#business_field_31006=目的国编码
business_field_31006=destination country ID
#business_field_31007=目的国全称
business_field_31007=destination country
#business_field_31008=文件业务类型
business_field_31008=upload file type
#*********具体响应到前端**********
business_exception_30001={0}必填字段未填写
......@@ -34,7 +42,7 @@ business_exception_30002=单次最多可查询1000个运单号码
business_exception_30003={0}不正确，请重新输入
business_exception_30004=The waybill you entered is generated by another user, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
business_exception_30005=The waybill you entered is generated by another account, whether continue uploading? Confirm, Cancel. No more prompts in the future for the same situation.
business_exception_30006=附件上传不符合标准
business_exception_30006=附件未上传
business_exception_30007=所有上传文件数量不超过{0}个文件
business_exception_30008=所有上传文件总大小不超过{0}M
business_exception_30009=运单或发票未上传
......@@ -43,9 +51,9 @@ business_exception_30011=该运单已被其他人创建，不可以重复创建
business_exception_30012=UUID不一致
business_exception_30013=文件名为：{0}，上传失败，请检查后重试
business_exception_30014=运单信息加载失败，请稍后重试
business_success_30015=上传成功
business_exception_30016=运单提交失败，请联系管理员!
business_exception_30017=运单号填写错误
business_success_30015=提交成功
business_exception_30016=提交失败，请稍后重试!
business_exception_30017=运单号填写错误，请检查!
business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试
business_exception_30019=Shipper Account填写错误
business_exception_30020=您的登录账号的shipperAccount与录入的shipperAccount不一致，请确认是否继续上传？
\ No newline at end of file
business_exception_30019=Shipper Account填写错误（Shipper Account是由9位数字组成）
business_exception_30020=您当前登录账号的shipper Account与您正在录入的shipperAccount不一致，请确认是否继续？
\ No newline at end of file
......
......@@ -18,6 +18,7 @@ import com.fedex.connect.manager.controller.sys.ISysAuthController;
import com.fedex.connect.manager.data.dto.LogLoginDto;
import com.fedex.connect.manager.data.dto.LoginRequest;
import com.fedex.connect.manager.data.dto.SysUserDto;
import com.fedex.connect.manager.enums.ResponseCode;
import com.fedex.connect.manager.util.ParamConfigUtil;
import com.google.gson.JsonObject;
import io.jsonwebtoken.Claims;
......@@ -243,7 +244,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
new SecurityContextLogoutHandler().logout(request, response, auth);
}
resultRS.setCode(HttpServletResponse.SC_OK);
resultRS.setMsg(localeMessageUtil.getMessage("system_exception_40007"));
resultRS.setMsg(localeMessageUtil.getMessage(ResponseCode.MESSAGE_CODE_40005.getMsg()));
//清理redis中token
String token = request.getHeader(SecurityConstants.TOKEN_HEADER);
......@@ -264,7 +265,7 @@ public class SysAuthController extends BaseController implements ISysAuthControl
return resultRS;
} catch (Exception e) {
log.error("登出3失败",e);
resultRS.setMsg(localeMessageUtil.getMessage("system_exception_40008"));
resultRS.setMsg(localeMessageUtil.getMessage(ResponseCode.MESSAGE_CODE_40006.getMsg()));
resultRS.setCode(HttpServletResponse.SC_BAD_REQUEST);
} finally {
if (!org.springframework.util.StringUtils.isEmpty(id)){
......
......@@ -30,13 +30,13 @@ public class SysUserController extends BaseController implements ISysUserControl
}
if (sysUser.getId() == null || sysUser.getId() == 0){
responseUtils.fail(ResponseCode.MESSAGE_CODE_40005);
responseUtils.fail(ResponseCode.MESSAGE_CODE_40001);
}
//返回用户信息
return responseUtils.success(sysUser);
} catch (Exception e){
log.error("获取用户信息失败",e);
responseUtils.fail(ResponseCode.MESSAGE_CODE_40006);
responseUtils.fail(ResponseCode.MESSAGE_CODE_40001);
}
return success;
}
......@@ -56,7 +56,7 @@ public class SysUserController extends BaseController implements ISysUserControl
return responseUtils.success(sysUser);
} catch (Exception e){
log.error("获取用户信息失败",e);
responseUtils.fail(ResponseCode.MESSAGE_CODE_40006);
responseUtils.fail(ResponseCode.MESSAGE_CODE_40001);
}
return success;
}
......
......@@ -13,7 +13,6 @@ public enum ResponseCode {
MESSAGE_CODE_40004(40004,"system_exception_40004"),
MESSAGE_CODE_40005(40005,"system_exception_40005"),
MESSAGE_CODE_40006(40006,"system_exception_40006"),
MESSAGE_CODE_40007(40007,"system_exception_40007"),
;
private Integer code;
private String msg;
......
......@@ -7,11 +7,9 @@ system_exception_10004=登录超过8小时，请重新登录
system_exception_10005=登录已过期，请重新登录
#******************业务相关、需要做国际化******************
business_exception_40001=存入token失败
business_exception_40001=系统异常：登录失败，请稍后重试！
business_log_40002=用户登录
system_exception_40003=系统异常,请联系清关部门
system_exception_40004=登录已过期，请重新登录
system_exception_40005=用戶不存在
system_exception_40006=登录已过期
system_exception_40007=退出成功
system_exception_40008=退出失败
\ No newline at end of file
system_exception_40003=系统异常，请稍后重试！
system_exception_40004=单次登录已过有效期，请重新登录！
system_exception_40005=退出成功
system_exception_40006=退出失败
\ No newline at end of file
......
......@@ -7,11 +7,9 @@ system_exception_10004=登录超过8小时，请重新登录
system_exception_10005=登录已过期，请重新登录
#******************业务相关、需要做国际化******************
business_exception_40001=存入token失败
business_exception_40001=系统异常：登录失败，请稍后重试！
business_log_40002=用户登录
system_exception_40003=系统异常,请联系清关部门
system_exception_40004=登录已过期，请重新登录
system_exception_40005=用戶不存在
system_exception_40006=登录已过期
system_exception_40007=退出成功
system_exception_40008=退出失败
\ No newline at end of file
system_exception_40003=系统异常，请稍后重试！
system_exception_40004=单次登录已过有效期，请重新登录！
system_exception_40005=退出成功
system_exception_40006=退出失败
\ No newline at end of file
......