diff --git a/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java b/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java index 188d7c9f..3f98fc5a 100644 --- a/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java +++ b/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java @@ -43,7 +43,7 @@ public class AppLogAspect { /** * 配置切入点 */ - @Pointcut("@annotation(co.yixiang.logging.aop.log.Log)") + @Pointcut("@annotation(co.yixiang.logging.aop.log.AppLog)") public void logPointcut() { // 该方法无方法体,主要为了让同类中其他方法使用此切入点 } @@ -61,7 +61,7 @@ public class AppLogAspect { Log log = new Log("INFO",System.currentTimeMillis() - currentTime.get()); currentTime.remove(); HttpServletRequest request = RequestHolder.getHttpServletRequest(); - logService.save(getUsername(), + logService.saveApp(getUsername(), StringUtils.getIp(RequestHolder.getHttpServletRequest()),joinPoint, log,getUid()); return result; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 03481eed..1409a7f6 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -13,12 +13,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreBargainUser; import co.yixiang.modules.activity.domain.YxStoreBargainUserHelp; import co.yixiang.modules.activity.param.BargainShareParam; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index 4f206286..c263bc16 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 804b20bf..19e80d02 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -13,7 +13,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.ShopConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java b/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java index e292b689..f3af655a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.cart.rest; import co.yixiang.annotation.Limit; import co.yixiang.api.ApiResult; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java index 6f9cdb9f..eeb713ee 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java @@ -11,7 +11,7 @@ package co.yixiang.modules.coupon.rest; import cn.hutool.core.util.NumberUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java index 22baafd7..f6baeef6 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.modules.manage.param.OrderPriceParam; import co.yixiang.modules.manage.param.ShoperQueryParam; diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 370122d2..3caa4afb 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -13,7 +13,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; @@ -47,7 +47,6 @@ import com.vdurmont.emoji.EmojiParser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 8a7349bb..8b790f3e 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -16,7 +16,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java index 07906e2f..f0f5c8bd 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.common.util.CityTreeUtil; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index bad2bc1f..dad907e1 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java index 3673668a..6d163f93 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.user.rest; import co.yixiang.api.ApiResult; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java index b75779bc..14510440 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.user.rest; import co.yixiang.api.ApiResult; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java index 54af7ae0..67786e84 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java @@ -11,7 +11,7 @@ package co.yixiang.modules.user.rest; import cn.hutool.core.bean.BeanUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.ShopConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java index 53fbda69..56366a7c 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java @@ -11,18 +11,16 @@ package co.yixiang.modules.wechat.rest.controller; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; -import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.common.aop.AppLog; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.wechat.rest.param.BindPhoneParam; import co.yixiang.modules.wechat.rest.param.WxPhoneParam; -import co.yixiang.mp.config.WxMpConfiguration; import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.RedisUtils; import co.yixiang.utils.ShopKeyUtils; @@ -30,7 +28,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.mp.api.WxMpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/yshop-app/src/main/java/co/yixiang/common/aop/AppLog.java b/yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java similarity index 92% rename from yshop-app/src/main/java/co/yixiang/common/aop/AppLog.java rename to yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java index a4dc6946..7cb9d083 100644 --- a/yshop-app/src/main/java/co/yixiang/common/aop/AppLog.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.common.aop; +package co.yixiang.logging.aop.log; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java b/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java index 11b92b97..b657c8d6 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java @@ -58,6 +58,15 @@ public interface LogService extends BaseService { @Async void save(String username, String ip, ProceedingJoinPoint joinPoint, Log log,Long uid); + /** + * 保存app日志数据 + * @param username 用户 + * @param ip 请求IP + * @param joinPoint / + * @param log 日志实体 + */ + @Async + void saveApp(String username, String ip, ProceedingJoinPoint joinPoint, Log log,Long uid); /** * 查询异常详情 * @param id 日志ID diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java b/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java index ca26cf4c..621fdb99 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java +++ b/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java @@ -11,6 +11,7 @@ import cn.hutool.json.JSONObject; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; +import co.yixiang.logging.aop.log.AppLog; import co.yixiang.logging.aop.log.Log; import co.yixiang.logging.service.LogService; import co.yixiang.logging.service.dto.LogErrorDTO; @@ -148,6 +149,55 @@ public class LogServiceImpl extends BaseServiceImpl