Просмотр исходного кода

20230714-完善系统框架,测试数据库、redis、VO等

iaun 3 лет назад
Родитель
Сommit
a9c3f05e0e

+ 12 - 9
pom.xml

@@ -17,7 +17,7 @@
         <java.version>1.8</java.version>
         <java.version>1.8</java.version>
     </properties>
     </properties>
     <dependencies>
     <dependencies>
-        <dependency>
+        <dependency><!-- 使用新版本yaml解析器 -->
             <groupId>org.yaml</groupId>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <artifactId>snakeyaml</artifactId>
             <version>2.0</version>
             <version>2.0</version>
@@ -35,22 +35,25 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
-        <dependency>
+        <dependency><!-- redis -->
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency><!-- 配置处理器 -->
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency><!-- mysql -->
             <groupId>mysql</groupId>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.33</version>
             <version>8.0.33</version>
         </dependency>
         </dependency>
-        <dependency>
+        <dependency><!-- mybatis plus -->
             <groupId>com.baomidou</groupId>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.3.1</version>
             <version>3.5.3.1</version>
         </dependency>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>junit</groupId>-->
-<!--            <artifactId>junit</artifactId>-->
-<!--            <version>4.13.2</version>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

+ 15 - 0
src/main/java/cn/iaun/it/config/InterceptorConfig.java

@@ -0,0 +1,15 @@
+package cn.iaun.it.config;
+
+import cn.iaun.it.interceptor.TokenInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+// Web拦截器,用于认证
+@Configuration
+public class InterceptorConfig extends WebMvcConfigurationSupport {
+    @Bean
+    public TokenInterceptor getTokenInterceptor() {
+        return new TokenInterceptor();
+    }
+}

+ 21 - 0
src/main/java/cn/iaun/it/config/RedisConfig.java

@@ -0,0 +1,21 @@
+package cn.iaun.it.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+// Redis序列化问题修正
+@Configuration
+public class RedisConfig {
+    @Bean
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(new StringRedisSerializer());
+        template.afterPropertiesSet();
+        return template;
+    }
+}

+ 36 - 0
src/main/java/cn/iaun/it/config/TokenConfig.java

@@ -0,0 +1,36 @@
+package cn.iaun.it.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@ConfigurationProperties(prefix = "config.token") // 从配置读取变量
+@Component
+public class TokenConfig {
+    private String secret;
+    private Long expire;
+    private String header;
+
+    public Long getExpire() {
+        return expire;
+    }
+
+    public void setExpire(Long expire) {
+        this.expire = expire;
+    }
+
+    public String getHeader() {
+        return header;
+    }
+
+    public void setHeader(String header) {
+        this.header = header;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+}

+ 39 - 0
src/main/java/cn/iaun/it/controller/ItUserController.java

@@ -1,13 +1,17 @@
 package cn.iaun.it.controller;
 package cn.iaun.it.controller;
 
 
 import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import cn.iaun.it.service.ItUserService;
 import cn.iaun.it.service.ItUserService;
 import cn.iaun.it.util.Result;
 import cn.iaun.it.util.Result;
 import cn.iaun.it.util.ResultCode;
 import cn.iaun.it.util.ResultCode;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.logging.Logger;
 
 
 @RestController
 @RestController
 @RequestMapping("/user")
 @RequestMapping("/user")
@@ -22,4 +26,39 @@ public class ItUserController {
     public Result<List<ItUser>> getUser() {
     public Result<List<ItUser>> getUser() {
         return new Result<>(ResultCode.SUCCESS, itUserService.getAll());
         return new Result<>(ResultCode.SUCCESS, itUserService.getAll());
     }
     }
+
+    @PostMapping(value = "/login")
+    public Result<ItUserLoginInfoVo> login(@RequestBody LoginRequest request) {
+        itUserService.loginByUserAndPassword(request.user, request.password);
+        return new Result<>(ResultCode.SUCCESS, null);
+    }
 }
 }
