1

13693261870

2022-09-28 f88e25e5a60297d5db0adb6464732781b3bf9370

1

 .gitignore

@@ -33,3 +33,4 @@
.vscode/
/data/*.backup
/src.zip
/logs

 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;

 src/main/java/com/lf/server/controller/sys/SignController.java

文件名从 src/main/java/com/lf/server/controller/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();

 src/main/java/com/lf/server/entity/sys/LoginInfo.java

文件名从 src/main/java/com/lf/server/entity/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;

 src/main/java/com/lf/server/entity/sys/MyRealm.java

文件名从 src/main/java/com/lf/server/entity/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;

 src/main/java/com/lf/server/entity/sys/Result.java

文件名从 src/main/java/com/lf/server/entity/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

 src/main/java/com/lf/server/entity/sys/User.java

文件名从 src/main/java/com/lf/server/entity/User.java 修改
@@ -1,4 +1,4 @@
package com.lf.server.entity;
package com.lf.server.entity.sys;

import lombok.AllArgsConstructor;
import lombok.Data;

 src/main/java/com/lf/server/mapper/sys/UserMapper.java

文件名从 src/main/java/com/lf/server/mapper/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;


 src/main/java/com/lf/server/service/sys/UserService.java

文件名从 src/main/java/com/lf/server/service/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;


 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:

 src/main/resources/mapper/sys/UserMapper.xml

文件名从 src/main/resources/mapper/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>