diff --git a/pom.xml b/pom.xml
index 18c73d39e..aef4f5b15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
RuoYi
- 1.0.3
+ 1.0.4
jar
RuoYi
diff --git a/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/src/main/java/com/ruoyi/framework/config/DruidConfig.java
index fec773438..b6752338f 100644
--- a/src/main/java/com/ruoyi/framework/config/DruidConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/DruidConfig.java
@@ -123,9 +123,9 @@ public class DruidConfig
reg.setServlet(new StatViewServlet());
reg.addUrlMappings("/monitor/druid/*");
/** 白名单 */
- reg.addInitParameter("allow", "10.211.61.45,127.0.0.1,123.207.20.136");
+ // reg.addInitParameter("allow", "10.211.61.45,127.0.0.1,123.207.20.136");
/** IP黑名单(共同存在时,deny优先于allow) */
- reg.addInitParameter("deny", "10.211.61.4");
+ // reg.addInitParameter("deny", "10.211.61.4");
/** 是否能够重置数据 禁用HTML页面上的“Reset All”功能 */
reg.addInitParameter("resetEnable", "false");
return reg;
diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
index c5f25f0e9..86506e97b 100644
--- a/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
+++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
@@ -2,13 +2,16 @@ package com.ruoyi.framework.shiro.web.filter;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.lang3.StringUtils;
+
import org.apache.shiro.session.SessionException;
import org.apache.shiro.subject.Subject;
+
import com.ruoyi.common.constant.CommonConstant;
import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SystemLogUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.project.system.user.domain.User;
import lombok.extern.slf4j.Slf4j;
@@ -45,9 +48,13 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
String redirectUrl = getRedirectUrl(request, response, subject);
try
{
- String loginName = ShiroUtils.getLoginName();
- // 记录用户退出日志
- SystemLogUtils.log(loginName, CommonConstant.LOGOUT, MessageUtils.message("user.logout.success"));
+ User user = (User) ShiroUtils.getSubjct().getPrincipal();
+ if (StringUtils.isNotNull(user))
+ {
+ String loginName = user.getLoginName();
+ // 记录用户退出日志
+ SystemLogUtils.log(loginName, CommonConstant.LOGOUT, MessageUtils.message("user.logout.success"));
+ }
// 退出登录
subject.logout();
}
@@ -71,7 +78,7 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
protected String getRedirectUrl(ServletRequest request, ServletResponse response, Subject subject)
{
String url = getLoginUrl();
- if (StringUtils.isNoneBlank(url))
+ if (StringUtils.isNotEmpty(url))
{
return url;
}
diff --git a/src/main/java/com/ruoyi/project/system/dept/dao/IDeptDao.java b/src/main/java/com/ruoyi/project/system/dept/dao/IDeptDao.java
index be3368e0c..b09c166a8 100644
--- a/src/main/java/com/ruoyi/project/system/dept/dao/IDeptDao.java
+++ b/src/main/java/com/ruoyi/project/system/dept/dao/IDeptDao.java
@@ -14,13 +14,14 @@ public interface IDeptDao
* 新增部门管理
*
* @param dept 部门对象
+ * @return 结果
*/
public int insertDept(Dept dept);
/**
* 查询部门人数
*
- * @param parentId 部门ID
+ * @param dept 部门对象
* @return 结果
*/
public int selectDeptCount(Dept dept);
diff --git a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
index 289052ac0..8d502e1d5 100644
--- a/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
+++ b/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
@@ -16,6 +16,7 @@ public interface IDeptService
* 新增部门管理
*
* @param dept 部门对象
+ * @return 结果
*/
public int insertDept(Dept dept);
diff --git a/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java b/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
index 9d8f09b67..4177ff505 100644
--- a/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
+++ b/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
@@ -2,17 +2,15 @@ package com.ruoyi.project.system.menu.controller;
import java.util.List;
import java.util.Map;
-
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.project.system.menu.service.IMenuService;
+import com.ruoyi.project.system.role.domain.Role;
/**
* 角色信息
@@ -39,11 +37,11 @@ public class MenuController extends BaseController
/**
* 加载菜单列表树
*/
- @GetMapping("/treeData/{roleId}")
+ @GetMapping("/treeData")
@ResponseBody
- public List
+
+
+
+
+
diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html
index 44924bf46..8a091cc01 100644
--- a/src/main/resources/templates/system/dept/edit.html
+++ b/src/main/resources/templates/system/dept/edit.html
@@ -37,12 +37,11 @@
-
-
diff --git a/src/main/resources/templates/system/menu/menu.html b/src/main/resources/templates/system/menu/menu.html
new file mode 100644
index 000000000..30d74d258
--- /dev/null
+++ b/src/main/resources/templates/system/menu/menu.html
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/src/main/resources/templates/system/role/add.html b/src/main/resources/templates/system/role/add.html
new file mode 100644
index 000000000..b6797fcc1
--- /dev/null
+++ b/src/main/resources/templates/system/role/add.html
@@ -0,0 +1,64 @@
+
+
+
+