From e880431e07be1a8af080a2bac9cf413e988cabe6 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Fri, 27 Jun 2025 14:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            |  7 +++++++
 .../project/ProjectCommissionController.java       | 13 +++++++++++++
 .../project/impl/ProjectCommissionServiceImpl.java |  4 ++--
 src/main/resources/application-caozhe.yml          | 14 ++++++++++----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4282b7c..0e564e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,6 +214,13 @@
             <version>2.6.9</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
+            <version>5.8.7</version>  <!-- 换成你项目里使用的 Spring Security 版本 -->
+        </dependency>
+
+
 
 
 
diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java
index 6e35d7a..76839b3 100644
--- a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java
+++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java
@@ -33,8 +33,11 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.GenericDeclaration;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -138,6 +141,16 @@ public class ProjectCommissionController {
         return ResultUtils.success(projectCommissionVOList);
     }
 
+
+//    public static void main(String[] args) {
+//        PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+//        String encode = passwordEncoder.encode("123456");
+//        System.out.println(encode);
+//        boolean matches = passwordEncoder.matches("123456", "$2a$10$/yBGQqsHK78vlEtuMGTVY.bU/TamHQbr4wQIzj1B1H1ud/ZKPGICC");
+//        System.out.println(matches);
+//    }
+
+
 //
 //    /**
 //     * 小程序用户修改项目的抽佣比例
diff --git a/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java b/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java
index 659bfaf..1b547c8 100644
--- a/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java
+++ b/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java
@@ -65,7 +65,7 @@ public class ProjectCommissionServiceImpl extends ServiceImpl<ProjectCommissionM
     public void updateProjectCommissionRate(ProjectCommissionUpdateRequest projectCommissionUpdateRequest) {
         Long id = projectCommissionUpdateRequest.getId();
         BigDecimal currentCommissionRate = projectCommissionUpdateRequest.getCurrentCommissionRate();
-        // 获取当前项目明细信息
+        // 获取当前项目明细抽佣信息
         ProjectCommission projectCommission = this.getById(id);
         ThrowUtils.throwIf(projectCommission == null, ErrorCode.OPERATION_ERROR, "项目明细抽佣信息不存在");
         Long projectDetailId = projectCommission.getProjectDetailId();
@@ -356,7 +356,7 @@ public class ProjectCommissionServiceImpl extends ServiceImpl<ProjectCommissionM
 
         startTime = System.currentTimeMillis();
 
-        // 更新用户项目明细抽佣记录
+        // 批量更新用户项目明细抽佣记录
         List<SubUserProjectCommission> proCommissions = subProjectCommissions.stream().filter(subProjectCommission -> subProjectCommission.getSubUserId() == -1L).toList();
         List<ProjectCommission> proCommissionList = commonService.convertList(proCommissions, ProjectCommission.class);
 //        this.updateBatchById(proCommissionList);
diff --git a/src/main/resources/application-caozhe.yml b/src/main/resources/application-caozhe.yml
index b4e441e..33bdd20 100644
--- a/src/main/resources/application-caozhe.yml
+++ b/src/main/resources/application-caozhe.yml
@@ -1,15 +1,21 @@
 spring:
   datasource:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
+#    username: qingcheng
+#    password: Qc@8ls2jf
+#    hikari:
+#      maximum-pool-size: 300
+#      max-lifetime: 120000
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
-    username: qingcheng
-    password: Qc@8ls2jf
+    url: jdbc:mysql://43.143.28.121:3306/easybbs?serverTimezone=Asia/Shanghai
+    username: easybbs
+    password: root
     hikari:
       maximum-pool-size: 300
       max-lifetime: 120000
 
 
-
   data:
     redis:
       port: 6379