增加权限,菜单...

Author: AaronVip

doc/sql/bing-upms.sql renamed to doc/sql/demo.sql

@@ -1,10 +1,6 @@
 /*
 Navicat MySQL Data Transfer
 
-Source Server         : CDB
-Source Server Version : 50628
-Source Host           : gz-cdb-qlqtn6j8.sql.tencentcdb.com:63816
-Source Database       : bing-upms
 
 Target Server Type    : MYSQL
 Target Server Version : 50628
@@ -135,8 +131,8 @@ CREATE TABLE `user` (
 -- Records of user
 -- ----------------------------
 INSERT INTO `user` VALUES ('2', 'test', 'test', 'd829b843a6550a947e82f2f38ed6b7a7', '123', '[email protected]', '1', '2017-09-13 09:40:18', '2017-09-13 09:40:20');
-INSERT INTO `user` VALUES ('115', 'qq', 'qq', '907bddcfaa59d96588f2cecd6df70e09', '1507637903315', 'XiaoBingBy@qq.com', '6', '2017-10-10 20:18:23', '2017-10-13 10:58:05');
-INSERT INTO `user` VALUES ('116', 'MM', 'MM', '00f1f98ac1894db39a46d8355d29ea6c', '1507794757173', 'XiaoBingBy@qq.com', '1', '2017-10-12 15:52:37', null);
+INSERT INTO `user` VALUES ('115', 'qq', 'qq', '907bddcfaa59d96588f2cecd6df70e09', '1507637903315', 'XiaoVictorBy@qq.com', '6', '2017-10-10 20:18:23', '2017-10-13 10:58:05');
+INSERT INTO `user` VALUES ('116', 'MM', 'MM', '00f1f98ac1894db39a46d8355d29ea6c', '1507794757173', 'XiaoVictorBy@qq.com', '1', '2017-10-12 15:52:37', null);
 INSERT INTO `user` VALUES ('117', '123', '123', '90904403cc3d56398f314cdc7aa71180', '1508422236752', '123123@qq', '1', '2017-10-19 22:10:37', null);
 
 -- ----------------------------

pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.7.RELEASE</version>
+		<version>1.5.9.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

src/main/java/com/victor/SpringbootMybatisShiroApplication.java

@@ -1,14 +1,16 @@
 package com.victor;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-
+import org.springframework.context.annotation.ComponentScan;
+@MapperScan({"com.victor.sys.mapper.*"})
 @SpringBootApplication
 public class SpringbootMybatisShiroApplication {
 
 
 	public static void main(String[] args) {
 		SpringApplication.run(SpringbootMybatisShiroApplication.class, args);
-		System.out.println("======== Spring Boot Success ========");
+		System.out.println("======== Spring Boot Success(成功) ========");
 	}
 }

src/main/java/com/victor/common/controller/BaseController.java

@@ -1,6 +1,6 @@
 package com.victor.common.controller;
 
-import org.apache.catalina.User;
+import com.victor.sys.entity.User;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import com.victor.common.result.JsonResult;
@@ -84,17 +84,17 @@ public String getCurrentLoginUsername() {
      */
     public Long getCurrentLoginId(){
         Subject currentUser = SecurityUtils.getSubject();
-       // User user = currentUser.getPrincipals().oneByType(User.class);
-        return null;
+        User user = currentUser.getPrincipals().oneByType(User.class);
+        return user.getId();
     }
 
     /**
      * 登录用户对象
      */
     public User getCurrentUser() {
         Subject currentUser = SecurityUtils.getSubject();
-       // User user = currentUser.getPrincipals().oneByType(User.class);
-        return null;
+       User user = currentUser.getPrincipals().oneByType(User.class);
+        return user;
     }
 
 }

src/main/java/com/victor/common/controller/PermissionController.java

@@ -3,10 +3,6 @@
 import java.util.Calendar;
 
 /**
- * Author: XiaoBingBy
- * Email: [email protected]
- * Date: 2017/9/1
- * Time: 00:00
  * Describe: 获取日期时间工具类
  */
 public class DateUtil {

src/main/java/com/victor/common/controller/RoleController.java

@@ -1,10 +1,5 @@
 package com.victor.common.utils;
-
 /**
- * Author: XiaoBingBy
- * Email: [email protected]
- * Date: 2017/9/1
- * Time: 00:00
  * Describe: String工具类
  */
 public class StringUtil {

src/main/java/com/victor/common/utils/DateUtil.java

@@ -11,7 +11,7 @@
  * Describe: MybatisPlus 配置 官方Demo
  */
 @Configuration
-@MapperScan({"com.victor.mapper*"})
+@MapperScan({"com.victor.sys.mapper.**"})
 public class MybatisPlusConfig {
 
     /**

src/main/java/com/victor/common/utils/StringUtil.java

@@ -47,12 +47,12 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)
         System.out.println("MyShiroRealm.doGetAuthenticationInfo()");
         //获取用户的输入的账号.
         String username = (String)token.getPrincipal();
-        System.out.println(token.getCredentials());
+        //System.out.println(token.getCredentials());
 
         //通过username从数据库中查找 User对象，如果找到，没找到.
         //实际项目中，这里可以根据实际情况做缓存，如果不做，Shiro自己也是有时间间隔机制，2分钟内不会重复执行该方法
         EntityWrapper<User> wrapper = new EntityWrapper<>();
-        wrapper.where("username = {0}",username);
+        wrapper.eq("username", username);
         User user = userService.selectOne(wrapper);
         System.out.println("----->>user="+user);
         if(user == null){
@@ -74,7 +74,7 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)
         SimpleAuthenticationInfo authenticationInfo = new SimpleAuthenticationInfo(
                 user, //用户名
                 user.getPassword(), //密码
-                ByteSource.Util.bytes(user.getGredentialsSat()),//salt=username+salt
+                ByteSource.Util.bytes(user.getSalt()),
                 getName()  //realm name
         );