From 21ffd0c9e83a9ac66c70b4155ba8baacc98fd783 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 17 Mar 2021 23:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.2=E3=80=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96admin=E8=BF=87=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E6=A0=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/listener/SuperAdminInitListener.java | 36 ---------- .../index/service/InitAdminService.java | 71 ------------------- .../system/login/LoginViewController.java | 41 ----------- .../system/organization/organization.js | 4 +- .../system/organization/organization_add.js | 4 +- .../system/organization/organization_edit.js | 4 +- .../webapp/assets/modular/system/user/user.js | 2 +- .../assets/modular/system/user/user_add.js | 2 +- .../assets/modular/system/user/user_edit.js | 2 +- src/main/webapp/pages/login.html | 2 +- 10 files changed, 10 insertions(+), 158 deletions(-) delete mode 100644 src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java delete mode 100644 src/main/java/cn/stylefeng/guns/modular/system/index/service/InitAdminService.java diff --git a/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java b/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java deleted file mode 100644 index 9e94ca4e..00000000 --- a/src/main/java/cn/stylefeng/guns/core/listener/SuperAdminInitListener.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.stylefeng.guns.core.listener; - -import cn.stylefeng.guns.core.consts.ProjectConstants; -import cn.stylefeng.guns.modular.system.index.service.InitAdminService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.core.Ordered; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 项目启动后初始化超级管理员 - * - * @author fengshuonan - * @date 2020/12/17 21:44 - */ -@Component -@Slf4j -public class SuperAdminInitListener implements ApplicationListener, Ordered { - - @Resource - private InitAdminService initAdminService; - - @Override - public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) { - initAdminService.initSuperAdmin(); - } - - @Override - public int getOrder() { - return ProjectConstants.SUPER_ADMIN_INIT_LISTENER_SORT; - } - -} diff --git a/src/main/java/cn/stylefeng/guns/modular/system/index/service/InitAdminService.java b/src/main/java/cn/stylefeng/guns/modular/system/index/service/InitAdminService.java deleted file mode 100644 index 0048c48e..00000000 --- a/src/main/java/cn/stylefeng/guns/modular/system/index/service/InitAdminService.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.stylefeng.guns.modular.system.index.service; - -import cn.stylefeng.guns.core.consts.ProjectConstants; -import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; -import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; -import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRole; -import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleResource; -import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleResourceService; -import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 初始化admin管理员的服务 - * - * @author fengshuonan - * @date 2020/12/17 21:56 - */ -@Service -public class InitAdminService { - - @Resource - private SysRoleService sysRoleService; - - @Resource - private SysResourceService sysResourceService; - - @Resource - private SysRoleResourceService sysRoleResourceService; - - /** - * 初始化超级管理员，超级管理员拥有最高权限 - * - * @author fengshuonan - * @date 2020/12/17 21:57 - */ - @Transactional(rollbackFor = Exception.class) - public void initSuperAdmin() { - - // 找到超级管理员的角色id - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysRole::getRoleCode, ProjectConstants.SUPER_ADMIN_ROLE_CODE); - SysRole superAdminRole = sysRoleService.getOne(queryWrapper); - - // 删除这个角色绑定的所有资源 - LambdaUpdateWrapper sysRoleResourceLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - sysRoleResourceLambdaUpdateWrapper.eq(SysRoleResource::getRoleId, superAdminRole.getRoleId()); - sysRoleResourceService.remove(sysRoleResourceLambdaUpdateWrapper); - - // 找到所有Resource，将所有资源赋给这个角色 - LambdaQueryWrapper sysResourceLambdaQueryWrapper = new LambdaQueryWrapper<>(); - sysResourceLambdaQueryWrapper.select(SysResource::getResourceCode); - List resources = sysResourceService.list(sysResourceLambdaQueryWrapper); - - ArrayList sysRoleResources = new ArrayList<>(); - for (SysResource resource : resources) { - SysRoleResource sysRoleResource = new SysRoleResource(); - sysRoleResource.setResourceCode(resource.getResourceCode()); - sysRoleResource.setRoleId(superAdminRole.getRoleId()); - sysRoleResources.add(sysRoleResource); - } - sysRoleResourceService.saveBatch(sysRoleResources, sysRoleResources.size()); - } - -} diff --git a/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java index 7cf7346b..dc00a1af 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java @@ -1,20 +1,9 @@ package cn.stylefeng.guns.modular.system.login; -import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; -import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginRequest; -import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginResponse; -import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; -import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; -import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; import org.springframework.stereotype.Controller; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.annotation.Resource; /** * 登录相关的界面渲染 @@ -26,9 +15,6 @@ import javax.annotation.Resource; @ApiResource(name = "登录相关的接口") public class LoginViewController { - @Resource - private AuthServiceApi authServiceApi; - /** * 登录界面 * @@ -44,31 +30,4 @@ public class LoginViewController { } } - /** - * 登录接口 - * - * @author fengshuonan - * @date 2020/12/27 17:10 - */ - @PostResource(name = "登录接口", path = "/loginAction", requiredPermission = false, requiredLogin = false) - @ResponseBody - public ResponseData loginAction(@RequestBody @Validated LoginRequest loginRequest) { - LoginResponse loginResponse = authServiceApi.login(loginRequest); - return new SuccessResponseData(loginResponse.getToken()); - } - - /** - * 用户登出 - * - * @return 登出成功 - * @author majianguo - * @date 2020/12/4 上午9:05 - */ - @PostResource(name = "登出接口", path = "/logout", requiredPermission = false) - @ResponseBody - public ResponseData logoutPage() { - authServiceApi.logout(); - return new SuccessResponseData(); - } - } diff --git a/src/main/webapp/assets/modular/system/organization/organization.js b/src/main/webapp/assets/modular/system/organization/organization.js index 5e9347ff..c59e31cb 100644 --- a/src/main/webapp/assets/modular/system/organization/organization.js +++ b/src/main/webapp/assets/modular/system/organization/organization.js @@ -61,7 +61,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel /* 渲染树形 */ function renderTree() { - $.get(Feng.ctxPath + '/hrOrganization/treeLayui', function (res) { + $.get(Feng.ctxPath + '/hrOrganization/tree', function (res) { tree.render({ elem: '#organizationTree', onlyIconControl: true, @@ -136,4 +136,4 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel return false; }); -}); \ No newline at end of file +}); diff --git a/src/main/webapp/assets/modular/system/organization/organization_add.js b/src/main/webapp/assets/modular/system/organization/organization_add.js index e81ff920..b9b15c24 100644 --- a/src/main/webapp/assets/modular/system/organization/organization_add.js +++ b/src/main/webapp/assets/modular/system/organization/organization_add.js @@ -7,7 +7,7 @@ layui.use(['form', 'admin', 'HttpRequest', 'xmSelect'], function () { var organizationXmSel; // 初始化组织树 - new HttpRequest(Feng.ctxPath + "/hrOrganization/treeLayui", 'get', function (data) { + new HttpRequest(Feng.ctxPath + "/hrOrganization/tree", 'get', function (data) { organizationXmSel = xmSelect.render({ el: '#organization', data: data.data, @@ -40,4 +40,4 @@ layui.use(['form', 'admin', 'HttpRequest', 'xmSelect'], function () { request.set(data.field); request.start(true); }); -}); \ No newline at end of file +}); diff --git a/src/main/webapp/assets/modular/system/organization/organization_edit.js b/src/main/webapp/assets/modular/system/organization/organization_edit.js index aef0c5eb..231d8147 100644 --- a/src/main/webapp/assets/modular/system/organization/organization_edit.js +++ b/src/main/webapp/assets/modular/system/organization/organization_edit.js @@ -13,7 +13,7 @@ layui.use(['form', 'admin', 'HttpRequest', 'xmSelect'], function () { form.val('organizationForm', result.data); // 初始化组织树 - new HttpRequest(Feng.ctxPath + "/hrOrganization/treeLayui", 'get', function (data) { + new HttpRequest(Feng.ctxPath + "/hrOrganization/tree", 'get', function (data) { console.log(result.data); organizationXmSel = xmSelect.render({ el: '#organization', @@ -49,4 +49,4 @@ layui.use(['form', 'admin', 'HttpRequest', 'xmSelect'], function () { request.set(data.field); request.start(true); }); -}); \ No newline at end of file +}); diff --git a/src/main/webapp/assets/modular/system/user/user.js b/src/main/webapp/assets/modular/system/user/user.js index 26c5c641..bce9b816 100644 --- a/src/main/webapp/assets/modular/system/user/user.js +++ b/src/main/webapp/assets/modular/system/user/user.js @@ -132,7 +132,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel /* 渲染树形 */ function renderTree() { - $.get(Feng.ctxPath + '/hrOrganization/treeLayui', function (res) { + $.get(Feng.ctxPath + '/hrOrganization/tree', function (res) { tree.render({ elem: '#organizationTree', onlyIconControl: true, diff --git a/src/main/webapp/assets/modular/system/user/user_add.js b/src/main/webapp/assets/modular/system/user/user_add.js index 4f3865cb..bdfb4123 100644 --- a/src/main/webapp/assets/modular/system/user/user_add.js +++ b/src/main/webapp/assets/modular/system/user/user_add.js @@ -9,7 +9,7 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func var positionXmSel; // 初始化组织树 - new HttpRequest(Feng.ctxPath + "/hrOrganization/treeLayui", 'get', function (data) { + new HttpRequest(Feng.ctxPath + "/hrOrganization/tree", 'get', function (data) { organizationXmSel = xmSelect.render({ el: '#organization', data: data.data, diff --git a/src/main/webapp/assets/modular/system/user/user_edit.js b/src/main/webapp/assets/modular/system/user/user_edit.js index 056d7a94..df476af1 100644 --- a/src/main/webapp/assets/modular/system/user/user_edit.js +++ b/src/main/webapp/assets/modular/system/user/user_edit.js @@ -26,7 +26,7 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func }).start(); // 初始化组织树 - new HttpRequest(Feng.ctxPath + "/hrOrganization/treeLayui", 'get', function (data) { + new HttpRequest(Feng.ctxPath + "/hrOrganization/tree", 'get', function (data) { organizationXmSel = xmSelect.render({ el: '#organization', data: data.data, diff --git a/src/main/webapp/pages/login.html b/src/main/webapp/pages/login.html index c007a111..e4a2d9ab 100644 --- a/src/main/webapp/pages/login.html +++ b/src/main/webapp/pages/login.html @@ -257,7 +257,7 @@ // 登录操作 form.on('submit(loginSubmit)', function (data){ admin.btnLoading('#loginSubmit',"登录中"); - var request = new HttpRequest(Feng.ctxPath + "/loginAction", 'post', function (data) { + var request = new HttpRequest(Feng.ctxPath + "/login", 'post', function (data) { // 清除顶部选择应用的缓存 index.clearTabCache(); // 重定向到首页