commit

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysConfigController.java

@@ -0,0 +1,124 @@
+package com.jsowell.web.controller.system;
+
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.system.domain.SysConfig;
+import com.jsowell.system.service.SysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController {
+	@Autowired
+	private SysConfigService configService;
+
+	/**
+	 * 获取参数配置列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:config:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysConfig config) {
+		startPage();
+		List<SysConfig> list = configService.selectConfigList(config);
+		return getDataTable(list);
+	}
+
+	@Log(title = "参数管理", businessType = BusinessType.EXPORT)
+	@PreAuthorize("@ss.hasPermi('system:config:export')")
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SysConfig config) {
+		List<SysConfig> list = configService.selectConfigList(config);
+		ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+		util.exportExcel(response, list, "参数数据");
+	}
+
+	/**
+	 * 根据参数编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:config:query')")
+	@GetMapping(value = "/{configId}")
+	public AjaxResult getInfo(@PathVariable Long configId) {
+		return AjaxResult.success(configService.selectConfigById(configId));
+	}
+
+	/**
+	 * 根据参数键名查询参数值
+	 */
+	@GetMapping(value = "/configKey/{configKey}")
+	public AjaxResult getConfigKey(@PathVariable String configKey) {
+		return AjaxResult.success(configService.selectConfigByKey(configKey));
+	}
+
+	/**
+	 * 新增参数配置
+	 */
+	@PreAuthorize("@ss.hasPermi('system:config:add')")
+	@Log(title = "参数管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysConfig config) {
+		if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+			return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+		}
+		config.setCreateBy(getUsername());
+		return toAjax(configService.insertConfig(config));
+	}
+
+	/**
+	 * 修改参数配置
+	 */
+	@PreAuthorize("@ss.hasPermi('system:config:edit')")
+	@Log(title = "参数管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysConfig config) {
+		if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+			return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+		}
+		config.setUpdateBy(getUsername());
+		return toAjax(configService.updateConfig(config));
+	}
+
+	/**
+	 * 删除参数配置
+	 */
+	@PreAuthorize("@ss.hasPermi('system:config:remove')")
+	@Log(title = "参数管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{configIds}")
+	public AjaxResult remove(@PathVariable Long[] configIds) {
+		configService.deleteConfigByIds(configIds);
+		return success();
+	}
+
+	/**
+	 * 刷新参数缓存
+	 */
+	@PreAuthorize("@ss.hasPermi('system:config:remove')")
+	@Log(title = "参数管理", businessType = BusinessType.CLEAN)
+	@DeleteMapping("/refreshCache")
+	public AjaxResult refreshCache() {
+		configService.resetConfigCache();
+		return AjaxResult.success();
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysDeptController.java

@@ -0,0 +1,140 @@
+package com.jsowell.web.controller.system;
+
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysDept;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.system.service.SysDeptService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * 部门信息
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController {
+	@Autowired
+	private SysDeptService deptService;
+
+	/**
+	 * 获取部门列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dept:list')")
+	@GetMapping("/list")
+	public AjaxResult list(SysDept dept) {
+		List<SysDept> depts = deptService.selectDeptList(dept);
+		return AjaxResult.success(depts);
+	}
+
+	/**
+	 * 查询部门列表（排除节点）
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dept:list')")
+	@GetMapping("/list/exclude/{deptId}")
+	public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+		List<SysDept> depts = deptService.selectDeptList(new SysDept());
+		Iterator<SysDept> it = depts.iterator();
+		while (it.hasNext()) {
+			SysDept d = (SysDept) it.next();
+			if (d.getDeptId().intValue() == deptId
+					|| ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) {
+				it.remove();
+			}
+		}
+		return AjaxResult.success(depts);
+	}
+
+	/**
+	 * 根据部门编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dept:query')")
+	@GetMapping(value = "/{deptId}")
+	public AjaxResult getInfo(@PathVariable Long deptId) {
+		deptService.checkDeptDataScope(deptId);
+		return AjaxResult.success(deptService.selectDeptById(deptId));
+	}
+
+	/**
+	 * 获取部门下拉树列表
+	 */
+	@GetMapping("/treeselect")
+	public AjaxResult treeselect(SysDept dept) {
+		List<SysDept> depts = deptService.selectDeptList(dept);
+		return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+	}
+
+	/**
+	 * 加载对应角色部门列表树
+	 */
+	@GetMapping(value = "/roleDeptTreeselect/{roleId}")
+	public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
+		List<SysDept> depts = deptService.selectDeptList(new SysDept());
+		AjaxResult ajax = AjaxResult.success();
+		ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+		ajax.put("depts", deptService.buildDeptTreeSelect(depts));
+		return ajax;
+	}
+
+	/**
+	 * 新增部门
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dept:add')")
+	@Log(title = "部门管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysDept dept) {
+		if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
+			return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+		}
+		dept.setCreateBy(getUsername());
+		return toAjax(deptService.insertDept(dept));
+	}
+
+	/**
+	 * 修改部门
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dept:edit')")
+	@Log(title = "部门管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysDept dept) {
+		Long deptId = dept.getDeptId();
+		deptService.checkDeptDataScope(deptId);
+		if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
+			return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+		} else if (dept.getParentId().equals(deptId)) {
+			return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+		} else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+			return AjaxResult.error("该部门包含未停用的子部门！");
+		}
+		dept.setUpdateBy(getUsername());
+		return toAjax(deptService.updateDept(dept));
+	}
+
+	/**
+	 * 删除部门
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dept:remove')")
+	@Log(title = "部门管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deptId}")
+	public AjaxResult remove(@PathVariable Long deptId) {
+		if (deptService.hasChildByDeptId(deptId)) {
+			return AjaxResult.error("存在下级部门,不允许删除");
+		}
+		if (deptService.checkDeptExistUser(deptId)) {
+			return AjaxResult.error("部门存在用户,不允许删除");
+		}
+		deptService.checkDeptDataScope(deptId);
+		return toAjax(deptService.deleteDeptById(deptId));
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysDictDataController.java

@@ -0,0 +1,113 @@
+package com.jsowell.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysDictData;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.system.service.SysDictDataService;
+import com.jsowell.system.service.SysDictTypeService;
+
+/**
+ * 数据字典信息
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController {
+	@Autowired
+	private SysDictDataService dictDataService;
+
+	@Autowired
+	private SysDictTypeService dictTypeService;
+
+	@PreAuthorize("@ss.hasPermi('system:dict:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysDictData dictData) {
+		startPage();
+		List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+		return getDataTable(list);
+	}
+
+	@Log(title = "字典数据", businessType = BusinessType.EXPORT)
+	@PreAuthorize("@ss.hasPermi('system:dict:export')")
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SysDictData dictData) {
+		List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+		ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+		util.exportExcel(response, list, "字典数据");
+	}
+
+	/**
+	 * 查询字典数据详细
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:query')")
+	@GetMapping(value = "/{dictCode}")
+	public AjaxResult getInfo(@PathVariable Long dictCode) {
+		return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+	}
+
+	/**
+	 * 根据字典类型查询字典数据信息
+	 */
+	@GetMapping(value = "/type/{dictType}")
+	public AjaxResult dictType(@PathVariable String dictType) {
+		List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+		if (StringUtils.isNull(data)) {
+			data = new ArrayList<SysDictData>();
+		}
+		return AjaxResult.success(data);
+	}
+
+	/**
+	 * 新增字典类型
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:add')")
+	@Log(title = "字典数据", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysDictData dict) {
+		dict.setCreateBy(getUsername());
+		return toAjax(dictDataService.insertDictData(dict));
+	}
+
+	/**
+	 * 修改保存字典类型
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:edit')")
+	@Log(title = "字典数据", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
+		dict.setUpdateBy(getUsername());
+		return toAjax(dictDataService.updateDictData(dict));
+	}
+
+	/**
+	 * 删除字典类型
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:remove')")
+	@Log(title = "字典类型", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{dictCodes}")
+	public AjaxResult remove(@PathVariable Long[] dictCodes) {
+		dictDataService.deleteDictDataByIds(dictCodes);
+		return success();
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysDictTypeController.java

@@ -0,0 +1,122 @@
+package com.jsowell.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysDictType;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.system.service.SysDictTypeService;
+
+/**
+ * 数据字典信息
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController {
+	@Autowired
+	private SysDictTypeService dictTypeService;
+
+	@PreAuthorize("@ss.hasPermi('system:dict:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysDictType dictType) {
+		startPage();
+		List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+		return getDataTable(list);
+	}
+
+	@Log(title = "字典类型", businessType = BusinessType.EXPORT)
+	@PreAuthorize("@ss.hasPermi('system:dict:export')")
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SysDictType dictType) {
+		List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+		ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+		util.exportExcel(response, list, "字典类型");
+	}
+
+	/**
+	 * 查询字典类型详细
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:query')")
+	@GetMapping(value = "/{dictId}")
+	public AjaxResult getInfo(@PathVariable Long dictId) {
+		return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+	}
+
+	/**
+	 * 新增字典类型
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:add')")
+	@Log(title = "字典类型", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysDictType dict) {
+		if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
+			return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+		}
+		dict.setCreateBy(getUsername());
+		return toAjax(dictTypeService.insertDictType(dict));
+	}
+
+	/**
+	 * 修改字典类型
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:edit')")
+	@Log(title = "字典类型", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysDictType dict) {
+		if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) {
+			return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+		}
+		dict.setUpdateBy(getUsername());
+		return toAjax(dictTypeService.updateDictType(dict));
+	}
+
+	/**
+	 * 删除字典类型
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:remove')")
+	@Log(title = "字典类型", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{dictIds}")
+	public AjaxResult remove(@PathVariable Long[] dictIds) {
+		dictTypeService.deleteDictTypeByIds(dictIds);
+		return success();
+	}
+
+	/**
+	 * 刷新字典缓存
+	 */
+	@PreAuthorize("@ss.hasPermi('system:dict:remove')")
+	@Log(title = "字典类型", businessType = BusinessType.CLEAN)
+	@DeleteMapping("/refreshCache")
+	public AjaxResult refreshCache() {
+		dictTypeService.resetDictCache();
+		return AjaxResult.success();
+	}
+
+	/**
+	 * 获取字典选择框列表
+	 */
+	@GetMapping("/optionselect")
+	public AjaxResult optionselect() {
+		List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+		return AjaxResult.success(dictTypes);
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysIndexController.java

@@ -0,0 +1,29 @@
+package com.jsowell.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.config.JsowellConfig;
+import com.jsowell.common.util.StringUtils;
+
+/**
+ * 首页
+ *
+ * @author jsowell
+ */
+@RestController
+public class SysIndexController {
+	/**
+	 * 系统基础配置
+	 */
+	@Autowired
+	private JsowellConfig jsowellConfig;
+
+	/**
+	 * 访问首页，提示语
+	 */
+	@RequestMapping("/")
+	public String index() {
+		return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", jsowellConfig.getName(), jsowellConfig.getVersion());
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysLoginController.java

@@ -0,0 +1,90 @@
+package com.jsowell.web.controller.system;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.jsowell.common.constant.Constants;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysMenu;
+import com.jsowell.common.core.domain.entity.SysUser;
+import com.jsowell.common.core.domain.model.LoginBody;
+import com.jsowell.common.util.SecurityUtils;
+import com.jsowell.framework.web.service.SysLoginService;
+import com.jsowell.framework.web.service.SysPermissionService;
+import com.jsowell.system.service.SysMenuService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 登录验证
+ *
+ * @author jsowell
+ */
+@RestController
+public class SysLoginController {
+    Logger logs = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private SysMenuService menuService;
+
+    @Autowired
+    private SysPermissionService permissionService;
+
+    /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/login")
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
+        logs.info("登录param：{}", JSONObject.toJSONString(loginBody));
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        logs.info("登录 result:{}", ajax.toString());
+        return ajax;
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("getInfo")
+    public AjaxResult getInfo() {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(user);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(user);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("user" , user);
+        ajax.put("roles" , roles);
+        ajax.put("permissions" , permissions);
+        return ajax;
+    }
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters() {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        logs.info("获取路由信息userId:{}, menus:{}, 菜单数量:{}", userId, menus, menus.size());
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysMenuController.java

@@ -0,0 +1,125 @@
+package com.jsowell.web.controller.system;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysMenu;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.system.service.SysMenuService;
+
+/**
+ * 菜单信息
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController {
+	@Autowired
+	private SysMenuService menuService;
+
+	/**
+	 * 获取菜单列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:menu:list')")
+	@GetMapping("/list")
+	public AjaxResult list(SysMenu menu) {
+		List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+		return AjaxResult.success(menus);
+	}
+
+	/**
+	 * 根据菜单编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:menu:query')")
+	@GetMapping(value = "/{menuId}")
+	public AjaxResult getInfo(@PathVariable Long menuId) {
+		return AjaxResult.success(menuService.selectMenuById(menuId));
+	}
+
+	/**
+	 * 获取菜单下拉树列表
+	 */
+	@GetMapping("/treeselect")
+	public AjaxResult treeselect(SysMenu menu) {
+		List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+		return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+	}
+
+	/**
+	 * 加载对应角色菜单列表树
+	 */
+	@GetMapping(value = "/roleMenuTreeselect/{roleId}")
+	public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+		List<SysMenu> menus = menuService.selectMenuList(getUserId());
+		AjaxResult ajax = AjaxResult.success();
+		ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+		ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+		return ajax;
+	}
+
+	/**
+	 * 新增菜单
+	 */
+	@PreAuthorize("@ss.hasPermi('system:menu:add')")
+	@Log(title = "菜单管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysMenu menu) {
+		if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
+			return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+		} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.isHttp(menu.getPath())) {
+			return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+		}
+		menu.setCreateBy(getUsername());
+		return toAjax(menuService.insertMenu(menu));
+	}
+
+	/**
+	 * 修改菜单
+	 */
+	@PreAuthorize("@ss.hasPermi('system:menu:edit')")
+	@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
+		if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) {
+			return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+		} else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.isHttp(menu.getPath())) {
+			return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+		} else if (menu.getMenuId().equals(menu.getParentId())) {
+			return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+		}
+		menu.setUpdateBy(getUsername());
+		return toAjax(menuService.updateMenu(menu));
+	}
+
+	/**
+	 * 删除菜单
+	 */
+	@PreAuthorize("@ss.hasPermi('system:menu:remove')")
+	@Log(title = "菜单管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{menuId}")
+	public AjaxResult remove(@PathVariable("menuId") Long menuId) {
+		if (menuService.hasChildByMenuId(menuId)) {
+			return AjaxResult.error("存在子菜单,不允许删除");
+		}
+		if (menuService.checkMenuExistRole(menuId)) {
+			return AjaxResult.error("菜单已分配,不允许删除");
+		}
+		return toAjax(menuService.deleteMenuById(menuId));
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysNoticeController.java

@@ -0,0 +1,86 @@
+package com.jsowell.web.controller.system;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.system.domain.SysNotice;
+import com.jsowell.system.service.SysNoticeService;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController {
+	@Autowired
+	private SysNoticeService noticeService;
+
+	/**
+	 * 获取通知公告列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:notice:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysNotice notice) {
+		startPage();
+		List<SysNotice> list = noticeService.selectNoticeList(notice);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 根据通知公告编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:notice:query')")
+	@GetMapping(value = "/{noticeId}")
+	public AjaxResult getInfo(@PathVariable Long noticeId) {
+		return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+	}
+
+	/**
+	 * 新增通知公告
+	 */
+	@PreAuthorize("@ss.hasPermi('system:notice:add')")
+	@Log(title = "通知公告", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysNotice notice) {
+		notice.setCreateBy(getUsername());
+		return toAjax(noticeService.insertNotice(notice));
+	}
+
+	/**
+	 * 修改通知公告
+	 */
+	@PreAuthorize("@ss.hasPermi('system:notice:edit')")
+	@Log(title = "通知公告", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
+		notice.setUpdateBy(getUsername());
+		return toAjax(noticeService.updateNotice(notice));
+	}
+
+	/**
+	 * 删除通知公告
+	 */
+	@PreAuthorize("@ss.hasPermi('system:notice:remove')")
+	@Log(title = "通知公告", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{noticeIds}")
+	public AjaxResult remove(@PathVariable Long[] noticeIds) {
+		return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysPostController.java

@@ -0,0 +1,117 @@
+package com.jsowell.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.system.domain.SysPost;
+import com.jsowell.system.service.SysPostService;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController {
+	@Autowired
+	private SysPostService postService;
+
+	/**
+	 * 获取岗位列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:post:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysPost post) {
+		startPage();
+		List<SysPost> list = postService.selectPostList(post);
+		return getDataTable(list);
+	}
+
+	@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+	@PreAuthorize("@ss.hasPermi('system:post:export')")
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SysPost post) {
+		List<SysPost> list = postService.selectPostList(post);
+		ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+		util.exportExcel(response, list, "岗位数据");
+	}
+
+	/**
+	 * 根据岗位编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:post:query')")
+	@GetMapping(value = "/{postId}")
+	public AjaxResult getInfo(@PathVariable Long postId) {
+		return AjaxResult.success(postService.selectPostById(postId));
+	}
+
+	/**
+	 * 新增岗位
+	 */
+	@PreAuthorize("@ss.hasPermi('system:post:add')")
+	@Log(title = "岗位管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysPost post) {
+		if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
+			return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+		} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
+			return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+		}
+		post.setCreateBy(getUsername());
+		return toAjax(postService.insertPost(post));
+	}
+
+	/**
+	 * 修改岗位
+	 */
+	@PreAuthorize("@ss.hasPermi('system:post:edit')")
+	@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysPost post) {
+		if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) {
+			return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+		} else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) {
+			return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+		}
+		post.setUpdateBy(getUsername());
+		return toAjax(postService.updatePost(post));
+	}
+
+	/**
+	 * 删除岗位
+	 */
+	@PreAuthorize("@ss.hasPermi('system:post:remove')")
+	@Log(title = "岗位管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{postIds}")
+	public AjaxResult remove(@PathVariable Long[] postIds) {
+		return toAjax(postService.deletePostByIds(postIds));
+	}
+
+	/**
+	 * 获取岗位选择框列表
+	 */
+	@GetMapping("/optionselect")
+	public AjaxResult optionselect() {
+		List<SysPost> posts = postService.selectPostAll();
+		return AjaxResult.success(posts);
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysProfileController.java

@@ -0,0 +1,131 @@
+package com.jsowell.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.config.JsowellConfig;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysUser;
+import com.jsowell.common.core.domain.model.LoginUser;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.SecurityUtils;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.file.FileUploadUtils;
+import com.jsowell.common.util.file.MimeTypeUtils;
+import com.jsowell.framework.web.service.TokenService;
+import com.jsowell.system.service.SysUserService;
+
+/**
+ * 个人信息 业务处理
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController {
+	@Autowired
+	private SysUserService userService;
+
+	@Autowired
+	private TokenService tokenService;
+
+	/**
+	 * 个人信息
+	 */
+	@GetMapping
+	public AjaxResult profile() {
+		LoginUser loginUser = getLoginUser();
+		SysUser user = loginUser.getUser();
+		AjaxResult ajax = AjaxResult.success(user);
+		ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+		ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+		return ajax;
+	}
+
+	/**
+	 * 修改用户
+	 */
+	@Log(title = "个人信息", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult updateProfile(@RequestBody SysUser user) {
+		LoginUser loginUser = getLoginUser();
+		SysUser sysUser = loginUser.getUser();
+		user.setUserName(sysUser.getUserName());
+		if (StringUtils.isNotEmpty(user.getPhone())
+				&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+		}
+		if (StringUtils.isNotEmpty(user.getEmail())
+				&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+		}
+		user.setUserId(sysUser.getUserId());
+		user.setPassword(null);
+		user.setAvatar(null);
+		user.setDeptId(null);
+		if (userService.updateUserProfile(user) > 0) {
+			// 更新缓存用户信息
+			sysUser.setNickName(user.getNickName());
+			sysUser.setPhone(user.getPhone());
+			sysUser.setEmail(user.getEmail());
+			sysUser.setSex(user.getSex());
+			tokenService.setLoginUser(loginUser);
+			return AjaxResult.success();
+		}
+		return AjaxResult.error("修改个人信息异常，请联系管理员");
+	}
+
+	/**
+	 * 重置密码
+	 */
+	@Log(title = "个人信息", businessType = BusinessType.UPDATE)
+	@PutMapping("/updatePwd")
+	public AjaxResult updatePwd(String oldPassword, String newPassword) {
+		LoginUser loginUser = getLoginUser();
+		String userName = loginUser.getUsername();
+		String password = loginUser.getPassword();
+		if (!SecurityUtils.matchesPassword(oldPassword, password)) {
+			return AjaxResult.error("修改密码失败，旧密码错误");
+		}
+		if (SecurityUtils.matchesPassword(newPassword, password)) {
+			return AjaxResult.error("新密码不能与旧密码相同");
+		}
+		if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
+			// 更新缓存用户密码
+			loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+			tokenService.setLoginUser(loginUser);
+			return AjaxResult.success();
+		}
+		return AjaxResult.error("修改密码异常，请联系管理员");
+	}
+
+	/**
+	 * 头像上传
+	 */
+	@Log(title = "用户头像", businessType = BusinessType.UPDATE)
+	@PostMapping("/avatar")
+	public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception {
+		if (!file.isEmpty()) {
+			LoginUser loginUser = getLoginUser();
+			String avatar = FileUploadUtils.upload(JsowellConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+			if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
+				AjaxResult ajax = AjaxResult.success();
+				ajax.put("imgUrl", avatar);
+				// 更新缓存用户头像
+				loginUser.getUser().setAvatar(avatar);
+				tokenService.setLoginUser(loginUser);
+				return ajax;
+			}
+		}
+		return AjaxResult.error("上传图片异常，请联系管理员");
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysRegisterController.java

@@ -0,0 +1,35 @@
+package com.jsowell.web.controller.system;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.model.RegisterBody;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.framework.web.service.SysRegisterService;
+import com.jsowell.system.service.SysConfigService;
+
+/**
+ * 注册验证
+ *
+ * @author jsowell
+ */
+@RestController
+public class SysRegisterController extends BaseController {
+	@Autowired
+	private SysRegisterService registerService;
+
+	@Autowired
+	private SysConfigService configService;
+
+	@PostMapping("/register")
+	public AjaxResult register(@RequestBody RegisterBody user) {
+		if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
+			return error("当前系统没有开启注册功能！");
+		}
+		String msg = registerService.register(user);
+		return StringUtils.isEmpty(msg) ? success() : error(msg);
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysRoleController.java

@@ -0,0 +1,223 @@
+package com.jsowell.web.controller.system;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysRole;
+import com.jsowell.common.core.domain.entity.SysUser;
+import com.jsowell.common.core.domain.model.LoginUser;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.framework.web.service.SysPermissionService;
+import com.jsowell.framework.web.service.TokenService;
+import com.jsowell.system.domain.SysUserRole;
+import com.jsowell.system.service.SysRoleService;
+import com.jsowell.system.service.SysUserService;
+
+/**
+ * 角色信息
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController {
+	@Autowired
+	private SysRoleService roleService;
+
+	@Autowired
+	private TokenService tokenService;
+
+	@Autowired
+	private SysPermissionService permissionService;
+
+	@Autowired
+	private SysUserService userService;
+
+	@PreAuthorize("@ss.hasPermi('system:role:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysRole role) {
+		startPage();
+		List<SysRole> list = roleService.selectRoleList(role);
+		return getDataTable(list);
+	}
+
+	@Log(title = "角色管理", businessType = BusinessType.EXPORT)
+	@PreAuthorize("@ss.hasPermi('system:role:export')")
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SysRole role) {
+		List<SysRole> list = roleService.selectRoleList(role);
+		ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+		util.exportExcel(response, list, "角色数据");
+	}
+
+	/**
+	 * 根据角色编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:query')")
+	@GetMapping(value = "/{roleId}")
+	public AjaxResult getInfo(@PathVariable Long roleId) {
+		roleService.checkRoleDataScope(roleId);
+		return AjaxResult.success(roleService.selectRoleById(roleId));
+	}
+
+	/**
+	 * 新增角色
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:add')")
+	@Log(title = "角色管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysRole role) {
+		if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
+			return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+		} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
+			return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+		}
+		role.setCreateBy(getUsername());
+		return toAjax(roleService.insertRole(role));
+
+	}
+
+	/**
+	 * 修改保存角色
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:edit')")
+	@Log(title = "角色管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysRole role) {
+		roleService.checkRoleAllowed(role);
+		roleService.checkRoleDataScope(role.getRoleId());
+		if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
+			return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+		} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
+			return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+		}
+		role.setUpdateBy(getUsername());
+
+		if (roleService.updateRole(role) > 0) {
+			// 更新缓存用户权限
+			LoginUser loginUser = getLoginUser();
+			if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
+				loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+				loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+				tokenService.setLoginUser(loginUser);
+			}
+			return AjaxResult.success();
+		}
+		return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+	}
+
+	/**
+	 * 修改保存数据权限
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:edit')")
+	@Log(title = "角色管理", businessType = BusinessType.UPDATE)
+	@PutMapping("/dataScope")
+	public AjaxResult dataScope(@RequestBody SysRole role) {
+		roleService.checkRoleAllowed(role);
+		roleService.checkRoleDataScope(role.getRoleId());
+		return toAjax(roleService.authDataScope(role));
+	}
+
+	/**
+	 * 状态修改
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:edit')")
+	@Log(title = "角色管理", businessType = BusinessType.UPDATE)
+	@PutMapping("/changeStatus")
+	public AjaxResult changeStatus(@RequestBody SysRole role) {
+		roleService.checkRoleAllowed(role);
+		roleService.checkRoleDataScope(role.getRoleId());
+		role.setUpdateBy(getUsername());
+		return toAjax(roleService.updateRoleStatus(role));
+	}
+
+	/**
+	 * 删除角色
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:remove')")
+	@Log(title = "角色管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{roleIds}")
+	public AjaxResult remove(@PathVariable Long[] roleIds) {
+		return toAjax(roleService.deleteRoleByIds(roleIds));
+	}
+
+	/**
+	 * 获取角色选择框列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:query')")
+	@GetMapping("/optionselect")
+	public AjaxResult optionselect() {
+		return AjaxResult.success(roleService.selectRoleAll());
+	}
+
+	/**
+	 * 查询已分配用户角色列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:list')")
+	@GetMapping("/authUser/allocatedList")
+	public TableDataInfo allocatedList(SysUser user) {
+		startPage();
+		List<SysUser> list = userService.selectAllocatedList(user);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 查询未分配用户角色列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:list')")
+	@GetMapping("/authUser/unallocatedList")
+	public TableDataInfo unallocatedList(SysUser user) {
+		startPage();
+		List<SysUser> list = userService.selectUnallocatedList(user);
+		return getDataTable(list);
+	}
+
+	/**
+	 * 取消授权用户
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:edit')")
+	@Log(title = "角色管理", businessType = BusinessType.GRANT)
+	@PutMapping("/authUser/cancel")
+	public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
+		return toAjax(roleService.deleteAuthUser(userRole));
+	}
+
+	/**
+	 * 批量取消授权用户
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:edit')")
+	@Log(title = "角色管理", businessType = BusinessType.GRANT)
+	@PutMapping("/authUser/cancelAll")
+	public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
+		return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+	}
+
+	/**
+	 * 批量选择用户授权
+	 */
+	@PreAuthorize("@ss.hasPermi('system:role:edit')")
+	@Log(title = "角色管理", businessType = BusinessType.GRANT)
+	@PutMapping("/authUser/selectAll")
+	public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
+		roleService.checkRoleDataScope(roleId);
+		return toAjax(roleService.insertAuthUsers(roleId, userIds));
+	}
+}

jsowell-admin/src/main/java/com/jsowell/web/controller/system/SysUserController.java

@@ -0,0 +1,212 @@
+package com.jsowell.web.controller.system;
+
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.constant.UserConstants;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.core.domain.entity.SysRole;
+import com.jsowell.common.core.domain.entity.SysUser;
+import com.jsowell.common.core.page.TableDataInfo;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.common.util.SecurityUtils;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.system.service.SysPostService;
+import com.jsowell.system.service.SysRoleService;
+import com.jsowell.system.service.SysUserService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息
+ *
+ * @author jsowell
+ */
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController {
+	@Autowired
+	private SysUserService userService;
+
+	@Autowired
+	private SysRoleService roleService;
+
+	@Autowired
+	private SysPostService postService;
+
+	/**
+	 * 获取用户列表
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:list')")
+	@GetMapping("/list")
+	public TableDataInfo list(SysUser user) {
+		startPage();
+		List<SysUser> list = userService.selectUserList(user);
+		return getDataTable(list);
+	}
+
+	@Log(title = "用户管理", businessType = BusinessType.EXPORT)
+	@PreAuthorize("@ss.hasPermi('system:user:export')")
+	@PostMapping("/export")
+	public void export(HttpServletResponse response, SysUser user) {
+		List<SysUser> list = userService.selectUserList(user);
+		ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+		util.exportExcel(response, list, "用户数据");
+	}
+
+	@Log(title = "用户管理", businessType = BusinessType.IMPORT)
+	@PreAuthorize("@ss.hasPermi('system:user:import')")
+	@PostMapping("/importData")
+	public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+		ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+		List<SysUser> userList = util.importExcel(file.getInputStream());
+		String operName = getUsername();
+		String message = userService.importUser(userList, updateSupport, operName);
+		return AjaxResult.success(message);
+	}
+
+	@PostMapping("/importTemplate")
+	public void importTemplate(HttpServletResponse response) {
+		ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+		util.importTemplateExcel(response, "用户数据");
+	}
+
+	/**
+	 * 根据用户编号获取详细信息
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:query')")
+	@GetMapping(value = {"/", "/{userId}"})
+	public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+		userService.checkUserDataScope(userId);
+		AjaxResult ajax = AjaxResult.success();
+		List<SysRole> roles = roleService.selectRoleAll();
+		ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+		ajax.put("posts", postService.selectPostAll());
+		if (StringUtils.isNotNull(userId)) {
+			SysUser sysUser = userService.selectUserById(userId);
+			ajax.put(AjaxResult.DATA_TAG, sysUser);
+			ajax.put("postIds", postService.selectPostListByUserId(userId));
+			ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+		}
+		return ajax;
+	}
+
+	/**
+	 * 新增用户
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:add')")
+	@Log(title = "用户管理", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@Validated @RequestBody SysUser user) {
+		if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName()))) {
+			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+		} else if (StringUtils.isNotEmpty(user.getPhone())
+				&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+		} else if (StringUtils.isNotEmpty(user.getEmail())
+				&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+		}
+		user.setCreateBy(getUsername());
+		user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+		return toAjax(userService.insertUser(user));
+	}
+
+	/**
+	 * 修改用户
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:edit')")
+	@Log(title = "用户管理", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@Validated @RequestBody SysUser user) {
+		userService.checkUserAllowed(user);
+		userService.checkUserDataScope(user.getUserId());
+		if (StringUtils.isNotEmpty(user.getPhone())
+				&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+		} else if (StringUtils.isNotEmpty(user.getEmail())
+				&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+		}
+		user.setUpdateBy(getUsername());
+		return toAjax(userService.updateUser(user));
+	}
+
+	/**
+	 * 删除用户
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:remove')")
+	@Log(title = "用户管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+	public AjaxResult remove(@PathVariable Long[] userIds) {
+		if (ArrayUtils.contains(userIds, getUserId())) {
+			return error("当前用户不能删除");
+		}
+		return toAjax(userService.deleteUserByIds(userIds));
+	}
+
+	/**
+	 * 重置密码
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+	@Log(title = "用户管理", businessType = BusinessType.UPDATE)
+	@PutMapping("/resetPwd")
+	public AjaxResult resetPwd(@RequestBody SysUser user) {
+		userService.checkUserAllowed(user);
+		userService.checkUserDataScope(user.getUserId());
+		user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+		user.setUpdateBy(getUsername());
+		return toAjax(userService.resetPwd(user));
+	}
+
+	/**
+	 * 状态修改
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:edit')")
+	@Log(title = "用户管理", businessType = BusinessType.UPDATE)
+	@PutMapping("/changeStatus")
+	public AjaxResult changeStatus(@RequestBody SysUser user) {
+		userService.checkUserAllowed(user);
+		userService.checkUserDataScope(user.getUserId());
+		user.setUpdateBy(getUsername());
+		return toAjax(userService.updateUserStatus(user));
+	}
+
+	/**
+	 * 根据用户编号获取授权角色
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:query')")
+	@GetMapping("/authRole/{userId}")
+	public AjaxResult authRole(@PathVariable("userId") Long userId) {
+		AjaxResult ajax = AjaxResult.success();
+		SysUser user = userService.selectUserById(userId);
+		List<SysRole> roles = roleService.selectRolesByUserId(userId);
+		ajax.put("user", user);
+		ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+		return ajax;
+	}
+
+	/**
+	 * 用户授权角色
+	 */
+	@PreAuthorize("@ss.hasPermi('system:user:edit')")
+	@Log(title = "用户管理", businessType = BusinessType.GRANT)
+	@PutMapping("/authRole")
+	public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
+		userService.checkUserDataScope(userId);
+		userService.insertUserAuth(userId, roleIds);
+		return success();
+	}
+
+	public static void main(String[] args) {
+		System.out.println(SecurityUtils.encryptPassword("admin123"));
+	}
+}