wms / wms4_hh · Commits

Commit d25e5be42648af3a9229c2b8efedc7ece026de30

Authored by 谭毅彬
1 parent 30b8a5b9

统一aspect工具类路径到 org.jeecg.utils.aspect 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 26 changed files with 129 additions and 101 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/CommonController.java
  View file @d25e5be
1 1 package org.jeecg.modules.system.controller;
2 2  
3   -import com.alibaba.fastjson.JSON;
4   -import com.alibaba.fastjson.JSONObject;
  3 +import java.io.BufferedInputStream;
  4 +import java.io.File;
  5 +import java.io.FileInputStream;
  6 +import java.io.IOException;
  7 +import java.io.InputStream;
  8 +import java.io.OutputStream;
  9 +import java.net.URLDecoder;
  10 +import java.util.Arrays;
  11 +
  12 +import javax.servlet.http.HttpServletRequest;
  13 +import javax.servlet.http.HttpServletResponse;
5 14  
6   -import io.swagger.annotations.ApiOperation;
7   -import lombok.extern.slf4j.Slf4j;
8 15 import org.jeecg.common.api.vo.Result;
9 16 import org.jeecg.common.constant.CommonConstant;
10 17 import org.jeecg.common.exception.JeecgBootException;
... ... @@ -13,7 +20,7 @@ import org.jeecg.common.util.CommonUtils;
13 20 import org.jeecg.common.util.RestUtil;
14 21 import org.jeecg.common.util.TokenUtils;
15 22 import org.jeecg.common.util.oConvertUtils;
16   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
  23 +import org.jeecg.utils.support.ApiLogger;
17 24 import org.springframework.beans.factory.annotation.Autowired;
18 25 import org.springframework.beans.factory.annotation.Value;
19 26 import org.springframework.http.HttpHeaders;
... ... @@ -22,18 +29,20 @@ import org.springframework.http.ResponseEntity;
22 29 import org.springframework.http.server.ServletServerHttpRequest;
23 30 import org.springframework.util.AntPathMatcher;
24 31 import org.springframework.util.FileCopyUtils;
25   -import org.springframework.web.bind.annotation.*;
  32 +import org.springframework.web.bind.annotation.GetMapping;
  33 +import org.springframework.web.bind.annotation.PostMapping;
  34 +import org.springframework.web.bind.annotation.RequestMapping;
  35 +import org.springframework.web.bind.annotation.RequestParam;
  36 +import org.springframework.web.bind.annotation.RestController;
26 37 import org.springframework.web.multipart.MultipartFile;
27 38 import org.springframework.web.multipart.MultipartHttpServletRequest;
28 39 import org.springframework.web.servlet.HandlerMapping;
29 40 import org.springframework.web.servlet.ModelAndView;
30 41  
31   -import javax.servlet.http.HttpServletRequest;
32   -import javax.servlet.http.HttpServletResponse;
33   -import java.io.*;
34   -import java.net.URLDecoder;
35   -import java.util.Arrays;
36   -import java.util.Collections;
  42 +import com.alibaba.fastjson.JSON;
  43 +import com.alibaba.fastjson.JSONObject;
  44 +
  45 +import lombok.extern.slf4j.Slf4j;
