diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js index 5ab7b12b9..3bce11af2 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/ruoyi-ui/src/api/system/user.js @@ -1,153 +1,176 @@ -import request from '@/utils/request' +import request from "@/utils/request"; import { praseStrEmpty } from "@/utils/ruoyi"; // 查询用户列表 export function listUser(query) { - return request({ - url: '/system/user/list', - method: 'get', - params: query - }) + return request({ + url: "/system/user/list", + method: "get", + params: query + }); } // 查询用户列表 export function listlrrUser(query) { - return request({ - url: '/system/user/lrrlist', - method: 'get', - params: query - }) + return request({ + url: "/system/user/lrrlist", + method: "get", + params: query + }); } // 查询用户详细 export function getUser(userId) { - return request({ - url: '/system/user/' + praseStrEmpty(userId), - method: 'get' - }) + return request({ + url: "/system/user/" + praseStrEmpty(userId), + method: "get" + }); } // 查询用户列表根据roleId export function getUsersByRoleId() { - return request({ - url: '/system/user/listbyroleid', - method: 'get' - }) + return request({ + url: "/system/user/listbyroleid", + method: "get" + }); } // 根据roleid查询用户列表 export function getUserOnlyByRoleId(roleId) { - return request({ - url: '/system/user/onlybyroleid/' + roleId, - method: 'get' - }) + return request({ + url: "/system/user/onlybyroleid/" + roleId, + method: "get" + }); } - // 新增用户 export function addUser(data) { - return request({ - url: '/system/user', - method: 'post', - data: data - }) + return request({ + url: "/system/user", + method: "post", + data: data + }); } // 修改用户 export function updateUser(data) { - return request({ - url: '/system/user', - method: 'put', - data: data - }) + return request({ + url: "/system/user", + method: "put", + data: data + }); } // 删除用户 export function delUser(userId) { - return request({ - url: '/system/user/' + userId, - method: 'delete' - }) + return request({ + url: "/system/user/" + userId, + method: "delete" + }); +} + +// 绑定微信 +export function bindwx(code) { + return request({ + url: "/system/user/bindwx/" + code, + method: "post" + }); +} + +// 是否已经绑定微信 +export function isbindwx() { + return request({ + url: "/system/user/isbindwx", + method: "get" + }); } // 导出用户 export function exportUser(query) { - return request({ - url: '/system/user/export', - method: 'get', - params: query - }) + return request({ + url: "/system/user/export", + method: "get", + params: query + }); } // 用户密码重置 export function resetUserPwd(userId, password) { - const data = { - userId, - password - } - return request({ - url: '/system/user/resetPwd', - method: 'put', - data: data - }) + const data = { + userId, + password + }; + return request({ + url: "/system/user/resetPwd", + method: "put", + data: data + }); } // 用户状态修改 export function changeUserStatus(userId, status) { - const data = { - userId, - status - } - return request({ - url: '/system/user/changeStatus', - method: 'put', - data: data - }) + const data = { + userId, + status + }; + return request({ + url: "/system/user/changeStatus", + method: "put", + data: data + }); } // 查询用户个人信息 export function getUserProfile() { - return request({ - url: '/system/user/profile', - method: 'get' - }) + return request({ + url: "/system/user/profile", + method: "get" + }); } // 修改用户个人信息 export function updateUserProfile(data) { - return request({ - url: '/system/user/profile', - method: 'put', - data: data - }) + return request({ + url: "/system/user/profile", + method: "put", + data: data + }); } // 用户密码重置 export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } - return request({ - url: '/system/user/profile/updatePwd', - method: 'put', - params: data - }) + const data = { + oldPassword, + newPassword + }; + return request({ + url: "/system/user/profile/updatePwd", + method: "put", + params: data + }); } // 用户头像上传 export function uploadAvatar(data) { - return request({ - url: '/system/user/profile/avatar', - method: 'post', - data: data - }) + return request({ + url: "/system/user/profile/avatar", + method: "post", + data: data + }); } // 下载用户导入模板 export function importTemplate() { - return request({ - url: '/system/user/importTemplate', - method: 'get' - }) -} \ No newline at end of file + return request({ + url: "/system/user/importTemplate", + method: "get" + }); +} + +// 登录方法 +export function wxlogin(code) { + return request({ + url: "/wxlogin/" + code, + method: "post" + }); +} diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 8fb1c6997..d640ec33b 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -42,6 +42,9 @@ 布局设置 + 退出登录 diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index ae4ca36a9..747452c68 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -22,7 +22,7 @@ NProgress.configure({ }) //const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] -const whiteList = ['/login', '/experience/apply/', '/experience/result/', '/experience/content/', '/benyi_child/child_preserve'] +const whiteList = ['/login','/wxlogin', '/experience/apply/', '/experience/result/', '/experience/content/', '/benyi_child/child_preserve'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index e27be8ace..e430ccb03 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -41,6 +41,12 @@ export const constantRoutes = [{ import ('@/views/login'), hidden: true }, + { + path: '/wxlogin', + component: () => + import ('@/views/wxlogin'), + hidden: true + }, { path: '/404', component: () => @@ -153,6 +159,22 @@ export const constantRoutes = [{ } }] }, + { + path: '/user/bind', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [{ + path: 'wx', + component: () => + import ('@/views/system/user/wx/index'), + name: 'Wx', + meta: { + title: '绑定微信', + icon: '' + } + }] + }, { path: '/user/change', component: Layout, @@ -165,7 +187,7 @@ export const constantRoutes = [{ name: 'Changedept', meta: { title: '切换岗位', - icon: 'user' + icon: '' } }] }, diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 468322bf2..5cf381b49 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -55,6 +55,7 @@ import RaddarChart from "./dashboard/RaddarChart"; import PieChart from "./dashboard/PieChart"; import BarChart from "./dashboard/BarChart"; import LineChart from "./dashboard/LineChart"; +import { bindwx, isbindwx, wxlogin } from "@/api/system/user"; //import { getSchoolCalendars } from "@/api/benyi/schoolcalendar"; //备用进行班级园历显示操作import { getSchoolCalendarsClass } from "@/api/benyi/schoolcalendarclass"; @@ -69,6 +70,7 @@ export default { }, data() { return { + code: "", calendarData: [], value: new Date(), // 查询参数 @@ -77,9 +79,31 @@ export default { }; }, created() { + this.code = this.$route.query.code; + //console.log(this.code); + this.bindWxInfo(); //this.getSchoolCalendarList(); }, methods: { + async bindWxInfo() { + await isbindwx().then((res) => { + if (this.code != "" && this.code != null && res.msg == "1") { + //console.log("绑定微信"); + this.$confirm("当前账号要绑定微信登录吗？", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + return bindwx(this.code); + }) + .then(() => { + this.msgSuccess("绑定成功"); + }) + .catch(function () {}); + } + }); + }, /** 查询园历列表 */ // getSchoolCalendarList() { // getSchoolCalendars(this.queryParams).then(response => { diff --git a/ruoyi-ui/src/views/system/user/wx/index.vue b/ruoyi-ui/src/views/system/user/wx/index.vue new file mode 100644 index 000000000..91cccffe2 --- /dev/null +++ b/ruoyi-ui/src/views/system/user/wx/index.vue @@ -0,0 +1,86 @@ + + + diff --git a/ruoyi-ui/src/views/wxlogin.vue b/ruoyi-ui/src/views/wxlogin.vue new file mode 100644 index 000000000..c08098721 --- /dev/null +++ b/ruoyi-ui/src/views/wxlogin.vue @@ -0,0 +1,39 @@ + + + \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index a05c525ac..0fde889b0 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -86,7 +86,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { // 过滤请求 .authorizeRequests() // 对于登录login 验证码captchaImage 允许匿名访问 - .antMatchers("/login", "/captchaImage").anonymous() + .antMatchers("/login","/wxlogin/**", "/captchaImage").anonymous() .antMatchers( HttpMethod.GET, "/*.html", diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java index 081bc4cd8..8cc2e6c43 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java @@ -102,4 +102,53 @@ public class SysLoginService { // 生成token return tokenService.createToken(loginUser); } + + /** + * 登录验证 + * + * @param username 用户名 + * @param password 密码 + * @return 结果 + */ + public String wxlogin(String username, String password) { + // 用户验证 + Authentication authentication = null; + try { + // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername + authentication = authenticationManager + .authenticate(new UsernamePasswordAuthenticationToken(username, password)); + } catch (Exception e) { + if (e instanceof BadCredentialsException) { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } else { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); + throw new CustomException(e.getMessage()); + } + } + + Collection keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*"); + List userOnlineList = new ArrayList(); + for (String key : keys) { + try { + LoginUser user = redisCache.getCacheObject(key); + if (StringUtils.isNotEmpty(username) && StringUtils.isNotNull(user.getUser())) { + if (StringUtils.equals(username, user.getUsername())) { + //存在已经登录用户，抛出异常 +// CustomException alreadyLoginExcep = new CustomException("该账号已在别处登陆", HttpStatus.ALREADY_LOGIN); +// alreadyLoginExcep.setObj(username); +// throw alreadyLoginExcep; + redisCache.deleteObject(key); + } + } + } catch (Exception e) { + } + } + + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); + LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + // 生成token + return tokenService.createToken(loginUser); + } + } diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java index 72dcf7a9c..95f7c14ac 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java @@ -3,14 +3,15 @@ package com.ruoyi.project.system.controller; import java.util.List; import java.util.Set; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.framework.redis.RedisCache; import com.ruoyi.project.system.domain.BySchool; import com.ruoyi.project.system.service.IBySchoolService; +import com.ruoyi.project.system.service.ISysUserService; 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 org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.framework.security.LoginBody; @@ -25,12 +26,20 @@ import com.ruoyi.project.system.service.ISysMenuService; /** * 登录验证 - * + * * @author ruoyi */ @RestController -public class SysLoginController -{ +public class SysLoginController { + @Value("${wx.appid}") + private String appid; + + @Value("${wx.secret}") + private String secret; + + @Value("${wx.domain}") + private String domain; + @Autowired private SysLoginService loginService; @@ -43,21 +52,24 @@ public class SysLoginController @Autowired private TokenService tokenService; + @Autowired + private ISysUserService userService; + + // @Autowired // private RedisCache redisCache; /** * 登录方法 - * + * * @param username 用户名 * @param password 密码 - * @param captcha 验证码 - * @param uuid 唯一标识 + * @param captcha 验证码 + * @param uuid 唯一标识 * @return 结果 */ @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody loginBody) - { + public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), @@ -66,6 +78,36 @@ public class SysLoginController return ajax; } + /** + * 登录方法 + * + * @return 结果 + */ + @PostMapping("/wxlogin/{code}") + public AjaxResult wxlogin(@PathVariable String code) { + AjaxResult ajax = AjaxResult.success(); + // 生成令牌 + String token = ""; + String url = domain; + String parmas = "appid=" + appid + "&secret=" + secret + "&code=" + code + "&grant_type=authorization_code"; + System.out.println(parmas); + String strResult = HttpUtils.sendGet(url, parmas); + JSONObject jsonObject = JSONObject.parseObject(strResult); + try { + String openId = jsonObject.get("openid").toString(); + SysUser sysUser = userService.selectUserByWxId(openId); + if (sysUser != null) { + token = loginService.wxlogin(sysUser.getUserName(), sysUser.getPw()); + } else { + return AjaxResult.error("登录失败"); + } + } catch (Exception e) { + return AjaxResult.error("登录失败"); + } + ajax.put(Constants.TOKEN, token); + return ajax; + } + // /** // * 将在其他地方登陆的账号强退 // * @@ -82,12 +124,11 @@ public class SysLoginController /** * 获取用户信息 - * + * * @return 用户信息 */ @GetMapping("getInfo") - public AjaxResult getInfo() - { + public AjaxResult getInfo() { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); SysUser user = loginUser.getUser(); // 角色集合 @@ -104,12 +145,11 @@ public class SysLoginController /** * 获取路由信息 - * + * * @return 路由信息 */ @GetMapping("getRouters") - public AjaxResult getRouters() - { + public AjaxResult getRouters() { LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); // 用户信息 SysUser user = loginUser.getUser(); diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java index d4fa69b35..0ea18fd61 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java @@ -3,11 +3,15 @@ package com.ruoyi.project.system.controller; import java.util.Date; import java.util.List; +import com.alibaba.fastjson.JSONObject; +import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.project.common.SchoolCommon; import com.ruoyi.project.system.domain.ByTeacherJbxx; import com.ruoyi.project.system.domain.SysDept; import com.ruoyi.project.system.service.*; +import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -41,6 +45,16 @@ import com.ruoyi.project.system.domain.SysUser; @RestController @RequestMapping("/system/user") public class SysUserController extends BaseController { + + @Value("${wx.appid}") + private String appid; + + @Value("${wx.secret}") + private String secret; + + @Value("${wx.domain}") + private String domain; + @Autowired private ISysUserService userService; @@ -76,15 +90,15 @@ public class SysUserController extends BaseController { @GetMapping("/lrrlist") public TableDataInfo lrrlist(SysUser user) { - int l1=103; + int l1 = 103; user.setDeptId(Long.valueOf(l1)); List list = userService.selectUserList(user); - int l2=105; + int l2 = 105; user.setDeptId(Long.valueOf(l2)); list.addAll(userService.selectUserList(user)); - int l3=107; + int l3 = 107; user.setDeptId(Long.valueOf(l3)); list.addAll(userService.selectUserList(user)); @@ -263,18 +277,18 @@ public class SysUserController extends BaseController { } //先判断前端的roleids是否有变化 - boolean isPd=true; + boolean isPd = true; if (schoolCommon.isSchool() == true) { List roleIdsOld = roleService.selectYeyRoleListByUserId(user.getUserId()); - if(roleIdsOld!=null&&roleIdsOld.size()>0){ - for (int i=0;i 0) { + for (int i = 0; i < roleIdsOld.size(); i++) { + if (roleIdsOld.get(i) == 100) { + isPd = false; } } } } - if(isPd){ + if (isPd) { //判断当前学校有多少个幼儿园管理员 需求至多3个幼儿园管理员 Long[] roleIds = user.getRoleIds(); int iCount = 0; @@ -329,4 +343,52 @@ public class SysUserController extends BaseController { user.setUpdateBy(SecurityUtils.getUsername()); return toAjax(userService.updateUserStatus(user)); } + + @Log(title = "用户管理-绑定微信", businessType = BusinessType.UPDATE) + @PostMapping("/bindwx/{code}") + public AjaxResult bindWx(@PathVariable String code) { + + String url = domain; + String parmas = "appid=" + appid + "&secret=" + secret + "&code=" + code + "&grant_type=authorization_code"; + System.out.println(parmas); + String strResult = HttpUtils.sendGet(url, parmas); + JSONObject jsonObject = JSONObject.parseObject(strResult); + try { + String openId = jsonObject.get("openid").toString(); + System.out.println(openId); + //首先判断当前用户是否绑定微信 + SysUser sysUser = userService.selectUserById(SecurityUtils.getLoginUser().getUser().getUserId()); + if (schoolCommon.isStringEmpty(sysUser.getOpenId())) { + //其次查询当前微信是否被绑定 + SysUser sysUserNew = new SysUser(); + sysUserNew.setOpenId(openId); + List list = userService.selectUserList(sysUserNew); + if (list != null && list.size() > 0) { + return AjaxResult.error("当前微信已绑定其他账号"); + } else { + //绑定 + sysUser.setOpenId(openId); + int iCount = userService.updateUserWx(sysUser); + return AjaxResult.success(iCount); + } + } else { + return AjaxResult.error("当前账户已绑定微信"); + } + } catch (Exception e) { + return AjaxResult.error("获取信息失败"); + } + + } + + @GetMapping("/isbindwx") + public AjaxResult isbindWx() { + //首先判断当前用户是否绑定微信 + SysUser sysUser = userService.selectUserById(SecurityUtils.getLoginUser().getUser().getUserId()); + if (schoolCommon.isStringEmpty(sysUser.getOpenId())) { + return AjaxResult.success("1"); + } else { + return AjaxResult.success("0"); + } + } + } \ No newline at end of file diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java index 37016945c..567a9002c 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java @@ -5,6 +5,7 @@ import java.util.List; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,328 +17,354 @@ import com.ruoyi.framework.web.domain.BaseEntity; /** * 用户对象 sys_user - * + * * @author ruoyi */ -public class SysUser extends BaseEntity -{ +public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; - /** 用户ID */ + /** + * 用户ID + */ @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") private Long userId; - /** 部门ID */ + /** + * 部门ID + */ @Excel(name = "部门编号", type = Type.IMPORT) private Long deptId; - /** 用户账号 */ + /** + * 用户账号 + */ @Excel(name = "登录名称") private String userName; - /** 用户昵称 */ + /** + * 用户昵称 + */ @Excel(name = "用户名称") private String nickName; - /** 用户邮箱 */ + /** + * 用户邮箱 + */ @Excel(name = "用户邮箱") private String email; - /** 手机号码 */ + /** + * 手机号码 + */ @Excel(name = "手机号码") private String phonenumber; - /** 用户性别 */ + /** + * 用户性别 + */ @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") private String sex; - /** 用户头像 */ + /** + * 用户头像 + */ private String avatar; - /** 密码 */ + /** + * 密码 + */ private String password; - /** 盐加密 */ + /** + * 盐加密 + */ private String salt; - /** 帐号状态（0正常 1停用） */ + /** + * 帐号状态（0正常 1停用） + */ @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") private String status; - /** 删除标志（0代表存在 2代表删除） */ + /** + * 删除标志（0代表存在 2代表删除） + */ private String delFlag; - /** 最后登陆IP */ + /** + * 最后登陆IP + */ @Excel(name = "最后登陆IP", type = Type.EXPORT) private String loginIp; - /** 最后登陆时间 */ + /** + * 最后登陆时间 + */ @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; - /** 部门对象 */ + /** + * 部门对象 + */ @Excels({ - @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), - @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) + @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), + @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) }) private SysDept dept; - /** 角色对象 */ + /** + * 角色对象 + */ private List roles; - /** 角色组 */ + /** + * 角色组 + */ private Long[] roleIds; - /** 岗位组 */ + /** + * 岗位组 + */ private Long[] postIds; - /** 部门组 */ + /** + * 部门组 + */ private Long[] deptIds; - /**教师对象*/ + /** + * 教师对象 + */ private ByTeacherJbxx byTeacherJbxx; - public SysUser() - { + /** + * 微信openid + */ + private String openId; + + /** + * pw + */ + private String pw; + + public SysUser() { } - public SysUser(Long userId) - { + public SysUser(Long userId) { this.userId = userId; } - public Long getUserId() - { + public Long getUserId() { return userId; } - public void setUserId(Long userId) - { + public void setUserId(Long userId) { this.userId = userId; } - public boolean isAdmin() - { + public boolean isAdmin() { return isAdmin(this.userId); } - public static boolean isAdmin(Long userId) - { + public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } - public Long getDeptId() - { + public Long getDeptId() { return deptId; } - public void setDeptId(Long deptId) - { + public void setDeptId(Long deptId) { this.deptId = deptId; } @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") - public String getNickName() - { + public String getNickName() { return nickName; } - public void setNickName(String nickName) - { + public void setNickName(String nickName) { this.nickName = nickName; } @NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") - public String getUserName() - { + public String getUserName() { return userName; } - public void setUserName(String userName) - { + public void setUserName(String userName) { this.userName = userName; } @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") - public String getPhonenumber() - { + public String getPhonenumber() { return phonenumber; } - public void setPhonenumber(String phonenumber) - { + public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } - public String getSex() - { + public String getSex() { return sex; } - public void setSex(String sex) - { + public void setSex(String sex) { this.sex = sex; } - public String getAvatar() - { + public String getAvatar() { return avatar; } - public void setAvatar(String avatar) - { + public void setAvatar(String avatar) { this.avatar = avatar; } @JsonProperty - public String getPassword() - { + public String getPassword() { return password; } - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } - public String getSalt() - { + public String getSalt() { return salt; } - public void setSalt(String salt) - { + public void setSalt(String salt) { this.salt = salt; } - public String getStatus() - { + public String getStatus() { return status; } - public void setStatus(String status) - { + public void setStatus(String status) { this.status = status; } - public String getDelFlag() - { + public String getDelFlag() { return delFlag; } - public void setDelFlag(String delFlag) - { + public void setDelFlag(String delFlag) { this.delFlag = delFlag; } - public String getLoginIp() - { + public String getLoginIp() { return loginIp; } - public void setLoginIp(String loginIp) - { + public void setLoginIp(String loginIp) { this.loginIp = loginIp; } - public Date getLoginDate() - { + public Date getLoginDate() { return loginDate; } - public void setLoginDate(Date loginDate) - { + public void setLoginDate(Date loginDate) { this.loginDate = loginDate; } - public SysDept getDept() - { + public SysDept getDept() { return dept; } - public void setDept(SysDept dept) - { + public void setDept(SysDept dept) { this.dept = dept; } - public List getRoles() - { + public List getRoles() { return roles; } - public void setRoles(List roles) - { + public void setRoles(List roles) { this.roles = roles; } - public Long[] getRoleIds() - { + public Long[] getRoleIds() { return roleIds; } - public void setRoleIds(Long[] roleIds) - { + public void setRoleIds(Long[] roleIds) { this.roleIds = roleIds; } - public Long[] getPostIds() - { + public Long[] getPostIds() { return postIds; } - public void setPostIds(Long[] postIds) - { + public void setPostIds(Long[] postIds) { this.postIds = postIds; } - public Long[] getDeptIds() - { + + public Long[] getDeptIds() { return deptIds; } - public void setDeptIds(Long[] deptIds) - { + public void setDeptIds(Long[] deptIds) { this.deptIds = deptIds; } - + + public String getOpenId() { + return openId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getPw() { + return pw; + } + + public void setPw(String pw) { + this.pw = pw; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("userId", getUserId()) - .append("deptId", getDeptId()) - .append("userName", getUserName()) - .append("nickName", getNickName()) - .append("email", getEmail()) - .append("phonenumber", getPhonenumber()) - .append("sex", getSex()) - .append("avatar", getAvatar()) - .append("password", getPassword()) - .append("salt", getSalt()) - .append("status", getStatus()) - .append("delFlag", getDelFlag()) - .append("loginIp", getLoginIp()) - .append("loginDate", getLoginDate()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("dept", getDept()) - .append("byTeacherJbxx", getByTeacherJbxx()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("salt", getSalt()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("dept", getDept()) + .append("byTeacherJbxx", getByTeacherJbxx()) + .append("openId", getOpenId()) + .append("pw", getPw()) + .toString(); } public ByTeacherJbxx getByTeacherJbxx() { diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java index e006404d1..ac0844337 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java @@ -53,6 +53,14 @@ public interface SysUserMapper */ public SysUser selectUserById(Long userId); + /** + * 通过用户ID查询用户 + * + * @param openId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserByWxId(String openId); + /** * 根据roleId查询用户列表 * @@ -85,6 +93,14 @@ public interface SysUserMapper */ public int updateUser(SysUser user); + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserWx(SysUser user); + /** * 修改用户头像 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java index df44dc43f..6bf432890 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java @@ -51,6 +51,14 @@ public interface ISysUserService */ public SysUser selectUserById(Long userId); + /** + * 通过用户ID查询用户 + * + * @param openId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserByWxId(String openId); + /** * 根据roleId查询用户列表 * @@ -138,6 +146,14 @@ public interface ISysUserService */ public int updateUserStatus(SysUser user); + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserWx(SysUser user); + /** * 修改用户基本信息 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index 9a914036b..735fcc6be 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -103,6 +103,17 @@ public class SysUserServiceImpl implements ISysUserService { return userMapper.selectUserById(userId); } + /** + * 通过用户ID查询用户 + * + * @param openId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByWxId(String openId) { + return userMapper.selectUserByWxId(openId); + } + /** * 根据roleId查询用户列表 * @@ -126,7 +137,6 @@ public class SysUserServiceImpl implements ISysUserService { } - /** * 查询用户所属角色组 * @@ -279,6 +289,17 @@ public class SysUserServiceImpl implements ISysUserService { return userMapper.updateUser(user); } + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserWx(SysUser user) { + return userMapper.updateUserWx(user); + } + /** * 修改用户基本信息 * diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml index 1cc845678..6bb04abc4 100644 --- a/ruoyi/src/main/resources/application.yml +++ b/ruoyi/src/main/resources/application.yml @@ -129,3 +129,9 @@ file: # domain: https://files.benyiedu.com/ domain: http://video.benyiedu.com/ bucket: bywebfile + +#wx +wx: + appid: wx0370c4756118456a + secret: f57143e81f3c95b0d909d91b3116cc82 + domain: https://api.weixin.qq.com/sns/oauth2/access_token diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml index 2172677e6..6e2a4daeb 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml @@ -1,58 +1,60 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - select count(1) from sys_user u left join sys_user_role r on u.user_id=r.user_id where dept_id=#{deptId} and role_id=#{roleId} and u.status='0' and u.del_flag = '0' - - - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.open_id, u.pw, d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -60,173 +62,199 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id - + + select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, + u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from + sys_user u + left join sys_dept d on u.dept_id = d.dept_id + where u.del_flag = '0' + + AND u.user_name like concat('%', #{userName}, '%') + + + AND u.open_id = #{openId} + + + AND u.status = #{status} + + + AND u.phonenumber like concat('%', #{phonenumber}, '%') + + + AND date_format(u.create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + + AND date_format(u.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET + (#{deptId},ancestors) )) + + + ${dataScope} + - - - - - + - + + where u.user_name = #{userName} + - + - + + where u.open_id = #{openId} + + + + + - - select count(1) from sys_user where user_name = #{userName} - - select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} - - select user_id, email from sys_user where email = #{email} - - - insert into sys_user( - user_id, - dept_id, - user_name, - nick_name, - email, - avatar, - phonenumber, - sex, - password, - status, - create_by, - remark, - create_time - )values( - #{userId}, - #{deptId}, - #{userName}, - #{nickName}, - #{email}, - #{avatar}, - #{phonenumber}, - #{sex}, - #{password}, - #{status}, - #{createBy}, - #{remark}, - sysdate() - ) - - - - update sys_user - - dept_id = #{deptId}, - user_name = #{userName}, - nick_name = #{nickName}, - email = #{email}, - phonenumber = #{phonenumber}, - sex = #{sex}, - avatar = #{avatar}, - password = #{password}, - status = #{status}, - login_ip = #{loginIp}, - login_date = #{loginDate}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where user_id = #{userId} - - - + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + open_id, + pw, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + #{openId}, + #{pw}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + open_id = #{openId}, + open_id = #{pw}, + update_time = sysdate() + + where user_id = #{userId} + + + update sys_user set status = #{status} where user_id = #{userId} - - + + + update sys_user set open_id = #{openId} where user_id = #{userId} + + + update sys_user set avatar = #{avatar} where user_name = #{userName} - - - update sys_user set password = #{password} where user_name = #{userName} + + + update sys_user set password = #{password},pw=#{pw} where user_name = #{userName} - - + + delete from sys_user where user_id = #{userId} - - - update sys_user set del_flag = '2' where user_id in - - #{userId} - - - + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + \ No newline at end of file