From 2b43d8a7b768479042c833b9af4c7be14578426f Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 25 Mar 2025 11:09:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=95=B4=E8=A7=84=E6=95=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 21 +-- .../exception/CustomExceptionHandle.java | 38 ---- .../com/ycwl/basic/service/HttpService.java | 168 ------------------ .../impl}/AppMemberServiceImpl.java | 18 +- .../impl}/AppScenicServiceImpl.java | 2 +- .../impl}/AppStatisticsServiceImpl.java | 3 +- .../impl}/GoodsServiceImpl.java | 2 +- .../impl}/WxPayServiceImpl.java | 9 +- .../pc => pc/impl}/AdminUserServiceImpl.java | 2 +- .../impl}/BrokerRecordServiceImpl.java | 2 +- .../pc => pc/impl}/BrokerServiceImpl.java | 3 +- .../pc => pc/impl}/CouponServiceImpl.java | 2 +- .../pc => pc/impl}/DeviceServiceImpl.java | 3 +- .../impl}/FaceDetectLogServiceImpl.java | 2 +- .../pc => pc/impl}/FaceSampleServiceImpl.java | 2 +- .../{impl/pc => pc/impl}/FaceServiceImpl.java | 2 +- .../pc => pc/impl}/MemberServiceImpl.java | 2 +- .../{impl/pc => pc/impl}/MenuServiceImpl.java | 2 +- .../pc => pc/impl}/OrderServiceImpl.java | 7 +- .../impl}/PriceConfigServiceImpl.java | 4 +- .../impl}/RenderWorkerServiceImpl.java | 2 +- .../{impl/pc => pc/impl}/RoleServiceImpl.java | 2 +- .../pc => pc/impl}/ScenicServiceImpl.java | 2 +- .../pc => pc/impl}/SourceServiceImpl.java | 2 +- .../{impl/pc => pc/impl}/TaskServiceImpl.java | 2 +- .../pc => pc/impl}/TemplateServiceImpl.java | 2 +- .../pc => pc/impl}/VideoServiceImpl.java | 4 +- .../ycwl/basic/service/wvp/WvpService.java | 4 - .../service/wvp/impl/WvpServiceImpl.java | 18 -- .../java/com/ycwl/basic/utils/WxMpUtil.java | 1 - src/main/resources/application-dev.yml | 17 +- src/main/resources/application-prod.yml | 4 - .../resources/mapper/StatisticsMapper.xml | 11 +- 33 files changed, 41 insertions(+), 324 deletions(-) delete mode 100644 src/main/java/com/ycwl/basic/service/HttpService.java rename src/main/java/com/ycwl/basic/service/{impl/mobile => mobile/impl}/AppMemberServiceImpl.java (93%) rename src/main/java/com/ycwl/basic/service/{impl/mobile => mobile/impl}/AppScenicServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/mobile => mobile/impl}/AppStatisticsServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/mobile => mobile/impl}/GoodsServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/mobile => mobile/impl}/WxPayServiceImpl.java (97%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/AdminUserServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/BrokerRecordServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/BrokerServiceImpl.java (95%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/CouponServiceImpl.java (97%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/DeviceServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/FaceDetectLogServiceImpl.java (96%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/FaceSampleServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/FaceServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/MemberServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/MenuServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/OrderServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/PriceConfigServiceImpl.java (94%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/RenderWorkerServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/RoleServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/ScenicServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/SourceServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/TaskServiceImpl.java (98%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/TemplateServiceImpl.java (99%) rename src/main/java/com/ycwl/basic/service/{impl/pc => pc/impl}/VideoServiceImpl.java (90%) delete mode 100644 src/main/java/com/ycwl/basic/service/wvp/WvpService.java delete mode 100644 src/main/java/com/ycwl/basic/service/wvp/impl/WvpServiceImpl.java diff --git a/pom.xml b/pom.xml index ca3fcea..07e7e28 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ - + com.github.wechatpay-apiv3 wechatpay-java @@ -53,17 +53,6 @@ org.springframework.boot spring-boot-starter-data-redis - - - io.lettuce - lettuce-core - - - - - - redis.clients - jedis @@ -96,7 +85,7 @@ org.projectlombok lombok - + provided @@ -160,12 +149,6 @@ 1.1 - - org.redisson - redisson - 3.22.0 - - com.aliyun.oss diff --git a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java index de19719..e7e16b6 100644 --- a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java +++ b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java @@ -85,44 +85,6 @@ public class CustomExceptionHandle { return ApiResponse.buildResult(BizCodeEnum.SERVER_UNKONWN_ERROR); } - public String getStackTrace(Throwable e) { - StringBuilder sb = new StringBuilder(); - StackTraceElement[] stackTrace = e.getStackTrace(); - sb.append(e.getClass().getName()).append(": ").append(e.getMessage()).append("\r\n"); - for (StackTraceElement stackTraceElement : stackTrace) { - sb.append("\tat ").append(stackTraceElement.toString()).append("\r\n"); - } - return sb.toString(); - } - - public String getRequestAsText() { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (attributes == null) { - return "---"; - } - HttpServletRequest request = attributes.getRequest(); - StringBuilder rawReq = new StringBuilder(); - rawReq.append(request.getMethod()).append(" ").append(request.getRequestURL()); - String queryString = request.getQueryString(); - if (queryString != null) { - rawReq.append("?").append(queryString); - } - rawReq.append("\r\n"); - Enumeration headerNames = request.getHeaderNames(); - while (headerNames.hasMoreElements()) { - String headerName = headerNames.nextElement(); - rawReq.append(headerName).append(": ").append(request.getHeader(headerName)).append("\r\n"); - } - rawReq.append("\r\n"); - // 获取body - try { - rawReq.append(request.getReader().lines().collect(Collectors.joining("\r\n"))); - rawReq.append("\r\n"); - } catch (IOException ignored) { - } - return rawReq.toString(); - } - /** * 移动端自定义异常统一处理类 */ diff --git a/src/main/java/com/ycwl/basic/service/HttpService.java b/src/main/java/com/ycwl/basic/service/HttpService.java deleted file mode 100644 index 2598c26..0000000 --- a/src/main/java/com/ycwl/basic/service/HttpService.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.ycwl.basic.service; - -import com.ycwl.basic.utils.HttpServiceUtil; -import com.ycwl.basic.utils.SslUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.StatusLine; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Http请求服务 - * - * @author songmingsong - */ -@Service -@Slf4j -public class HttpService { - - /** - * @param requestUrl - * 请求地址 - * @param params - * 参数 - * @param encoding - * 编码 - * @return String - * @throws Exception - * 抛出的异常新 - */ - public String doHttpsPost(String requestUrl, Map params, String encoding) throws Exception { - String result = HttpServiceUtil.REQUEST_NO_RESULT; - // build client 对象 - CloseableHttpClient httpClient = null; - try { - httpClient = SslUtil.sslHttpClientBuild(); - requestUrl = requestUrl.replaceAll("\\s*", ""); - HttpPost post = new HttpPost(requestUrl); - RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(5000) - .setConnectionRequestTimeout(1000).setSocketTimeout(5000).build(); - post.setConfig(requestConfig); - // 请求首部--可选的，User-Agent对于一些服务器必选，不加可能不会返回正确结果 - post.setHeader("User-Agent", - "Mozilla/5.0 (Linux; U; Android 5.0.2; zh-cn; PLK-UL00 Build/HONORPLK-UL00) AppleWebKit/533.1 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.4 TBS/025483 Mobile Safari/533.1 MicroMessenger/6.3.8.56_re6b2553.680 NetType/"); - List parasList = new ArrayList(); - if (null != params && params.size() > 0) { - for (String key : params.keySet()) { - NameValuePair param = new BasicNameValuePair(key, params.get(key)); - parasList.add(param); - } - } - // Exec Request - HttpEntity paramsEntity = new UrlEncodedFormEntity(parasList, encoding); - post.setEntity(paramsEntity); - CloseableHttpResponse resp = httpClient.execute(post); - - // 获得起始行 - StatusLine status = resp.getStatusLine(); - // 获取实体 - if (HttpServiceUtil.success(status)) { - // 获取实体 - HttpEntity entity = resp.getEntity(); - // 编码格式 - result = EntityUtils.toString(entity, encoding); - // 释放实体 response.close();//关闭响应 - EntityUtils.consume(entity); - } - } catch (Exception e) { - log.error("doHttpsPost", e); - throw e; - } finally { - if (httpClient != null) { - httpClient.close(); - } - } - return result; - - } - - public String doGet(String requestUrl, String encoding) throws Exception { - String result = HttpServiceUtil.REQUEST_NO_RESULT; - // build client 对象 - CloseableHttpClient httpClient = null; - try { - httpClient = SslUtil.sslHttpClientBuild(); - requestUrl = requestUrl.replaceAll("\\s*", ""); - HttpGet get = new HttpGet(requestUrl); - // 请求首部--可选的，User-Agent对于一些服务器必选，不加可能不会返回正确结果 - get.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64;rv:39.0) Gecko/20100101 Firefox/39.0"); - get.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64;rv:39.0) Gecko/20100101 Firefox/39.0"); - // Exec Request - CloseableHttpResponse resp = httpClient.execute(get); - // 获得起始行 - StatusLine status = resp.getStatusLine(); - if (HttpServiceUtil.success(status)) { - // 获取实体 - HttpEntity entity = resp.getEntity(); - // 编码格式 - result = EntityUtils.toString(entity, encoding); - // 释放实体 response.close();//关闭响应 - EntityUtils.consume(entity); - } - } finally { - if (httpClient != null) { - httpClient.close(); - } - } - return result; - } - - public String doPost(String requestUrl, String jsonData, Map headers, String encoding) throws Exception { - String result = HttpServiceUtil.REQUEST_NO_RESULT; // 默认返回值 - CloseableHttpClient httpClient = null; - try { - // 使用自定义 SSL 工具类创建支持 HTTPS 的 HttpClient - httpClient = SslUtil.sslHttpClientBuild(); - - // 清理 URL 中的空格字符 - requestUrl = requestUrl.replaceAll("\\s*", ""); - HttpPost post = new HttpPost(requestUrl); - - // 设置请求头 - if (headers != null && !headers.isEmpty()) { - for (Map.Entry header : headers.entrySet()) { - post.setHeader(header.getKey(), header.getValue()); - } - } - - // 设置请求体 - if (jsonData != null) { - StringEntity entity = new StringEntity(jsonData, encoding); - entity.setContentType("application/json"); - post.setEntity(entity); - } - - // 执行请求 - CloseableHttpResponse response = httpClient.execute(post); - - // 获取响应状态码及响应数据 - StatusLine status = response.getStatusLine(); - if (HttpServiceUtil.success(status)) { - HttpEntity entity = response.getEntity(); - result = EntityUtils.toString(entity, encoding); - EntityUtils.consume(entity); // 确保释放资源 - } - response.close(); // 关闭响应对象 - } finally { - if (httpClient != null) { - httpClient.close(); // 关闭 HttpClient - } - } - return result; - } - -} diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java similarity index 93% rename from src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java rename to src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java index aaed88e..706da85 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppMemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java @@ -1,5 +1,7 @@ -package com.ycwl.basic.service.impl.mobile; +package com.ycwl.basic.service.mobile.impl; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.ycwl.basic.config.WechatConfig; import com.ycwl.basic.constant.BaseContextHandler; @@ -18,7 +20,6 @@ import com.ycwl.basic.model.pc.member.req.MemberReqQuery; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.mp.MpConfigEntity; import com.ycwl.basic.repository.ScenicRepository; -import com.ycwl.basic.service.HttpService; import com.ycwl.basic.service.mobile.AppMemberService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.BeanCopierUtils; @@ -40,12 +41,6 @@ import java.util.Map; @Slf4j @Service public class AppMemberServiceImpl implements AppMemberService { - @Autowired - private WechatConfig config; - - @Autowired - private HttpService httpService; - @Autowired private MemberMapper memberMapper; @@ -57,19 +52,18 @@ public class AppMemberServiceImpl implements AppMemberService { @Override public Map getOpenId(Long scenicId, String code) { - Map paramMap = new HashMap<>(NumberConstant.FOUR); + Map paramMap = new HashMap<>(NumberConstant.FOUR); MpConfigEntity scenicMpConfig = scenicRepository.getScenicMpConfig(scenicId); paramMap.put("appid", scenicMpConfig.getAppId()); paramMap.put("secret", scenicMpConfig.getAppSecret()); paramMap.put("js_code", code); paramMap.put("grant_type", "authorization_code"); try { - String response = httpService.doHttpsPost(WeiXinConstant.GET_OPEN_ID, paramMap, "UTF-8"); + String response = HttpUtil.post(WeiXinConstant.GET_OPEN_ID, paramMap); if (StringUtils.isBlank(response)) { return null; } - ObjectMapper mapper = new ObjectMapper(); - return mapper.readValue(response, Map.class); + return JSONObject.parseObject(response); } catch (Exception e) { log.error("getOpenId", e); throw new AppException(BizCodeEnum.SERVER_INTERNAL_ERROR); diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java rename to src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java index e94288e..2f5cc75 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.mobile; +package com.ycwl.basic.service.mobile.impl; import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java rename to src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java index f96e4fe..a5f4661 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppStatisticsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppStatisticsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.mobile; +package com.ycwl.basic.service.mobile.impl; import com.ycwl.basic.enums.StatisticEnum; import com.ycwl.basic.mapper.StatisticsMapper; @@ -13,7 +13,6 @@ import com.ycwl.basic.service.mobile.AppStatisticsService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.DateUtils; import com.ycwl.basic.utils.JwtTokenUtil; -import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java rename to src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java index 63101f6..4622280 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.mobile; +package com.ycwl.basic.service.mobile.impl; import cn.hutool.extra.qrcode.QrCodeUtil; import cn.hutool.http.HttpUtil; diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/WxPayServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java similarity index 97% rename from src/main/java/com/ycwl/basic/service/impl/mobile/WxPayServiceImpl.java rename to src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java index e30e6f1..224ad37 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/WxPayServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/WxPayServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.mobile; +package com.ycwl.basic.service.mobile.impl; import com.alibaba.fastjson.JSONObject; @@ -29,22 +29,15 @@ import com.ycwl.basic.enums.StatisticEnum; import com.ycwl.basic.exception.AppException; import com.ycwl.basic.mapper.OrderMapper; import com.ycwl.basic.mapper.PaymentMapper; -import com.ycwl.basic.mapper.SourceMapper; import com.ycwl.basic.mapper.StatisticsMapper; -import com.ycwl.basic.mapper.VideoMapper; import com.ycwl.basic.model.mobile.statistic.req.StatisticsRecordAddReq; import com.ycwl.basic.model.pc.order.entity.OrderEntity; -import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; import com.ycwl.basic.model.pc.order.req.OrderUpdateReq; -import com.ycwl.basic.model.pc.order.resp.OrderRespVO; import com.ycwl.basic.model.pc.payment.entity.PaymentEntity; -import com.ycwl.basic.model.pc.source.entity.MemberSourceEntity; -import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity; import com.ycwl.basic.model.wx.WXPayOrderReqVO; import com.ycwl.basic.model.wx.WxPayRespVO; import com.ycwl.basic.model.wx.WxchatCallbackSuccessData; import com.ycwl.basic.repository.OrderRepository; -import com.ycwl.basic.service.HttpService; import com.ycwl.basic.service.mobile.WxPayService; import com.ycwl.basic.utils.SnowFlakeUtil; import com.ycwl.basic.utils.WXPayUtil; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java index 3f429c9..b6da7dc 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/AdminUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import cn.hutool.crypto.digest.DigestUtil; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerRecordServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/BrokerRecordServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/BrokerRecordServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/BrokerRecordServiceImpl.java index 05fb901..28ff924 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerRecordServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/BrokerRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/BrokerServiceImpl.java similarity index 95% rename from src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/BrokerServiceImpl.java index 75afc35..89301ae 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/BrokerServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/BrokerServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -7,7 +7,6 @@ import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO; import com.ycwl.basic.service.pc.BrokerService; -import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/CouponServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/CouponServiceImpl.java similarity index 97% rename from src/main/java/com/ycwl/basic/service/impl/pc/CouponServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/CouponServiceImpl.java index e86c13f..9249adc 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/CouponServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/CouponServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycwl.basic.mapper.CouponMapper; import com.ycwl.basic.model.pc.coupon.entity.CouponEntity; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java index 26f6cb7..f47a8a9 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/DeviceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/DeviceServiceImpl.java @@ -1,10 +1,9 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ycwl.basic.model.pc.device.entity.DeviceEntity; import com.ycwl.basic.model.pc.device.req.DeviceBatchSortRequest; -import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.model.wvp.WvpSyncReqVo; import com.ycwl.basic.repository.DeviceRepository; import com.ycwl.basic.mapper.DeviceMapper; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceDetectLogServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceDetectLogServiceImpl.java similarity index 96% rename from src/main/java/com/ycwl/basic/service/impl/pc/FaceDetectLogServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/FaceDetectLogServiceImpl.java index dda710e..f6c7739 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceDetectLogServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceDetectLogServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java index c5669e3..5d3a7f1 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceSampleServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java index 2c67f23..0d19893 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/MemberServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/MemberServiceImpl.java index 9dcaad0..529191c 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/MemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/MemberServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/MenuServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/MenuServiceImpl.java index d0de308..03ddd10 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/MenuServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.ycwl.basic.mapper.MenuMapper; import com.ycwl.basic.model.pc.menu.MenuNode; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index fa48774..3dfca7f 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -13,7 +13,6 @@ import com.ycwl.basic.model.mobile.order.IsBuyRespVO; import com.ycwl.basic.model.mobile.order.OrderAppPageReq; import com.ycwl.basic.model.mobile.order.PriceObj; import com.ycwl.basic.model.mobile.order.RefundOrderReq; -import com.ycwl.basic.model.mobile.statistic.req.StatisticsRecordAddReq; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.order.entity.OrderEntity; @@ -29,19 +28,15 @@ import com.ycwl.basic.model.pc.orderOp.entity.OrderOperationEntity; import com.ycwl.basic.model.pc.price.entity.PriceConfigEntity; import com.ycwl.basic.model.pc.price.resp.GoodsListRespVO; import com.ycwl.basic.model.pc.source.entity.SourceEntity; -import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity; import com.ycwl.basic.model.pc.video.entity.VideoEntity; -import com.ycwl.basic.model.pc.video.resp.VideoRespVO; import com.ycwl.basic.model.wx.WXPayOrderReqVO; import com.ycwl.basic.model.wx.WxPayRespVO; import com.ycwl.basic.repository.FaceRepository; import com.ycwl.basic.repository.PriceRepository; import com.ycwl.basic.repository.VideoRepository; import com.ycwl.basic.repository.VideoTaskRepository; -import com.ycwl.basic.service.mobile.GoodsService; import com.ycwl.basic.service.mobile.WxPayService; import com.ycwl.basic.service.pc.OrderService; -import com.ycwl.basic.service.task.impl.TaskTaskServiceImpl; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.BigDecimalUtil; import com.ycwl.basic.utils.SnowFlakeUtil; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/PriceConfigServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/PriceConfigServiceImpl.java similarity index 94% rename from src/main/java/com/ycwl/basic/service/impl/pc/PriceConfigServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/PriceConfigServiceImpl.java index 4e6b4f2..99b19e9 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/PriceConfigServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/PriceConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycwl.basic.biz.PriceBiz; @@ -7,9 +7,7 @@ import com.ycwl.basic.model.pc.price.entity.PriceConfigEntity; import com.ycwl.basic.model.pc.price.req.PriceConfigListReq; import com.ycwl.basic.model.pc.price.resp.GoodsListRespVO; import com.ycwl.basic.model.pc.price.resp.PriceConfigRespVO; -import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; -import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.repository.TemplateRepository; import com.ycwl.basic.service.pc.PriceConfigService; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/RenderWorkerServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/RenderWorkerServiceImpl.java index 8dba6c5..0365798 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/RenderWorkerServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/RenderWorkerServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/RoleServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/RoleServiceImpl.java index 326375e..7ad47e7 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/ScenicServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/ScenicServiceImpl.java index fc18ef2..37a8a3f 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/ScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/ScenicServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java index 4e72225..52c55a3 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/SourceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/TaskServiceImpl.java similarity index 98% rename from src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/TaskServiceImpl.java index dda32cc..c7b19c0 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/TaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/TaskServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/TemplateServiceImpl.java similarity index 99% rename from src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/TemplateServiceImpl.java index 9ca8cd1..87d104d 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/TemplateServiceImpl.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/VideoServiceImpl.java similarity index 90% rename from src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java rename to src/main/java/com/ycwl/basic/service/pc/impl/VideoServiceImpl.java index 246c44c..6d26229 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/VideoServiceImpl.java @@ -1,14 +1,12 @@ -package com.ycwl.basic.service.impl.pc; +package com.ycwl.basic.service.pc.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.ycwl.basic.mapper.VideoMapper; -import com.ycwl.basic.model.pc.video.entity.VideoEntity; import com.ycwl.basic.model.pc.video.req.VideoReqQuery; import com.ycwl.basic.model.pc.video.resp.VideoRespVO; import com.ycwl.basic.service.pc.VideoService; import com.ycwl.basic.utils.ApiResponse; -import com.ycwl.basic.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/ycwl/basic/service/wvp/WvpService.java b/src/main/java/com/ycwl/basic/service/wvp/WvpService.java deleted file mode 100644 index ed10093..0000000 --- a/src/main/java/com/ycwl/basic/service/wvp/WvpService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ycwl.basic.service.wvp; - -public interface WvpService { -} diff --git a/src/main/java/com/ycwl/basic/service/wvp/impl/WvpServiceImpl.java b/src/main/java/com/ycwl/basic/service/wvp/impl/WvpServiceImpl.java deleted file mode 100644 index 80ec34a..0000000 --- a/src/main/java/com/ycwl/basic/service/wvp/impl/WvpServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ycwl.basic.service.wvp.impl; - -import com.ycwl.basic.repository.DeviceRepository; -import com.ycwl.basic.repository.ScenicRepository; -import com.ycwl.basic.service.wvp.WvpService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -@Service -public class WvpServiceImpl implements WvpService { - @Autowired - private RedisTemplate redisTemplate; - @Autowired - private DeviceRepository deviceRepository; - @Autowired - private ScenicRepository scenicRepository; -} diff --git a/src/main/java/com/ycwl/basic/utils/WxMpUtil.java b/src/main/java/com/ycwl/basic/utils/WxMpUtil.java index 1cec290..3e6ea55 100644 --- a/src/main/java/com/ycwl/basic/utils/WxMpUtil.java +++ b/src/main/java/com/ycwl/basic/utils/WxMpUtil.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import java.io.FileOutputStream; import java.io.InputStream; import java.util.Date; -import java.util.HashMap; public class WxMpUtil { private static final String GET_WXA_CODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%s"; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b6e26bd..c77db07 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -18,14 +18,10 @@ spring: username: zt password: ZhEnTuAi2024zHeNtUaI hikari: - connection-timeout: 30000 # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒 - minimum-idle: 5 # 最小连接数 - maximum-pool-size: 20 # 最大连接数 - auto-commit: true # 事务自动提交 - idle-timeout: 60000 # 连接超时的最大时长（毫秒） - pool-name: DateSourceHikariCP # 连接池名字 - max-lifetime: 180000 # 连接的生命时长（毫秒） - connection-test-query: SELECT 1 # 连接测试语句 + minimum-idle: 5 # 最小连接数 + maximum-pool-size: 20 # 最大连接数 + auto-commit: true # 事务自动提交 + pool-name: HikariCP # 连接池名字 jackson: date-format: "yyyy-MM-dd HH:mm:ss" time-zone: GMT+8 @@ -34,11 +30,6 @@ spring: port: 6379 # 密码过于复杂需要使用''引起来，要不可能导致项目无法启动，因为无法识别特殊字符 password: ZhEnTuAi - jedis: - pool: - max-active: -1 # 连接池最大连接数（使用负值表示没有限制） - min-idle: 1 # 连接池中的最小空闲连接 - time-between-eviction-runs: 3000 timeout: 40000 # 配置用户头像存放静态资源文件夹 resources: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 36bf363..ff29ffc 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -34,10 +34,6 @@ spring: port: 6379 # 密码过于复杂需要使用''引起来，要不可能导致项目无法启动，因为无法识别特殊字符 password: '' - jedis: - pool: - max-active: 64 # 连接池最大连接数（使用负值表示没有限制） - min-idle: 2 # 连接池中的最小空闲连接 timeout: 1000 # 配置用户头像存放静态资源文件夹 resources: diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml index a86a338..4419027 100644 --- a/src/main/resources/mapper/StatisticsMapper.xml +++ b/src/main/resources/mapper/StatisticsMapper.xml @@ -155,14 +155,15 @@