All | 修改 | 日志输出调整

mt
2024年11月6日13:38:05

-package com.fedex.connect.customer.controller;
+package com.fedex.connect.customer.controller.base;
 
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.customer.service.biz.IAttachmentService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
@@ -20,7 +20,7 @@ import java.util.Objects;
 /**
  * @author EDY
  */
-public class AbstractEtController {
+public class BaseController {
 
     @Resource
     protected LocaleMessageUtil localeMessageUtil;
@@ -87,7 +87,7 @@ public class AbstractEtController {
      * @param response
      * @return
      */
-    public HttpStatus errorMappingStatus(ResponseResultVo response) {
+    public HttpStatus errorMappingStatus(ResponseVo response) {
         if (Objects.isNull(response)) {
             return HttpStatus.BAD_REQUEST; //400
         }
@@ -101,7 +101,7 @@ public class AbstractEtController {
      * @param <T>
      * @return
      */
-    public <T> boolean isSuccess(ResponseEntity<ResponseResultVo<T>> responseEntity) {
+    public <T> boolean isSuccess(ResponseEntity<ResponseVo<T>> responseEntity) {
         return responseEntity != null && responseEntity.getBody() != null && responseEntity.getBody().isSuccess();
     }
 
@@ -111,7 +111,7 @@ public class AbstractEtController {
      * @param <T>
      * @return
      */
-    public <T> boolean isSuccess(ResponseResultVo<T> response) {
+    public <T> boolean isSuccess(ResponseVo<T> response) {
         return response != null && response.isSuccess();
     }
 

 package com.fedex.connect.customer.controller.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.customer.data.bo.LongBo;
 import org.springframework.web.bind.annotation.RequestBody;
 
 public interface IAttachmentController {
-    ResponseResultVo findHistory(@RequestBody LongBo bo);
+    ResponseVo findHistory(@RequestBody LongBo bo);
 }

 package com.fedex.connect.customer.controller.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
 import org.springframework.web.bind.annotation.RequestBody;
 
 public interface IConsignmentController {
-    ResponseResultVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery);
+    ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery);
 
-    ResponseResultVo addConsignment(@RequestBody AddBo bo);
+    ResponseVo addConsignment(@RequestBody AddBo bo);
 }

 package com.fedex.connect.customer.controller.biz.impl;
 
 import com.fedex.connect.common.dependencies.date.model.LogShowModel;
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
-import com.fedex.connect.customer.controller.AbstractEtController;
+import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.biz.IAttachmentController;
 import com.fedex.connect.customer.data.bo.LongBo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,16 +20,16 @@ import org.springframework.web.bind.annotation.RestController;
   * @Description 类说明 附件相关
   * @Date 2024/11/4
   */
+@Slf4j
 @RestController
 @RequestMapping(value = "/attachment", name = "附件相关")
 @Api(value = "AttachmentControllerImpl", tags = {"附件相关"})
-public class AttachmentControllerImpl extends AbstractEtController implements IAttachmentController {
-    private static final Logger logger = LoggerFactory.getLogger(AttachmentControllerImpl.class);
+public class AttachmentControllerImpl extends BaseController implements IAttachmentController {
 
     @PostMapping("/find/history")
     @ApiOperation(value = "历史上传记录查询")
-    public ResponseResultVo findHistory(@RequestBody LongBo bo) {
-        ResponseResultVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
+    public ResponseVo findHistory(@RequestBody LongBo bo) {
+        ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
         if (responseResultVo != null){
             return responseResultVo;
         }
@@ -39,11 +38,8 @@ public class AttachmentControllerImpl extends AbstractEtController implements IA
             userId = CurrentUserInfo.getUserId();
             //userId = 0L;
         } catch (Exception e) {
-            logger.error(LogShowModel.showException("Exception", e));
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
-        }
-        if (userId == null) {
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
+            log.error(LogShowModel.showException("Exception", e));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
         }
         return attachmentService.findHistory(userId,bo.getId());
     }

 package com.fedex.connect.customer.controller.biz.impl;
 
 import com.fedex.connect.common.dependencies.date.model.LogShowModel;
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
 import com.fedex.connect.common.model.sys.User;
-import com.fedex.connect.customer.controller.AbstractEtController;
+import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.biz.IConsignmentController;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
@@ -26,23 +26,23 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value = "/consignment", name = "运单相关")
 @Api(value = "ConsignmentController", tags = {"运单相关"})
-public class ConsignmentControllerImpl extends AbstractEtController implements IConsignmentController {
+public class ConsignmentControllerImpl extends BaseController implements IConsignmentController {
     private static final Logger logger = LoggerFactory.getLogger(ConsignmentControllerImpl.class);
 
 
     @PostMapping("/find/list")
     @ApiOperation(value = "运单查询")
-    public ResponseResultVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
+    public ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
         User user = null;
         try {
             user = CurrentUserInfo.getUser();
             //userId = 0L;
         } catch (Exception e) {
             logger.error(LogShowModel.showException("Exception", e));
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
         }
         if (user == null) {
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
         }
 
         ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
@@ -53,8 +53,8 @@ public class ConsignmentControllerImpl extends AbstractEtController implements I
 
     @PostMapping("/add")
     @ApiOperation("上传运单")
-    public ResponseResultVo addConsignment(@RequestBody AddBo bo){
-        ResponseResultVo responseResultVo = consignmentValidate.preCheckAdd(bo);
+    public ResponseVo addConsignment(@RequestBody AddBo bo){
+        ResponseVo responseResultVo = consignmentValidate.preCheckAdd(bo);
         if (responseResultVo != null){
             return responseResultVo;
         }
@@ -63,10 +63,10 @@ public class ConsignmentControllerImpl extends AbstractEtController implements I
             user = CurrentUserInfo.getUser();
         } catch (Exception e) {
             logger.error(LogShowModel.showException("Exception", e));
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
         }
         if (user == null) {
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
         }
         return consignmentService.add(bo,user);
     }

-package com.fedex.connect.customer.service;
+package com.fedex.connect.customer.service.base;
 
 
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;
 
-public class AbstractEtService {
+public class BaseService {
 
 	@Resource
 	protected LocaleMessageUtil localeMessageUtil;

 package com.fedex.connect.customer.service.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 
 public interface IAttachmentService {
-    ResponseResultVo findHistory(Long userId, Long bizId);
+    ResponseVo findHistory(Long userId, Long bizId);
 }

 package com.fedex.connect.customer.service.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
@@ -11,9 +11,9 @@ public interface IConsignmentService {
       * @Description 功能说明 运单查询
       * @Date 2024/11/5
       * @param query
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    ResponseResultVo findConsignments(ConsignmentQuery query);
+    ResponseVo findConsignments(ConsignmentQuery query);
 
     /**
       * @Author Szl
@@ -21,7 +21,7 @@ public interface IConsignmentService {
       * @Date 2024/11/5
       * @param bo
       * @param user
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    ResponseResultVo add(AddBo bo, User user);
+    ResponseVo add(AddBo bo, User user);
 }

@@ -2,9 +2,9 @@ package com.fedex.connect.customer.service.biz.impl;
 
 import com.fedex.connect.common.dependencies.contants.DigitConstants;
 import com.fedex.connect.common.dependencies.date.vo.PageResult;
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
-import com.fedex.connect.customer.service.AbstractEtService;
+import com.fedex.connect.customer.service.base.BaseService;
 import com.fedex.connect.customer.service.biz.IAttachmentService;
 import org.springframework.stereotype.Service;
 
@@ -17,16 +17,16 @@ import java.util.List;
   * @Date 2024/11/4
   */
 @Service
-public class AttachmentServiceImpl extends AbstractEtService implements IAttachmentService {
+public class AttachmentServiceImpl extends BaseService implements IAttachmentService {
     /**
       * @Author Szl
       * @Description 功能说明 查询该运单历史数据
       * @Date 2024/11/5
       * @param userId
       * @param bizId
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseResultVo findHistory(Long userId, Long bizId) {
+    public ResponseVo findHistory(Long userId, Long bizId) {
         List<AttachmentHistoryDto> history = attachmentRepository.findHistory(bizId);
 
         if (history != null) {
@@ -42,7 +42,7 @@ public class AttachmentServiceImpl extends AbstractEtService implements IAttachm
         PageResult pageResult = new PageResult();
         pageResult.setList(history != null ? history : Collections.emptyList());
 
-        return ResponseResultVo.succ(pageResult);
+        return ResponseVo.succ(pageResult);
     }
 
 }

@@ -2,13 +2,13 @@ package com.fedex.connect.customer.service.biz.impl;
 
 import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
 import com.fedex.connect.common.dependencies.date.vo.PageResult;
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.biz.Consignment;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.query.ConsignmentQuery;
-import com.fedex.connect.customer.service.AbstractEtService;
+import com.fedex.connect.customer.service.base.BaseService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@ import java.util.List;
   * @Date 2024/10/31
   */
 @Service
-public class ConsignmentServiceImpl extends AbstractEtService implements IConsignmentService {
+public class ConsignmentServiceImpl extends BaseService implements IConsignmentService {
 
     @Autowired
     private ConsignmentUtil consignmentUtil;
@@ -32,13 +32,13 @@ public class ConsignmentServiceImpl extends AbstractEtService implements IConsig
       * @Description 功能说明 运单查询
       * @Date 2024/11/5
       * @param query
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseResultVo findConsignments(ConsignmentQuery query) {
+    public ResponseVo findConsignments(ConsignmentQuery query) {
 
         List<String> consignmentCodeList = query.getConsignmentCodeList();
         if (Utils.isNotEmpty(consignmentCodeList) && consignmentCodeList.size() > GlobalConstantFedex.DECLARE_COUNT) {
-            return ResponseResultVo.fail(localeMessageUtil.getMessage("conl_cus_declare_count_max"));
+            return ResponseVo.fail(localeMessageUtil.getMessage("conl_cus_declare_count_max"));
         }
 
         //查询数量
@@ -54,7 +54,7 @@ public class ConsignmentServiceImpl extends AbstractEtService implements IConsig
         }
         List<Consignment> consignments = consignmentExtRepository.findConsignments(query);
         pageResult.setList(consignments);
-        return ResponseResultVo.succ(pageResult);
+        return ResponseVo.succ(pageResult);
     }
 
     /**
@@ -63,14 +63,14 @@ public class ConsignmentServiceImpl extends AbstractEtService implements IConsig
       * @Date 2024/11/5
       * @param bo
       * @param user
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseResultVo add(AddBo bo, User user){
+    public ResponseVo add(AddBo bo, User user){
         //查询运单表是否存在已提交的运单
         Consignment consignment = consignmentExtRepository.findByConsignmentCode(bo.getConsignmentCode());
         if (consignment != null && consignment.getId() != null){
             //如果存在则进行bo基础校验
-            ResponseResultVo responseResultVo = consignmentUtil.consignmentCreatorCheck(consignment,bo);
+            ResponseVo responseResultVo = consignmentUtil.consignmentCreatorCheck(consignment,bo);
             if (responseResultVo != null){
                 return responseResultVo;
             }
@@ -78,6 +78,6 @@ public class ConsignmentServiceImpl extends AbstractEtService implements IConsig
 
         }
         //如果不存在直接返回
-        return ResponseResultVo.succ(null);
+        return ResponseVo.succ(null);
     }
 }

 package com.fedex.connect.customer.util.service.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.model.biz.Consignment;
@@ -25,9 +25,9 @@ public class ConsignmentUtil {
       * @Description 功能说明 校验运单创建人
       * @Date 2024/11/5
       * @param consignment
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseResultVo consignmentCreatorCheck(Consignment consignment, AddBo bo) {
+    public ResponseVo consignmentCreatorCheck(Consignment consignment, AddBo bo) {
         List<String> errList = new ArrayList<>();
 
         // 校验字段是否匹配，并将错误信息添加到errList中
@@ -38,7 +38,7 @@ public class ConsignmentUtil {
         if (!errList.isEmpty()) {
             String enumResCode601 = localeMessageUtil.getMessage("enum_res_code_601");
             String errResult = String.join(",", errList) + enumResCode601;
-            return ResponseResultVo.fail(ResponseCode.CONSIGNMENT_CREATOR_ERR.getCode(), errResult);
+            return ResponseVo.fail(ResponseCode.CONSIGNMENT_CREATOR_ERR.getCode(), errResult);
         }
 
         return null;

 package com.fedex.connect.customer.validate.controller.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.customer.data.bo.LongBo;
@@ -23,11 +23,11 @@ public class AttachmentValidate {
       * @Description 功能说明 历史数据输入校验
       * @Date 2024/11/5
       * @param bo
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseResultVo preCheckForFindHistory(LongBo bo){
+    public ResponseVo preCheckForFindHistory(LongBo bo){
         if (bo == null || bo.getId() == null){
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));
         }
         return null;
     }

 package com.fedex.connect.customer.validate.controller.biz;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.customer.data.bo.AddBo;
@@ -24,13 +24,13 @@ public class ConsignmentValidate {
       * @Description 功能说明 添加运单校验
       * @Date 2024/11/5
       * @param bo
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseResultVo
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
       */
-    public ResponseResultVo preCheckAdd(AddBo bo){
+    public ResponseVo preCheckAdd(AddBo bo){
         if (bo == null || StringUtils.isEmpty(bo.getAccountNo()) || StringUtils.isEmpty(bo.getConsignmentCode()) ||
                 StringUtils.isEmpty(bo.getRecipientCountry()) || StringUtils.isEmpty(bo.getShipperAccount()) ||
                 StringUtils.isEmpty(bo.getShipperCountry())){
-            return ResponseResultVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.REQUEST_PARAM_NULL.getMsg()));
         }
         return null;
     }

 package com.fedex.connect.common.dependencies.authentication.exception;
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.util.SpringBeanUtil;
 import com.google.gson.Gson;
@@ -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");
-        ResponseResultVo result = new ResponseResultVo();
+        ResponseVo result = new ResponseVo();
         result.setCode(HttpServletResponse.SC_FORBIDDEN);
         //使用context手动注入
         LocaleMessageUtil localeMessageUtil = SpringBeanUtil.getBean(LocaleMessageUtil.class);

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

-package com.fedex.connect.common.dependencies.config;
+package com.fedex.connect.common.dependencies.cache;
 
 
 import com.fedex.connect.common.dependencies.contants.DictionaryConstants;

+package com.fedex.connect.common.dependencies.config;
+
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.dependencies.exception.BaseException;
+import com.fedex.connect.common.dependencies.exception.OpErrorException;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@ConditionalOnProperty(prefix = "common.exception-advice-webconfig", name = "enable", havingValue = "true")
+@RestControllerAdvice
+public class ControllerExceptionAdvice {
+
+    @ExceptionHandler(Exception.class)
+    public ResponseVo exceptionHandler(Exception ex) {
+        ResponseVo res = new ResponseVo();
+        res.setSuccess(false);
+        res.setCode(599);
+        res.setMsg("system error");
+        return res;
+    }
+
+    @ExceptionHandler(BaseException.class)
+    public ResponseVo baseExceptionHandler(BaseException ex) {
+        ResponseVo res = new ResponseVo();
+        res.setSuccess(false);
+        res.setCode(ex.getCode().intValue());
+        res.setMsg(ex.getMessage());
+        return res;
+    }
+
+    @ExceptionHandler(OpErrorException.class)
+    public ResponseVo opErrorExceptionHandler(OpErrorException ex) {
+        ResponseVo res = new ResponseVo();
+        res.setSuccess(false);
+        res.setCode(ex.getCode());
+        res.setMsg(ex.getMessage());
+        return res;
+    }
+}

-package com.fedex.connect.common.dependencies.config;
-
-import com.fedex.connect.common.model.bi.DictionaryEntries;
-
-import java.util.List;
-
-public class DictionaryProvider {
-    // 用于存储字典数据的静态列表
-    private static List<DictionaryEntries> dictionaryData;
-
-    // 设置字典数据的方法
-    public static void setDictionaryData(List<DictionaryEntries> data) {
-        dictionaryData = data;
-    }
-
-    // 获取字典数据的方法
-    public static List<DictionaryEntries> getDictionaryData() {
-        return dictionaryData;
-    }
-}

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

+package com.fedex.connect.common.dependencies.exception;
+
+public class BaseException extends RuntimeException {
+    private Integer code;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public BaseException(Integer code, String message) {
+        super(message);
+        this.code = code;
+    }
+}

+package com.fedex.connect.common.dependencies.exception;
+
+public class OpErrorException extends RuntimeException {
+    private int code;
+
+    public int getCode() {
+        return code;
+    }
+
+    public OpErrorException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    public OpErrorException(int code, String message,Throwable e) {
+        super(message,e);
+        this.code = code;
+    }
+}
\ No newline at end of file

@@ -19,7 +19,6 @@ public class LocaleMessageUtil {
     public LocaleMessageUtil() {
     }
 
-
     public String getMessage(String code) {
         return this.getConnectorMessage(code, null);
     }

@@ -8,7 +8,7 @@ import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt;
 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class AbstractDaoRepository {
+public class BaseRepository {
     @Autowired
     protected KafkaTemporaryStorageMapper kafkaTemporaryStorageMapper;
     @Autowired

 package com.fedex.connect.kafka.repository.repo.impl;
 
 import com.fedex.connect.common.model.biz.CeInfo;
-import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
+import com.fedex.connect.kafka.repository.base.BaseRepository;
 import com.fedex.connect.kafka.repository.repo.ICeInfoRepository;
 import org.springframework.stereotype.Repository;
 
@@ -15,7 +15,7 @@ import java.util.List;
   * @Date 2024/4/22
   */
 @Repository
-public class CeInfoRepositoryImpl extends AbstractDaoRepository implements ICeInfoRepository {
+public class CeInfoRepositoryImpl extends BaseRepository implements ICeInfoRepository {
     @Override
     public CeInfo save(CeInfo entity) {
         if(entity != null) {

@@ -3,7 +3,7 @@ package com.fedex.connect.kafka.repository.repo.impl;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.biz.Consignment;
 import com.fedex.connect.common.model.biz.ConsignmentExample;
-import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
+import com.fedex.connect.kafka.repository.base.BaseRepository;
 import com.fedex.connect.kafka.repository.repo.IConsignmentRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
@@ -14,7 +14,7 @@ import java.util.List;
 
 @Slf4j
 @Repository
-public class ConsignmentRepositoryImpl extends AbstractDaoRepository implements IConsignmentRepository {
+public class ConsignmentRepositoryImpl extends BaseRepository implements IConsignmentRepository {
     @Override
     public Consignment save(Consignment entity) {
         if(entity != null) {

 package com.fedex.connect.kafka.repository.repo.impl;
 
 import com.fedex.connect.common.model.sys.KafkaStorageHistory;
-import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
+import com.fedex.connect.kafka.repository.base.BaseRepository;
 import com.fedex.connect.kafka.repository.repo.IKafkaStorageHistoryRepository;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * 2022年11月3日15:30:53
  */
 @Repository
-public class KafkaStorageHistoryRepositoryImpl extends AbstractDaoRepository implements IKafkaStorageHistoryRepository {
+public class KafkaStorageHistoryRepositoryImpl extends BaseRepository implements IKafkaStorageHistoryRepository {
     @Override
     public KafkaStorageHistory save(KafkaStorageHistory entity){
         if(entity != null) {

 package com.fedex.connect.kafka.repository.repo.impl;
 
 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
-import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
+import com.fedex.connect.kafka.repository.base.BaseRepository;
 import com.fedex.connect.kafka.repository.repo.IKafkaTemporaryStorageRepository;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * 2022年11月3日15:30:53
  */
 @Repository
-public class KafkaTemporaryStorageRepositoryImpl extends AbstractDaoRepository implements IKafkaTemporaryStorageRepository {
+public class KafkaTemporaryStorageRepositoryImpl extends BaseRepository implements IKafkaTemporaryStorageRepository {
 
     @Override
     public void updateKafkaTemporaryStorageById(String consCode, String remark, Long id) {

 package com.fedex.connect.kafka.util;
 
-import com.fedex.connect.common.dependencies.config.CacheSystem;
+import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.enums.biz.ConsignmentStatusEnum;
 import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.dependencies.util.DateUtil;

-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.service.sys.ISysAuthService;
-import com.fedex.connect.manager.service.sys.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
-    @Autowired
-    protected PropertiesConfig propertiesConfig;
-
-    @Autowired
-    protected ISysUserService sysUserService;
-
-    @Autowired
-    protected ISysAuthService sysAuthService;
-
-    @Autowired
-    protected ILogLoginService logLoginService;
-
-    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.manager.controller.base;
+
+
+import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
+import com.fedex.connect.manager.config.PropertiesConfig;
+import com.fedex.connect.manager.service.log.ILogLoginService;
+import com.fedex.connect.manager.service.sys.ISysAuthService;
+import com.fedex.connect.manager.service.sys.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.Resource;
+
+/**
+ * @author EDY
+ */
+public class BaseController {
+    @Resource
+    protected LocaleMessageUtil localeMessageUtil;
+    @Autowired
+    protected PropertiesConfig propertiesConfig;
+    @Autowired
+    protected ISysUserService sysUserService;
+    @Autowired
+    protected ISysAuthService sysAuthService;
+    @Autowired
+    protected ILogLoginService logLoginService;
+}

 package com.fedex.connect.manager.controller.bi.impl;
 
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -9,4 +12,9 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value="DicEntriesController",tags={"字典相关操作"})
 public class DicEntriesController {
 
+    @PostMapping("/init")
+    @ApiOperation(value = "初始化进入首页获取FCL登录地址")
+    public ResponseVo init(){
+        return ResponseVo.succ(fclIndexLoginUrl);
+    }
 }

@@ -2,13 +2,13 @@ package com.fedex.connect.manager.controller.sys.impl;
 
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 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.common.enums.FCLSessionInfoEnum;
-import com.fedex.connect.manager.controller.AbstractEtController;
+import com.fedex.connect.manager.controller.base.BaseController;
 import com.fedex.connect.manager.controller.sys.ISysAuthController;
 import com.fedex.connect.manager.data.dto.LogLoginDto;
 import com.fedex.connect.manager.data.dto.LoginRequest;
@@ -18,8 +18,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +35,7 @@ import java.util.*;
 @RestController
 @RequestMapping(value = "/auth", name = "权鉴操作相关请求")
 @Api(value="SysAuthController",tags={"用户相关请求(无需token)"})
-public class SysAuthControllerImpl extends AbstractEtController implements ISysAuthController {
+public class SysAuthControllerImpl extends BaseController implements ISysAuthController {
 
 
     @Value("${fcl.interface.logurl}")
@@ -45,8 +43,8 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
 
     @PostMapping("/init")
     @ApiOperation(value = "初始化进入首页获取FCL登录地址")
-    public ResponseResultVo init(){
-        return ResponseResultVo.succ(fclIndexLoginUrl);
+    public ResponseVo init(){
+        return ResponseVo.succ(fclIndexLoginUrl);
     }
 
 
@@ -80,7 +78,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
-                ResponseResultVo tokenResult = sysAuthService.createFclToken(jsonObject);
+                ResponseVo 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);
@@ -138,7 +136,7 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
         //创建token
         LoginRequest loginRequest = new LoginRequest();
         loginRequest.setRememberMe(true);
-        ResponseResultVo tokenResult = sysAuthService.createAccessToken(loginRequest, loginUser);
+        ResponseVo 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.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.Utils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,17 +26,17 @@ public class LoginRequest implements Serializable {
      * @param dto
      * @return
      */
-    public static ResponseResultVo validate(LoginRequest dto){
+    public static ResponseVo validate(LoginRequest dto){
         if (dto == null){
-            ResponseResultVo.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
+            ResponseVo.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
         }
         if (StringUtils.isBlank(dto.getAccNo())){
-            ResponseResultVo.fail("auth_login_accno_null");
+            ResponseVo.fail("auth_login_accno_null");
         }
         if (StringUtils.isBlank(dto.getPassword())){
-            ResponseResultVo.fail("auth_login_pwd_null");
+            ResponseVo.fail("auth_login_pwd_null");
         }
-        return ResponseResultVo.succ(null);
+        return ResponseVo.succ(null);
     }
 
     /**

@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;
 
-public class AbstractEtService {
+public class BaseService {
 
 	@Resource
 	protected LocaleMessageUtil localeMessageUtil;

-package com.fedex.connect.manager.controller.log;
+package com.fedex.connect.manager.service.log;
 
 import com.fedex.connect.manager.data.dto.LogLoginDto;
 

-package com.fedex.connect.manager.controller.log.impl;
+package com.fedex.connect.manager.service.log.impl;
 
-import com.fedex.connect.manager.controller.log.ILogLoginService;
 import com.fedex.connect.manager.data.dto.LogLoginDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.base.AbstractEtService;
+import com.fedex.connect.manager.service.base.BaseService;
+import com.fedex.connect.manager.service.log.ILogLoginService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author EDY
  */
 @Service
-public class LogLoginServiceImpl extends AbstractEtService implements ILogLoginService {
+public class LogLoginServiceImpl extends BaseService implements ILogLoginService {
 
     private Logger logger = LoggerFactory.getLogger(LogLoginServiceImpl.class);
 

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

@@ -4,7 +4,7 @@ import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.manager.data.bo.RedisSlabBo;
-import com.fedex.connect.manager.service.base.AbstractEtService;
+import com.fedex.connect.manager.service.base.BaseService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.google.gson.Gson;
 import org.slf4j.Logger;
@@ -17,7 +17,7 @@ import java.util.Optional;
 
 
 @Service
-public class RedisUtilServiceImpl extends AbstractEtService implements IRedisUtilService {
+public class RedisUtilServiceImpl extends BaseService implements IRedisUtilService {
 
     private static Logger logger = LoggerFactory.getLogger(RedisUtilServiceImpl.class);
 

@@ -3,7 +3,7 @@ package com.fedex.connect.manager.service.sys.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.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
@@ -11,7 +11,7 @@ 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.service.base.AbstractEtService;
+import com.fedex.connect.manager.service.base.BaseService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
 import com.fedex.connect.manager.service.sys.ISysAuthService;
 import com.google.gson.JsonObject;
@@ -31,7 +31,7 @@ import java.util.UUID;
  * @author EDY
  */
 @Service
-public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthService {
+public class SysAuthServiceImpl extends BaseService implements ISysAuthService {
 
     private Logger logger = LoggerFactory.getLogger(SysAuthServiceImpl.class);
 
@@ -47,7 +47,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
      * @param user
      * @return
      */
-    public ResponseResultVo createAccessToken(LoginRequest loginRequest, User user) {
+    public ResponseVo 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 ResponseResultVo.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
+            return ResponseVo.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
         }
 
-        return ResponseResultVo.succ(token);
+        return ResponseVo.succ(token);
     }
 
 
@@ -77,17 +77,17 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
      * @param token token信息
      * @return token key
      */
-    public ResponseResultVo createFclToken(JsonObject token) {
+    public ResponseVo createFclToken(JsonObject token) {
         String tokenKey ="" + 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 ResponseResultVo.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
+            return ResponseVo.fail(ResponseCode.SYSTEM_EXECEPTION_CODE.getCode(), localeMessageUtil.getMessage("service_auth_token_reeids"), null);
         }
 
-        return ResponseResultVo.succ(tokenKey);
+        return ResponseVo.succ(tokenKey);
     }
 
     /**

 package com.fedex.connect.manager.service.sys.impl;
 
-import com.fedex.connect.common.dependencies.config.CacheSystem;
+import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
@@ -9,7 +9,7 @@ import com.fedex.connect.common.model.sys.RoleExample;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.base.AbstractEtService;
+import com.fedex.connect.manager.service.base.BaseService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * @author EDY
  */
 @Service
-public class SysRoleServiceImpl extends AbstractEtService implements ISysRoleService {
+public class SysRoleServiceImpl extends BaseService implements ISysRoleService {
 
     private static Logger log = LoggerFactory.getLogger(SysRoleServiceImpl.class);
 

@@ -3,7 +3,7 @@ package com.fedex.connect.manager.service.sys.impl;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.base.AbstractEtService;
+import com.fedex.connect.manager.service.base.BaseService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +17,7 @@ import java.util.Date;
  * @author EDY
  */
 @Service
-public class SysUserRoleServiceImpl extends AbstractEtService implements ISysUserRoleService {
+public class SysUserRoleServiceImpl extends BaseService implements ISysUserRoleService {
 
     private static Logger log = LoggerFactory.getLogger(SysUserRoleServiceImpl.class);
 

@@ -2,7 +2,7 @@ package com.fedex.connect.manager.service.sys.impl;
 
 import com.fedex.connect.common.dependencies.arithmetic.AESUtil;
 import com.fedex.connect.common.dependencies.authentication.EncryptProvider;
-import com.fedex.connect.common.dependencies.config.CacheSystem;
+import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
@@ -11,7 +11,7 @@ import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
-import com.fedex.connect.manager.service.base.AbstractEtService;
+import com.fedex.connect.manager.service.base.BaseService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
 import com.fedex.connect.manager.service.sys.ISysUserService;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  * 用户相关操作
  */
 @Service
-public class SysUserServiceImpl extends AbstractEtService implements ISysUserService {
+public class SysUserServiceImpl extends BaseService implements ISysUserService {
 
     private static Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);