diff --git a/pom.xml b/pom.xml index 64913ab1b..11b44e76f 100644 --- a/pom.xml +++ b/pom.xml @@ -202,6 +202,13 @@ ruoyi-common ${ruoyi.version} + + + + com.ruoyi + ruoyi-fq + ${ruoyi.version} + @@ -213,6 +220,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + ruoyi-fq pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 6ce09fa62..da56746a0 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -78,6 +78,12 @@ com.ruoyi ruoyi-generator + + + + com.ruoyi + ruoyi-fq + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 0f7379d1a..bd0e31ea2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -1,22 +1,13 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import cn.hutool.core.util.ArrayUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysRole; @@ -24,6 +15,15 @@ import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 角色信息 @@ -236,7 +236,7 @@ public class SysRoleController extends BaseController /** * 查询已分配用户角色列表 */ - @RequiresPermissions("system:role:list") + //@RequiresPermissions("system:role:list") @PostMapping("/authUser/allocatedList") @ResponseBody public TableDataInfo allocatedList(SysUser user) @@ -278,6 +278,36 @@ public class SysRoleController extends BaseController return prefix + "/selectUser"; } + /** + * 选择用户 + * roleId 用户 + */ + @GetMapping("/authUser/selectUserCommon/{roleId}") + public String selectUserCommon(@PathVariable("roleId") Long roleId,ModelMap mmap) + { + mmap.put("role", roleService.selectRoleById(roleId)); + return prefix + "/selectUserCommon"; + } + + /** + * 选择用户 不包括roleIds + * roleId 用户 + */ + @GetMapping("/authUser/selectUserCommonExt/{roleIds}") + public String selectUserCommonExt(@PathVariable("roleIds") String roleIds,ModelMap mmap) + { + if(StringUtils.isNotEmpty(roleIds)){ + /*String[] strs = roleIds.split(","); + Long[] ls = new Long[strs.length]; + for (int i=0; i roles = roleService.selectRolesByUserId(userId); + List userRoles = userService.selectUserRoleByUserId(userId); mmap.put("user", user); - mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + mmap.put("userRoles", userRoles); return prefix + "/authRole"; } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d69c66d27..9dba969d6 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,10 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://49.234.16.218:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #url: jdbc:mysql://127.0.0.1:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: u)i0Gd=2QxY* # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ffa7945cb..07d869916 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -10,13 +10,14 @@ ruoyi: demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） profile: D:/ruoyi/uploadPath + #profile: /home/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 7777 servlet: # 应用的访问路径 context-path: / @@ -61,9 +62,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 15MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 30MB # 服务模块 devtools: restart: @@ -108,11 +109,9 @@ shiro: httpOnly: true # 设置Cookie的过期时间，天为单位 maxAge: 30 - # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）KeyGenerator keygen = KeyGenerator.getInstance("AES"); SecretKey deskey = keygen.generateKey(); System.out.println(Base64.encodeToString(deskey.getEncoded())); - cipherKey: zSyK5Kp6PZAAjlT+eeNMlg== session: # Session超时时间，-1代表永不过期（默认30分钟） - expireTime: 30 + expireTime: 60 # 同步session到数据库的周期（默认1分钟） dbSyncPeriod: 1 # 相隔多久检查一次session的有效性，默认就是10分钟 diff --git a/ruoyi-admin/src/main/resources/static/favicon.ico b/ruoyi-admin/src/main/resources/static/favicon.ico index 6f07782ab..e15fcb351 100644 Binary files a/ruoyi-admin/src/main/resources/static/favicon.ico and b/ruoyi-admin/src/main/resources/static/favicon.ico differ diff --git a/ruoyi-admin/src/main/resources/static/favicon.ico.bak b/ruoyi-admin/src/main/resources/static/favicon.ico.bak new file mode 100644 index 000000000..6f07782ab Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/favicon.ico.bak differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background.jpg b/ruoyi-admin/src/main/resources/static/img/login-background.jpg index adfa3f90c..2c48aac51 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/login-background.jpg and b/ruoyi-admin/src/main/resources/static/img/login-background.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background.jpg.bak b/ruoyi-admin/src/main/resources/static/img/login-background.jpg.bak new file mode 100644 index 000000000..adfa3f90c Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background.jpg.bak differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background2.jpg b/ruoyi-admin/src/main/resources/static/img/login-background2.jpg new file mode 100644 index 000000000..d964cdcdc Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background2.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background3.jpg b/ruoyi-admin/src/main/resources/static/img/login-background3.jpg new file mode 100644 index 000000000..93d7aed5f Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background3.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background4.jpg b/ruoyi-admin/src/main/resources/static/img/login-background4.jpg new file mode 100644 index 000000000..8c76f4383 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background4.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background6.jpg b/ruoyi-admin/src/main/resources/static/img/login-background6.jpg new file mode 100644 index 000000000..6a381bbfc Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/login-background6.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/profile.jpg b/ruoyi-admin/src/main/resources/static/img/profile.jpg index b3a940b21..d871daf5b 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/profile.jpg and b/ruoyi-admin/src/main/resources/static/img/profile.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/profile2.jpg b/ruoyi-admin/src/main/resources/static/img/profile2.jpg new file mode 100644 index 000000000..b3a940b21 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/profile2.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 9a0dd3b7e..91e8f05a7 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -1399,10 +1399,10 @@ var table = { $.modal.msgError("不能选择根节点（" + nodes[i].name + "）"); return false; } - if (nodes[i].isParent) { + /*if (nodes[i].isParent) { $.modal.msgError("不能选择父节点（" + nodes[i].name + "）"); return false; - } + }*/ } return true; }, diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index f96fca047..28f44ceb8 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + 系统首页 @@ -26,7 +26,7 @@
@@ -180,8 +180,10 @@