From 1f978728ad15047ed1dd3a35983a8cd12683c51b Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 13 Jan 2025 17:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/AdminMapper.java       |  3 ++-
 .../java/com/example/demo/serviceImpl/AdminServiceImpl.java  | 11 +++++++++++
 src/main/resources/application.yml                           | 12 ++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java
index e07fd69..c1190f5 100644
--- a/src/main/java/com/example/demo/mapper/AdminMapper.java
+++ b/src/main/java/com/example/demo/mapper/AdminMapper.java
@@ -23,12 +23,12 @@ public interface AdminMapper {
             "UPDATE admin",
             "<set>",
             "<if test='name!=null and name.length()>0'>name =#{name},</if>",
-            "<if test='jwcode!=null and jwcode.length()>0'>jwcode =#{jwcode},</if>",
             "<if test='password!=null and password.length()>0'>password =#{password},</if>",
             "<if test='permission!=null and permission.length()>0'>permission =#{permission},</if>",
             "<if test='area!=null and area.length()>0'>area =#{area},</if>",
             "<if test='adminFlag!=null and adminFlag.length()>0'>admin_flag =#{adminFlag},</if>",
             "</set>",
+            "where jwcode =#{jwcode}",
             "</script>"
     })
     int update(Admin admin);
@@ -46,6 +46,7 @@ public interface AdminMapper {
             "<script>",
             "SELECT * from admin",
             "<where>",
+            "permission is not null",
             "<if test='name!=null and name.length()>0'> and `name` like concat('%',#{name},'%')</if>",
             "<if test='jwcode!=null and jwcode.length()>0'> and jwcode=#{jwcode}</if>",
             "<if test='permission!=null'> and permission=#{permission}</if>",
diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
index 4d62ecd..02dc6f8 100644
--- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
@@ -41,6 +41,17 @@ public class AdminServiceImpl implements AdminService {
 
     @Override
     public int add(Admin admin) {
+        //判断jwcode是否已存在
+        Admin admin1=adminMapper.selectByJwcode(admin);
+        if(!ObjectUtils.isEmpty(admin1)){
+            throw new RuntimeException("用户已存在");
+        }
+        //设置密码
+        if(ObjectUtils.isEmpty(admin.getPassword())){
+            admin.setPassword(passwordEncoder.encode("$2a$10$jKrLD.8RTPzk4oe6c27b0ec9QP4DodbCVQLrLIEXS0xeT2vsp9cJK"));
+        }else {
+            admin.setPassword(passwordEncoder.encode(admin.getPassword()));
+        }
          return adminMapper.insert(admin);
     }
     @CacheEvict(value = "admin",allEntries = true)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8037bd9..d899acb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,13 +28,13 @@ spring:
       cache-null-values: true
   data:
     redis:
-      host: 39.99.159.73
-      port: 20001
-      password: 8912h12jhhajsd
+#      host: 39.99.159.73
+#      port: 20001
+#      password: 8912h12jhhajsd
+#      timeout: 1000
+      host: 127.0.0.1
+      port: 6379
       timeout: 1000
-      #    host: 127.0.0.1
-      #    port: 6379
-      #    timeout: 1000
       lettuce:
         pool:
           max-active: 20