dao|log实体创建

@@ -51,6 +51,12 @@
       <version>12.2.0.1</version>
       <scope>${install.scope}</scope>
     </dependency>
+      <dependency>
+          <groupId>com.fedex.connect</groupId>
+          <artifactId>common-dependencies</artifactId>
+          <version>1.0.0</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
   <profiles>

+package com.fedex.connect.customer.controller;
+
+
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.Resource;
+import java.net.URI;
+import java.util.Objects;
+
+/**
+ * @author EDY
+ */
+public class AbstractEtController {
+
+    @Resource
+    protected LocaleMessageUtil localeMessageUtil;
+
+
+    public <T> ResponseEntity<T> seeOther(String url) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(URI.create(url));
+        return result(HttpStatus.SEE_OTHER, httpHeaders);
+    }
+
+    public <T> ResponseEntity<T> temporaryRedirect(String url) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(URI.create(url));
+        return result(HttpStatus.TEMPORARY_REDIRECT, httpHeaders);
+    }
+
+    public <T> ResponseEntity<T> permanentRedirect(String url) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(URI.create(url));
+        return result(HttpStatus.PERMANENT_REDIRECT, httpHeaders);
+    }
+
+    public <T> ResponseEntity<T> result(HttpStatus status, T data) {
+        return new ResponseEntity<>(data, status);
+    }
+
+    public <T> ResponseEntity<T> result(HttpStatus status, HttpHeaders headers) {
+        return new ResponseEntity<>(headers, status);
+    }
+
+    public <T> ResponseEntity<T> ok(T data) {
+        return new ResponseEntity<>(data, HttpStatus.OK);
+    }
+
+    public <T> ResponseEntity<T> ok(MultiValueMap<String, String> headers, T data) {
+        return new ResponseEntity<>(data, headers, HttpStatus.OK);
+    }
+
+    public <T> ResponseEntity<T> error(HttpStatus code) {
+        return new ResponseEntity<>(code);
+    }
+
+
+    public <T> ResponseEntity<T> error(HttpStatus code, MultiValueMap<String, String> headers) {
+        return new ResponseEntity<>(headers, code);
+    }
+
+
+    /**
+     * 通过自定义的错误码，转换为对应的HttpStatus
+     * @param response
+     * @return
+     */
+    public HttpStatus errorMappingStatus(ResponseResultVo response) {
+        if (Objects.isNull(response)) {
+            return HttpStatus.BAD_REQUEST; //400
+        }
+        return HttpStatus.BAD_REQUEST; //400
+    }
+
+
+    /**
+     * 判定是否返回成功
+     * @param responseEntity
+     * @param <T>
+     * @return
+     */
+    public <T> boolean isSuccess(ResponseEntity<ResponseResultVo<T>> responseEntity) {
+        return responseEntity != null && responseEntity.getBody() != null && responseEntity.getBody().isSuccess();
+    }
+
+    /**
+     * 判定是否返回成功
+     * @param response
+     * @param <T>
+     * @return
+     */
+    public <T> boolean isSuccess(ResponseResultVo<T> response) {
+        return response != null && response.isSuccess();
+    }
+
+}

+package com.fedex.connect.customer.controller.biz;
+
+public interface IConsignmentController {
+}

