From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 8a27dd5..481de34 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -1,10 +1,9 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
-import com.qcloud.cos.utils.Md5Utils;
import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -23,7 +22,6 @@
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
-import lombok.Data;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +43,7 @@
private final AdminRoleRelationService adminRoleRelationService;
private final RoleService roleService;
private AdminMapper adminMapper;
+ private Snowflake snowflake;
public Admin findByUserName(String username) {
return getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, username).last("limit 1"));
@@ -54,9 +53,14 @@
public boolean register(AdminParam param) {
Admin admin = findByUserName(param.getUsername());
if (admin != null) {
- throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡瀛樺湪");
+ throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡鍦ㄧ鐞嗗憳涓瓨鍦�");
+ }
+ Client one = SpringContextHolder.getBean(ClientService.class).getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, param.getUsername()));
+ if (one != null) {
+ throw new BusinessException("褰撳墠璐﹀彿" + param.getUsername() + "宸茬粡鍦ㄥ鎴蜂腑瀛樺湪");
}
Admin save = new Admin();
+ save.setId(snowflake.nextId());
save.setUsername(param.getUsername());
save.setPassword(passwordEncoder.encode(param.getPassword()));
save.setNickName(param.getNickName());
@@ -323,8 +327,16 @@
throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦紝璇烽噸鏂扮‘璁わ紒");
}
+ /**
+ * key鎿嶄綔鏃ュ織
+ */
+ String content = "鎿嶄綔鐢ㄦ埛key锛�" + SecurityUtils.getUsername() + " 琚搷浣滅敤鎴穒d锛�" + userId;
+
+
//鑾峰彇
if (type == 1) {
+ content += "鎿嶄綔绫诲瀷:鑾峰彇key";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鎿嶄綔鐢ㄦ埛key", content);
return "鐢ㄦ埛鐨勪究鎹风櫥褰昸ey涓猴細" + client.getUserKey();
} else {
//鏇存柊
@@ -332,6 +344,8 @@
client.setUserKey(md5);
boolean flag = clientService.updateById(client);
if (flag) {
+ content += "鎿嶄綔绫诲瀷:鐢熸垚key,鏂扮殑key涓猴細" + md5;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鎿嶄綔鐢ㄦ埛key", content);
return "鐢熸垚渚挎嵎鐧诲綍key鎴愬姛锛岃鐢ㄦ埛key涓猴細" + md5 + "锛岃濡ュ杽淇濈锛�";
} else {
throw new BusinessException("鐢熸垚渚挎嵎鐧诲綍key澶辫触锛�");
--
Gitblit v1.9.3