From f88e25e5a60297d5db0adb6464732781b3bf9370 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 28 九月 2022 09:23:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/UserService.java | 8 ++--
src/main/java/com/lf/server/entity/sys/LoginInfo.java | 2
.gitignore | 1
src/main/java/com/lf/server/config/ShiroConfig.java | 3 -
src/main/java/com/lf/server/mapper/sys/UserMapper.java | 4 +-
src/main/resources/mapper/sys/UserMapper.xml | 4 +-
src/main/java/com/lf/server/controller/sys/SignController.java | 27 ++++++-------
src/main/java/com/lf/server/entity/sys/Result.java | 4 +
src/main/java/com/lf/server/entity/sys/MyRealm.java | 4 +-
src/main/java/com/lf/server/entity/sys/User.java | 2
src/main/resources/application.yml | 2
11 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3d6a2f0..5771591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
.vscode/
/data/*.backup
/src.zip
+/logs
diff --git a/src/main/java/com/lf/server/config/ShiroConfig.java b/src/main/java/com/lf/server/config/ShiroConfig.java
index ebe5401..7f45d4e 100644
--- a/src/main/java/com/lf/server/config/ShiroConfig.java
+++ b/src/main/java/com/lf/server/config/ShiroConfig.java
@@ -1,7 +1,7 @@
package com.lf.server.config;
import com.alibaba.druid.pool.DruidDataSource;
-import com.lf.server.entity.MyRealm;
+import com.lf.server.entity.sys.MyRealm;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
import org.apache.shiro.codec.Base64;
import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
@@ -14,7 +14,6 @@
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/com/lf/server/controller/SignController.java b/src/main/java/com/lf/server/controller/sys/SignController.java
similarity index 88%
rename from src/main/java/com/lf/server/controller/SignController.java
rename to src/main/java/com/lf/server/controller/sys/SignController.java
index f1f2d77..9a23ce9 100644
--- a/src/main/java/com/lf/server/controller/SignController.java
+++ b/src/main/java/com/lf/server/controller/sys/SignController.java
@@ -1,9 +1,9 @@
-package com.lf.server.controller;
+package com.lf.server.controller.sys;
-import com.lf.server.entity.LoginInfo;
-import com.lf.server.entity.Result;
-import com.lf.server.entity.User;
-import com.lf.server.service.UserService;
+import com.lf.server.entity.sys.LoginInfo;
+import com.lf.server.entity.sys.Result;
+import com.lf.server.entity.sys.User;
+import com.lf.server.service.sys.UserService;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.*;
import org.apache.shiro.subject.Subject;
@@ -22,7 +22,7 @@
@Autowired
UserService userService;
- @RequestMapping("/getName")
+ @GetMapping("/getName")
public User getName(String loginName) {
return userService.queryUserByName(loginName);
}
@@ -32,7 +32,7 @@
*
* @return String
*/
- @RequestMapping({"/", "/toIndex"})
+ @GetMapping({"/", "/toIndex"})
public ModelAndView toIndex(ModelAndView mv) {
mv.setViewName("index");
@@ -49,7 +49,7 @@
*
* @return String
*/
- @RequestMapping("/toLogin")
+ @GetMapping("/toLogin")
public ModelAndView toLogin(ModelAndView mv) {
mv.setViewName("login");
@@ -61,7 +61,7 @@
*
* @return String
*/
- @RequestMapping("/noauth")
+ @GetMapping("/noauth")
public ModelAndView toNoAuth(ModelAndView mv) {
mv.setViewName("noauth");
@@ -73,7 +73,7 @@
*
* @return String
*/
- @RequestMapping("/buy")
+ @GetMapping("/buy")
public String buy() {
Subject subject = SecurityUtils.getSubject();
@@ -90,7 +90,7 @@
*
* @return String
*/
- @RequestMapping("/login")
+ @GetMapping("/login")
public ModelAndView login(String username, String password, String service, Integer rememberMe) {
ModelAndView mv = new ModelAndView();
try {
@@ -127,7 +127,7 @@
*
* @return String
*/
- @RequestMapping("/logout")
+ @GetMapping("/logout")
public ModelAndView logout() {
Subject subject = SecurityUtils.getSubject();
subject.logout();
@@ -144,8 +144,7 @@
* @param userInfo
* @return
*/
- @ResponseBody
- @RequestMapping(value = "/ajaxLogin", method = RequestMethod.POST, produces = "application/json; charset=UTF-8")
+ @PostMapping(value = "/ajaxLogin", produces = "application/json; charset=UTF-8")
public Result ajaxLogin(@RequestBody User userInfo) {
try {
Subject subject = SecurityUtils.getSubject();
diff --git a/src/main/java/com/lf/server/entity/LoginInfo.java b/src/main/java/com/lf/server/entity/sys/LoginInfo.java
similarity index 97%
rename from src/main/java/com/lf/server/entity/LoginInfo.java
rename to src/main/java/com/lf/server/entity/sys/LoginInfo.java
index af083e1..f3e3c7b 100644
--- a/src/main/java/com/lf/server/entity/LoginInfo.java
+++ b/src/main/java/com/lf/server/entity/sys/LoginInfo.java
@@ -1,4 +1,4 @@
-package com.lf.server.entity;
+package com.lf.server.entity.sys;
import java.io.Serializable;
import java.util.Set;
diff --git a/src/main/java/com/lf/server/entity/MyRealm.java b/src/main/java/com/lf/server/entity/sys/MyRealm.java
similarity index 96%
rename from src/main/java/com/lf/server/entity/MyRealm.java
rename to src/main/java/com/lf/server/entity/sys/MyRealm.java
index 9b528a4..d95f47f 100644
--- a/src/main/java/com/lf/server/entity/MyRealm.java
+++ b/src/main/java/com/lf/server/entity/sys/MyRealm.java
@@ -1,6 +1,6 @@
-package com.lf.server.entity;
+package com.lf.server.entity.sys;
-import com.lf.server.service.UserService;
+import com.lf.server.service.sys.UserService;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.*;
import org.apache.shiro.authz.AuthorizationInfo;
diff --git a/src/main/java/com/lf/server/entity/Result.java b/src/main/java/com/lf/server/entity/sys/Result.java
similarity index 92%
rename from src/main/java/com/lf/server/entity/Result.java
rename to src/main/java/com/lf/server/entity/sys/Result.java
index 2f037d7..54fb254 100644
--- a/src/main/java/com/lf/server/entity/Result.java
+++ b/src/main/java/com/lf/server/entity/sys/Result.java
@@ -1,4 +1,6 @@
-package com.lf.server.entity;
+package com.lf.server.entity.sys;
+
+import com.lf.server.entity.sys.LoginInfo;
/**
* Result
diff --git a/src/main/java/com/lf/server/entity/User.java b/src/main/java/com/lf/server/entity/sys/User.java
similarity index 96%
rename from src/main/java/com/lf/server/entity/User.java
rename to src/main/java/com/lf/server/entity/sys/User.java
index ccd5368..f2c3ee1 100644
--- a/src/main/java/com/lf/server/entity/User.java
+++ b/src/main/java/com/lf/server/entity/sys/User.java
@@ -1,4 +1,4 @@
-package com.lf.server.entity;
+package com.lf.server.entity.sys;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/src/main/java/com/lf/server/mapper/UserMapper.java b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
similarity index 81%
rename from src/main/java/com/lf/server/mapper/UserMapper.java
rename to src/main/java/com/lf/server/mapper/sys/UserMapper.java
index af292d1..b64725b 100644
--- a/src/main/java/com/lf/server/mapper/UserMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
@@ -1,6 +1,6 @@
-package com.lf.server.mapper;
+package com.lf.server.mapper.sys;
-import com.lf.server.entity.User;
+import com.lf.server.entity.sys.User;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/lf/server/service/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
similarity index 85%
rename from src/main/java/com/lf/server/service/UserService.java
rename to src/main/java/com/lf/server/service/sys/UserService.java
index 9fa6550..9d3a767 100644
--- a/src/main/java/com/lf/server/service/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -1,8 +1,8 @@
-package com.lf.server.service;
+package com.lf.server.service.sys;
-import com.lf.server.entity.LoginInfo;
-import com.lf.server.entity.User;
-import com.lf.server.mapper.UserMapper;
+import com.lf.server.entity.sys.LoginInfo;
+import com.lf.server.entity.sys.User;
+import com.lf.server.mapper.sys.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3a439ed..7fff0f5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,7 +46,7 @@
mapper-locations: classpath:mapper/**/*.xml
logging:
- config: classpath:log/logback-spring.xml
+ config: classpath:logback-spring.xml
# RestTemplate config
remote:
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml
similarity index 82%
rename from src/main/resources/mapper/UserMapper.xml
rename to src/main/resources/mapper/sys/UserMapper.xml
index ac452ab..23ac2bf 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/sys/UserMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lf.server.mapper.UserMapper">
- <select id="queryUserByName" resultType="com.lf.server.entity.User">
+<mapper namespace="com.lf.server.mapper.sys.UserMapper">
+ <select id="queryUserByName" resultType="com.lf.server.entity.sys.User">
select userid,loginname,password from magbg.org_user where loginname=#{loginName}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3