Merge remote-tracking branch 'origin/develop' into develop

DESKTOP-AO0VKC8\mahua
2 parents 55466ced 0b6c3407
Showing 26 changed files with 1227 additions and 5 deletions
src/main/java/com/huaheng/api/acs/controller/StateInfoUp.java
src/main/java/com/huaheng/api/acs/controller/TaskConfirm.java
src/main/java/com/huaheng/api/general/controller/AdjustApi.java
src/main/java/com/huaheng/api/general/controller/BasicDataApi.java
src/main/java/com/huaheng/api/general/controller/CycleCountApi.java
src/main/java/com/huaheng/api/general/controller/ReceiptApi.java
src/main/java/com/huaheng/api/general/controller/ReceiptController.java
src/main/java/com/huaheng/api/general/controller/ShipmentApi.java
src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java
src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java
src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java
src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java
src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java
src/main/java/com/huaheng/common/utils/http/HttpUtils.java
src/main/java/com/huaheng/framework/aspectj/ApiLogAspect.java
src/main/java/com/huaheng/framework/aspectj/lang/annotation/ApiLogger.java
src/main/java/com/huaheng/pc/config/address/service/AddressService.java
src/main/java/com/huaheng/pc/config/address/service/AddressServiceImpl.java
src/main/java/com/huaheng/pc/monitor/apilog/controller/ApiLogController.java
src/main/java/com/huaheng/pc/monitor/apilog/domain/ApiLog.java
@@ -2,6 +2,7 @@ package com.huaheng.api.acs.controller;
  
 import com.huaheng.api.acs.domain.StateInfoUploadModel;
 import com.huaheng.api.acs.service.AcsService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -28,6 +29,7 @@ public class StateInfoUp extends BaseController {
     @PostMapping("/StateInfoUpload")
     @ApiOperation("AGV 信息上传接口")
     @ResponseBody
+    @ApiLogger(apiName = "AGV 信息上传", from="ACS")
     public AjaxResult StateInfoUpload(@RequestBody StateInfoUploadModel model)
     {
         return acsService.StateInfoUpload(model);
@@ -2,6 +2,7 @@ package com.huaheng.api.acs.controller;
  
 import com.huaheng.api.acs.domain.AgvTask;
 import com.huaheng.api.acs.service.AcsService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -28,6 +29,7 @@ public class TaskConfirm extends BaseController {
     @PostMapping("/TaskConfirm")
     @ApiOperation("AGV 任务回传接口")
     @ResponseBody
+    @ApiLogger(apiName = "AGV任务回传", from="ACS")
     public AjaxResult TaskConfirm(@RequestBody AgvTask model)
     {
         return acsService.TaskConfirm(model);
@@ -5,6 +5,7 @@ import com.huaheng.api.general.domain.AdjustDomain;
 import com.huaheng.api.general.domain.CycCountDomain;
 import com.huaheng.api.general.service.AdjustService;
 import com.huaheng.api.general.service.CycleCountService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.domain.AjaxResult;
@@ -30,6 +31,7 @@ public class AdjustApi {
     @PostMapping("/adjust")
     @ApiOperation("调整单添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加调整单", from="ERP")
     public AjaxResult adjust(@RequestBody AdjustDomain adjustDomain)
     {
         AjaxResult ajaxResult = adjustService.insertAdjust(adjustDomain);
 package com.huaheng.api.general.controller;
  
 import com.huaheng.api.general.service.BasicDataApiService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -34,6 +35,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/addMaterial")
     @ApiOperation("物料添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加物料", from="ERP")
     public AjaxResult AddMaterialApi(@RequestBody Material material)
     {
         AjaxResult ajaxResult = basicDataApiService.material(material);
@@ -45,6 +47,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/queryMaterial")
     @ApiOperation("物料查询公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "查询物料", from="ERP")
     public AjaxResult QueryMaterialApi(@RequestBody Material material)
     {
         AjaxResult ajaxResult = basicDataApiService.queryMaterial(material);
@@ -58,6 +61,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/dictData")
     @ApiOperation("字典添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加字典", from="ERP")
     public AjaxResult UnitlApi(@RequestBody DictData dictData)
     {
         AjaxResult ajaxResult = basicDataApiService.dict(dictData);
@@ -72,6 +76,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/addWarehouse")
     @ApiOperation("仓库添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加仓库", from="ERP")
     public AjaxResult WarehouseApi(@RequestBody Warehouse warehouse)
     {
         AjaxResult ajaxResult = basicDataApiService.warehouse(warehouse);
@@ -85,6 +90,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/customer")
     @ApiOperation("客户档案添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加客户", from="ERP")
     public AjaxResult CustomerApi(@RequestBody Customer customer)
     {
         AjaxResult ajaxResult = basicDataApiService.customer(customer);
@@ -98,6 +104,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/dept")
     @ApiOperation("部门档案添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加部门", from="ERP")
     public AjaxResult DeptApi(@RequestBody Dept dept)
     {
         AjaxResult ajaxResult = basicDataApiService.dept(dept);
@@ -111,6 +118,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/user")
     @ApiOperation("人员档案添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加人员", from="ERP")
     public AjaxResult UserApi(@RequestBody User user)
     {
         AjaxResult ajaxResult = basicDataApiService.user(user);
@@ -122,6 +130,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/queryUserApi")
     @ApiOperation("用户查询公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "查询用户", from="ERP")
     public AjaxResult queryUserApi(@RequestBody User user)
     {
         AjaxResult ajaxResult = basicDataApiService.queryUser(user);
@@ -135,6 +144,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/containerCapacity")
     @ApiOperation("容器容量添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加容器", from="ERP")
     public AjaxResult containerCapacityApi(@RequestBody ContainerCapacity containerCapacity){
         AjaxResult ajaxResult = basicDataApiService.containerCapacity(containerCapacity);
         return ajaxResult;
@@ -147,6 +157,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/supplier")
     @ApiOperation("供应商档案添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加供应商", from="ERP")
     public AjaxResult SupplierApi(@RequestBody Supplier supplier){
         AjaxResult ajaxResult = basicDataApiService.supplier(supplier);
         return ajaxResult;
@@ -158,6 +169,7 @@ public class BasicDataApi extends BaseController {
     @PostMapping("/queryInventoryApi")
     @ApiOperation("库存查询公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "查询库存", from="ERP")
     public AjaxResult queryInventoryApi(@RequestBody InventoryDetail inventoryDetail)
     {
         AjaxResult ajaxResult = basicDataApiService.queryInventoryApi(inventoryDetail);
@@ -5,6 +5,7 @@ import com.huaheng.api.general.domain.CycCountDomain;
 import com.huaheng.api.general.domain.ReceiptDomain;
 import com.huaheng.api.general.service.CycleCountService;
 import com.huaheng.api.general.service.ReceiptApiService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.domain.AjaxResult;
@@ -32,6 +33,7 @@ public class CycleCountApi {
     @PostMapping("/adjust")
     @ApiOperation("盘点单添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加盘点单", from="ERP")
     public AjaxResult cycleCount(@RequestBody CycCountDomain cycCountDomain)
     {
         AjaxResult ajaxResult = cycleCountService.insertCycleCount(cycCountDomain);
@@ -4,6 +4,7 @@ package com.huaheng.api.general.controller;
 import com.huaheng.api.general.domain.ReceiptDomain;
 import com.huaheng.api.general.service.ReceiptApiService;
 import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.domain.AjaxResult;
@@ -31,6 +32,7 @@ public class ReceiptApi {
     @PostMapping("/receipt")
     @ApiOperation("入库单添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加入库单", from="ERP")
     public AjaxResult Receipt(@RequestBody ReceiptDomain receiptDomain)
     {
         AjaxResult ajaxResult = receiptApiService.receipt(receiptDomain);
@@ -44,6 +46,7 @@ public class ReceiptApi {
     @Log(title = "入库-入库单 ",operating = "入库单删除", action = BusinessType.UPDATE)
     @PostMapping("/remove")
     @ResponseBody
+    @ApiLogger(apiName = "取消入库单", from="ERP")
     public AjaxResult remove(@RequestBody Integer[] ids){
         if (StringUtils.isNull(ids)){
             return AjaxResult.error("id为空");
@@ -2,6 +2,7 @@ package com.huaheng.api.general.controller;
  
 import com.huaheng.api.general.domain.Receipt;
 import com.huaheng.api.general.service.ReceiptService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.domain.AjaxResult;
@@ -30,6 +31,7 @@ public class ReceiptController {
     @PostMapping("/insertReceipt")
     @ApiOperation("入库单下发接口")
     @ResponseBody
+    @ApiLogger(apiName = "下发入库单", from="ERP")
     public AjaxResult MaterialApi(@RequestBody Receipt receipt) {
         System.out.println("————————开始接收入库单——————————");
         System.out.println(receipt);
@@ -3,6 +3,7 @@ package com.huaheng.api.general.controller;
  
 import com.huaheng.api.general.domain.ShipmentDomain;
 import com.huaheng.api.general.service.ShipmentApiService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.domain.AjaxResult;
@@ -27,6 +28,7 @@ public class ShipmentApi {
     @PostMapping("/shipment")
     @ApiOperation("出库单添加公共接口")
     @ResponseBody
+    @ApiLogger(apiName = "添加出库单", from="ERP")
     public AjaxResult Shipment(@RequestBody ShipmentDomain shipmentDomain)
     {
         AjaxResult ajaxResult = shipmentApiService.shipment(shipmentDomain);
 package com.huaheng.api.wcs.controller;
  
 import com.huaheng.api.wcs.service.emptyOutHandle.EmptyOutHandleService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -31,6 +32,7 @@ public class EmptyOutHandle extends BaseController {
     @PostMapping("/EmptyOutHandle")
     @ApiOperation("wcs空出处理")
     @ResponseBody
+    @ApiLogger(apiName = "空出处理", from="WCS")
     public AjaxResult EmptyOutHandle(String taskNo)
     {
         AjaxResult ajaxResult =emptyOutHandleService.EmptyOutHandle(taskNo) ;
@@ -2,6 +2,7 @@ package com.huaheng.api.wcs.controller;
  
 import com.huaheng.api.wcs.domain.TaskFinishDomain;
 import com.huaheng.api.wcs.service.overrideHandle.OverrideHandleService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -30,6 +31,7 @@ public class OverrideHandle extends BaseController {
     @PostMapping("/ReenterHandle")
     @ApiOperation("wcs重入处理")
     @ResponseBody
+    @ApiLogger(apiName = "重入处理", from="WCS")
     public AjaxResult ReenterHandle(@RequestBody TaskFinishDomain taskFinishDomain) {
         return overrideHandleService.OverrideHandle(taskFinishDomain);
     }
@@ -3,6 +3,7 @@ package com.huaheng.api.wcs.controller;
 import com.huaheng.api.wcs.domain.TaskFinishDomain;
 import com.huaheng.api.wcs.domain.WcsTask;
 import com.huaheng.api.wcs.service.taskFinish.TaskFinishService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -31,6 +32,7 @@ public class TaskFinish extends BaseController {
     @PostMapping("/complete")
     @ApiOperation("wcs任务完成")
     @ResponseBody
+    @ApiLogger(apiName = "任务完成", from="WCS")
     public AjaxResult TaskFinish(@RequestBody TaskFinishDomain taskFinishDomain)
     {
         AjaxResult ajaxResult =taskFinishService.completeTaskByWCS(taskFinishDomain) ;
 package com.huaheng.api.wcs.controller;
  
 import com.huaheng.api.wcs.service.taskCancel.TaskCancelService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.web.controller.BaseController;
 import com.huaheng.framework.web.domain.AjaxResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +22,7 @@ public class TaskInfoController extends BaseController {
  
  
     @GetMapping
+    @ApiLogger(apiName = "取消任务", from="WCS")
     public AjaxResult info(Integer id) {
         return taskCancelService.TaskCance(id);
     }
@@ -3,6 +3,7 @@ package com.huaheng.api.wcs.controller;
 import com.huaheng.api.wcs.domain.WcsTask;
 import com.huaheng.api.wcs.service.emptyOutHandle.EmptyOutHandleService;
 import com.huaheng.api.wcs.service.warecellAllocation.WarecellAllocationService;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -31,6 +32,7 @@ public class WarecellAllocation extends BaseController {
     @PostMapping("/WarecellAllocation")
     @ApiOperation(value="wcs仓位分配", notes="wcs仓位分配", httpMethod = "POST")
     @ResponseBody
+    @ApiLogger(apiName = "仓位分配", from="WCS")
     public AjaxResult WarecellAllocation(String taskNo, String length, String width, String height, String weight, String destination, String locationType) {
         WcsTask wcsTask = new WcsTask();
         wcsTask.setTaskNo(taskNo);
@@ -55,6 +57,7 @@ public class WarecellAllocation extends BaseController {
     @PostMapping("/DestinationAllocation")
     @ApiOperation(value="wcs去向分配", notes="wcs去向分配", httpMethod = "POST")
     @ResponseBody
+    @ApiLogger(apiName = "去向分配", from="WCS")
     public AjaxResult DestinationAllocation(String taskNo, String length, String width, String height, String weight) {
         WcsTask wcsTask = new WcsTask();
         wcsTask.setTaskNo(taskNo);
 package com.huaheng.common.utils.http;
  
+import com.huaheng.framework.aspectj.ApiLogAspect;
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpPost;
@@ -225,11 +228,15 @@ public class HttpUtils
     public static String bodypost(String strURL, String params) {
         System.out.println(strURL);
         System.out.println(params);
+        HttpURLConnection connection = null;
+        InputStream is = null;
+        OutputStreamWriter out = null;
         String result = null;
+        ApiLog log = null;
+
         try {
             URL url = new URL(strURL);// 创建连接
-            HttpURLConnection connection = (HttpURLConnection)
-            url.openConnection();
+            connection = (HttpURLConnection) url.openConnection();
             connection.setDoOutput(true);
             connection.setDoInput(true);
             connection.setUseCaches(false);
@@ -237,10 +244,12 @@ public class HttpUtils
             connection.setRequestMethod("POST");// 设置请求方式
             connection.setRequestProperty("Accept","application/json");// 设置接收数据的格式
             connection.setRequestProperty("Content-Type","application/json");// 设置发送数据的格式
-            connection.connect(); OutputStreamWriter out = new OutputStreamWriter( connection.getOutputStream(),"UTF-8");// utf-8编码
+            log = ApiLogAspect.initApiLog(connection, params);
+            connection.connect();
+            out = new OutputStreamWriter( connection.getOutputStream(),"UTF-8");// utf-8编码
             out.append(params); out.flush(); out.close(); // 读取响应
             int length = (int) connection.getContentLength();// 获取长度
-            InputStream is = connection.getInputStream();
+            is = connection.getInputStream();
             BufferedReader br = new BufferedReader(new InputStreamReader(is));
 //            String ret = "";
 //            if ((ret = br.readLine()) != null) {
@@ -256,8 +265,13 @@ public class HttpUtils
  
 //            }
         } catch (Exception e) {
-            // TODO: handle exception
+            ApiLogAspect.setApiLogException(log, e);
             e.printStackTrace();
+        }finally {
+            ApiLogAspect.finishApiLog(log, connection, result);
+            if(connection != null)
+                connection.disconnect();
+            IOUtils.closeQuietly(out, is);
         }
         return result;
     }
+package com.huaheng.framework.aspectj;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huaheng.common.utils.ServletUtils;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.address.domain.Address;
+import com.huaheng.pc.config.address.service.AddressService;
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import com.huaheng.pc.monitor.apilog.service.IApiLogService;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.*;
+
+/**
+ * Api调用日志记录处理
+ * 
+ * @author huaheng
+ */
+@Aspect
+@Component
+//@EnableAsync
+public class ApiLogAspect
+{
+    private static final Logger log = LoggerFactory.getLogger(ApiLogAspect.class);
+
+    private static IApiLogService apiLogService;
+
+    private static AddressService addressService;
+
+
+    @Autowired
+    public void setApiLogService(IApiLogService apiLogService){
+        ApiLogAspect.apiLogService = apiLogService;
+    }
+
+    @Autowired
+    public void setAddressService(AddressService addressService){
+        ApiLogAspect.addressService = addressService;
+    }
+
+    // 配置织入点
+    @Pointcut("@annotation(com.huaheng.framework.aspectj.lang.annotation.ApiLogger)")
+    public void logPointCut()
+    {
+    }
+
+    @Around("logPointCut()  && @annotation(apiLogger)")
+    public Object around(ProceedingJoinPoint point, ApiLogger apiLogger) throws Throwable
+    {
+        if("WMS".equalsIgnoreCase(apiLogger.from()))
+            //实际上静态方法上的Aop注解无法拦截到
+            return aroundWms2XXX(point, apiLogger);
+        else
+            return aroundXXX2Wms(point, apiLogger);
+    }
+
+    /**处理xxx调用wms接口的日志**/
+    private Object aroundXXX2Wms(ProceedingJoinPoint point, ApiLogger apiLogger){
+        Object ret = null;
+        ApiLog log = initApiLog(apiLogger, point);
+        try{
+            ret = point.proceed();
+        }catch (Exception e){
+            setApiLogException(log, e);
+            throw e;
+        }finally{
+            finishApiLog(log, ret);
+            return ret;
+        }
+    }
+
+    /**处理WMS调用xxx接口的日志**/
+    private Object aroundWms2XXX(ProceedingJoinPoint point, ApiLogger apiLogger){
+        Object ret = null;
+        ApiLog log = new ApiLog();
+
+        HttpURLConnection connection = null;
+        String body = null;
+
+        try {
+            connection = (HttpURLConnection) point.getArgs()[0];
+            body = (String) point.getArgs()[1];
+            initApiLog(connection, body);
+        }catch (Exception e){
+
+        }
+
+        try{
+            ret = point.proceed();
+        }catch (Exception e){
+            setApiLogException(log, e);
+            throw e;
+        }finally{
+            finishApiLog(log, connection, ret.toString());
+            return ret;
+        }
+    }
+
+    /**记录WMS调用外接口的请求信息
+     * 在HttpUtils.bodypost方法中直接调用本类static方法**/
+    public static  ApiLog initApiLog(HttpURLConnection connection, String body){
+        ApiLog log = new ApiLog();
+        try {
+            log.setApiMethod(connection.getRequestMethod());
+            log.setUrl(connection.getURL().toString());
+            log.setRequestTime(new Date());
+            parseUrl(log, connection.getURL());
+
+            //请求头
+            Set<String> keySet = connection.getRequestProperties().keySet();
+            ArrayList<String> headerList = new ArrayList<>();
+            Iterator<String> it = keySet.iterator();
+            while (it.hasNext()) {
+                String name = it.next();
+                String header = connection.getRequestProperty(name);
+                headerList.add(name + ": " + header);
+            }
+
+            log.setRequestHeader(org.apache.commons.lang3.StringUtils.join(headerList, "\n"));
+            log.setRequestBody(body);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return log;
+    }
+
+    /**根据url,从address表中判断调用的去向**/
+    public static void parseUrl(ApiLog log, URL url){
+        try {
+            String[] spList = url.toString().split("/");
+            String apiName = spList[spList.length - 1];
+            int index = url.toString().lastIndexOf(apiName);
+            String addUrl = url.toString().substring(0, index);
+
+            Address address = addressService.getAddressByUrl(addUrl);
+            log.setApiName(apiName);
+            log.setRequestFrom("WMS");
+            log.setResponseBy(address.getParam().toUpperCase());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    /**记录响应头信息**/
+    public static void finishApiLog(ApiLog log, HttpURLConnection connection, String body){
+        try {
+            log.setResponseBody(body);
+            log.setResponseTime(new Date());
+            Long duration = log.getResponseTime().getTime() - log.getRequestTime().getTime();
+            log.setDuration(duration.intValue());
+            log.setHttpCode(String.valueOf(connection.getResponseCode()));
+
+            //响应头
+            Set<String> keyset = connection.getHeaderFields().keySet();
+            ArrayList<String> headerList = new ArrayList<>();
+            Iterator<String> it = keyset.iterator();
+            while(it.hasNext()){
+                String name = it.next();
+                String header = connection.getHeaderField(name);
+                headerList.add(name + ": " + header);
+            }
+            log.setResponseHeader(org.apache.commons.lang3.StringUtils.join(headerList, "\n"));
+            AjaxResult json = JSON.parseObject(body, AjaxResult.class);
+            log.setHttpCode(String.valueOf(json.getCode()));
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveApiLog(log);
+        }
+    }
+
+    private ApiLog initApiLog(ApiLogger apiLogger, ProceedingJoinPoint point){
+        ApiLog log = new ApiLog();
+        try{
+            log.setRequestTime(new Date());
+            log.setRequestFrom(apiLogger.from());
+            log.setResponseBy(apiLogger.to());
+            log.setApiName(apiLogger.apiName());
+
+            HttpServletRequest request = ServletUtils.getRequest();
+
+            String qryStr = request.getQueryString();
+            String url = request.getRequestURL().toString();
+            if(StringUtils.isNotEmpty(qryStr))
+                url = url + "?" + qryStr;
+            log.setUrl(url);
+
+            log.setApiMethod(request.getMethod());
+            log.setIp(request.getRemoteAddr());
+
+            rebuildRequestHeader(log);
+
+            rebuildRequestBody(log, request);
+
+            //如果reqeust中取不到post参数，就从接口方法参数中取json对象
+            if(StringUtils.isEmpty(log.getRequestBody()))
+                rebuildRequestBody(log, point);
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return log;
+    }
+
+    private void finishApiLog(ApiLog log, Object ret){
+        try {
+            rebuildResponseHeader(log);
+            rebuildResponseBody(log, ret);
+
+            log.setResponseTime(new Date());
+            Long duration = log.getResponseTime().getTime() - log.getRequestTime().getTime();
+            log.setDuration(duration.intValue());
+
+            HttpServletResponse resp = ServletUtils.getResponse();
+            log.setHttpCode(String.valueOf(resp.getStatus()));
+
+            if (ret instanceof AjaxResult) {
+                int retCode = ((AjaxResult) ret).getCode();
+                log.setRetCode(String.valueOf(retCode));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            saveApiLog(log);
+        }
+    }
+
+    public static void setApiLogException(ApiLog log, Exception e){
+        try {
+            String exception = ExceptionUtils.getFullStackTrace(e);
+            String shortExpInfo = e.getMessage() + "\n" + org.apache.commons.lang3.StringUtils.left(exception, 1000);
+            log.setException(shortExpInfo);
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
+    }
+
+    private void rebuildRequestHeader(ApiLog log){
+        try {
+            HttpServletRequest req = ServletUtils.getRequest();
+            Enumeration names = req.getHeaderNames();
+            ArrayList<String> headerList = new ArrayList<>();
+            while(names.hasMoreElements()){
+                String name = (String)names.nextElement();
+                String header = req.getHeader(name);
+                headerList.add(name + ": " + header);
+            }
+            String headers = org.apache.commons.lang3.StringUtils.join(headerList, "\n");
+            log.setRequestHeader(headers);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    /**先从post参数中构造request body*/
+    private void rebuildRequestBody(ApiLog log, HttpServletRequest request){
+        try{
+            Set<String> keySet = request.getParameterMap().keySet();
+            Iterator<String> it = keySet.iterator();
+            StringBuffer sbf = new StringBuffer();
+            while(it.hasNext()){
+                String key = it.next();
+                String value = request.getParameter(key);
+                sbf.append(key).append("=").append(value);
+                if(it.hasNext())
+                    sbf.append("&");
+            }
+            log.setRequestBody(sbf.toString());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 根据接口中的参数构造request body
+     */
+    private void rebuildRequestBody(ApiLog log, ProceedingJoinPoint point)
+    {
+        try {
+            if (point.getArgs().length == 1) {
+                log.setRequestBody(JSONObject.toJSONString(point.getArgs()[0]));
+                return;
+            }
+
+            MethodSignature m = (MethodSignature) point.getSignature();
+            HashMap<String, Object> map = new HashMap<>();
+            Object[] args = point.getArgs();
+            for (int i = 0; i < m.getParameterNames().length; i++) {
+                String name = m.getParameterNames()[i];
+//                Class type = m.getParameterTypes()[i];
+                map.put(name, args[i]);
+            }
+
+            log.setRequestBody(JSONObject.toJSONString(map));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    private void rebuildResponseHeader(ApiLog log){
+        try {
+            HttpServletResponse resp = ServletUtils.getResponse();
+            Collection names = resp.getHeaderNames();
+            ArrayList<String> headerList = new ArrayList<>();
+            Iterator<String> it = names.iterator();
+            while(it.hasNext()){
+                String name = it.next();
+                String header = resp.getHeader(name);
+                headerList.add(name + ": " + header);
+            }
+            String headers = org.apache.commons.lang3.StringUtils.join(headerList, "\n");
+            log.setResponseHeader(headers);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    private void rebuildResponseBody(ApiLog log, Object ret){
+        try {
+            log.setResponseBody(JSONObject.toJSON(ret).toString());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    public static void saveApiLog(ApiLog log){
+        try{
+            apiLogService.saveOrUpdate(log);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}
+package com.huaheng.framework.aspectj.lang.annotation;
+
+import com.huaheng.framework.aspectj.lang.constant.OperatorType;
+
+import java.lang.annotation.*;
+
+/**
+ * 第三方系统API请求调用日志注解
+ * 
+ * @author huaheng
+ *
+ */
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ApiLogger
+{
+    /** 接口名称 */
+    String apiName() default "";
+
+    /** 接口调用方 */
+    String from() default "";
+
+    /** 接口提供方 */
+    String to() default "WMS";
+
+}
@@ -15,4 +15,6 @@ public interface AddressService extends IService&lt;Address&gt;{
      * @return 是否复制成功
      */
     Boolean addressCopy(String warehouseCode, String newWarehouseCode);
+
+    Address getAddressByUrl(String url);
 }
@@ -68,4 +68,13 @@ public class AddressServiceImpl extends ServiceImpl&lt;AddressMapper, Address&gt; impl
             return false;
         }
     }
+
+    @Override
+    public Address getAddressByUrl(String url) {
+        LambdaQueryWrapper<Address> addressLam = Wrappers.lambdaQuery();
+        addressLam.eq(Address::getUrl,url)
+                .eq(Address::getWarehouseCode, ShiroUtils.getWarehouseCode());
+        Address address=this.getOne(addressLam);
+        return address;
+    }
 }
+package com.huaheng.pc.monitor.apilog.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.utils.DateUtils;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.common.utils.StringUtils;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import com.huaheng.pc.monitor.apilog.service.IApiLogService;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.common.support.Convert;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 接口调用日志 信息操作处理
+ *
+ * @author huaheng
+ * @date 2020-07-14
+ */
+@Controller
+@RequestMapping("/monitor/apilog")
+public class ApiLogController extends BaseController {
+    private String prefix = "monitor/apilog";
+
+    @Resource
+    private IApiLogService apiLogService;
+
+    @RequiresPermissions("monitor:apiLog:view")
+    @GetMapping()
+    public String apiLog() {
+        return prefix + "/apiLog";
+    }
+
+
+    @RequiresPermissions("monitor:apiLog:view")
+    @GetMapping("/list/{id}")
+    public String apiLogDetail(@PathVariable("id") Integer id, ModelMap mmap) {
+        mmap.put("apiLog", apiLogService.getById(id));
+        return prefix + "/detail";
+    }
+
+    /**
+     * 查询接口调用日志列表
+     */
+    @RequiresPermissions("monitor:apiLog:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ApiLog apiLog, @ApiParam(name = "beginRequestTime", value = "起始时间") String beginRequestTime,
+                              @ApiParam(name = "endRequestTime", value = "起始时间") String endRequestTime,
+                              @ApiParam(name = "endRequestTime", value = "起始时间") String hasException,
+                              @ApiParam(name = "endRequestTime", value = "起始时间") String paramDuration) {
+        LambdaQueryWrapper<ApiLog> lambdaQueryWrapper = Wrappers.lambdaQuery();
+
+        Date requestTime = new Date();
+        try {
+            requestTime = DateUtils.dateTime(DateUtils.YYYY_MM_DD, endRequestTime);
+        }catch (Exception e){
+
+        }
+        requestTime = DateUtils.addDays(requestTime, 1);
+
+        lambdaQueryWrapper
+                .eq(StringUtils.isNotEmpty(apiLog.getApiName()), ApiLog::getApiName, apiLog.getApiName())
+                .eq(StringUtils.isNotEmpty(apiLog.getRequestFrom()), ApiLog::getRequestFrom, apiLog.getRequestFrom())
+                .eq(StringUtils.isNotEmpty(apiLog.getResponseBy()), ApiLog::getResponseBy, apiLog.getResponseBy())
+                .ge(StringUtils.isNotEmpty(beginRequestTime), ApiLog::getRequestTime, beginRequestTime)
+                .ge(NumberUtils.isNumber(paramDuration), ApiLog::getDuration, paramDuration)
+                .isNotNull("1".equals(hasException),ApiLog::getException)
+                .isNull("0".equals(hasException),ApiLog::getException)
+                .le(StringUtils.isNotEmpty(endRequestTime), ApiLog::getRequestTime, requestTime)
+                .eq(StringUtils.isNotEmpty(apiLog.getHttpCode()), ApiLog::getHttpCode, apiLog.getHttpCode())
+                .eq(StringUtils.isNotEmpty(apiLog.getRetCode()), ApiLog::getRetCode, apiLog.getRetCode()).orderByDesc(ApiLog::getId);
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        ;
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            /*使用分页查询*/
+            Page<ApiLog> page = new Page<>(pageNum, pageSize);
+            IPage<ApiLog> iPage = apiLogService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<ApiLog> list = apiLogService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增接口调用日志
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存接口调用日志
+     */
+    @RequiresPermissions("monitor:apiLog:add")
+    @Log(title = "接口日志", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ApiLog apiLog) {
+        return toAjax(apiLogService.save(apiLog));
+    }
+
+    /**
+     * 修改接口调用日志
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        ApiLog apiLog = apiLogService.getById(id);
+        mmap.put("apiLog", apiLog);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存接口调用日志
+     */
+    @RequiresPermissions("monitor:apiLog:edit")
+    @Log(title = "接口日志", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ApiLog apiLog) {
+        return toAjax(apiLogService.updateById(apiLog));
+    }
+
+    /**
+     * 删除接口调用日志
+     */
+    @RequiresPermissions("monitor:apiLog:remove")
+    @Log(title = "接口日志", action = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
+        return toAjax(apiLogService.removeByIds(Arrays.asList(Convert.toIntArray(ids))));
+    }
+
+}
+package com.huaheng.pc.monitor.apilog.domain;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 接口调用日志表 api_log
+ * 
+ * @author huaheng
+ * @date 2020-07-14
+ */
+@TableName(value = "api_log")
+@Data
+public class ApiLog implements Serializable{
+	private static final long serialVersionUID = 1L;
+	
+        /** - */
+        @TableId(value = "id", type = IdType.AUTO)
+    	private Integer id;
+        /** 模块标题 */
+        @TableField(value = "apiName")
+    	private String apiName;
+        /** 请求类型 */
+        @TableField(value = "apiMethod")
+        private String apiMethod;
+        /** 请求方ip地址 */
+        @TableField(value = "ip")
+    	private String ip;
+        /** 请求方名称 */
+        @TableField(value = "requestFrom")
+    	private String requestFrom;
+        /** 响应方名称 */
+        @TableField(value = "responseBy")
+    	private String responseBy;
+        /** 请求地址 */
+        @TableField(value = "url")
+    	private String url;
+        /** 请求时间 */
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @TableField(value = "requestTime")
+    	private Date requestTime;
+        /** 响应时间 */
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @TableField(value = "responseTime")
+    	private Date responseTime;
+        /** 请求头 */
+        @TableField(value = "requestHeader")
+    	private String requestHeader;
+        /** 请求内容 */
+        @TableField(value = "requestBody")
+    	private String requestBody;
+        /** 响应头 */
+        @TableField(value = "responseHeader")
+    	private String responseHeader;
+        /** 响应内容 */
+        @TableField(value = "responseBody")
+    	private String responseBody;
+        /** 响应耗时（毫秒） */
+        @TableField(value = "duration")
+    	private int duration;
+        /** httpCode */
+        @TableField(value = "httpCode")
+    	private String httpCode;
+        /** retCode */
+        @TableField(value = "retCode")
+        private String retCode;
+        /** 异常堆栈信息 */
+        @TableField(value = "exception")
+    	private String exception;
+
+        public String getExceptionMsg(){
+            String msg = exception;
+            try{
+                msg = exception.split("\n")[0];
+            }catch (Exception e){
+
+            }
+            return msg;
+        }
+
+}
+package com.huaheng.pc.monitor.apilog.mapper;
+
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
+/**
+ * 接口调用日志 数据层
+ * 
+ * @author huaheng
+ * @date 2020-07-14
+ */
+public interface ApiLogMapper extends BaseMapper<ApiLog> {
+
+    public List<String> getRequestFromList();
+
+    public List<String> getResponseByList();
+
+    public List<String> getHttpCodeList();
+
+    public List<String> getApiNameList();
+
+    public List<String> getHttpRetList();
+}
+	
+package com.huaheng.pc.monitor.apilog.service;
+
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * 接口调用日志 服务层
+ * 
+ * @author huaheng
+ * @date 2020-07-14
+ */
+public interface IApiLogService  extends IService<ApiLog> {
+
+    public List<String> getRequestFromList();
+
+    public List<String> getResponseByList();
+
+    public List<String> getHttpCodeList();
+
+    public List<String> getApiNameList();
+
+    public List<String> getRetCodeList();
+}
+	
+
+package com.huaheng.pc.monitor.apilog.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.monitor.apilog.service.IApiLogService;
+import com.huaheng.pc.monitor.apilog.domain.ApiLog;
+import com.huaheng.pc.monitor.apilog.mapper.ApiLogMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * 接口调用日志 服务层实现
+ * 
+ * @author huaheng
+ * @date 2020-07-14
+ */
+@Service("apiLogService")
+public class ApiLogServiceImpl extends ServiceImpl<ApiLogMapper, ApiLog> implements IApiLogService {
+
+    @Resource
+    ApiLogMapper apiLogMapper;
+
+    @Override
+    public List<String> getRequestFromList() {
+        return apiLogMapper.getRequestFromList();
+    }
+
+    @Override
+    public List<String> getResponseByList() {
+        return apiLogMapper.getResponseByList();
+    }
+
+    @Override
+    public List<String> getHttpCodeList() {
+        return apiLogMapper.getHttpCodeList();
+    }
+
+    @Override
+    public List<String> getRetCodeList() {
+        return apiLogMapper.getHttpRetList();
+    }
+
+    @Override
+    public List<String> getApiNameList() {
+        return apiLogMapper.getApiNameList();
+    }
+}
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaheng.pc.monitor.apilog.mapper.ApiLogMapper">
+
+    <resultMap type="com.huaheng.pc.monitor.apilog.domain.ApiLog" id="apiLogResult">
+        <result property="id" column="id"/>
+        <result property="apiName" column="apiName"/>
+        <result property="apiMethod" column="apiMethod"/>
+        <result property="ip" column="ip"/>
+        <result property="requestFrom" column="requestFrom"/>
+        <result property="responseBy" column="responseBy"/>
+        <result property="url" column="url"/>
+        <result property="requestTime" column="requestTime"/>
+        <result property="responseTime" column="responseTime"/>
+        <result property="requestHeader" column="requestHeader"/>
+        <result property="requestBody" column="requestBody"/>
+        <result property="responseHeader" column="responseHeader"/>
+        <result property="responseBody" column="responseBody"/>
+        <result property="duration" column="duration"/>
+        <result property="httpCode" column="httpCode"/>
+        <result property="retCode" column="retCode"/>
+        <result property="exception" column="exception"/>
+    </resultMap>
+    <sql id="selectapiLogVo">
+        select id, apiName, apiMethod, ip, requestFrom, responseBy, url, requestTime, responseTime, requestHeader, requestBody, responseHeader, responseBody, duration, httpCode, retCode, `exception` from api_log
+    </sql>
+    <select id="getRequestFromList" resultType="java.lang.String">
+        select  distinct(requestFrom) from api_log order by requestFrom asc
+    </select>
+    <select id="getResponseByList" resultType="java.lang.String">
+        select  distinct(responseBy) from api_log order by responseBy asc
+    </select>
+    <select id="getHttpCodeList" resultType="java.lang.String">
+        select  distinct(httpCode) from api_log order by httpCode asc
+    </select>
+    <select id="getApiNameList" resultType="java.lang.String">
+        select  distinct(apiName) from api_log order by apiName asc
+    </select>
+    <select id="getHttpRetList" resultType="java.lang.String">
+        select  distinct(retCode) from api_log order by retCode asc
+    </select>
+
+</mapper>
 \ No newline at end of file
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 select-info">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>API：</label>
+                            <select name="apiName">
+                                <option value=""></option>
+                                <option th:each="item:${@apiLogService.getApiNameList()}" th:value="${item}" th:text="${item}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>请求方：</label>
+                            <select name="requestFrom">
+                                <option value=""></option>
+                                <option th:each="item:${@apiLogService.getRequestFromList()}" th:value="${item}" th:text="${item}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>响应方：</label>
+                            <select name="responseBy">
+                                <option value=""></option>
+                                <option th:each="item:${@apiLogService.getResponseByList()}" th:value="${item}" th:text="${item}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>httpCode：</label>
+                            <select name="httpCode">
+                                <option value=""></option>
+                                <option th:each="item:${@apiLogService.getHttpCodeList()}" th:value="${item}" th:text="${item}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>retCode：</label>
+                            <select name="retCode">
+                                <option value=""></option>
+                                <option th:each="item:${@apiLogService.getHttpCodeList()}" th:value="${item}" th:text="${item}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>异常：</label>
+                            <select name="hasException">
+                                <option value=""></option>
+                                <option value="1">有异常</option>
+                                <option value="0">无异常</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>响应时间 &gt; </label>
+                            <input type="text" name="paramDuration" placeholder="1000毫秒"/>
+                        </li>
+                        <li class="time">
+                            <label>请求时间：</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginRequestTime"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endRequestTime"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="btn-group hidden-xs" id="toolbar" role="group">
+            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
+               shiro:hasPermission="apilog:apiLog:add">
+                <i class="fa fa-plus"></i> 新增
+            </a>
+            <a class="btn btn-outline btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="apilog:apilog:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-outline btn-danger btn-rounded multiple disabled" onclick="$.operate.batRemove()"
+               shiro:hasPermission="apilog:apiLog:remove">
+                <i class="fa fa-trash-o"></i> 删除
+            </a>
+        </div>
+
+        <div class="col-sm-12 select-info table-striped">
+            <table id="bootstrap-table" data-mobile-responsive="true"></table>
+        </div>
+    </div>
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('apilog:apiLog:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('apilog:apiLog:remove')}]];
+    var prefix = ctx + "monitor/apilog"
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            detailUrl: prefix + "/list/{id}",
+            // createUrl: prefix + "/add",
+            // updateUrl: prefix + "/edit/{id}",
+            // removeUrl: prefix + "/remove",
+            modalName: "接口调用日志",
+            pageSize: 30,
+            columns: [
+                {
+                    field: 'id',
+                    title: 'id',
+                    visible: true
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.detail(\'' + row.id + '\')">详情</a> ');
+                        return actions.join('');
+                    }
+                },
+                {
+                    field: 'apiName',
+                    title: 'API'
+                },
+                /**
+                {
+                    field: 'ip',
+                    title: 'IP'
+                },
+                 **/
+                {
+                    field: 'requestFrom',
+                    title: 'from'
+                },
+                {
+                    field: 'responseBy',
+                    title: 'to'
+                },
+                /**
+                {
+                    field: 'url',
+                    title: '请求地址'
+                },
+                 **/
+                {
+                    field: 'httpCode',
+                    title: 'http',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        var style = "style='color:green'"
+                        if(value>200)
+                            style = " style='color:red'";
+                        if(value == undefined)
+                            value = " "
+                        actions.push('<span '+ style + '>'+value+ '</span>')
+                        return actions.join(" ")
+                    }
+                },
+                {
+                    field: 'retCode',
+                    title: 'ret',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        var style = "style='color:green'"
+                        if(value>200)
+                            style = " style='color:red'";
+                        if(value == undefined)
+                            value = " "
+                        actions.push('<span '+ style + '>'+value+ '</span>')
+                        return actions.join(" ")
+                    }
+                },
+                {
+                    field: 'requestTime',
+                    title: '请求时间'
+                },
+                /**
+                {
+                    field: 'responseTime',
+                    title: '响应时间'
+                },
+                 **/
+                {
+                    field: 'duration',
+                    title: '耗时',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        var style = ""
+                        if(value>1000)
+                            style = " style='color:red'";
+                        if(value == undefined)
+                            value = " "
+                        actions.push('<span '+ style + ' title="毫秒">'+value+ '</span>')
+                        return actions.join(" ")
+                    }
+                },
+                /**
+                {
+                    field: 'requestHeader',
+                    title: '请求头'
+                },
+                 **/
+
+                {
+                    field: 'requestBody',
+                    title: '请求内容',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(value == undefined)
+                            value = " "
+                        actions.push('<pre style="white-space: pre-wrap; width:400px" ondblclick="parseJson(this)" title="双击格式化">'+value+ '</pre>')
+                        return actions.join(" ")
+                    }
+                },
+                /**
+                {
+                    field: 'responseHeader',
+                    title: '响应头'
+                },
+                 **/
+                {
+                    field: 'responseBody',
+                    title: '响应内容',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(value == undefined)
+                            value = " "
+                        actions.push('<pre style="white-space: pre-wrap; width:400px" ondblclick="parseJson(this)" title="双击格式化">'+value+ '</pre>')
+                        return actions.join(" ")
+                    }
+                },
+
+                {
+                    field: 'exceptionMsg',
+                    title: '异常信息',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        if(value == undefined)
+                            value = " "
+                        actions.push('<span style="color:red">'+value+ '</span>')
+                        return actions.join(" ")
+                    }
+                }
+                ]
+        };
+        $.table.init(options);
+    });
+
+    function parseJson(obj){
+        var str = obj.innerHTML
+        try {
+            str = JSON.parse(str);
+            obj.outerHTML = '<pre style="white-space: pre-wrap; width:400px">' + JSON.stringify(str, null, 2) + '</pre>';
+        }catch (e) {
+            str = str.split("&amp;").join("&#10;")
+            obj.outerHTML = '<pre style="white-space: pre-wrap; width:400px">' + str + '</pre>';
+        }
+    }
+</script>
+</body>
+</html>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header"/>
+    <th:block th:include="include :: datetimepicker-css"/>
+    <style>
+        .mylabel{
+            text-align: right;
+        }
+        .red{
+            color:red;
+        }
+        .green{
+            color:green;
+        }
+    </style>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <div class="" id="form-apilog-edit" th:object="${apiLog}">
+        <div class="">
+            <label class="col-sm-2 mylabel">ID：</label>
+            <label class="col-sm-10" th:text="${apiLog.getId()}"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">接口名：</label>
+            <label class="col-sm-10" th:text="${apiLog.getApiName()}"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">请求方ip：</label>
+            <label class="col-sm-10" th:text="${apiLog.getIp()}==null?'&nbsp;':${apiLog.getIp()} + '&nbsp;'"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">调用方向：</label>
+            <label class="col-sm-10" th:text="${apiLog.getRequestFrom()} +  '&nbsp;&nbsp;->&nbsp;&nbsp;'  + ${apiLog.getResponseBy()}"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">Method：</label>
+            <label class="col-sm-10" th:text="${apiLog.getApiMethod()}"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">接口地址：</label>
+            <label class="col-sm-10" th:text="${apiLog.getUrl()}"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">请求时间：</label>
+            <label class="col-sm-10" th:text="${#dates.format(apiLog.requestTime, 'yyyy-MM-dd HH:mm:ss')}"></label>
+        </div>
+        <!--<div class="">-->
+            <!--<label class="col-sm-2 mylabel">响应时间：</label>-->
+            <!--<label class="col-sm-10" th:text="${#dates.format(apiLog.responseTime, 'yyyy-MM-dd HH:mm:ss')}"></label>-->
+        <!--</div>-->
+        <div class=""  th:classappend="${apiLog.getDuration()}>=1000?'red'">
+            <label class="col-sm-2 mylabel">耗时：</label>
+            <label class="col-sm-10" th:text="${apiLog.getDuration()} + ' 毫秒'"></label>
+        </div>
+        <div class="" th:classappend="${apiLog.getHttpCode()}=='200'?'green':'red'">
+            <label class="col-sm-2 mylabel">HttpCode：</label>
+            <label class="col-sm-10" th:text="${apiLog.getHttpCode()}==null?'&nbsp;':${apiLog.getHttpCode()}"></label>
+        </div>
+        <div class="" th:classappend="${apiLog.getRetCode()}=='200'?'green':'red'">
+            <label class="col-sm-2 mylabel">RetCode：</label>
+            <label class="col-sm-10" th:text="${apiLog.getRetCode()}==null?'&nbsp;':${apiLog.getRetCode()}"></label>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">请求头：</label>
+            <div class="col-sm-10"><pre style="white-space: pre-wrap;" th:text="${apiLog.getRequestHeader()}"></pre></div>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">响应头：</label>
+            <div class="col-sm-10"><pre style="white-space: pre-wrap;"  th:text="${apiLog.getResponseHeader()}"></pre></div>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">请求内容：</label>
+            <div class="col-sm-10"><pre id="preReqBody" style="white-space: pre-wrap;"  th:text="${apiLog.getRequestBody()}"></pre></div>
+        </div>
+        <div class="">
+            <label class="col-sm-2 mylabel">响应内容：</label>
+            <div class="col-sm-10"><pre id="preRespBody" style="white-space: pre-wrap;" th:text="${apiLog.getResponseBody()}"></pre></div>
+        </div>
+        <!--<div class="">-->
+            <!--<label class="col-sm-2 mylabel">httpCode：</label>-->
+            <!--<div class="col-sm-8">-->
+                <!--<select name="httpcode" class="form-control m-b">-->
+                    <!--<option value="">所有</option>-->
+                <!--</select>-->
+                <!--<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
+            <!--</div>-->
+        <!--</div>-->
+        <div class="" th:classappend="${apiLog.getException()}!=null?'red'">
+            <label class="col-sm-2 mylabel">异常信息：</label>
+            <div class="col-sm-10"><pre style="white-space: pre-wrap;" th:text="${apiLog.getException()}"></pre></div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "apilog/apilog";
+    function parseJson(obj){
+        var str = obj.innerHTML
+        try {
+            str = JSON.parse(str);
+            obj.innerHTML = JSON.stringify(str, null, 2);
+        }catch (e) {
+            str = str.split("&amp;").join("&#10;")
+            obj.innerHTML = str;
+        }
+    }
+
+    parseJson(document.getElementById("preReqBody"))
+    parseJson(document.getElementById("preRespBody"))
+</script>
+</body>
+</html>
 \ No newline at end of file