更换注解

miniapp/src/main/java/com/kym/miniapp/aspect/SysLogAspect.java → admin/src/main/java/com/kym/admin/aspect/SysLogAspect.java

@@ -1,4 +1,4 @@
-package com.kym.miniapp.aspect;
+package com.kym.admin.aspect;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.google.gson.Gson;
@@ -33,11 +33,11 @@ public class SysLogAspect {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SysLogAspect.class);
     IDGenerator idGenerator;
-    @Autowired
-    private SystemLogService systemLogService;
+    private final SystemLogService systemLogService;
 
-    SysLogAspect() {
+    SysLogAspect(SystemLogService systemLogService) {
         this.idGenerator = new IDGenerator();
+        this.systemLogService = systemLogService;
     }
 
     /**

admin/src/main/java/com/kym/admin/aspect/AppLogAspect.java → miniapp/src/main/java/com/kym/miniapp/aspect/AppLogAspect.java

@@ -1,4 +1,4 @@
-package com.kym.admin.aspect;
+package com.kym.miniapp.aspect;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.google.gson.Gson;
@@ -81,10 +81,12 @@ public class AppLogAspect {
         //设置IP地址
         appLog.setIp(IPUtils.getIpAddr(request));
         //用户名、公司id、后台用户id
-        appLog.setUserId(StpUtil.getSession().getLong("userId"));
-        appLog.setCompanyId(StpUtil.getSession().getLong("companyId"));
-        appLog.setUsername(StpUtil.getSession().getString("username"));
-        appLog.setExecuteTime(executeTime);
+        if (!apiLog.value().contains("回调") || apiLog.value().contains("通知")) {
+            appLog.setUserId(StpUtil.getSession().getLong("userId"));
+            appLog.setCompanyId(StpUtil.getSession().getLong("companyId"));
+            appLog.setUsername(StpUtil.getSession().getString("username"));
+            appLog.setExecuteTime(executeTime);
+        }
 
         //保存系统日志
         appLogService.save(appLog);

miniapp/src/main/java/com/kym/miniapp/controller/AccountController.java

@@ -1,6 +1,7 @@
 package com.kym.miniapp.controller;
 
 import com.kym.common.R;
+import com.kym.common.annotation.ApiLog;
 import com.kym.service.miniapp.WalletDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +24,7 @@ public class AccountController {
     @Autowired
     private WalletDetailService walletDetailService;
 
+    @ApiLog("钱包明细")
     @GetMapping("/walletDetail")
     public R walletDetail(@RequestParam(name = "type", defaultValue = "0",required = false) int type) {
         return R.success(walletDetailService.listWalletDetail(type));

miniapp/src/main/java/com/kym/miniapp/controller/ChargerController.java

@@ -2,7 +2,7 @@ package com.kym.miniapp.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.kym.common.R;
-import com.kym.common.annotation.SysLog;
+import com.kym.common.annotation.ApiLog;
 import com.kym.entity.admin.Station;
 import com.kym.entity.enplus.response.EnResponse;
 import com.kym.entity.miniapp.ChargeOrder;

miniapp/src/main/java/com/kym/miniapp/controller/CommonController.java

@@ -1,7 +1,7 @@
 package com.kym.miniapp.controller;
 
 import com.kym.common.R;
-import com.kym.common.annotation.SysLog;
+import com.kym.common.annotation.ApiLog;
 import com.kym.service.admin.ContactService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

miniapp/src/main/java/com/kym/miniapp/controller/DataDictController.java

@@ -2,7 +2,7 @@ package com.kym.miniapp.controller;
 
 import com.kym.common.IQuery;
 import com.kym.common.R;
-import com.kym.common.annotation.SysLog;
+import com.kym.common.annotation.ApiLog;
 import com.kym.common.controller.IController;
 import com.kym.entity.miniapp.DataDict;
 import com.kym.service.miniapp.DataDictService;

miniapp/src/main/java/com/kym/miniapp/controller/FileController.java

@@ -2,7 +2,7 @@ package com.kym.miniapp.controller;
 
 import cn.hutool.core.io.FileUtil;
 import com.kym.common.R;
-import com.kym.common.annotation.SysLog;
+import com.kym.common.annotation.ApiLog;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.miniapp.Attachment;
 import com.kym.service.miniapp.AttachmentService;
@@ -31,7 +31,7 @@ public class FileController {
     @PostMapping("/upload")
     public R<?> upload(MultipartFile file) throws IOException {
         var fileName = file.getOriginalFilename();
-        CommUtil.asserts(!CommUtil.isExecutable(FileUtil.getSuffix(fileName)),"上传文件类型不支持");
+        CommUtil.asserts(!CommUtil.isExecutable(FileUtil.getSuffix(fileName)), "上传文件类型不支持");
         Attachment attachment = attachmentService.upload(file);
         return R.success(attachment);
     }

miniapp/src/main/java/com/kym/miniapp/controller/PaymentController.java

@@ -2,6 +2,7 @@ package com.kym.miniapp.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.kym.common.R;
+import com.kym.common.annotation.ApiLog;
 import com.kym.service.wechat.WxPayService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.SneakyThrows;
@@ -20,12 +21,14 @@ public class PaymentController {
     @Autowired
     private WxPayService wxPayService;
 
+    @ApiLog("微信预支付")
     @PostMapping("/prepay")
     @ResponseBody
     R prepay(@RequestBody JSONObject params) {
         return R.success(wxPayService.prepay(params));
     }
 
+    @ApiLog("微信回调")
     @SneakyThrows
     @PostMapping("/notify")
     @ResponseBody

miniapp/src/main/java/com/kym/miniapp/controller/UserController.java

@@ -4,7 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.kym.common.R;
-import com.kym.common.annotation.SysLog;
+import com.kym.common.annotation.ApiLog;
 import com.kym.common.utils.IDGenerator;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.params.WxLoginParams;