Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/lq/api/service/SysFileService.java

src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * Created by qi_liang on 2018/6/21.
+ * 日志事务实现类
  * @author qi
  */
 @Service

src/main/java/com/lq/cms/web/FileSystemController.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.util.Date;
 
 /**
- * Created by qi_liang on 2018/3/24.
+ *  @author qi
  *  文件系统控制类
  */
 

src/main/java/com/lq/cms/web/IndexController.java

@@ -34,7 +34,7 @@ import java.util.Date;
 import java.util.List;
 
 /** 首页控制类
- * Created by qi on 2017/8/20.
+ *  @author qi
  */
 @Controller("CmsIndexController")
 @RequestMapping("/cms")

src/main/java/com/lq/cms/web/UeditorController.java

@@ -12,6 +12,10 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 
+/**
+ * 富文本编辑器接口
+ * @author qi
+ */
 @Controller
 @RequestMapping("/ueditor")
 public class UeditorController {

src/main/java/com/lq/code/dao/BaseDao.java

@@ -40,26 +40,30 @@ public interface BaseDao<T> extends BaseMapper<T> {
 
 
     /**
-     *  删除一条数据
+     * 删除一条数据
      * @param id
+     * @return
      */
      int delete(@Param("id") Long id);
 
     /**
-     *  批量保存数据
+     * 批量保存数据
      * @param entitylist
+     * @return
      */
     int batchSave(List<T> entitylist);
 
     /**
-     *  批量更新数据
+     * 批量更新数据
      * @param entitylist
+     * @return
      */
      int batchUpdate(List<T> entitylist);
 
     /**
-     *  批量删除数据
+     * 批量删除数据
      * @param entitylist
+     * @return
      */
     int batchDelete(List<T> entitylist);
 

src/main/java/com/lq/code/interceptor/shiro/ShiroRealmNew.java

@@ -0,0 +1,53 @@
+package com.lq.code.interceptor.shiro;
+
+import com.lq.cms.service.SysRoleService;
+import com.lq.cms.service.SysUserService;
+import com.lq.entity.SysRole;
+import com.lq.entity.SysUser;
+import org.apache.shiro.authc.*;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 新版授权
+ * @author qi
+ */
+public class ShiroRealmNew extends AuthorizingRealm {
+
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private SysRoleService sysRoleService;
+
+
+
+    @Override
+    protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
+        SysUser sysUser=(SysUser)principalCollection.getPrimaryPrincipal();
+        //用户拥有的角色
+        List<SysRole> sysRoleList=sysRoleService.findByUserId(sysUser.getId());
+
+        return null;
+    }
+
+    @Override
+    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
+        SimpleAuthenticationInfo SimpleAuthenticationInfo = null;
+        UsernamePasswordToken token = (UsernamePasswordToken)authenticationToken;
+        String pass = new String(token.getPassword());
+        SysUser sysUser = sysUserService.findByLoginNameAndPassword(token.getUsername(),pass);
+        if (sysUser!=null) {
+            String realName = this.getName();
+            sysUser.setLastLoginTime(new Date());
+            sysUserService.update(sysUser);
+            SimpleAuthenticationInfo = new SimpleAuthenticationInfo(sysUser,pass,realName);
+        }
+        return SimpleAuthenticationInfo;
+    }
+}

src/main/java/com/lq/code/util/email/emailUtil2.java

@@ -6,7 +6,8 @@ import javax.mail.internet.MimeMessage;
 import java.util.Properties;
 
 /**
- * Created by qi_liang on 2018/3/17.
+ * 邮箱工具类
+ * @author qi
  */
 public class emailUtil2 {