From 4e8974b2f7e22d9f21e08fc95be7b93ab09ac1d8 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Fri, 9 Aug 2024 11:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/system/api/RemoteLogService.java |  6 +++---
 .../api/factory/RemoteLogFallbackFactory.java  | 10 +++++-----
 .../common/log/service/AsyncLogService.java    | 10 +++++-----
 .../common/security/utils/SecurityUtils.java   | 18 +++++++++---------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteLogService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteLogService.java
index d45f0fb..7404aa1 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteLogService.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteLogService.java
@@ -31,9 +31,9 @@ public interface RemoteLogService
      * @throws Exception 异常
      * @return 结果
      */
-    @PostMapping("/operlog")
-    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
-
+//    @PostMapping("/operlog")
+//    public R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) throws Exception;
+//
 
     /**
      * 保存系统日志
diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java
index 8388df3..3b3ea88 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java
@@ -31,11 +31,11 @@ public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogServic
         log.error("日志服务调用失败:{}", throwable.getMessage());
         return new RemoteLogService()
         {
-            @Override
-            public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
-            {
-                return R.fail("保存操作日志失败:" + throwable.getMessage());
-            }
+//            @Override
+//            public R<Boolean> saveLog(SysOperLog sysOperLog, String source)
+//            {
+//                return R.fail("保存操作日志失败:" + throwable.getMessage());
+//            }
 
             @Override
             public R<Boolean> addLogs(SysLogsVo sysLogsVo, String source) throws Exception {
diff --git a/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/service/AsyncLogService.java b/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/service/AsyncLogService.java
index 3b85645..590915b 100644
--- a/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/service/AsyncLogService.java
+++ b/bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/service/AsyncLogService.java
@@ -25,11 +25,11 @@ public class AsyncLogService
     /**
      * 保存系统日志记录
      */
-    @Async
-    public void saveSysLog(SysOperLog sysOperLog) throws Exception
-    {
-        remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
-    }
+//    @Async
+//    public void saveSysLog(SysOperLog sysOperLog) throws Exception
+//    {
+//        remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
+//    }
 
 
     /**
diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java
index c5c853f..3a32009 100644
--- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java
+++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java
@@ -115,13 +115,13 @@ public class SecurityUtils
         return passwordEncoder.matches(rawPassword, encodedPassword);
     }
 
-    public static void main(String[] args) {
-//$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2
-        //$2a$10$zvlw3Mu8M.j.MhAChrYwluj88ziX6lVD3AoRrBQpwKMcdIZvKMoR2
-//        String msg= encryptPassword("Admin@1234");
-        String msg= encryptPassword("admin123");
-        boolean rest = matchesPassword("admin123","$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2");
-        System.err.println(msg);
-        System.err.println(rest);
-    }
+//    public static void main(String[] args) {
+////$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2
+//        //$2a$10$zvlw3Mu8M.j.MhAChrYwluj88ziX6lVD3AoRrBQpwKMcdIZvKMoR2
+////        String msg= encryptPassword("Admin@1234");
+//        String msg= encryptPassword("Bonus$2024");
+//        boolean rest = matchesPassword("admin123","$2a$10$5azz92OgGRyRUETz/ZJeZu1exkggPYUDRssvreywTjKk.0Pmn2Q16");
+//        System.err.println(msg);
+//        System.err.println(rest);
+//    }
 }