+package com.fedex.connect.customer.data;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.Objects;
+
+public class PageBase {
+
+    private Integer page;
+
+    private Integer size;
+
+    @JsonIgnore
+    private Integer start;
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public Integer getStart() {
+        Integer start = 0;
+        if (Objects.nonNull(page) && Objects.nonNull(size)) {
+            start = (page - 1) * size;
+        }
+        return start;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public PageBase() {
+    }
+
+    public PageBase(Integer page, Integer size, Integer start) {
+        this.page = page;
+        this.size = size;
+        this.start = start;
+    }
+}

+package com.fedex.connect.customer.data.query;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.customer.data.PageBase;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+
+public class ConsignmentQuery extends PageBase {
+
+    public static ConsignmentQuery dataProcessing(ConsignmentQuery query){
+        //多提单号查询
+        if (Utils.isNotEmpty(query.getDeliveryNo())) {
+            query.setDeliveryNoList(Utils.split(query.getDeliveryNo(), "[;\\n]"));
+        }
+        if(!CollectionUtils.isEmpty(query.getDeliveryNoList())) {
+            query.setCreateTimeFrom(null);
+            query.setCreateTimeTo(null);
+        }
+        query.setStart(query.getStart());
+        return query;
+    }
+
+    private String createTimeFrom;
+
+    private String createTimeTo;
+
+    private String deliveryNo;
+
+    private Long sort;
+
+    @JsonIgnore
+    private List<String> deliveryNoList;
+
+    @JsonIgnore
+    private Long userId;
+
+    public String getCreateTimeFrom() {
+        return createTimeFrom;
+    }
+
+    public void setCreateTimeFrom(String createTimeFrom) {
+        this.createTimeFrom = createTimeFrom;
+    }
+
+    public String getCreateTimeTo() {
+        return createTimeTo;
+    }
+
+    public void setCreateTimeTo(String createTimeTo) {
+        this.createTimeTo = createTimeTo;
+    }
+
+    public String getDeliveryNo() {
+        return deliveryNo;
+    }
+
+    public void setDeliveryNo(String deliveryNo) {
+        this.deliveryNo = deliveryNo;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public List<String> getDeliveryNoList() {
+        return deliveryNoList;
+    }
+
+    public void setDeliveryNoList(List<String> deliveryNoList) {
+        this.deliveryNoList = deliveryNoList;
+    }
+
+    public Long getSort() {
+        return sort;
+    }
+
+    public void setSort(Long sort) {
+        this.sort = sort;
+    }
+}

+package com.fedex.connect.customer.service;
+
+
+import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+
+import javax.annotation.Resource;
+
+public class AbstractEtService {
+
+	@Resource
+	protected LocaleMessageUtil localeMessageUtil;
+
+	/**
+	 * repository
+	 */
+
+
+	/**
+	 * Mapper---------------------------------------------
+	 */
+
+
+	/**
+	 * MapperExt---------------------------------------------
+	 */
+
+}

+package com.fedex.connect.customer.service.biz;
+
+public interface IConsignmentService {
+
+}

+package com.fedex.connect.customer.service.biz.impl;
+
+import com.fedex.connect.customer.service.AbstractEtService;
+import com.fedex.connect.customer.service.biz.IConsignmentService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ConsignmentServiceImpl extends AbstractEtService implements IConsignmentService {
+
+}

 package com.fedex.connect.common.dependencies.authentication.exception;
 
-import com.fedex.export.common.i18n.LocaleMessageUtil;
-import com.fedex.export.common.util.SpringBeanUtil;
-import com.fedex.export.data.vo.JsonResult;
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import com.fedex.connect.common.dependencies.util.SpringBeanUtil;
 import com.google.gson.Gson;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
@@ -24,7 +24,7 @@ public class JwtAccessDeniedHandler implements AccessDeniedHandler {
     public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/json");
-        JsonResult result = new JsonResult();
+        ResponseResultVo result = new ResponseResultVo();
         result.setCode(HttpServletResponse.SC_FORBIDDEN);
         //使用context手动注入
         LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class);

 package com.fedex.connect.common.dependencies.authentication.exception;
 
-import com.fedex.export.common.i18n.LocaleMessageUtil;
-import com.fedex.export.common.util.SpringBeanUtil;
-import com.fedex.export.data.vo.JsonResult;
+
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import com.fedex.connect.common.dependencies.util.SpringBeanUtil;
 import com.google.gson.Gson;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -25,7 +26,7 @@ public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/json");
-        JsonResult result = new JsonResult();
+        ResponseResultVo result = new ResponseResultVo();
         result.setCode(HttpServletResponse.SC_UNAUTHORIZED);
         //使用context手动注入
         LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class);

@@ -3,7 +3,7 @@ package com.fedex.connect.common.dependencies.config;
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
-import com.fedex.connect.common.model.base.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;

 package com.fedex.connect.common.dependencies.config;
 
-import com.fedex.connect.common.model.base.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
 
 import java.util.List;
 

+package com.fedex.connect.common.dependencies.date.dto;
+
+import com.fedex.connect.common.model.sys.User;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 继承核心用户信息。实现UserDetails。SpringSecurity进行用户信息认证
+ * @author Administrator
+ */
+public class SecurityUserDetails implements UserDetails {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String username;
+
+    private String password;
+
+    private boolean isAccountNonExpired = true;
+
+    private boolean isAccountNonLocked = true;
+
+    private boolean isCredentialsNonExpired = true;
+
+    private boolean isEnabled = true;
+
+    private User user;
+
+    private Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setAccountNonExpired(boolean isAccountNonExpired) {
+        this.isAccountNonExpired = isAccountNonExpired;
+    }
+
+    public void setAccountNonLocked(boolean isAccountNonLocked) {
+        this.isAccountNonLocked = isAccountNonLocked;
+    }
+
+    public void setCredentialsNonExpired(boolean isCredentialsNonExpired) {
+        this.isCredentialsNonExpired = isCredentialsNonExpired;
+    }
+
+    public void setEnabled(boolean isEnabled) {
+        this.isEnabled = isEnabled;
+    }
+
+    public void setAuthorities(Set<GrantedAuthority> authorities) {
+        this.authorities = authorities;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return isAccountNonExpired;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return isAccountNonLocked;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return isCredentialsNonExpired;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+
+
+    @Override
+    public Collection<GrantedAuthority> getAuthorities() {
+        return authorities;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+}

+package com.fedex.connect.common.dependencies.date.model;
+
+import com.google.gson.Gson;
+
+/**
+ * 用于打印日志的Model。
+ * 为了将来打印的日志，转换语言
+ * @author EDY
+ */
+public class LogShowModel {
+
+    /**
+     * 方法
+     */
+    private String method;
+
+    /**
+     * 参数
+     */
+    private Object param;
+
+    /**
+     * 返回
+     */
+    private Object result;
+
+    /**
+     * 异常
+     */
+    private Exception e;
+
+    /**
+     * 错误
+     */
+    private String msg;
+
+
+    public static String showRequest(String methodName, Object param){
+        LogShowModel lsm = new LogShowModel();
+        lsm.setMethod(methodName);
+        lsm.setParam(param);
+        return lsm.toString();
+    }
+
+    public static String showResponse(String methodName, Object result){
+        LogShowModel lsm = new LogShowModel();
+        lsm.setMethod(methodName);
+        lsm.setResult(result);
+        return lsm.toString();
+    }
+
+    public static String showException(String methodName, Exception e){
+        LogShowModel lsm = new LogShowModel();
+        lsm.setMethod(methodName);
+        lsm.setE(e);
+        return lsm.toString();
+    }
+
+    public static String showMsg(String methodName, String msg){
+        LogShowModel lsm = new LogShowModel();
+        lsm.setMethod(methodName);
+        lsm.setMsg(msg);
+        return lsm.toString();
+    }
+
+    @Override
+    public String toString() {
+        Gson gson = new Gson();
+        StringBuilder show = new StringBuilder("方法：" + method);
+        if (param != null){
+            show.append(",请求参数："+gson.toJson(param));
+        }
+        if (result != null){
+            show.append(",响应："+gson.toJson(result));
+        }
+        if (e != null){
+            show.append(",异常："+ e.toString());
+        }
+        if (msg != null){
+            show.append(","+ msg);
+        }
+        return show.toString();
+    }
+
+    public LogShowModel(String method, Object param, Object result, Exception e, String msg) {
+        this.method = method;
+        this.param = param;
+        this.result = result;
+        this.e = e;
+        this.msg = msg;
+    }
+
+    public LogShowModel() {
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public Object getParam() {
+        return param;
+    }
+
+    public void setParam(Object param) {
+        this.param = param;
+    }
+
+    public Object getResult() {
+        return result;
+    }
+
+    public void setResult(Object result) {
+        this.result = result;
+    }
+
+    public Exception getE() {
+        return e;
+    }
+
+    public void setE(Exception e) {
+        this.e = e;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

-package com.fedex.connect.manager.data.vo;
+package com.fedex.connect.common.dependencies.date.vo;
 
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 
 import javax.servlet.http.HttpServletResponse;
 
-public class JsonResult<T> {
+/**
+  * @Author Szl
+  * @Description 类说明 响应结果vo
+  * @Date 2024/10/30
+  */
+public class ResponseResultVo<T> {
 
     private int code = HttpServletResponse.SC_BAD_REQUEST;;
     private String msg;
@@ -43,16 +48,16 @@ public class JsonResult<T> {
         this.data = data;
     }
 
-    public static JsonResult succ(Object data,String message) {
+    public static ResponseResultVo succ(Object data, String message) {
         return succ(ResponseCode.SUCCESS_CODE.getCode(), message, data);
     }
 
-    public static JsonResult succ(Object data) {
+    public static ResponseResultVo succ(Object data) {
         return succ(ResponseCode.SUCCESS_CODE.getCode(), "SUCCESS", data);
     }
 
-    public static JsonResult succ(int code, String msg, Object data) {
-        JsonResult r = new JsonResult();
+    public static ResponseResultVo succ(int code, String msg, Object data) {
+        ResponseResultVo r = new ResponseResultVo();
         r.setCode(code);
         r.setMsg(msg);
         r.setSuccess(true);
@@ -60,12 +65,12 @@ public class JsonResult<T> {
         return r;
     }
 
-    public static JsonResult fail(String msg) {
+    public static ResponseResultVo fail(String msg) {
         return fail(ResponseCode.FAIL_CODE.getCode(), msg,null);
     }
 
-    public static JsonResult fail(int code, String msg,Object data) {
-        JsonResult r = new JsonResult();
+    public static ResponseResultVo fail(int code, String msg, Object data) {
+        ResponseResultVo r = new ResponseResultVo();
         r.setCode(code);
         r.setMsg(msg);
         r.setSuccess(false);
@@ -73,11 +78,11 @@ public class JsonResult<T> {
         return r;
     }
 
-    public static JsonResult fail(ResponseCode resultCode) {
+    public static ResponseResultVo fail(ResponseCode resultCode) {
         return fail(resultCode.getCode(), resultCode.getMsg(), null);
     }
 
-    public static JsonResult fail(ResponseCode resultCode, Object data) {
+    public static ResponseResultVo fail(ResponseCode resultCode, Object data) {
         return fail(resultCode.getCode(), resultCode.getMsg(), data);
     }
 }

+package com.fedex.connect.common.dependencies.util;
+
+import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
+import com.fedex.connect.common.model.sys.User;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+
+/**
+ * @author Administrator
+ */
+public class CurrentUserInfo {
+
+    public static UserDetails getUserDetails() throws RuntimeException {
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        UserDetails userDetails = null;
+        try {
+            userDetails = (UserDetails) principal;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+        return userDetails;
+    }
+
+    public static User getCurUser() throws Exception {
+        SecurityUserDetails userDetails = null;
+        try {
+            userDetails = (SecurityUserDetails) getUserDetails();
+        } catch (Exception e) {
+            throw e;
+        }
+        return userDetails.getUser();
+    }
+
+    public static User getUser() throws Exception {
+        User sysUser = null;
+        try {
+            sysUser = getCurUser();
+        } catch (Exception e) {
+            throw e;
+        }
+        return sysUser;
+    }
+
+    /**
+     * 用户ID
+     *
+     * @return
+     */
+    public static Long getUserId() throws Exception {
+        return getUser().getId();
+    }
+
+    /**
+     * 用户登录名 + 用户姓名
+     *
+     * @return
+     */
+    public static String getUserName() throws Exception {
+        return getUser().getAccNo() + " - " + getUser().getUserName();
+    }
+
+    /**
+     * 用户登录名
+     *
+     * @return
+     */
+    public static String getLoginName() throws Exception {
+        return getUser().getAccNo();
+    }
+
+    public static Long findUserId() {
+        SecurityUserDetails s = ((SecurityUserDetails) getUserDetails());
+        return s.getId();
+    }
+
+    public static List<String> getAuthorities() {
+        Collection<GrantedAuthority> gaList = (Collection<GrantedAuthority>) getUserDetails().getAuthorities();
+        List<String> list = new ArrayList<String>();
+        for (GrantedAuthority ga : gaList) {
+            list.add(ga.getAuthority());
+        }
+        return list;
+    }
+}

+package com.fedex.connect.common.dependencies.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ *spring加载过程中将ApplicationContext注入到工具类当中，在使用时，直接从工具类中获取对应的bean
+ * @author EDY
+ */
+@Component
+public class SpringBeanUtil implements ApplicationContextAware {
+
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        /** 将框架初始化加载的ioc容器赋值给 静态ApplicationContext*/
+        if (SpringBeanUtil.applicationContext == null) {
+            SpringBeanUtil.applicationContext = applicationContext;
+        }
+    }
+
+    /**
+     * 获取Ioc容器
+     */
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+
+    /**
+     * 通过名称获取Bean
+     */
+    public static Object getBean(String name) {
+        return getApplicationContext().getBean(name);
+    }
+
+    /**
+     * 通过class获取Bean
+     */
+    public static <T> T getBean(Class<T> clazz) {
+        return getApplicationContext().getBean(clazz);
+    }
+
+    /**
+     * 通过名称、class获取Bean
+     */
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return getApplicationContext().getBean(name, clazz);
+    }
+}
\ No newline at end of file

 package com.fedex.connect.manager.controller;
 
 
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.manager.config.PropertiesConfig;
 import com.fedex.connect.manager.controller.log.ILogLoginService;
-import com.fedex.connect.manager.data.vo.JsonResult;
 import com.fedex.connect.manager.service.system.ISysAuthService;
 import com.fedex.connect.manager.service.system.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +86,7 @@ public class AbstractEtController {
      * @param response
      * @return
      */
-    public HttpStatus errorMappingStatus(JsonResult response) {
+    public HttpStatus errorMappingStatus(ResponseResultVo response) {
         if (Objects.isNull(response)) {
             return HttpStatus.BAD_REQUEST; //400
         }
@@ -100,7 +100,7 @@ public class AbstractEtController {
      * @param <T>
      * @return
      */
-    public <T> boolean isSuccess(ResponseEntity<JsonResult<T>> responseEntity) {
+    public <T> boolean isSuccess(ResponseEntity<ResponseResultVo<T>> responseEntity) {
         return responseEntity != null && responseEntity.getBody() != null && responseEntity.getBody().isSuccess();
     }
 
@@ -110,7 +110,7 @@ public class AbstractEtController {
      * @param <T>
      * @return
      */
-    public <T> boolean isSuccess(JsonResult<T> response) {
+    public <T> boolean isSuccess(ResponseResultVo<T> response) {
         return response != null && response.isSuccess();
     }
 

@@ -2,6 +2,7 @@ package com.fedex.connect.manager.controller.system.impl;
 
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.StringExtUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
@@ -12,7 +13,6 @@ import com.fedex.connect.manager.controller.system.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.data.vo.JsonResult;
 import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,8 +44,8 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
 
     @PostMapping("/init")
     @ApiOperation(value = "初始化进入首页获取FCL登录地址")
-    public JsonResult init(){
-        return JsonResult.succ(fclIndexLoginUrl);
+    public ResponseResultVo init(){
+        return ResponseResultVo.succ(fclIndexLoginUrl);
     }
 
 
@@ -79,7 +79,7 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
             if (cookiesList.size() > 0 && cookiesList.size() == saveKeyList.size()){
                 JsonObject jsonObject = GsonUtils.stringToBean("{"+String.join(",",cookiesList)+"}",JsonObject.class);
                 //set cookie by fcl_key
-                JsonResult tokenResult = sysAuthService.createFclToken(jsonObject);
+                ResponseResultVo tokenResult = sysAuthService.createFclToken(jsonObject);
                 if (tokenResult.isSuccess()){
                     String fcl_token_key  = String.valueOf(tokenResult.getData());
                     String redirectUrl = String.format("%s?token=%s", propertiesConfig.getFclLoginUrl(), fcl_token_key);
@@ -137,7 +137,7 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
         //创建token
         LoginRequest loginRequest = new LoginRequest();
         loginRequest.setRememberMe(true);
-        JsonResult tokenResult = sysAuthService.createAccessToken(loginRequest, loginUser);
+        ResponseResultVo tokenResult = sysAuthService.createAccessToken(loginRequest, loginUser);
 
         //记录日志
         LogLoginDto dto = new LogLoginDto(loginUser.getId(), DatabaseConstants.USER_OPER_FCL_REGISTER,

 package com.fedex.connect.manager.data.dto;
 
 
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.Utils;
-import com.fedex.connect.manager.data.vo.JsonResult;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -26,17 +26,17 @@ public class LoginRequest implements Serializable {
      * @param dto
      * @return
      */
-    public static JsonResult validate(LoginRequest dto){
+    public static ResponseResultVo validate(LoginRequest dto){
         if (dto == null){
-            JsonResult.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
+            ResponseResultVo.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
         }
         if (StringUtils.isBlank(dto.getAccNo())){
-            JsonResult.fail("auth_login_accno_null");
+            ResponseResultVo.fail("auth_login_accno_null");
         }
         if (StringUtils.isBlank(dto.getPassword())){
-            JsonResult.fail("auth_login_pwd_null");
+            ResponseResultVo.fail("auth_login_pwd_null");
         }
-        return JsonResult.succ(null);
+        return ResponseResultVo.succ(null);
     }
 
     /**

@@ -2,12 +2,12 @@ package com.fedex.connect.manager.data.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.BytesUtils;
 import com.fedex.connect.common.dependencies.util.StringExtUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.sys.User;
-import com.fedex.connect.manager.data.vo.JsonResult;
 import io.swagger.annotations.ApiModel;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -43,94 +43,94 @@ public class SysUserDto {
      * @param dto
      * @return
      */
-    public static JsonResult validatedDto(SysUserDto dto){
+    public static ResponseResultVo validatedDto(SysUserDto dto){
         if (dto == null){
-            JsonResult.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
+            ResponseResultVo.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
         }
         //必填校验
         if (StringUtils.isBlank(dto.getAccNo())){
-            JsonResult.fail("dto_vali_user_accno_null");
+            ResponseResultVo.fail("dto_vali_user_accno_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getAccNo()) > 200){
-            JsonResult.fail("dto_vali_user_accno_max");
+            ResponseResultVo.fail("dto_vali_user_accno_max");
         }
         if (StringUtils.isBlank(dto.getUserName())){
-            JsonResult.fail("dto_vali_user_name_null");
+            ResponseResultVo.fail("dto_vali_user_name_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getUserName()) > 200){
-            JsonResult.fail("dto_vali_user_name_max");
+            ResponseResultVo.fail("dto_vali_user_name_max");
         }
         if (StringUtils.isBlank(dto.getPassword())){
-            JsonResult.fail("dto_vali_user_pwd_null");
+            ResponseResultVo.fail("dto_vali_user_pwd_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getPassword()) > 255){
-            JsonResult.fail("dto_vali_user_pwd_max");
+            ResponseResultVo.fail("dto_vali_user_pwd_max");
         }
         if (StringUtils.isBlank(dto.getPassword2())){
-            JsonResult.fail("dto_vali_user_pwd2_null");
+            ResponseResultVo.fail("dto_vali_user_pwd2_null");
         }
         if (StringUtils.equals(dto.getPassword(),dto.getPassword2())){
-            JsonResult.fail("dto_vali_user_pwd3_null");
+            ResponseResultVo.fail("dto_vali_user_pwd3_null");
         }
         if (StringUtils.isBlank(dto.getFedexAccNo())){
-            JsonResult.fail("dto_vali_user_fed_no_null");
+            ResponseResultVo.fail("dto_vali_user_fed_no_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getFedexAccNo()) > 200){
-            JsonResult.fail("dto_vali_user_fed_no_max");
+            ResponseResultVo.fail("dto_vali_user_fed_no_max");
         }
         if (!NumberUtils.isDigits(dto.getFedexAccNo()) || dto.getFedexAccNo().length() != 9){
-            JsonResult.fail("dto_vali_user_fed_no_num");
+            ResponseResultVo.fail("dto_vali_user_fed_no_num");
         }
         if (StringUtils.isBlank(dto.getFedexAccNo2())){
-            JsonResult.fail("dto_vali_user_fed_no_null");
+            ResponseResultVo.fail("dto_vali_user_fed_no_null");
         }
         if (!NumberUtils.isDigits(dto.getFedexAccNo2()) || dto.getFedexAccNo2().length() != 9){
-            JsonResult.fail("dto_vali_user_fed_no_num");
+            ResponseResultVo.fail("dto_vali_user_fed_no_num");
         }
         if (StringUtils.equals(dto.getFedexAccNo(),dto.getFedexAccNo2())){
-            JsonResult.fail("dto_vali_user_fed_no3_null");
+            ResponseResultVo.fail("dto_vali_user_fed_no3_null");
         }
         if (StringUtils.isBlank(dto.getEmail())){
-            JsonResult.fail("dto_vali_user_email_null");
+            ResponseResultVo.fail("dto_vali_user_email_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getEmail()) > 100){
-            JsonResult.fail("dto_vali_user_email_max");
+            ResponseResultVo.fail("dto_vali_user_email_max");
         }
         if (!StringExtUtil.isEmail(dto.getEmail())){
-            JsonResult.fail("dto_vali_user_email_final");
+            ResponseResultVo.fail("dto_vali_user_email_final");
         }
         if (StringUtils.isBlank(dto.getPhone())){
-            JsonResult.fail("dto_vali_user_phone_null");
+            ResponseResultVo.fail("dto_vali_user_phone_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getPhone()) > 20){
-            JsonResult.fail("dto_vali_user_phone_max");
+            ResponseResultVo.fail("dto_vali_user_phone_max");
         }
         if (StringUtils.isBlank(dto.getCompanyName())){
-            JsonResult.fail("dto_vali_user_com_name_null");
+            ResponseResultVo.fail("dto_vali_user_com_name_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getCompanyName()) > 255){
-            JsonResult.fail("dto_vali_user_com_name_max");
+            ResponseResultVo.fail("dto_vali_user_com_name_max");
         }
         if (StringUtils.isBlank(dto.getUnifiedBusinessNum())){
-            JsonResult.fail("dto_vali_user_no_null");
+            ResponseResultVo.fail("dto_vali_user_no_null");
         }
         if (BytesUtils.getStrUTF8ByteLength(dto.getUnifiedBusinessNum()) > 30){
-            JsonResult.fail("dto_vali_user_no_max");
+            ResponseResultVo.fail("dto_vali_user_no_max");
         }
         if (!StringUtils.isBlank(dto.getCustomsSerialNum()) &&
                 BytesUtils.getStrUTF8ByteLength(dto.getUnifiedBusinessNum()) > 30){
-            JsonResult.fail("dto_vali_serlai_max");
+            ResponseResultVo.fail("dto_vali_serlai_max");
         }
         if (!NumberUtils.isDigits(dto.getUnifiedBusinessNum())){
-            JsonResult.fail("dto_vali_user_no_final");
+            ResponseResultVo.fail("dto_vali_user_no_final");
         }
         if (!dto.isPolicyFlag()){
-            JsonResult.fail("dto_vali_user_no_policy");
+            ResponseResultVo.fail("dto_vali_user_no_policy");
         }
         if (!dto.isClauseFlag()){
-            JsonResult.fail("dto_vali_user_no_clause");
+            ResponseResultVo.fail("dto_vali_user_no_clause");
         }
-        return JsonResult.succ(null);
+        return ResponseResultVo.succ(null);
     }
 
     /**

 package com.fedex.connect.manager.service.system;
 
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.LoginRequest;
-import com.fedex.connect.manager.data.vo.JsonResult;
 import com.google.gson.JsonObject;
 
 public interface ISysAuthService {
-    JsonResult createAccessToken(LoginRequest loginRequest, User user);
+    ResponseResultVo createAccessToken(LoginRequest loginRequest, User user);
 
-    JsonResult createFclToken(JsonObject token);
+    ResponseResultVo createFclToken(JsonObject token);
 
     JsonObject getFclToken(String tokenKey);
 }

@@ -3,6 +3,7 @@ package com.fedex.connect.manager.service.system.impl;
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
+import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
@@ -10,7 +11,6 @@ import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.LoginRequest;
-import com.fedex.connect.manager.data.vo.JsonResult;
 import com.fedex.connect.manager.service.AbstractEtService;
 import com.fedex.connect.manager.service.system.IRedisUtilService;
 import com.fedex.connect.manager.service.system.ISysAuthService;
@@ -47,7 +47,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
      * @param user
      * @return
      */
-    public JsonResult createAccessToken(LoginRequest loginRequest, User user) {
+    public ResponseResultVo createAccessToken(LoginRequest loginRequest, User user) {
         //2、创建token
         List<String> roleCodeList = new ArrayList<>();
         Role roleInfo = sysRoleInfoService.findRoleByUserId(user.getId());
@@ -65,10 +65,10 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
             redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + user.getId(), token, redisExpireTime);
         } catch (NullPointerException e) {
             logger.error("***************** redis 异常：{} *********************", e);
-            return JsonResult.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
+            return ResponseResultVo.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
         }
 
-        return JsonResult.succ(token);
+        return ResponseResultVo.succ(token);
     }
 
 
@@ -77,17 +77,17 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
      * @param token token信息
      * @return token key
      */
-    public JsonResult createFclToken(JsonObject token) {
+    public ResponseResultVo createFclToken(JsonObject token) {
         String tokenKey = DatabaseConstants.FCL_PREFIX + UUID.randomUUID();
         try {
             /*redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + tokenKey, GsonUtils.beanToString(token), RedisConstants.REDIS_EXPRIE_TIME_1W);*/
             redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + tokenKey, GsonUtils.beanToString(token), 1);
         } catch (NullPointerException e) {
             logger.error("***************** redis 异常：{} *********************", e);
-            return JsonResult.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
+            return ResponseResultVo.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
         }
 
-        return JsonResult.succ(tokenKey);
+        return ResponseResultVo.succ(tokenKey);
     }
 
     /**

@@ -3,7 +3,7 @@ package com.fedex.connect.manager.service.system.impl;
 import com.fedex.connect.common.dependencies.config.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
-import com.fedex.connect.common.model.base.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.RoleExample;
 import com.fedex.connect.common.model.sys.UserRole;

@@ -5,7 +5,7 @@ import com.fedex.connect.common.dependencies.authentication.EncryptProvider;
 import com.fedex.connect.common.dependencies.config.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
-import com.fedex.connect.common.model.base.DictionaryEntries;
+import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserExample;