From e0763ee1515356b5639b9d2269d376a11c7e908c Mon Sep 17 00:00:00 2001 From: coding_liang Date: Sat, 25 Feb 2023 23:55:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lyt/OnlineExamSystemApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/lyt/OnlineExamSystemApplication.java b/src/main/java/com/lyt/OnlineExamSystemApplication.java index e802991..732c12d 100644 --- a/src/main/java/com/lyt/OnlineExamSystemApplication.java +++ b/src/main/java/com/lyt/OnlineExamSystemApplication.java @@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class OnlineExamSystemApplication { public static void main(String[] args) { + // SpringApplication.run(OnlineExamSystemApplication.class, args); } -- Gitee From 22f597600f641ab5c580b98c4f91e6255843152b Mon Sep 17 00:00:00 2001 From: coding_liang Date: Sat, 25 Feb 2023 23:56:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lyt/OnlineExamSystemApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lyt/OnlineExamSystemApplication.java b/src/main/java/com/lyt/OnlineExamSystemApplication.java index 732c12d..659f2f8 100644 --- a/src/main/java/com/lyt/OnlineExamSystemApplication.java +++ b/src/main/java/com/lyt/OnlineExamSystemApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class OnlineExamSystemApplication { public static void main(String[] args) { - // + //测试一下 SpringApplication.run(OnlineExamSystemApplication.class, args); } -- Gitee From 31fd66a4895f4f34211872daf2fad7940b7e5a0f Mon Sep 17 00:00:00 2001 From: coding_liang Date: Sun, 26 Feb 2023 00:11:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..e69de29 -- Gitee From 2bf233b91554c3bc542df4ffa57275f9baae492e Mon Sep 17 00:00:00 2001 From: coding_liang Date: Mon, 27 Feb 2023 10:43:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test2.txt diff --git a/test2.txt b/test2.txt new file mode 100644 index 0000000..e69de29 -- Gitee From fd2e5b4e53c7db495e624fb3e4dfe132cab14fa9 Mon Sep 17 00:00:00 2001 From: coding_liang Date: Sun, 9 Apr 2023 14:26:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mybatis=E9=A9=BC=E5=B3=B0?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?User=E7=9A=84=E5=B1=9E=E6=80=A7=20bean=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=BE=85=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyt/JwtInterceptor/JwtInterceptor.java | 2 +- src/main/java/com/lyt/bean/User.java | 73 ++----------------- .../com/lyt/controller/LoginController.java | 17 +++-- .../java/com/lyt/controller/LoginJwt.java | 2 + .../com/lyt/controller/UserConteroller.java | 12 +-- src/main/java/com/lyt/dao/UserDao.java | 3 +- .../java/com/lyt/service/TokenService.java | 4 +- .../java/com/lyt/service/UserService.java | 20 ++--- src/main/resources/application.yml | 4 +- src/main/resources/mapper/UserMapper.xml | 4 +- .../lyt/OnlineExamSystemApplicationTests.java | 8 +- 11 files changed, 44 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/lyt/JwtInterceptor/JwtInterceptor.java b/src/main/java/com/lyt/JwtInterceptor/JwtInterceptor.java index 387f997..c8ded60 100644 --- a/src/main/java/com/lyt/JwtInterceptor/JwtInterceptor.java +++ b/src/main/java/com/lyt/JwtInterceptor/JwtInterceptor.java @@ -60,7 +60,7 @@ public class JwtInterceptor implements HandlerInterceptor { throw new RuntimeException("用户不存在，请重新登录"); } // 验证 token - JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(user.getPassWord2())).build(); + JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(user.getPassword())).build(); try { jwtVerifier.verify(token); } catch (JWTVerificationException e) { diff --git a/src/main/java/com/lyt/bean/User.java b/src/main/java/com/lyt/bean/User.java index e533db6..d7f2d3f 100644 --- a/src/main/java/com/lyt/bean/User.java +++ b/src/main/java/com/lyt/bean/User.java @@ -8,76 +8,13 @@ import lombok.NoArgsConstructor; @AllArgsConstructor //20203776梁业添 public class User { - private int id; + private String userId; private String username; + private String account; private String password; - private String email; - private String role; - private boolean state; + private String sex; + private String role_type; + private boolean deleted; - private String userID; - private String userName2; - private String passWord2; - public User() { - } - public int getId() { - return id; - } - - public String getUsername() { - return username; - } - - public String getPassword() { - return password; - } - - public boolean isState() { - return state; - } - - public String getEmail() { - return email; - } - - public String getRole() { - return role; - } - - public void setId(int id) { - this.id = id; - } - - public void setUsername(String username) { - this.username = username; - } - - public void setPassword(String password) { - this.password = password; - } - - public void setEmail(String email) { - this.email = email; - } - - public void setRole(String role) { - this.role = role; - } - - public void setState(boolean state) { - this.state = state; - } - - @Override - public String toString() { - return "User{" + - "id=" + id + - ", username='" + username + '\'' + - ", password='" + password + '\'' + - ", email='" + email + '\'' + - ", role='" + role + '\'' + - ", state=" + state + - '}'; - } } diff --git a/src/main/java/com/lyt/controller/LoginController.java b/src/main/java/com/lyt/controller/LoginController.java index 0b1811d..35667a8 100644 --- a/src/main/java/com/lyt/controller/LoginController.java +++ b/src/main/java/com/lyt/controller/LoginController.java @@ -17,13 +17,13 @@ public class LoginController { @CrossOrigin @RequestMapping("/login2") public String userLogin(@RequestBody User user) { - System.out.println("User : " + user); - String str = "error"; - int count = userDao.getUserByMassage(user.getUsername(), user.getPassword()); - if (count > 0) { - str = "ok"; - } - return str; +// System.out.println("User : " + user); +// String str = "error"; +// int count = userDao.getUserByMassage(user.getUsername(), user.getPassword()); +// if (count > 0) { +// str = "ok"; +// } + return null; } @@ -41,7 +41,8 @@ public class LoginController { public String userLoginTest(@RequestBody User user) { System.out.println("User : " + user); String str = "error"; - int count = userDao.getUserByMassage(user.getUsername(), user.getPassword()); +// int count = userDao.getUserByMassage(user.getUsername(), user.getPassword()); + int count = 0; if (count > 0) { str = "ok"; } diff --git a/src/main/java/com/lyt/controller/LoginJwt.java b/src/main/java/com/lyt/controller/LoginJwt.java index 709ad27..7ede194 100644 --- a/src/main/java/com/lyt/controller/LoginJwt.java +++ b/src/main/java/com/lyt/controller/LoginJwt.java @@ -6,6 +6,7 @@ import com.lyt.bean.User; import com.lyt.service.TokenService; import com.lyt.service.UserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ public class LoginJwt { @Autowired private TokenService tokenService; + @CrossOrigin @PostMapping("login") public Object login(String username, String password) { JSONObject jsonObject = new JSONObject(); diff --git a/src/main/java/com/lyt/controller/UserConteroller.java b/src/main/java/com/lyt/controller/UserConteroller.java index 881cffe..970572e 100644 --- a/src/main/java/com/lyt/controller/UserConteroller.java +++ b/src/main/java/com/lyt/controller/UserConteroller.java @@ -44,12 +44,12 @@ public class UserConteroller { @CrossOrigin @RequestMapping("/addUser") public String addUser(@RequestBody User user){ - System.out.println(user); - user.setRole("普通用户"); - user.setState(false); - int i = userDao.addUser(user); - String str = i >0?"success":"error"; - return str; +// System.out.println(user); +// user.setRole("普通用户"); +// user.setState(false); +// int i = userDao.addUser(user); +// String str = i >0?"success":"error"; + return ""; } @RequestMapping("/getUpdate") diff --git a/src/main/java/com/lyt/dao/UserDao.java b/src/main/java/com/lyt/dao/UserDao.java index 5a0a2ab..33ab0f2 100644 --- a/src/main/java/com/lyt/dao/UserDao.java +++ b/src/main/java/com/lyt/dao/UserDao.java @@ -17,6 +17,5 @@ public interface UserDao { public User getUpdateUser(int id); public int editUser(User user); public int deleteUser(int id); - - + public List getAll() ; } diff --git a/src/main/java/com/lyt/service/TokenService.java b/src/main/java/com/lyt/service/TokenService.java index f93677e..edb430b 100644 --- a/src/main/java/com/lyt/service/TokenService.java +++ b/src/main/java/com/lyt/service/TokenService.java @@ -17,9 +17,9 @@ public class TokenService { public String getToken(User user) { Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME); String token=""; - token= JWT.create().withAudience(user.getUserID()) // 将 user id 保存到 token 里面 + token= JWT.create().withAudience(user.getUserId()) // 将 user id 保存到 token 里面 .withExpiresAt(date) //五分钟后token过期 - .sign(Algorithm.HMAC256(user.getPassWord2())); // 以 password 作为 token 的密钥 + .sign(Algorithm.HMAC256(user.getPassword())); // 以 password 作为 token 的密钥 return token; } diff --git a/src/main/java/com/lyt/service/UserService.java b/src/main/java/com/lyt/service/UserService.java index fd8f443..324f0f5 100644 --- a/src/main/java/com/lyt/service/UserService.java +++ b/src/main/java/com/lyt/service/UserService.java @@ -8,11 +8,11 @@ public class UserService { public User getUser(String userid, String password){ if ("admin".equals(userid) && "admin".equals(password)){ - User user=new User(); - user.setUserID("admin"); - user.setUserName2("admin"); - user.setPassWord2("admin"); - return user; +// User user=new User(); +// user.setUserID("admin"); +// user.setUserName2("admin"); +// user.setPassWord2("admin"); + return null; } else{ return null; @@ -21,11 +21,11 @@ public class UserService { public User getUser(String userid){ if ("admin".equals(userid)){ - User user=new User(); - user.setUserID("admin"); - user.setUserName2("admin"); - user.setPassWord2("admin"); - return user; +// User user=new User(); +// user.setUserID("admin"); +// user.setUserName2("admin"); +// user.setPassWord2("admin"); + return null; } else{ return null; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6bf876e..8d7457a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,12 +4,14 @@ spring: datasource: #MySQL配置 driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/sport?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC + url: jdbc:mysql://localhost:3306/onlineexamsystem?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC username: root password: root mybatis: mapper-locations: classpath:mapper/*.xml type-aliases-package: com.example.demo.model + configuration: + map-underscore-to-camel-case: true server: port: 8090 \ No newline at end of file diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index 67ce2eb..2718497 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -7,7 +7,9 @@ SELECT count(id) FROM easyUser WHERE username=#{username} AND password=#{password} - +