测试服务器

pom.xml

@@ -24,10 +24,10 @@
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.kafka</groupId>-->
+<!--			<artifactId>spring-kafka</artifactId>-->
+<!--		</dependency>-->
 
 
 		<!--		<dependency>-->
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
-
+			<version>3.3.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/example/demo/controller/AdminController.java

@@ -24,6 +24,17 @@ public class AdminController {
 
     private  final AdminService adminService;
 
+    @PostMapping("/add")
+    public Result add(@RequestBody Admin admin){
+        try {
+            return Result.success(adminService.add(admin));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return Result.error(e.getMessage());
+        }
+    }
+
     @PostMapping("/search")
     public Result search(@RequestBody Page page){
         if(ObjectUtils.isEmpty(page.getPageNum())){
@@ -34,6 +45,16 @@ public class AdminController {
         }
     }
 
+    @PostMapping("/area")
+
+    public Result area(){
+        return Result.success(adminService.area());
+    }
+    @PostMapping("/store")
+    public Result store(){
+        return Result.success(adminService.store());
+    }
+
     @PostMapping("/login")
     public Result login(@RequestBody Admin admin){
 
@@ -73,5 +94,25 @@ public class AdminController {
         }
     }
 
+    @PostMapping("/update")
+    public Result update(@RequestBody Admin admin){
+        try {
+            return Result.success(adminService.edit(admin));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return Result.error(e.getMessage());
+        }
+    }
 
+    @PostMapping("/selectNo")
+    public Result selectNo(@RequestBody Admin admin){
+        try {
+            return Result.success(adminService.selectNo(admin));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+            return Result.error(e.getMessage());
+        }
+    }
 }

src/main/java/com/example/demo/controller/ConsumeController.java

@@ -3,7 +3,7 @@ package com.example.demo.controller;
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.DetailY;
 import com.example.demo.domain.vo.*;
-import com.example.demo.controller.KafkaProducer;
+//import com.example.demo.controller.KafkaProducer;
 import com.example.demo.serviceImpl.ConsumeServiceImpl;
 import com.example.demo.serviceImpl.UserServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,8 +28,8 @@ public class ConsumeController {
     @Autowired
     private UserServiceImpl userService;
 
-    @Autowired
-    private KafkaProducer kafkaProducer;
+//    @Autowired
+//    private KafkaProducer kafkaProducer;
 
     @PostMapping("/add")
     public Result add(@RequestBody DetailY detailY) throws Exception {
@@ -38,14 +38,14 @@ public class ConsumeController {
             ObjectMapper objectMapper = new ObjectMapper();
             String detailJson = objectMapper.writeValueAsString(detailY);
 
-            // 发送消息到 Kafka 队列
-            kafkaProducer.sendMessage("consume-topic", detailJson);
-
-            return Result.success("Request added to Kafka queue");
+//            // 发送消息到 Kafka 队列
+//            kafkaProducer.sendMessage("consume-topic", detailJson);
+            consumeService.insert(detailY);
         } catch (Exception e) {
             log.error(Arrays.toString(e.getStackTrace()));
             return Result.error(e.getMessage());
         }
+        return Result.success();
     }
 
     @PostMapping("/select")

src/main/java/com/example/demo/controller/KafkaConfig.java

@@ -1,9 +1,9 @@
-package com.example.demo.controller;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.kafka.annotation.EnableKafka;
-
-@Configuration
-@EnableKafka
-public class KafkaConfig {
-}
+//package com.example.demo.controller;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.kafka.annotation.EnableKafka;
+//
+//@Configuration
+//@EnableKafka
+//public class KafkaConfig {
+//}

src/main/java/com/example/demo/controller/KafkaConsumer.java

@@ -1,76 +1,76 @@
-package com.example.demo.controller;
-
-import com.example.demo.domain.entity.Detail;
-import com.example.demo.domain.entity.DetailY;
-import com.example.demo.domain.entity.Recharge;
-import com.example.demo.serviceImpl.ConsumeServiceImpl;
-import com.example.demo.sevice.RechargeService;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.List;
-
-@Service
-@Slf4j
-public class KafkaConsumer {
-
-    @Autowired
-    private ConsumeServiceImpl consumeService;
-
-    @Autowired
-    private RechargeService rechargeService;
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    @KafkaListener(topics = "rechargeadd_topic")
-    public void listenRechargeadd(String message) {
-        try {
-            // 反序列化为List<Recharge>
-            List<Recharge> rechargeList = objectMapper.readValue(message, new TypeReference<List<Recharge>>() {});
-
-            // 遍历并处理每个充值记录
-            for (Recharge recharge : rechargeList) {
-                processRecharge(recharge);
-            }
-        } catch (IOException e) {
-            // 处理反序列化异常
-            e.printStackTrace();
-        }
-    }
-
-    private void processRecharge(Recharge recharge) {
-        // 具体的业务处理逻辑
-        System.out.println("Processing recharge: " + recharge);
-    }
-
-    @KafkaListener(topics = "consume-topic", groupId = "my-group")
-    public void listenConsume(String message) {
-        try {
-            DetailY detailY = objectMapper.readValue(message, DetailY.class);
-
-            // 处理消费请求
-            Integer result = consumeService.insert(detailY);
-            log.info("Processed consume request with result: {}", result);
-        } catch (Exception e) {
-            log.error("Error processing consume message: {}", message, e);
-        }
-    }
-
-    @KafkaListener(topics = "recharge-topic", groupId = "my-group")
-    public void listenRecharge(String message) {
-        try {
-            Recharge recharge = objectMapper.readValue(message, Recharge.class);
-
-            // 处理充值请求
-            rechargeService.add(recharge);
-            log.info("Processed recharge request with id: {}", recharge.getRechargeId());
-        } catch (Exception e) {
-            log.error("Error processing recharge message: {}", message, e);
-        }
-    }
-}
+//package com.example.demo.controller;
+//
+//import com.example.demo.domain.entity.Detail;
+//import com.example.demo.domain.entity.DetailY;
+//import com.example.demo.domain.entity.Recharge;
+//import com.example.demo.serviceImpl.ConsumeServiceImpl;
+//import com.example.demo.sevice.RechargeService;
+//import com.fasterxml.jackson.core.type.TypeReference;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.kafka.annotation.KafkaListener;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.IOException;
+//import java.util.List;
+//
+//@Service
+//@Slf4j
+//public class KafkaConsumer {
+//
+//    @Autowired
+//    private ConsumeServiceImpl consumeService;
+//
+//    @Autowired
+//    private RechargeService rechargeService;
+//
+//    private final ObjectMapper objectMapper = new ObjectMapper();
+//
+//    @KafkaListener(topics = "rechargeadd_topic")
+//    public void listenRechargeadd(String message) {
+//        try {
+//            // 反序列化为List<Recharge>
+//            List<Recharge> rechargeList = objectMapper.readValue(message, new TypeReference<List<Recharge>>() {});
+//
+//            // 遍历并处理每个充值记录
+//            for (Recharge recharge : rechargeList) {
+//                processRecharge(recharge);
+//            }
+//        } catch (IOException e) {
+//            // 处理反序列化异常
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    private void processRecharge(Recharge recharge) {
+//        // 具体的业务处理逻辑
+//        System.out.println("Processing recharge: " + recharge);
+//    }
+//
+//    @KafkaListener(topics = "consume-topic", groupId = "my-group")
+//    public void listenConsume(String message) {
+//        try {
+//            DetailY detailY = objectMapper.readValue(message, DetailY.class);
+//
+//            // 处理消费请求
+//            Integer result = consumeService.insert(detailY);
+//            log.info("Processed consume request with result: {}", result);
+//        } catch (Exception e) {
+//            log.error("Error processing consume message: {}", message, e);
+//        }
+//    }
+//
+//    @KafkaListener(topics = "recharge-topic", groupId = "my-group")
+//    public void listenRecharge(String message) {
+//        try {
+//            Recharge recharge = objectMapper.readValue(message, Recharge.class);
+//
+//            // 处理充值请求
+//            rechargeService.add(recharge);
+//            log.info("Processed recharge request with id: {}", recharge.getRechargeId());
+//        } catch (Exception e) {
+//            log.error("Error processing recharge message: {}", message, e);
+//        }
+//    }
+//}

src/main/java/com/example/demo/controller/KafkaProducer.java

@@ -1,16 +1,16 @@
-package com.example.demo.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.stereotype.Service;
-
-@Service
-public class KafkaProducer {
-
-    @Autowired
-    private KafkaTemplate<String, String> kafkaTemplate;
-
-    public void sendMessage(String topic, String message) {
-        kafkaTemplate.send(topic, message);
-    }
-}
+//package com.example.demo.controller;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.kafka.core.KafkaTemplate;
+//import org.springframework.stereotype.Service;
+//
+//@Service
+//public class KafkaProducer {
+//
+//    @Autowired
+//    private KafkaTemplate<String, String> kafkaTemplate;
+//
+//    public void sendMessage(String topic, String message) {
+//        kafkaTemplate.send(topic, message);
+//    }
+//}

src/main/java/com/example/demo/controller/PermissionController.java

@@ -0,0 +1,24 @@
+package com.example.demo.controller;
+
+
+import com.example.demo.domain.vo.Result;
+import com.example.demo.sevice.PermissionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/permission")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class PermissionController {
+    private final PermissionService permissionService;
+
+    @RequestMapping("/getPermission")
+    public Result getPermission() {
+        return Result.success(permissionService.getPermission());
+    }
+}

src/main/java/com/example/demo/controller/RechargeController.java

@@ -3,8 +3,9 @@ package com.example.demo.controller;
 import com.example.demo.domain.entity.Recharge;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
-import com.example.demo.controller.KafkaProducer;
+//import com.example.demo.controller.KafkaProducer;
 import com.example.demo.sevice.RechargeService;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,12 +25,13 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @Slf4j
 @CrossOrigin
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class RechargeController {
 
     private final RechargeService rechargeService;
     private final ObjectMapper objectMapper; // 添加这一行
-    @Autowired
-    private KafkaProducer kafkaProducer;
+//    @Autowired
+//    private KafkaProducer kafkaProducer;
     @PostMapping("/addmore")
     public Result add(@RequestBody Map<String, Object> requestBody) {
         try {
@@ -41,7 +43,7 @@ public class RechargeController {
 
             // 提取并转换所有的 Recharge 对象
             List<Recharge> recharges = requestBody.entrySet().stream()
-                    .filter(entry -> !entry.getKey().equals("token"))
+                    .filter(entry -> !entry.getKey().equals("token") && entry.getValue() instanceof Map)
                     .map(entry -> {
                         try {
                             return objectMapper.convertValue(entry.getValue(), Recharge.class);
@@ -60,8 +62,8 @@ public class RechargeController {
             // 将 Recharge 对象转换为 JSON 字符串
             String rechargeJson = objectMapper.writeValueAsString(recharges);
 
-            // 发送消息到 Kafka 队列
-            kafkaProducer.sendMessage("rechargeadd-topic", rechargeJson);
+            // 发送消息到 Kafka 队列（如果需要）
+            // kafkaProducer.sendMessage("rechargeadd-topic", rechargeJson);
 
             return rechargeService.addRecharges(recharges);
         } catch (Exception e) {
@@ -77,15 +79,16 @@ public class RechargeController {
             // 将 Recharge 对象转换为 JSON 字符串
             ObjectMapper objectMapper = new ObjectMapper();
             String rechargeJson = objectMapper.writeValueAsString(recharge);
-
-            // 发送消息到 Kafka 队列
-            kafkaProducer.sendMessage("recharge-topic", rechargeJson);
-
-            return Result.success("Request added to Kafka queue");
+            rechargeService.add(recharge);
+////            // 发送消息到 Kafka 队列
+////            kafkaProducer.sendMessage("recharge-topic", rechargeJson);
+//
+//            return Result.success("Request added to Kafka queue");
         } catch (Exception e) {
             log.error(Arrays.toString(e.getStackTrace()));
             return Result.error(e.getMessage());
         }
+        return Result.success();
     }
 
     @PostMapping("/edit")

src/main/java/com/example/demo/domain/entity/Admin.java

@@ -1,3 +1,74 @@
+//package com.example.demo.domain.entity;
+//
+//import com.fasterxml.jackson.annotation.JsonFormat;
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import org.springframework.format.annotation.DateTimeFormat;
+//import org.springframework.security.core.GrantedAuthority;
+//import org.springframework.security.core.authority.SimpleGrantedAuthority;
+//import org.springframework.security.core.userdetails.UserDetails;
+//
+//import java.io.Serializable;
+//import java.util.*;
+//
+//@Data
+//@NoArgsConstructor
+//public class Admin implements UserDetails, Serializable {
+//    private Integer adminId;
+//    private String name;
+//    private String username;
+//    private String password;
+//    private String permission;
+//    private String area;
+//    private String adminFlag;
+//    private String store;
+//    private String token;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
+//    private Date createTime;
+//    private String jwcode;
+//    @Override
+//    @JsonIgnore
+//    public Collection<? extends GrantedAuthority> getAuthorities() {
+//        Set<GrantedAuthority> authorities = new HashSet<>();
+//        if (permission != null) {
+//            int permValue = permission.intValue();
+//            if (permValue == 1) {
+//                authorities.add(new SimpleGrantedAuthority("ROLE_SUPER_ADMIN"));
+//            } else if (permValue == 2) {
+//                authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
+//            } else if (permValue == 3) {
+//                authorities.add(new SimpleGrantedAuthority("ROLE_AUDITORS"));
+//            }
+//        }
+//        return authorities;
+//    }
+//    @Override
+//    @JsonIgnore
+//    public boolean isAccountNonExpired() {
+//        return UserDetails.super.isAccountNonExpired();
+//    }
+//
+//    @Override
+//    @JsonIgnore
+//    public boolean isAccountNonLocked() {
+//        return UserDetails.super.isAccountNonLocked();
+//    }
+//
+//    @Override
+//    @JsonIgnore
+//    public boolean isCredentialsNonExpired() {
+//        return UserDetails.super.isCredentialsNonExpired();
+//    }
+//
+//    @Override
+//    @JsonIgnore
+//    public boolean isEnabled() {
+//        return UserDetails.super.isEnabled();
+//    }
+//}
+//
 package com.example.demo.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -19,7 +90,7 @@ public class Admin implements UserDetails, Serializable {
     private String name;
     private String username;
     private String password;
-    private Integer permission;
+    private String permission;
     private String area;
     private String adminFlag;
     private String store;
@@ -28,41 +99,53 @@ public class Admin implements UserDetails, Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String jwcode;
+
     @Override
     @JsonIgnore
     public Collection<? extends GrantedAuthority> getAuthorities() {
         Set<GrantedAuthority> authorities = new HashSet<>();
-        if(permission == 1){
+        Optional.ofNullable(permission)
+                .map(Integer::valueOf)
+                .ifPresent(permValue -> {
+                    switch (permValue) {
+                        case 1:
                             authorities.add(new SimpleGrantedAuthority("ROLE_SUPER_ADMIN"));
-        }else if(permission == 2){
+                            break;
+                        case 2:
                             authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
-        }else if(permission == 3){
+                            break;
+                        case 3:
                             authorities.add(new SimpleGrantedAuthority("ROLE_AUDITORS"));
+                            break;
+                        default:
+                            // 可以添加默认角色或处理未知权限
+                            break;
                     }
+                });
         return authorities;
     }
+
     @Override
     @JsonIgnore
     public boolean isAccountNonExpired() {
-        return UserDetails.super.isAccountNonExpired();
+        return true; // 默认账户未过期
     }
 
     @Override
     @JsonIgnore
     public boolean isAccountNonLocked() {
-        return UserDetails.super.isAccountNonLocked();
+        return true; // 默认账户未锁定
     }
 
     @Override
     @JsonIgnore
     public boolean isCredentialsNonExpired() {
-        return UserDetails.super.isCredentialsNonExpired();
+        return true; // 默认凭证未过期
     }
 
     @Override
     @JsonIgnore
     public boolean isEnabled() {
-        return UserDetails.super.isEnabled();
+        return true; // 默认账户启用
     }
 }
-

src/main/java/com/example/demo/domain/entity/Permission.java

@@ -0,0 +1,11 @@
+package com.example.demo.domain.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class Permission {
+    private Integer permissionId;
+    private String permissionName;
+}

src/main/java/com/example/demo/domain/entity/Recharge.java

@@ -1,6 +1,7 @@
 package com.example.demo.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -10,8 +11,9 @@ import java.util.Date;
 
 @Data
 @NoArgsConstructor
-
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Recharge {
+    private String Rate;
     private Integer rechargeId;
     private String jwcode;
     private Integer activityId;
@@ -38,10 +40,7 @@ public class Recharge {
     private Integer line;
     private String showInput;
     private String imageUrl;
-    private String rate;
     private String isInputInvalid;
     private String inputErrorMessage;
 
-
-
 }

src/main/java/com/example/demo/mapper/AdminMapper.java

@@ -11,9 +11,9 @@ import java.util.List;
 public interface AdminMapper {
     @Insert({
             "insert into admin",
-            "(name,jwcode,password,permission,area,admin_flag,create_time)",
+            "(name,jwcode,password,permission,area,admin_flag,create_time,remark)",
             "values",
-            "(#{name},#{jwcode},,#{password},#{permission},#{area},#{admin_flag},now())"
+            "(#{name},#{jwcode},,#{password},#{permission},#{area},#{admin_flag},now(),#{remark})"
     })
     @Options(useGeneratedKeys = true,keyColumn = "admin_id",keyProperty = "adminId")
     int insert(Admin admin);
@@ -46,13 +46,40 @@ public interface AdminMapper {
             "<script>",
             "SELECT * from admin",
             "<where>",
-            "<if test='name!=null and name.length()>0'> and `name` like concat('%',#{name},'%'),</if>",
-            "<if test='jwcode!=null and jwcode.length()>0'> and `jwcode` like concat('%',#{jwcode},'%'),</if>",
-            "<if test='permission!=null'> and permission=#{permission},</if>",
-            "<if test='area!=null and area.length()>0'> and `area` like concat('%',#{area},'%'),</if>",
-            "<if test='adminFlag!=null'> and admin_flag =#{adminFlag},</if>",
+            "<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>",
+            "<if test='area!=null and area.length()>0'> and `area`=#{area}</if>",
+            "<if test='store!=null and store.length()>0'> and `store`=#{store}</if>",
+            "<if test='adminFlag!=null'> and admin_flag =#{adminFlag}</if>",
             "</where>",
             "</script>"
     })
     List<Admin> select(Admin admin);
+
+    @Select({
+            "select DISTINCT store from admin"
+    })
+    List<String> selectStore();
+    @Select({
+            "select DISTINCT area from admin"
+    })
+    List<String> selectArea();
+
+    @Select({
+//            "<script>",
+            "select * from admin ",
+//            "<where>",
+            "where permission is null and jwcode=#{jwcode}",
+//            "</where>",
+
+    })
+    List<Admin> selectNo(Admin admin);
+
+    @Select({
+            "select * from admin",
+            "where jwcode=#{jwcode}"
+    })
+    Admin selectByJwcode(Admin admin);
+
 }

src/main/java/com/example/demo/mapper/PermissionMapper.java

@@ -0,0 +1,15 @@
+package com.example.demo.mapper;
+
+import com.example.demo.domain.entity.Permission;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface PermissionMapper {
+    @Select({
+            "select * from permission"
+    })
+    List<Permission> getPermission();
+}

src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 
 import java.util.List;
@@ -91,4 +92,28 @@ public class AdminServiceImpl implements AdminService {
 
         }
     }
+
+    @Override
+    public List<String> store() {
+        return adminMapper.selectStore();
+    }
+
+    @Override
+    public List<String> area() {
+        return adminMapper.selectArea();
+    }
+
+    @Override
+    public List<Admin> selectNo(Admin admin) {
+       Admin admin1=adminMapper.selectByJwcode(admin);
+       if(ObjectUtils.isEmpty(admin1)){
+           throw new RuntimeException("用户不存在");
+       }
+       if(admin1.getPermission()!=null){
+           throw new RuntimeException("用户已有权限");
+       }
+        return adminMapper.selectNo(admin);
+    }
+
+
 }

src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java

@@ -0,0 +1,24 @@
+package com.example.demo.serviceImpl;
+
+import com.example.demo.domain.entity.Permission;
+import com.example.demo.mapper.PermissionMapper;
+import com.example.demo.sevice.PermissionService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Transactional
+@Service
+@RequiredArgsConstructor
+@CacheConfig(cacheNames = "permission")
+public class PermissionServiceImpl implements PermissionService {
+
+    private final PermissionMapper permissionMapper;
+    @Override
+    public List<Permission> getPermission() {
+        return permissionMapper.getPermission();
+    }
+}

src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@@ -44,7 +44,7 @@ public class RechargeServiceImpl implements RechargeService {
     @Override
     @Transactional
 
-    @CacheEvict(value = "recharge",allEntries = true)
+//    @CacheEvict(value = "recharge",allEntries = true)
     public int add(Recharge recharge) throws Exception {
 //        return rechargeMapper.insert(recharge);
 

src/main/java/com/example/demo/sevice/AdminService.java

@@ -14,4 +14,7 @@ public interface AdminService {
     List<Admin> search(Admin admin);
     PageInfo<Admin> searchForPage(Integer pageNum, Integer pageSize, Admin admin);
     Admin login(Admin admin)throws Exception;
+    List<String> store();
+    List<String> area();
+    List<Admin> selectNo(Admin admin);
 }

src/main/java/com/example/demo/sevice/PermissionService.java

@@ -0,0 +1,9 @@
+package com.example.demo.sevice;
+
+import com.example.demo.domain.entity.Permission;
+
+import java.util.List;
+
+public interface PermissionService {
+    List<Permission> getPermission();
+}

src/main/resources/application.yml

@@ -7,14 +7,13 @@ spring:
       max-file-size: 10MB
       max-request-size: 100MB
   datasource:
-    hikari: # HikariCP连接池配置
-
-      maximum-pool-size: 10 # 最大连接数
-      minimum-idle: 5 # 最小空闲连接数
-      idle-timeout: 30000 # 空闲连接超时时间（毫秒）
-      max-lifetime: 1800000 # 连接最大存活时间（毫秒）
-      connection-timeout: 30000 # 连接超时时间（毫秒）
-      pool-name: HwgoldHikariCP # 连接池名称
+    hikari:
+      maximum-pool-size: 10
+      minimum-idle: 5
+      idle-timeout: 30000
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username: hwgold
@@ -29,27 +28,18 @@ spring:
       cache-null-values: true
   data:
     redis:
-      host: 127.0.0.1
-      port: 6379
+      host: 39.99.159.73
+      port: 20001
+      password: 8912h12jhhajsd
       timeout: 1000
+      #    host: 127.0.0.1
+      #    port: 6379
+      #    timeout: 1000
       lettuce:
         pool:
-          max-active: 20  # 连接池最大连接数（使用负值表示没有限制）
-          max-wait: -1  # 最大阻塞等待时间（负数表示没有限制）
-          max-idle: 5  # 连接池中最大空闲连接
-          min-idle: 0  # 连接池中最小空闲连接
-  kafka:
-    bootstrap-servers: localhost:9092
-    producer:
-      key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.apache.kafka.common.serialization.StringSerializer
-      acks: all
-      retries: 1
-    consumer:
-      group-id: my-group
-      auto-offset-reset: earliest
-      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+          max-active: 20
+          max-wait: -1
+          max-idle: 5
 
 mybatis:
   configuration:
@@ -57,4 +47,5 @@ mybatis:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 upload:
-  path: D:/gold1/
+  path: D:/gold1
+#  path: /home/java/haiwaiyanfa/gold1/