From 62b43c8a4d5b1e76bad35079388f4dc8610c251a Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 18 May 2026 21:47:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heyu/api/common/LogClassicConverter.java | 12 +- .../vv/VvTradeOrderConvertServiceImpl.java | 4 +- .../com/heyu/api/data/utils/Base64Utils.java | 2 +- .../main/java/com/heyu/api/data/utils/R.java | 7 +- .../handle/traffic/BVehicleLicenseHandle.java | 4 +- .../main/java/com/heyu/api/aop/LogAop.java | 9 +- .../java/com/heyu/api/aop/ZhenZhenLogAop.java | 8 +- .../heyu/api/controller/BaseController.java | 86 ++++++++ .../car/RecognizeDriverLicenseController.java | 11 +- .../RecognizeDrivingLicenseController.java | 185 +++++++++--------- .../request/car/VehicleLicenseRequest.java | 44 +++++ .../com/heyu/api/schedule/ScheduleUtils.java | 15 +- .../src/main/resources/log/logback-dev.xml | 8 +- .../src/main/resources/log/logback-online.xml | 8 +- 14 files changed, 254 insertions(+), 149 deletions(-) create mode 100644 api-web/api-interface/src/main/java/com/heyu/api/request/car/VehicleLicenseRequest.java diff --git a/api-common/src/main/java/com/heyu/api/common/LogClassicConverter.java b/api-common/src/main/java/com/heyu/api/common/LogClassicConverter.java index f644d08..d4ebfbb 100644 --- a/api-common/src/main/java/com/heyu/api/common/LogClassicConverter.java +++ b/api-common/src/main/java/com/heyu/api/common/LogClassicConverter.java @@ -2,21 +2,17 @@ package com.heyu.api.common; import ch.qos.logback.classic.pattern.ClassicConverter; import ch.qos.logback.classic.spi.ILoggingEvent; +import org.slf4j.MDC; public class LogClassicConverter extends ClassicConverter { @Override public String convert(ILoggingEvent event) { - if (LogAspect.threadLocalNo != null && LogAspect.threadLocalNo.get() != null) { + String traceId = MDC.get("traceId"); + if (traceId != null) { StringBuffer sb = new StringBuffer(); - sb.append("[").append(LogAspect.threadLocalNo.get()); - Long start = LogAspect.threadLocalTime.get(); - Long end; - if (start != null) { - end = System.currentTimeMillis(); - sb.append(",").append(end - start); - } + sb.append("[").append(traceId); sb.append("]"); return sb.toString(); } diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java index 04b78c3..224a207 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java @@ -1,6 +1,5 @@ package com.heyu.api.data.service.impl.vv; -import com.heyu.api.common.LogAspect; import com.heyu.api.data.dao.vv.VvPackageDao; import com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao; import com.heyu.api.data.entity.vv.VvPackageEntity; @@ -17,6 +16,7 @@ import com.heyu.api.data.utils.SanUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.slf4j.MDC; import java.util.ArrayList; import java.util.List; @@ -114,7 +114,7 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic entity.setFeatures(reason[1]); } } - entity.setTraceId(LogAspect.threadLocalNo.get()); + entity.setTraceId(MDC.get("traceId")); vvTradeOrderLineStatusLogDao.insertVvTradeOrderLineStatusLog(entity); return 1; } diff --git a/api-mapper/src/main/java/com/heyu/api/data/utils/Base64Utils.java b/api-mapper/src/main/java/com/heyu/api/data/utils/Base64Utils.java index d4c348e..b5d30e2 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/utils/Base64Utils.java +++ b/api-mapper/src/main/java/com/heyu/api/data/utils/Base64Utils.java @@ -121,7 +121,7 @@ public class Base64Utils { public static void main(String[] args) { - String imagePath = "/Users/quyixiao/Desktop/ocr/testxxx.jpg"; + String imagePath = "/Users/quyixiao/Desktop/Xnip2026-05-18_20-36-51.jpg"; String base64Image = encodeImageToBase64(imagePath); System.out.println("Base64 Image String:"); System.out.println(base64Image); diff --git a/api-mapper/src/main/java/com/heyu/api/data/utils/R.java b/api-mapper/src/main/java/com/heyu/api/data/utils/R.java index f1cd8ae..392d5d6 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/utils/R.java +++ b/api-mapper/src/main/java/com/heyu/api/data/utils/R.java @@ -1,8 +1,8 @@ package com.heyu.api.data.utils; -import com.heyu.api.common.LogAspect; import com.heyu.api.data.dto.RespCode; +import org.slf4j.MDC; import java.util.HashMap; import java.util.Map; @@ -40,8 +40,9 @@ public class R { public R() { this.code = RespCode.SUCCESS.code; this.msg = RespCode.SUCCESS.msg; - if (LogAspect.threadLocalNo != null) { - this.traceId = LogAspect.threadLocalNo.get(); + this.traceId = MDC.get("traceId"); + if (this.traceId == null) { + this.traceId = MDC.get("X-B3-TraceId"); } } diff --git a/api-third/src/main/java/com/heyu/api/baidu/handle/traffic/BVehicleLicenseHandle.java b/api-third/src/main/java/com/heyu/api/baidu/handle/traffic/BVehicleLicenseHandle.java index db19f95..bd9149f 100644 --- a/api-third/src/main/java/com/heyu/api/baidu/handle/traffic/BVehicleLicenseHandle.java +++ b/api-third/src/main/java/com/heyu/api/baidu/handle/traffic/BVehicleLicenseHandle.java @@ -45,9 +45,7 @@ public class BVehicleLicenseHandle extends BaiduBaseHandle requestBaidu(String content) { + String result = null; + try { + if (StringUtils.isBlank(content)) { + log.error("请求内容为空，未知异常"); + return null; + } + if (content.startsWith("&")) { + content = content.substring(1); + } + + Request baiduRequest = createBaiduRequest(content); + try (Response response = HTTP_CLIENT.newCall(baiduRequest).execute()) { + result = response.body().string(); + return com.alibaba.fastjson.JSONObject.parseObject(result, Map.class); + } + } catch (IOException e) { + log.error("BaseController requestBaidu 异常", e); + } finally { + log.info("BaseController requestBaidu result :{}", result); + } + log.error("BaseController requestBaidu 没有返回值。"); + return null; + } + + private Request createBaiduRequest(String content) { + MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); + okhttp3.RequestBody body = okhttp3.RequestBody.create(mediaType, content); + return new Request.Builder() + .url("https://aip.baidubce.com/" + VEHICLE_LICENSE_URI + "?access_token=" + getBaiduAccessToken()) + .method("POST", body) + .addHeader("Content-Type", "application/x-www-form-urlencoded") + .addHeader("Accept", "application/json") + .build(); + } + + private String getAccessToken(String apiKey, String secretKey) throws Exception { + MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded"); + okhttp3.RequestBody body = okhttp3.RequestBody.create(mediaType, "grant_type=client_credentials&client_id=" + apiKey + + "&client_secret=" + secretKey); + Request request = new Request.Builder() + .url("https://aip.baidubce.com/oauth/2.0/token") + .method("POST", body) + .addHeader("Content-Type", "application/x-www-form-urlencoded") + .build(); + try (Response response = HTTP_CLIENT.newCall(request).execute()) { + return new org.json.JSONObject(response.body().string()).getString("access_token"); + } + } + + private String getBaiduAccessToken() { + try { + String accessTokenKey = BAIDU_API_KEY + ":" + BAIDU_SECRET_KEY + ":token"; + String accessToken = redisUtils.get(accessTokenKey); + if (StringUtils.isBlank(accessToken)) { + accessToken = getAccessToken(BAIDU_API_KEY, BAIDU_SECRET_KEY); + redisUtils.set(accessTokenKey, accessToken, RedisConstans.SECOND_OF_ONE_7_DAY); + } + return accessToken; + } catch (Exception e) { + log.error("getBaiduToken error", e); + } + log.error("getBaiduToken error token is null "); + return null; + } + } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDriverLicenseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDriverLicenseController.java index d2bccc9..5ac58c0 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDriverLicenseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDriverLicenseController.java @@ -5,7 +5,7 @@ import com.aliyun.ocr20191230.models.RecognizeDriverLicenseResponseBody; import com.heyu.api.alibaba.handle.common.text.ARecognizeDriverLicenseHandle; import com.heyu.api.alibaba.request.common.text.ARecognizeDriverLicenseRequest; import com.heyu.api.controller.BaseController; -import com.heyu.api.data.annotation.NotIntercept; +import com.heyu.api.data.annotation.EbAuthentication; import com.heyu.api.data.constants.ApiConstants; import com.heyu.api.data.utils.ApiR; import com.heyu.api.data.utils.R; @@ -14,6 +14,7 @@ import com.heyu.api.resp.car.RecognizeDriverLicenseFaceResp; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -42,20 +43,18 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @RequestMapping("/driver/license") -@NotIntercept public class RecognizeDriverLicenseController extends BaseController { @Autowired private ARecognizeDriverLicenseHandle aRecognizeDriverLicenseHandle; + // http://localhost:8888/driver/license/recognize?side=face&imageBase64=/9j/4AAQSkZJRgABA + @EbAuthentication(tencent = ApiConstants.TENCENT_AUTH) @PostMapping("/recognize") - public R recognize(ARecognizeDriverLicenseRequest request) { + public R recognize(@RequestBody ARecognizeDriverLicenseRequest request) { if (!hasImage(request)) { return R.error("imageUrl和imageBase64不能同时为空"); } - if (!isFaceOrBack(request.getSide())) { - return R.error("side只能为face或back"); - } ApiR aR = aRecognizeDriverLicenseHandle.handle(request); if (!isValidAliResponse(aR)) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDrivingLicenseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDrivingLicenseController.java index 020b0fa..995ef24 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDrivingLicenseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/car/RecognizeDrivingLicenseController.java @@ -1,103 +1,133 @@ package com.heyu.api.controller.car; -import com.aliyun.ocr20191230.models.RecognizeDrivingLicenseResponse; -import com.aliyun.ocr20191230.models.RecognizeDrivingLicenseResponseBody; -import com.heyu.api.alibaba.handle.common.text.ARecognizeDrivingLicenseHandle; -import com.heyu.api.alibaba.request.common.text.ARecognizeDrivingLicenseRequest; -import com.heyu.api.baidu.handle.traffic.BVehicleLicenseHandle; import com.heyu.api.baidu.request.traffic.BVehicleLicenseRequest; import com.heyu.api.controller.BaseController; import com.heyu.api.data.annotation.NotIntercept; import com.heyu.api.data.constants.ApiConstants; -import com.heyu.api.data.utils.ApiR; import com.heyu.api.data.utils.MapUtils; import com.heyu.api.data.utils.R; +import com.heyu.api.data.utils.StringUtils; +import com.heyu.api.request.car.VehicleLicenseRequest; import com.heyu.api.resp.car.RecognizeDrivingLicenseBackResp; import com.heyu.api.resp.car.RecognizeDrivingLicenseFaceResp; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.Map; -/*** - * - * https://next.api.aliyun.com/api/ocr/2019-12-30/RecognizeDrivingLicense?tab=DEMO&lang=JAVA - *行驶证识别 - * - * RecognizeDrivingLicense - * 行驶证识别能力可以识别行驶证首页和副页关键字段内容，输出品牌型号、车辆类型、车牌号码、检验记录、核定载质量、核定载人数等 21 个关键字段信息。 - * +/** + * 行驶证识别。 * https://console.bce.baidu.com/support/?_=1740219852952×tamp=1740323990690#/api?product=AI&project=%E6%96%87%E5%AD%97%E8%AF%86%E5%88%AB&parent=%E4%BA%A4%E9%80%9A%E5%9C%BA%E6%99%AFOCR&api=rest%2F2.0%2Focr%2Fv1%2Fvehicle_license&method=post - * - * */ @Slf4j @RestController @RequestMapping("/driving/license") @NotIntercept +@SuppressWarnings("unchecked") public class RecognizeDrivingLicenseController extends BaseController { - @Autowired - private ARecognizeDrivingLicenseHandle arRecognizeDrivingLicenseHandle; - - @Autowired - private BVehicleLicenseHandle bVehicleLicenseHandle; - + // http://localhost:8888/driving/license/recognize @PostMapping("/recognize") - public R recognize(ARecognizeDrivingLicenseRequest request) { - if (!hasImage(request)) { - return R.error("imageUrl和imageBase64不能同时为空"); + public R recognize(@RequestBody VehicleLicenseRequest request) { + BVehicleLicenseRequest bVehicleLicenseRequest = toBaiduRequest(request); + String checkMsg = checkRequest(bVehicleLicenseRequest); + if (!isBlank(checkMsg)) { + return R.error(checkMsg); } - if (!isFaceOrBack(request.getSide())) { - return R.error("side只能为face或back"); + Map data = requestBaidu(getContent(bVehicleLicenseRequest)); + if (data == null) { + return R.error("识别失败"); } - ApiR bR = bVehicleLicenseHandle.handle(toBaiduRequest(request)); - if (bR != null && bR.isSuccess() && bR.getData() != null) { - if (ApiConstants.face.equals(request.getSide())) { - return R.ok().setData(toFaceResp(bR.getData())); - } - return R.ok().setData(toBackResp(bR.getData())); - } - - ApiR aR = arRecognizeDrivingLicenseHandle.handle(request); - if (!isValidAliResponse(aR)) { - return R.error(!isBlank(thirdError(aR)) ? thirdError(aR) : thirdError(bR)); - } - - RecognizeDrivingLicenseResponseBody.RecognizeDrivingLicenseResponseBodyData data = - aR.getData().getBody().getData(); - if (ApiConstants.face.equals(request.getSide())) { - if (data.getFaceResult() == null) { - return R.error("未识别到行驶证正页信息"); - } - return R.ok().setData(toFaceResp(data.getFaceResult())); - } - if (data.getBackResult() == null) { - return R.error("未识别到行驶证副页信息"); - } - return R.ok().setData(toBackResp(data.getBackResult())); + R result = R.ok(); + return result.setData(toRecognizeResp(bVehicleLicenseRequest.getVehicleLicenseSide(), data)); } - private BVehicleLicenseRequest toBaiduRequest(ARecognizeDrivingLicenseRequest request) { + private BVehicleLicenseRequest toBaiduRequest(VehicleLicenseRequest request) { BVehicleLicenseRequest bVehicleLicenseRequest = new BVehicleLicenseRequest(); - bVehicleLicenseRequest.setVehicleLicenseSide(request.getSide()); + if (request == null) { + return bVehicleLicenseRequest; + } bVehicleLicenseRequest.setImageUrl(request.getImageUrl()); bVehicleLicenseRequest.setImageBase64(request.getImageBase64()); + if (StringUtils.isNotBlank(request.getSide())) { + bVehicleLicenseRequest.setVehicleLicenseSide(request.getSide()); + } return bVehicleLicenseRequest; } - private boolean isValidAliResponse(ApiR apiR) { - return apiR != null - && apiR.isSuccess() - && apiR.getData() != null - && isSuccessStatusCode(apiR.getData().getStatusCode()) - && apiR.getData().getBody() != null - && apiR.getData().getBody().getData() != null; + private String checkRequest(BVehicleLicenseRequest request) { + if (!hasImage(request)) { + return "imageUrl和imageBase64不能同时为空"; + } + if (checkNotTrueFalse(request.getDetectDirection())) { + return "detectDirection 必须传 " + ApiConstants.trueOrFalse + ",false：不进行图像方向自动矫正, true: 开启图像方向自动矫正功能，可对旋转 90/180/270 度的图片进行自动矫正并识别"; + } + if (checkNotFrontBack(request.getVehicleLicenseSide())) { + return "vehicleLicenseSide 必须传 " + ApiConstants.frontOrback + ",front：正向， back反面"; + } + if (checkNotTrueFalse(request.getUnified())) { + return "unified必须为 " + ApiConstants.trueOrFalse + ", false 不进行归一化处理, rue：对输出字段进行归一化处理，将新/老版行驶证的“注册登记日期/注册日期”统一为”注册日期“进行输出"; + } + if (checkNotTrueFalse(request.getQualityWarn())) { + return "qualityWarn 必须为" + ApiConstants.trueOrFalse + ",false：不输出质量告警信息, true : 输出行驶证遮挡、不完整质量告警信息"; + } + return null; + } + + private boolean hasImage(BVehicleLicenseRequest request) { + return request != null && (!isBlank(request.getImageUrl()) || !isBlank(request.getImageBase64())); + } + + private String getContent(BVehicleLicenseRequest request) { + StringBuffer sb = getImageContent(request); + if (StringUtils.isNotBlank(request.getDetectDirection())) { + sb.append("&detect_direction=").append(request.getDetectDirection()); + } + if (StringUtils.isNotBlank(request.getVehicleLicenseSide())) { + sb.append("&vehicle_license_side=").append(request.getVehicleLicenseSide()); + } + if (StringUtils.isNotBlank(request.getUnified())) { + sb.append("&unified=").append(request.getUnified()); + } + if (StringUtils.isNotBlank(request.getQualityWarn())) { + sb.append("&quality_warn=").append(request.getQualityWarn()); + } + if (StringUtils.isNotBlank(request.getRiskWarn())) { + sb.append("&risk_warn=").append(request.getRiskWarn()); + } + return sb.toString(); + } + + private StringBuffer getImageContent(BVehicleLicenseRequest request) { + StringBuffer sb = new StringBuffer(); + if (StringUtils.isNotBlank(request.getImageBase64())) { + sb.append("&image=").append(request.getImageBase64()); + } + + if (StringUtils.isNotBlank(request.getImageUrl())) { + sb.append("&url=").append(request.getImageUrl()); + } + return sb; + } + + private boolean checkNotTrueFalse(String value) { + return !ApiConstants.trueOrFalse.contains(value); + } + + private boolean checkNotFrontBack(String value) { + return !ApiConstants.frontOrback.contains(value); + } + + private Object toRecognizeResp(String side, Map data) { + if (ApiConstants.front.equals(side)) { + return toFaceResp(data); + } + return toBackResp(data); } private RecognizeDrivingLicenseFaceResp toFaceResp(Map data) { @@ -130,35 +160,4 @@ public class RecognizeDrivingLicenseController extends BaseController { return backResp; } - private RecognizeDrivingLicenseFaceResp toFaceResp( - RecognizeDrivingLicenseResponseBody.RecognizeDrivingLicenseResponseBodyDataFaceResult faceResult) { - RecognizeDrivingLicenseFaceResp faceResp = new RecognizeDrivingLicenseFaceResp(); - faceResp.setIssueDate(faceResult.getIssueDate()); - faceResp.setModel(faceResult.getModel()); - faceResp.setVehicleType(faceResult.getVehicleType()); - faceResp.setOwner(faceResult.getOwner()); - faceResp.setEngineNumber(faceResult.getEngineNumber()); - faceResp.setPlateNumber(faceResult.getPlateNumber()); - faceResp.setAddress(faceResult.getAddress()); - faceResp.setUseCharacter(faceResult.getUseCharacter()); - faceResp.setVin(faceResult.getVin()); - faceResp.setRegisterDate(faceResult.getRegisterDate()); - return faceResp; - } - - private RecognizeDrivingLicenseBackResp toBackResp( - RecognizeDrivingLicenseResponseBody.RecognizeDrivingLicenseResponseBodyDataBackResult backResult) { - RecognizeDrivingLicenseBackResp backResp = new RecognizeDrivingLicenseBackResp(); - backResp.setOverallDimension(backResult.getOverallDimension()); - backResp.setInspectionRecord(backResult.getInspectionRecord()); - backResp.setUnladenMass(backResult.getUnladenMass()); - backResp.setFileNumber(backResult.getFileNumber()); - backResp.setTractionMass(backResult.getTractionMass()); - backResp.setGrossMass(backResult.getGrossMass()); - backResp.setPlateNumber(backResult.getPlateNumber()); - backResp.setApprovedPassengerCapacity(backResult.getApprovedPassengerCapacity()); - backResp.setEnergyType(backResult.getEnergyType()); - backResp.setApprovedLoad(backResult.getApprovedLoad()); - return backResp; - } } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/request/car/VehicleLicenseRequest.java b/api-web/api-interface/src/main/java/com/heyu/api/request/car/VehicleLicenseRequest.java new file mode 100644 index 0000000..445fad1 --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/request/car/VehicleLicenseRequest.java @@ -0,0 +1,44 @@ +package com.heyu.api.request.car; + + +import lombok.Data; + +/** + *https://console.bce.baidu.com/support/?_=1740219852952×tamp=1740323990690#/api?product=AI&project=%E6%96%87%E5%AD%97%E8%AF%86%E5%88%AB&parent=%E4%BA%A4%E9%80%9A%E5%9C%BA%E6%99%AFOCR&api=rest%2F2.0%2Focr%2Fv1%2Fvehicle_license&method=post + * + * 行驶证识别 + */ +@Data +public class VehicleLicenseRequest { + + /** + * 是否必选： 和 url/pdf_file/ofd_file 四选一 + * 类型： string + * 说明: + * 图像数据，base64编码后进行urlencode，要求base64编码和urlencode后大小不超过8M，最短边至少15px，最长边最大4096px，支持jpg/jpeg/png/bmp格式 + * 优先级：image > url > pdf_file > ofd_file ，当image字段存在时，url、pdf_file、ofd_file 字段失效 + */ + private String imageBase64; + + + /** + * 和 image/pdf_file/ofd_file 四选一 + * 说明 ： + * 图片完整url，url长度不超过1024字节，url对应的图片base64编码后大小不超过8M，最短边至少15px，最长边最大4096px，支持jpg/jpeg/png/bmp格式 + * 优先级：image > url > pdf_file > ofd_file，当image字段存在时，url字段失效 + * 请注意关闭URL防盗链 + */ + private String imageUrl; + + + + /** + * - front：默认值，识别行驶证主页 + * - back：识别行驶证副页 + */ + private String side; + + + + +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/schedule/ScheduleUtils.java b/api-web/api-interface/src/main/java/com/heyu/api/schedule/ScheduleUtils.java index 0315977..6dad41b 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/schedule/ScheduleUtils.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/schedule/ScheduleUtils.java @@ -17,7 +17,6 @@ package com.heyu.api.schedule; -import com.heyu.api.common.EBException; import com.heyu.api.data.constants.ApiConstants; import com.heyu.api.data.entity.calca.ScheduleJobEntity; import org.quartz.*; @@ -65,7 +64,7 @@ public class ScheduleUtils { try { return (CronTrigger) scheduler.getTrigger(getTriggerKey(jobId)); } catch (SchedulerException e) { - throw new EBException("获取定时任务CronTrigger出现异常", e); + throw new RuntimeException("获取定时任务CronTrigger出现异常", e); } } @@ -96,7 +95,7 @@ public class ScheduleUtils { pauseJob(scheduler, scheduleJob.getJobId()); } } catch (SchedulerException e) { - throw new EBException("创建定时任务失败", e); + throw new RuntimeException("创建定时任务失败", e); } } @@ -127,7 +126,7 @@ public class ScheduleUtils { } } catch (SchedulerException e) { - throw new EBException("更新定时任务失败", e); + throw new RuntimeException("更新定时任务失败", e); } } @@ -141,7 +140,7 @@ public class ScheduleUtils { dataMap.put(ApiConstants.JOB_PARAM_KEY, scheduleJob); scheduler.triggerJob(getJobKey(scheduleJob.getJobId()), dataMap); } catch (SchedulerException e) { - throw new EBException("立即执行定时任务失败", e); + throw new RuntimeException("立即执行定时任务失败", e); } } @@ -152,7 +151,7 @@ public class ScheduleUtils { try { scheduler.pauseJob(getJobKey(jobId)); } catch (SchedulerException e) { - throw new EBException("暂停定时任务失败", e); + throw new RuntimeException("暂停定时任务失败", e); } } @@ -163,7 +162,7 @@ public class ScheduleUtils { try { scheduler.resumeJob(getJobKey(jobId)); } catch (SchedulerException e) { - throw new EBException("暂停定时任务失败", e); + throw new RuntimeException("暂停定时任务失败", e); } } @@ -174,7 +173,7 @@ public class ScheduleUtils { try { scheduler.deleteJob(getJobKey(jobId)); } catch (SchedulerException e) { - throw new EBException("删除定时任务失败", e); + throw new RuntimeException("删除定时任务失败", e); } } diff --git a/api-web/api-interface/src/main/resources/log/logback-dev.xml b/api-web/api-interface/src/main/resources/log/logback-dev.xml index 417c8e9..7533b23 100644 --- a/api-web/api-interface/src/main/resources/log/logback-dev.xml +++ b/api-web/api-interface/src/main/resources/log/logback-dev.xml @@ -6,15 +6,9 @@ - - - - - + value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-B3-TraceId:-},%X{X-B3-SpanId:-}] [%thread]%-5level %F:%L %msg%n"/> diff --git a/api-web/api-interface/src/main/resources/log/logback-online.xml b/api-web/api-interface/src/main/resources/log/logback-online.xml index 2640bf8..7fa04b8 100644 --- a/api-web/api-interface/src/main/resources/log/logback-online.xml +++ b/api-web/api-interface/src/main/resources/log/logback-online.xml @@ -6,15 +6,9 @@ - - - - - + value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{X-B3-TraceId:-},%X{X-B3-SpanId:-}] [%thread]%-5level %F:%L %msg%n"/>