37 46  
38 47 /**
39 48 * <p>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
  View file @d25e5be
... ... @@ -9,12 +9,16 @@ import org.jeecg.common.api.vo.Result;
9 9 import org.jeecg.modules.wms.api.acs.entity.AcsStatus;
10 10 import org.jeecg.modules.wms.api.acs.service.IAcsService;
11 11 import org.jeecg.modules.wms.config.address.service.IAddressService;
12   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
13 12 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
14 13 import org.jeecg.modules.wms.task.agvTask.service.IAgvTaskService;
15 14 import org.jeecg.utils.StringUtils;
16 15 import org.jeecg.utils.constant.QuantityConstant;
17   -import org.springframework.web.bind.annotation.*;
  16 +import org.jeecg.utils.support.ApiLogger;
  17 +import org.springframework.web.bind.annotation.PostMapping;
  18 +import org.springframework.web.bind.annotation.RequestBody;
  19 +import org.springframework.web.bind.annotation.RequestMapping;
  20 +import org.springframework.web.bind.annotation.ResponseBody;
  21 +import org.springframework.web.bind.annotation.RestController;
18 22  
19 23 import cn.monitor4all.logRecord.annotation.OperationLog;
20 24 import io.swagger.annotations.Api;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/controller/ErpController.java
  View file @d25e5be
... ... @@ -4,11 +4,19 @@ import javax.annotation.Resource;
4 4 import javax.servlet.http.HttpServletRequest;
5 5  
6 6 import org.jeecg.common.api.vo.Result;
7   -import org.jeecg.modules.wms.api.erp.entity.*;
  7 +import org.jeecg.modules.wms.api.erp.entity.ErpCancel;
  8 +import org.jeecg.modules.wms.api.erp.entity.ErpMaterial;
  9 +import org.jeecg.modules.wms.api.erp.entity.ErpReceipt;
  10 +import org.jeecg.modules.wms.api.erp.entity.ErpShipment;
  11 +import org.jeecg.modules.wms.api.erp.entity.InventoryQueryParam;
8 12 import org.jeecg.modules.wms.api.erp.service.IErpService;
9   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
10 13 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
11   -import org.springframework.web.bind.annotation.*;
  14 +import org.jeecg.utils.support.ApiLogger;
  15 +import org.springframework.web.bind.annotation.PostMapping;
  16 +import org.springframework.web.bind.annotation.RequestBody;
  17 +import org.springframework.web.bind.annotation.RequestMapping;
  18 +import org.springframework.web.bind.annotation.ResponseBody;
  19 +import org.springframework.web.bind.annotation.RestController;
12 20  
13 21 import io.swagger.annotations.Api;
14 22 import io.swagger.annotations.ApiOperation;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/controller/MesController.java
  View file @d25e5be
... ... @@ -12,9 +12,13 @@ import org.jeecg.modules.wms.api.erp.service.IErpService;
12 12 import org.jeecg.modules.wms.api.mes.entity.MesReceiptMaterial;
13 13 import org.jeecg.modules.wms.api.mes.entity.MesShipmentMaterial;
14 14 import org.jeecg.modules.wms.api.mes.servuce.IMesService;
15   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
16 15 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
17   -import org.springframework.web.bind.annotation.*;
  16 +import org.jeecg.utils.support.ApiLogger;
  17 +import org.springframework.web.bind.annotation.PostMapping;
  18 +import org.springframework.web.bind.annotation.RequestBody;
  19 +import org.springframework.web.bind.annotation.RequestMapping;
  20 +import org.springframework.web.bind.annotation.ResponseBody;
  21 +import org.springframework.web.bind.annotation.RestController;
18 22  
19 23 import io.swagger.annotations.Api;
20 24 import io.swagger.annotations.ApiOperation;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
  View file @d25e5be
1 1 package org.jeecg.modules.wms.api.mobile.controller;
2 2  
3 3 import javax.annotation.Resource;
4   -import javax.servlet.http.HttpServletRequest;
5 4  
6   -import org.jeecg.common.api.vo.Result;
7   -import org.jeecg.common.aspect.annotation.AutoLog;
8   -import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
9   -import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
10 5 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
11   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
12 6 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
13   -import org.jeecg.utils.HuahengJwtUtil;
14   -import org.jeecg.utils.constant.QuantityConstant;
15   -import org.springframework.web.bind.annotation.PostMapping;
16   -import org.springframework.web.bind.annotation.RequestBody;
17 7 import org.springframework.web.bind.annotation.RequestMapping;
18   -import org.springframework.web.bind.annotation.ResponseBody;
19 8 import org.springframework.web.bind.annotation.RestController;
20 9  
21 10 import io.swagger.annotations.Api;
22   -import io.swagger.annotations.ApiOperation;
23 11  
24 12 /**
25 13 * PDA入库接口，整合复用PC端service层接口
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
  View file @d25e5be
1 1 package org.jeecg.modules.wms.api.mobile.controller;
2 2  
3 3 import javax.annotation.Resource;
4   -import javax.servlet.http.HttpServletRequest;
5 4  
6   -import org.jeecg.common.api.vo.Result;
7   -import org.jeecg.common.aspect.annotation.AutoLog;
8   -import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
9 5 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
10   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
11 6 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
12   -import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
13   -import org.jeecg.utils.HuahengJwtUtil;
14   -import org.jeecg.utils.constant.QuantityConstant;
15   -import org.springframework.web.bind.annotation.PostMapping;
16   -import org.springframework.web.bind.annotation.RequestBody;
17 7 import org.springframework.web.bind.annotation.RequestMapping;
18   -import org.springframework.web.bind.annotation.ResponseBody;
19 8 import org.springframework.web.bind.annotation.RestController;
20 9  
21 10 import io.swagger.annotations.Api;
22   -import io.swagger.annotations.ApiOperation;
23 11  
24 12 /**
25 13 * * PDA出库接口，整合复用PC端service层接口
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
  View file @d25e5be
... ... @@ -5,13 +5,22 @@ import javax.servlet.http.HttpServletRequest;
5 5  
6 6 import org.jeecg.common.api.vo.Result;
7 7 import org.jeecg.common.aspect.annotation.AutoLog;
8   -import org.jeecg.modules.wms.api.wcs.entity.*;
  8 +import org.jeecg.modules.wms.api.wcs.entity.ArriveEntity;
  9 +import org.jeecg.modules.wms.api.wcs.entity.ManyEmptyDomain;
  10 +import org.jeecg.modules.wms.api.wcs.entity.ManyEmptyOutDomain;
  11 +import org.jeecg.modules.wms.api.wcs.entity.MaterialInfoEntity;
  12 +import org.jeecg.modules.wms.api.wcs.entity.TaskEntity;
  13 +import org.jeecg.modules.wms.api.wcs.entity.WarecellDomain;
9 14 import org.jeecg.modules.wms.api.wcs.service.WcsService;
10   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
11 15 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
12 16 import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
13 17 import org.jeecg.utils.StringUtils;
14   -import org.springframework.web.bind.annotation.*;
  18 +import org.jeecg.utils.support.ApiLogger;
  19 +import org.springframework.web.bind.annotation.PostMapping;
  20 +import org.springframework.web.bind.annotation.RequestBody;
  21 +import org.springframework.web.bind.annotation.RequestMapping;
  22 +import org.springframework.web.bind.annotation.ResponseBody;
  23 +import org.springframework.web.bind.annotation.RestController;
15 24  
16 25 import io.swagger.annotations.Api;
17 26 import io.swagger.annotations.ApiOperation;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
  View file @d25e5be
... ... @@ -27,7 +27,6 @@ import org.jeecg.modules.wms.config.material.service.IMaterialService;
27 27 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
28 28 import org.jeecg.modules.wms.config.zone.entity.Zone;
29 29 import org.jeecg.modules.wms.config.zone.service.IZoneService;
30   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
31 30 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerDetail;
32 31 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
33 32 import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerDetailService;
... ... @@ -39,6 +38,7 @@ import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
39 38 import org.jeecg.utils.OkHttpUtils;
40 39 import org.jeecg.utils.StringUtils;
41 40 import org.jeecg.utils.constant.QuantityConstant;
  41 +import org.jeecg.utils.support.ApiLogger;
42 42 import org.springframework.stereotype.Service;
43 43 import org.springframework.transaction.annotation.Transactional;
44 44  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @d25e5be
... ... @@ -24,7 +24,6 @@ import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
24 24 import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
25 25 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
26 26 import org.jeecg.modules.wms.config.material.service.IMaterialService;
27   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
28 27 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
29 28 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
30 29 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
... ... @@ -32,13 +31,23 @@ import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService
32 31 import org.jeecg.utils.HuahengJwtUtil;
33 32 import org.jeecg.utils.StringUtils;
34 33 import org.jeecg.utils.constant.QuantityConstant;
  34 +import org.jeecg.utils.support.ApiLogger;
35 35 import org.jeecgframework.poi.excel.ExcelImportUtil;
36 36 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
37 37 import org.jeecgframework.poi.excel.entity.ExportParams;
38 38 import org.jeecgframework.poi.excel.entity.ImportParams;
39 39 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
40 40 import org.springframework.beans.factory.annotation.Autowired;
41   -import org.springframework.web.bind.annotation.*;
  41 +import org.springframework.web.bind.annotation.DeleteMapping;
  42 +import org.springframework.web.bind.annotation.GetMapping;
  43 +import org.springframework.web.bind.annotation.PathVariable;
  44 +import org.springframework.web.bind.annotation.PostMapping;
  45 +import org.springframework.web.bind.annotation.RequestBody;
  46 +import org.springframework.web.bind.annotation.RequestMapping;
  47 +import org.springframework.web.bind.annotation.RequestMethod;
  48 +import org.springframework.web.bind.annotation.RequestParam;
  49 +import org.springframework.web.bind.annotation.ResponseBody;
  50 +import org.springframework.web.bind.annotation.RestController;
42 51 import org.springframework.web.multipart.MultipartFile;
43 52 import org.springframework.web.multipart.MultipartHttpServletRequest;
44 53 import org.springframework.web.servlet.ModelAndView;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @d25e5be
... ... @@ -24,7 +24,6 @@ import org.jeecg.common.util.oConvertUtils;
24 24 import org.jeecg.modules.wms.api.erp.service.IErpService;
25 25 import org.jeecg.modules.wms.api.mobile.entity.CallBoxBean;
26 26 import org.jeecg.modules.wms.api.mobile.service.IMobileService;
27   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
28 27 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
29 28 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
30 29 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
... ... @@ -34,13 +33,23 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderServ
34 33 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
35 34 import org.jeecg.utils.HuahengJwtUtil;
36 35 import org.jeecg.utils.constant.QuantityConstant;
  36 +import org.jeecg.utils.support.ApiLogger;
37 37 import org.jeecgframework.poi.excel.ExcelImportUtil;
38 38 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
39 39 import org.jeecgframework.poi.excel.entity.ExportParams;
40 40 import org.jeecgframework.poi.excel.entity.ImportParams;
41 41 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
42 42 import org.springframework.beans.factory.annotation.Autowired;
43   -import org.springframework.web.bind.annotation.*;
  43 +import org.springframework.web.bind.annotation.DeleteMapping;
  44 +import org.springframework.web.bind.annotation.GetMapping;
  45 +import org.springframework.web.bind.annotation.PathVariable;
  46 +import org.springframework.web.bind.annotation.PostMapping;
  47 +import org.springframework.web.bind.annotation.RequestBody;
  48 +import org.springframework.web.bind.annotation.RequestMapping;
  49 +import org.springframework.web.bind.annotation.RequestMethod;
  50 +import org.springframework.web.bind.annotation.RequestParam;
  51 +import org.springframework.web.bind.annotation.ResponseBody;
  52 +import org.springframework.web.bind.annotation.RestController;
44 53 import org.springframework.web.multipart.MultipartFile;
45 54 import org.springframework.web.multipart.MultipartHttpServletRequest;
46 55 import org.springframework.web.servlet.ModelAndView;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
  View file @d25e5be
... ... @@ -25,7 +25,6 @@ import org.jeecg.modules.wms.config.port.entity.Port;
25 25 import org.jeecg.modules.wms.config.port.service.IPortService;
26 26 import org.jeecg.modules.wms.config.zone.entity.Zone;
27 27 import org.jeecg.modules.wms.config.zone.service.IZoneService;
28   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
29 28 import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
30 29 import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
31 30 import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
... ... @@ -36,13 +35,23 @@ import org.jeecg.utils.ConvertUtils;
36 35 import org.jeecg.utils.HuahengJwtUtil;
37 36 import org.jeecg.utils.StringUtils;
38 37 import org.jeecg.utils.constant.QuantityConstant;
  38 +import org.jeecg.utils.support.ApiLogger;
39 39 import org.jeecgframework.poi.excel.ExcelImportUtil;
40 40 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
41 41 import org.jeecgframework.poi.excel.entity.ExportParams;
42 42 import org.jeecgframework.poi.excel.entity.ImportParams;
43 43 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
44 44 import org.springframework.beans.factory.annotation.Autowired;
45   -import org.springframework.web.bind.annotation.*;
  45 +import org.springframework.web.bind.annotation.DeleteMapping;
  46 +import org.springframework.web.bind.annotation.GetMapping;
  47 +import org.springframework.web.bind.annotation.PathVariable;
  48 +import org.springframework.web.bind.annotation.PostMapping;
  49 +import org.springframework.web.bind.annotation.RequestBody;
  50 +import org.springframework.web.bind.annotation.RequestMapping;
  51 +import org.springframework.web.bind.annotation.RequestMethod;
  52 +import org.springframework.web.bind.annotation.RequestParam;
  53 +import org.springframework.web.bind.annotation.ResponseBody;
  54 +import org.springframework.web.bind.annotation.RestController;
46 55 import org.springframework.web.multipart.MultipartFile;
47 56 import org.springframework.web.multipart.MultipartHttpServletRequest;
48 57 import org.springframework.web.servlet.ModelAndView;
... ...
huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
  View file @d25e5be
... ... @@ -12,8 +12,8 @@ import org.apache.shiro.SecurityUtils;
12 12 import org.jeecg.common.exception.JeecgBootException;
13 13 import org.jeecg.common.system.vo.LoginUser;
14 14 import org.jeecg.common.util.oConvertUtils;
15   -import org.jeecg.modules.wms.framework.aspectj.dto.ApiAuthentication;
16   -import org.jeecg.modules.wms.framework.aspectj.dto.RSA256Key;
  15 +import org.jeecg.utils.support.ApiAuthentication;
  16 +import org.jeecg.utils.support.RSA256Key;
17 17 import org.springframework.stereotype.Component;
18 18 import org.springframework.util.CollectionUtils;
19 19  
... ...
huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java
  View file @d25e5be
1 1 package org.jeecg.utils;
2 2  
3   -import com.alibaba.fastjson.JSON;
4   -import com.alibaba.fastjson.TypeReference;
5   -import com.alibaba.fastjson.parser.Feature;
6   -import org.jeecg.common.exception.JeecgBootException;
7   -import com.xkcoding.http.util.StringUtil;
8   -
9   -import antlr.StringUtils;
10   -import cn.hutool.core.util.StrUtil;
11   -import net.bytebuddy.asm.Advice.This;
12   -import okhttp3.*;
13   -import org.jeecg.modules.wms.framework.aspectj.ApiLoggerAspect;
14   -import org.jeecg.modules.wms.monitor.apiLog.entity.ApiLog;
15   -import org.slf4j.Logger;
16   -import org.slf4j.LoggerFactory;
17   -import org.springframework.messaging.support.ErrorMessage;
18   -
19 3 import java.io.IOException;
20   -import java.lang.reflect.Type;
21 4 import java.util.HashMap;
22 5 import java.util.Map;
23 6 import java.util.Objects;
24 7 import java.util.concurrent.TimeUnit;
25   -import java.util.concurrent.TimeoutException;
26 8  
27 9 import javax.validation.constraints.NotNull;
28 10  
  11 +import org.jeecg.common.exception.JeecgBootException;
  12 +import org.jeecg.modules.wms.monitor.apiLog.entity.ApiLog;
  13 +import org.jeecg.utils.aspect.ApiLoggerAspect;
  14 +import org.slf4j.Logger;
  15 +import org.slf4j.LoggerFactory;
  16 +
  17 +import com.alibaba.fastjson.JSON;
  18 +import com.alibaba.fastjson.TypeReference;
  19 +
  20 +import cn.hutool.core.util.StrUtil;
  21 +import okhttp3.ConnectionPool;
  22 +import okhttp3.FormBody;
  23 +import okhttp3.Interceptor;
  24 +import okhttp3.MediaType;
  25 +import okhttp3.OkHttpClient;
  26 +import okhttp3.Request;
  27 +import okhttp3.RequestBody;
  28 +import okhttp3.Response;
  29 +
29 30 /**
30 31 * OkHttp发送请求
31 32 * @author huaheng
... ...
huaheng-wms-core/src/main/java/org/jeecg/utils/SecretKeyUtils.java
  View file @d25e5be
... ... @@ -14,7 +14,7 @@ import java.util.Base64;
14 14 import java.util.HashMap;
15 15 import java.util.Map;
16 16  
17   -import org.jeecg.modules.wms.framework.aspectj.dto.RSA256Key;
  17 +import org.jeecg.utils.support.RSA256Key;
18 18  
19 19 /**
20 20 * KeyPairGenerator https://www.jianshu.com/p/4de1ee0e7206 key的生成使用方法
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/ApiAuthenticationAspect.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiAuthenticationAspect.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj;
  1 +package org.jeecg.utils.aspect;
2 2  
3 3 import java.lang.reflect.Method;
4   -import java.util.Arrays;
5 4  
6 5 import javax.servlet.http.HttpServletRequest;
7 6  
... ... @@ -10,10 +9,10 @@ import org.aspectj.lang.annotation.Aspect;
10 9 import org.aspectj.lang.annotation.Before;
11 10 import org.aspectj.lang.annotation.Pointcut;
12 11 import org.aspectj.lang.reflect.MethodSignature;
13   -import org.bouncycastle.crypto.RuntimeCryptoException;
14   -import org.jeecg.modules.wms.framework.aspectj.dto.ApiAuthentication;
15   -import org.jeecg.modules.wms.framework.aspectj.dto.RSA256Key;
16 12 import org.jeecg.utils.HuahengJwtUtil;
  13 +import org.jeecg.utils.support.ApiAuthentication;
  14 +import org.jeecg.utils.support.PassApiAuthentication;
  15 +import org.jeecg.utils.support.RSA256Key;
17 16 import org.springframework.beans.factory.annotation.Autowired;
18 17 import org.springframework.scheduling.annotation.EnableAsync;
19 18 import org.springframework.stereotype.Component;
... ... @@ -25,11 +24,7 @@ import com.auth0.jwt.JWTVerifier;
25 24 import com.auth0.jwt.algorithms.Algorithm;
26 25 import com.auth0.jwt.exceptions.JWTVerificationException;
27 26 import com.auth0.jwt.interfaces.DecodedJWT;
28   -import com.baomidou.mybatisplus.extension.service.IService;
29 27  
30   -import cn.hutool.core.date.DatePattern;
31   -import cn.hutool.core.date.DateUtil;
32   -import cn.hutool.core.util.StrUtil;
33 28 import lombok.extern.slf4j.Slf4j;
34 29  
35 30 /**
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/ApiLoggerAspect.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/ApiLoggerAspect.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj;
  1 +package org.jeecg.utils.aspect;
2 2  
3 3 import java.net.InetAddress;
4 4 import java.net.URL;
... ... @@ -22,16 +22,14 @@ import org.aspectj.lang.annotation.Pointcut;
22 22 import org.aspectj.lang.reflect.MethodSignature;
23 23 import org.jeecg.JeecgSystemApplication;
24 24 import org.jeecg.common.api.vo.Result;
25   -import org.jeecg.modules.wms.config.address.entity.Address;
26 25 import org.jeecg.modules.wms.config.address.service.IAddressService;
27   -import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
28 26 import org.jeecg.modules.wms.monitor.apiLog.entity.ApiLog;
29 27 import org.jeecg.modules.wms.monitor.apiLog.service.IApiLogService;
30 28 import org.jeecg.utils.HuahengJwtUtil;
31 29 import org.jeecg.utils.ServletUtils;
32 30 import org.jeecg.utils.SpringUtils;
33 31 import org.jeecg.utils.StringUtils;
34   -import org.jeecg.utils.constant.QuantityConstant;
  32 +import org.jeecg.utils.support.ApiLogger;
35 33 import org.slf4j.Logger;
36 34 import org.slf4j.LoggerFactory;
37 35 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -70,7 +68,7 @@ public class ApiLoggerAspect {
70 68 }
71 69  
72 70 // 配置织入点
73   - @Pointcut("@annotation(org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger)")
  71 + @Pointcut("@annotation(org.jeecg.utils.support.ApiLogger)")
74 72 public void logPointCut() {}
75 73  
76 74 @Around("logPointCut() && @annotation(apiLogger)")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/LogRecordAspect.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj;
  1 +package org.jeecg.utils.aspect;
2 2  
3 3 import javax.servlet.http.HttpServletRequest;
4 4  
... ... @@ -6,13 +6,10 @@ import org.aspectj.lang.ProceedingJoinPoint;
6 6 import org.aspectj.lang.annotation.Around;
7 7 import org.aspectj.lang.annotation.Aspect;
8 8 import org.aspectj.lang.annotation.Pointcut;
9   -import org.jeecg.modules.wms.framework.aspectj.ApiLoggerAspect;
10 9 import org.springframework.context.annotation.Configuration;
11 10 import org.springframework.web.context.request.RequestContextHolder;
12 11 import org.springframework.web.context.request.ServletRequestAttributes;
13 12  
14   -import com.alibaba.druid.util.StringUtils;
15   -
16 13 import lombok.extern.slf4j.Slf4j;
17 14  
18 15 // 暂时注释掉，提高系统性能
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/dto/ApiAuthentication.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/ApiAuthentication.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.dto;
  1 +package org.jeecg.utils.support;
2 2  
3 3 import java.util.Date;
4 4  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/lang/annotation/ApiLogger.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/ApiLogger.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.lang.annotation;
  1 +package org.jeecg.utils.support;
2 2  
3 3 import java.lang.annotation.*;
4 4  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/lang/constant/BusinessStatus.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/BusinessStatus.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.lang.constant;
  1 +package org.jeecg.utils.support;
2 2  
3 3 /**
4 4 * 操作状态
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/lang/constant/BusinessType.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/BusinessType.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.lang.constant;
  1 +package org.jeecg.utils.support;
2 2  
3 3 /**
4 4 * 业务操作类型
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/lang/constant/DataSourceName.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/DataSourceName.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.lang.constant;
  1 +package org.jeecg.utils.support;
2 2  
3 3 /**
4 4 * 多数据源别名
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/lang/constant/OperatorType.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/OperatorType.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.lang.constant;
  1 +package org.jeecg.utils.support;
2 2  
3 3 /**
4 4 * 操作人类别
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/PassApiAuthentication.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/PassApiAuthentication.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj;
  1 +package org.jeecg.utils.support;
2 2  
3 3 import java.lang.annotation.ElementType;
4 4 import java.lang.annotation.Retention;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/lang/constant/ProcessCode.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/ProcessCode.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.lang.constant;
  1 +package org.jeecg.utils.support;
2 2  
3 3 /**
4 4 * 任务流程编码
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/aspectj/dto/RSA256Key.java renamed to huaheng-wms-core/src/main/java/org/jeecg/utils/support/RSA256Key.java
  View file @d25e5be
1   -package org.jeecg.modules.wms.framework.aspectj.dto;
  1 +package org.jeecg.utils.support;
2 2  
3 3 import java.security.interfaces.RSAPrivateKey;
4 4 import java.security.interfaces.RSAPublicKey;
... ...