From 009d0b454445e960551759f3fc081874ed9b1dd3 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 26 Nov 2021 17:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E7=A7=98=E9=92=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/customer/api/CustomerApi.java      | 10 ++++++++++
 .../modular/service/CustomerService.java      |  1 +
 .../service/impl/CustomerServiceImpl.java     | 20 +++++++++++++------
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/CustomerApi.java b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/CustomerApi.java
index 0a8e32847..56a916022 100644
--- a/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/CustomerApi.java
+++ b/kernel-s-customer/customer-api/src/main/java/cn/stylefeng/roses/kernel/customer/api/CustomerApi.java
@@ -60,4 +60,14 @@ public interface CustomerApi {
      */
     void updateMemberExpiryDate(Long customerId, Date expiryDate);
 
+    /**
+     * 重置个人秘钥
+     *
+     * @param customerId 用户id
+     * @return 用户秘钥
+     * @author fengshuonan
+     * @date 2021/7/20 10:44
+     */
+    String createOrUpdateCustomerSecret(Long customerId);
+
 }
diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/CustomerService.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/CustomerService.java
index 884e8774e..4355bf0d5 100644
--- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/CustomerService.java
+++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/CustomerService.java
@@ -126,6 +126,7 @@ public interface CustomerService extends IService<Customer>, CustomerApi {
     /**
      * 重置个人秘钥
      *
+     * @return 用户秘钥
      * @author fengshuonan
      * @date 2021/7/20 10:44
      */
diff --git a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
index d9831ce79..d0f1a9bbf 100644
--- a/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
+++ b/kernel-s-customer/customer-business/src/main/java/cn/stylefeng/roses/kernel/customer/modular/service/impl/CustomerServiceImpl.java
@@ -49,7 +49,6 @@ import cn.stylefeng.roses.kernel.security.api.expander.SecurityConfigExpander;
 import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -365,19 +364,28 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         // 获取当前登录用户
         Long userId = LoginContext.me().getLoginUser().getUserId();
 
+        return this.createOrUpdateCustomerSecret(userId);
+    }
+
+    @Override
+    public String createOrUpdateCustomerSecret(Long customerId) {
+        if(customerId == null){
+            return null;
+        }
+
         // 重新生成秘钥
-        String uuid = IdWorker.get32UUID();
+        String randomString = RandomUtil.randomString(32);
 
         // 更新用户秘钥
         LambdaUpdateWrapper<Customer> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.set(Customer::getSecretKey, uuid);
-        wrapper.eq(Customer::getCustomerId, userId);
+        wrapper.set(Customer::getSecretKey, randomString);
+        wrapper.eq(Customer::getCustomerId, customerId);
         this.update(wrapper);
 
         // 清除缓存中的用户信息
-        customerInfoCacheOperatorApi.remove(String.valueOf(userId));
+        customerInfoCacheOperatorApi.remove(String.valueOf(customerId));
 
-        return uuid;
+        return randomString;
     }
 
     @Override