+
+class LoginRequest {
+    String user;
+    String password;
+
+    @Override
+    public String toString() {
+        return "LoginRequest{" +
+                "user='" + user + '\'' +
+                ", password='" + password + '\'' +
+                '}';
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}

+ 4 - 0
src/main/java/cn/iaun/it/interceptor/TokenInterceptor.java

@@ -0,0 +1,4 @@
+package cn.iaun.it.interceptor;
+
+public class TokenInterceptor {
+}

+ 11 - 2
src/main/java/cn/iaun/it/mapper/ItUserMapper.java

@@ -1,9 +1,18 @@
 package cn.iaun.it.mapper;
 package cn.iaun.it.mapper;
 
 
 import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Service;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 
-@Service
+@Mapper
 public interface ItUserMapper extends BaseMapper<ItUser> {
 public interface ItUserMapper extends BaseMapper<ItUser> {
+    @Select(
+            "select u.user as user, u.display_name as display_name, u.phone_number as phone_number, u.role_id as role_id, " +
+                    "r.name as role_name " +
+                    "from it_user u left join it_role r on u.role_id = r.role_id " +
+                    "where u.user = #{user} and u.password = #{password}"
+    )
+    ItUserLoginInfoVo selectItUserLoginInfo(String user, String password);
 }
 }

+ 22 - 0
src/main/java/cn/iaun/it/model/ItRole.java

@@ -0,0 +1,22 @@
+package cn.iaun.it.model;
+
+public class ItRole {
+    private Long roleId;
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+}

+ 22 - 0
src/main/java/cn/iaun/it/model/ItRolePermission.java

@@ -0,0 +1,22 @@
+package cn.iaun.it.model;
+
+public class ItRolePermission {
+    private Long roleId;
+    private Long sysId;
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public Long getSysId() {
+        return sysId;
+    }
+
+    public void setSysId(Long sysId) {
+        this.sysId = sysId;
+    }
+}

+ 22 - 0
src/main/java/cn/iaun/it/model/ItSys.java

@@ -0,0 +1,22 @@
+package cn.iaun.it.model;
+
+public class ItSys {
+    private Long sysId;
+    private String name;
+
+    public Long getSysId() {
+        return sysId;
+    }
+
+    public void setSysId(Long sysId) {
+        this.sysId = sysId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

+ 0 - 2
src/main/java/cn/iaun/it/model/ItUser.java

@@ -1,7 +1,6 @@
 package cn.iaun.it.model;
 package cn.iaun.it.model;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 
 
 
@@ -10,7 +9,6 @@ public class ItUser {
     private Long userId;
     private Long userId;
     private String user;
     private String user;
     private String displayName;
     private String displayName;
-    @TableField(select = false)
     private String password;
     private String password;
     private String phoneNumber;
     private String phoneNumber;
     private Long roleId;
     private Long roleId;

+ 70 - 0
src/main/java/cn/iaun/it/model/vo/user/ItUserLoginInfoVo.java

@@ -0,0 +1,70 @@
+package cn.iaun.it.model.vo.user;
+
+public class ItUserLoginInfoVo {
+    private String user;
+    private String displayName;
+    private String phoneNumber;
+    private Long roleId;
+    private String roleName;
+    private String token;
+
+    @Override
+    public String toString() {
+        return "ItUserLoginInfoVo{" +
+                "user='" + user + '\'' +
+                ", displayName='" + displayName + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", roleId=" + roleId +
+                ", roleName='" + roleName + '\'' +
+                ", token='" + token + '\'' +
+                '}';
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+}

+ 3 - 0
src/main/java/cn/iaun/it/service/ItUserService.java

@@ -1,10 +1,13 @@
 package cn.iaun.it.service;
 package cn.iaun.it.service;
 
 
 import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 
 
 import java.util.List;
 import java.util.List;
 
 
 
 
 public interface ItUserService {
 public interface ItUserService {
     List<ItUser> getAll();
     List<ItUser> getAll();
+
+    ItUserLoginInfoVo loginByUserAndPassword(String user, String password);
 }
 }

+ 8 - 0
src/main/java/cn/iaun/it/service/impl/ItUserServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iaun.it.service.impl;
 
 
 import cn.iaun.it.mapper.ItUserMapper;
 import cn.iaun.it.mapper.ItUserMapper;
 import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import cn.iaun.it.service.ItUserService;
 import cn.iaun.it.service.ItUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -19,4 +20,11 @@ public class ItUserServiceImpl implements ItUserService {
     public List<ItUser> getAll() {
     public List<ItUser> getAll() {
         return itUserMapper.selectList(null);
         return itUserMapper.selectList(null);
     }
     }
+
+    @Override
+    public ItUserLoginInfoVo loginByUserAndPassword(String user, String password) {
+        ItUserLoginInfoVo itUserLoginInfoVo = itUserMapper.selectItUserLoginInfo(user, password);
+        System.out.println(itUserLoginInfoVo);
+        return itUserLoginInfoVo;
+    }
 }
 }

+ 33 - 5
src/main/java/cn/iaun/it/util/Result.java

@@ -1,14 +1,15 @@
 package cn.iaun.it.util;
 package cn.iaun.it.util;
 
 
 public class Result<T> {
 public class Result<T> {
-    private final Integer code;
-    private final String message;
+    private Integer code;
+    private String message;
 
 
-    private final T data;
+    private T data;
 
 
     public Result() {
     public Result() {
-        this.code = 1;
-        this.message = "OK";
+        ResultCode resultCode = ResultCode.SUCCESS;
+        this.code = resultCode.getCode();
+        this.message = resultCode.getMessage();
         this.data = null;
         this.data = null;
     }
     }
 
 
@@ -18,6 +19,33 @@ public class Result<T> {
         this.data = data;
         this.data = data;
     }
     }
 
 
+    public void success(T data) {
+        ResultCode resultCode = ResultCode.SUCCESS;
+        this.code = resultCode.getCode();
+        this.message = resultCode.getMessage();
+        this.data = data;
+    }
+
+    public void fail() {
+        ResultCode resultCode = ResultCode.FAILED;
+        this.code = resultCode.getCode();
+        this.message = resultCode.getMessage();
+        this.data = null;
+    }
+
+    public void fail(T data) {
+        ResultCode resultCode = ResultCode.FAILED;
+        this.code = resultCode.getCode();
+        this.message = resultCode.getMessage();
+        this.data = data;
+    }
+
+    public void setResult(ResultCode resultCode, T data) {
+        this.code = resultCode.getCode();
+        this.message = resultCode.getMessage();
+        this.data = data;
+    }
+
     public Integer getCode() {
     public Integer getCode() {
         return code;
         return code;
     }
     }

+ 5 - 1
src/main/java/cn/iaun/it/util/ResultCode.java

@@ -1,7 +1,11 @@
 package cn.iaun.it.util;
 package cn.iaun.it.util;
 
 
 public enum ResultCode {
 public enum ResultCode {
-    SUCCESS(1, "成功");
+    SUCCESS(1, "成功"),
+    FAILED(-1, "失败"),
+
+    /* 用户模块 1001XXX */
+    USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误");
 
 
     private final Integer code;
     private final Integer code;
     private final String message;
     private final String message;

+ 15 - 1
src/main/resources/application.yml

@@ -11,4 +11,18 @@ spring:
     init:
     init:
       schema-locations: classpath:db/schema.sql
       schema-locations: classpath:db/schema.sql
       data-locations: classpath:db/data.sql
       data-locations: classpath:db/data.sql
-      mode: always
+      mode: always
+  redis:
+    host: localhost
+    port: 6379
+    password: hello6379
+
+config:
+  token:
+    secret: abcdef
+    expire: 1
+    header: 1
+
+logging:
+  level:
+    cn.iaun.it.mapper: trace

+ 27 - 0
src/test/java/cn/iaun/it/RedisTest.java

@@ -0,0 +1,27 @@
+package cn.iaun.it;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import javax.annotation.Resource;
+
+@SpringBootTest
+public class RedisTest {
+    @Resource
+    private RedisTemplate<String, String> redisTemplate;
+
+    @Test
+    void set() {
+        ValueOperations<String, String> ops = redisTemplate.opsForValue();
+        ops.set("foo", "bar");
+    }
+
+    @Test
+    void get() {
+        ValueOperations<String, String> ops = redisTemplate.opsForValue();
+        String data = ops.get("foo");
+        System.out.println(data);
+    }
+}

+ 17 - 0
src/test/java/cn/iaun/it/SampleTest.java

@@ -2,6 +2,8 @@ package cn.iaun.it;
 
 
 import cn.iaun.it.mapper.ItUserMapper;
 import cn.iaun.it.mapper.ItUserMapper;
 import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
+import cn.iaun.it.config.TokenConfig;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +15,8 @@ import java.util.List;
 public class SampleTest {
 public class SampleTest {
     @Autowired
     @Autowired
     private ItUserMapper itUserMapper;
     private ItUserMapper itUserMapper;
+    @Autowired
+    private TokenConfig tokenConfig;
 
 
     @Test
     @Test
     public void testSelect() {
     public void testSelect() {
@@ -22,4 +26,17 @@ public class SampleTest {
         userList.forEach(System.out::println);
         userList.forEach(System.out::println);
     }
     }
 
 
+    @Test
+    public void testUserLogin() {
+        ItUserLoginInfoVo itUserLoginVo = itUserMapper.selectItUserLoginInfo("test02", "789456");
+        System.out.println(itUserLoginVo);
+    }
+
+    @Test
+    public void testGetSecret() {
+        System.out.println(tokenConfig.getSecret());
+        System.out.println(tokenConfig.getHeader());
+        System.out.println(tokenConfig.getExpire());
+    }
+
 }
 }