diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java index af59ee0f..ad33e201 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java @@ -1,402 +1,368 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.controller; - -import com.chatopera.cc.acd.ACDWorkMonitor; -import com.chatopera.cc.basic.Constants; -import com.chatopera.cc.basic.MainContext; -import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.basic.auth.AuthToken; -import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.model.AgentStatus; -import com.chatopera.cc.model.SystemConfig; -import com.chatopera.cc.model.User; -import com.chatopera.cc.model.UserRole; -import com.chatopera.cc.persistence.repository.AgentStatusRepository; -import com.chatopera.cc.persistence.repository.UserRepository; -import com.chatopera.cc.persistence.repository.UserRoleRepository; -import com.chatopera.cc.proxy.AgentProxy; -import com.chatopera.cc.proxy.AgentSessionProxy; -import com.chatopera.cc.proxy.OnlineUserProxy; -import com.chatopera.cc.proxy.UserProxy; -import com.chatopera.cc.util.Menu; -import org.apache.commons.lang.StringUtils; -import org.jasypt.exceptions.EncryptionOperationNotPossibleException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.io.UnsupportedEncodingException; -import java.security.NoSuchAlgorithmException; -import java.util.Date; -import java.util.List; - -/** - * @author CSKefu - * @version 1.0.1 - */ -@Controller -public class LoginController extends Handler { - private final static Logger logger = LoggerFactory.getLogger(LoginController.class); - - @Autowired - private UserRepository userRepository; - - @Autowired - private UserRoleRepository userRoleRes; - - @Autowired - private AuthToken authToken; - - @Autowired - private AgentStatusRepository agentStatusRes; - - @Autowired - private Cache cache; - - @Autowired - private AgentProxy agentProxy; - - @Autowired - private AgentSessionProxy agentSessionProxy; - - @Autowired - private UserProxy userProxy; - - @Autowired - private ACDWorkMonitor acdWorkMonitor; - - /** - * 登录页面 - * - * @param request - * @param response - * @param referer - * @param msg - * @return - * @throws NoSuchAlgorithmException - */ - @RequestMapping(value = "/login", method = RequestMethod.GET) - @Menu(type = "apps", subtype = "user", access = true) - public ModelAndView login(HttpServletRequest request, HttpServletResponse response, @RequestHeader(value = "referer", required = false) String referer, @Valid String msg) { - ModelAndView view = new ModelAndView("redirect:/"); - if (request.getSession(true).getAttribute(Constants.USER_SESSION_NAME) == null) { - view = new ModelAndView("/login"); - if (StringUtils.isNotBlank(request.getParameter("referer"))) { - referer = request.getParameter("referer"); - } - if (StringUtils.isNotBlank(referer)) { - view.addObject("referer", referer); - } - Cookie[] cookies = request.getCookies(); // 这样便可以获取一个cookie数组 - if (cookies != null) { - for (Cookie cookie : cookies) { - if (cookie != null && StringUtils.isNotBlank(cookie.getName()) && StringUtils.isNotBlank( - cookie.getValue())) { - if (cookie.getName().equals(Constants.CSKEFU_SYSTEM_COOKIES_FLAG)) { - String flagid; - try { - flagid = MainUtils.decryption(cookie.getValue()); - if (StringUtils.isNotBlank(flagid)) { - User user = userRepository.findById(flagid); - if (user != null) { - view = this.processLogin(request, user, referer); - } - } - } catch (EncryptionOperationNotPossibleException e) { - logger.error("[login] error:", e); - view = request(super.createRequestPageTempletResponse("/public/clearcookie")); - return view; - } catch (NoSuchAlgorithmException e) { - logger.error("[login] error:", e); - } - } - } - } - } - } - if (StringUtils.isNotBlank(msg)) { - view.addObject("msg", msg); - } - SystemConfig systemConfig = MainUtils.getSystemConfig(); - if (systemConfig != null && systemConfig.isEnableregorgi()) { - view.addObject("show", true); - } - if (systemConfig != null) { - view.addObject("systemConfig", systemConfig); - } - return view; - } - - /** - * 提交登录表单 - * - * @param request - * @param response - * @param user - * @param referer - * @param sla - * @return - * @throws NoSuchAlgorithmException - */ - @RequestMapping(value = "/login", method = RequestMethod.POST) - @Menu(type = "apps", subtype = "user", access = true) - public ModelAndView login( - final HttpServletRequest request, - final HttpServletResponse response, - @Valid User user, - @Valid String referer, - @Valid String sla) throws NoSuchAlgorithmException { - ModelAndView view = new ModelAndView("redirect:/"); - if (request.getSession(true).getAttribute(Constants.USER_SESSION_NAME) == null) { - if (user != null && user.getUsername() != null) { - final User loginUser = userRepository.findByUsernameAndPasswordAndDatastatus( - user.getUsername(), MainUtils.md5(user.getPassword()), false); - if (loginUser != null && StringUtils.isNotBlank(loginUser.getId())) { - view = this.processLogin(request, loginUser, referer); - - // 自动登录 - if (StringUtils.equals("1", sla)) { - Cookie flagid = new Cookie( - Constants.CSKEFU_SYSTEM_COOKIES_FLAG, MainUtils.encryption(loginUser.getId())); - flagid.setMaxAge(7 * 24 * 60 * 60); - response.addCookie(flagid); - } - - // add authorization code for rest api - final String orgi = loginUser.getOrgi(); - String auth = MainUtils.getUUID(); - authToken.putUserByAuth(auth, loginUser); - userRepository.save(loginUser); // 更新登录状态到数据库 - response.addCookie((new Cookie("authorization", auth))); - - // 该登录用户是坐席，并且具有坐席对话的角色 - if ((loginUser.isAgent() && - loginUser.getRoleAuthMap().containsKey("A01") && - ((boolean) loginUser.getRoleAuthMap().get("A01") == true)) - || loginUser.isAdmin()) { - try { - /**************************************** - * 登录成功，设置该坐席为就绪状态（默认） - ****************************************/ - // https://gitlab.chatopera.com/chatopera/cosinee.w4l/issues/306 - final AgentStatus agentStatus = agentProxy.resolveAgentStatusByAgentnoAndOrgi( - loginUser.getId(), orgi, loginUser.getSkills()); - agentStatus.setBusy(false); - agentProxy.ready(loginUser, agentStatus, false); - - // 工作状态记录 - acdWorkMonitor.recordAgentStatus(agentStatus.getAgentno(), - agentStatus.getUsername(), - agentStatus.getAgentno(), - user.isAdmin(), // 0代表admin - agentStatus.getAgentno(), - MainContext.AgentStatusEnum.OFFLINE.toString(), - MainContext.AgentStatusEnum.READY.toString(), - MainContext.AgentWorkType.MEIDIACHAT.toString(), - orgi, null); - - } catch (Exception e) { - logger.error("[login] set agent status", e); - } - } - } else { - view = request(super.createRequestPageTempletResponse("/login")); - if (StringUtils.isNotBlank(referer)) { - view.addObject("referer", referer); - } - view.addObject("msg", "0"); - } - } - } - SystemConfig systemConfig = MainUtils.getSystemConfig(); - if (systemConfig != null && systemConfig.isEnableregorgi()) { - view.addObject("show", true); - } - if (systemConfig != null) { - view.addObject("systemConfig", systemConfig); - } - - return view; - } - - /** - * 处理登录事件 - * - * @param request - * @param loginUser - * @param referer - * @return - */ - private ModelAndView processLogin(final HttpServletRequest request, final User loginUser, String referer) { - ModelAndView view = new ModelAndView(); - if (loginUser != null) { - // 设置登录用户的状态 - loginUser.setLogin(true); - // 更新redis session信息，用以支持sso - agentSessionProxy.updateUserSession( - loginUser.getId(), MainUtils.getContextID(request.getSession().getId()), loginUser.getOrgi()); - loginUser.setSessionid(MainUtils.getContextID(request.getSession().getId())); - - - if (StringUtils.isNotBlank(referer)) { - view = new ModelAndView("redirect:" + referer); - } else { - view = new ModelAndView("redirect:/"); - } - - // 登录成功 判断是否进入多租户页面 - SystemConfig systemConfig = MainUtils.getSystemConfig(); - if (systemConfig != null && systemConfig.isEnabletneant() && systemConfig.isTenantconsole() && !loginUser.isAdmin()) { - view = new ModelAndView("redirect:/apps/tenant/index"); - } - List userRoleList = userRoleRes.findByOrgiAndUser(loginUser.getOrgi(), loginUser); - if (userRoleList != null && userRoleList.size() > 0) { - for (UserRole userRole : userRoleList) { - loginUser.getRoleList().add(userRole.getRole()); - } - } - - // 获取用户部门以及下级部门 - userProxy.attachOrgansPropertiesForUser(loginUser); - - // 添加角色信息 - userProxy.attachRolesMap(loginUser); - - loginUser.setLastlogintime(new Date()); - if (StringUtils.isNotBlank(loginUser.getId())) { - userRepository.save(loginUser); - } - - super.setUser(request, loginUser); - // 当前用户 企业id为空 调到创建企业页面 - if (StringUtils.isBlank(loginUser.getOrgid())) { - view = new ModelAndView("redirect:/apps/organization/add.html"); - } - } - return view; - } - - - /** - * 登出用户 - * code代表登出的原因 - * - * @param request - * @param response - * @param code 登出的代码 - * @return - */ - @RequestMapping("/logout") - public String logout(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "code", required = false) String code) throws UnsupportedEncodingException { - final User user = super.getUser(request); - request.getSession().removeAttribute(Constants.USER_SESSION_NAME); - request.getSession().invalidate(); - Cookie[] cookies = request.getCookies(); - if (cookies != null) { - for (Cookie cookie : cookies) { - if (cookie != null && StringUtils.isNotBlank(cookie.getName()) && StringUtils.isNotBlank( - cookie.getValue())) { - if (cookie.getName().equals(Constants.CSKEFU_SYSTEM_COOKIES_FLAG)) { - cookie.setMaxAge(0); - response.addCookie(cookie); - } - } - } - } - - if (StringUtils.isNotBlank(code)) { - return "redirect:/?msg=" + code; - } - - return "redirect:/"; - } - - @RequestMapping(value = "/register") - @Menu(type = "apps", subtype = "user", access = true) - public ModelAndView register(HttpServletRequest request, HttpServletResponse response, @Valid String msg) { - ModelAndView view = request(super.createRequestPageTempletResponse("redirect:/")); - if (request.getSession(true).getAttribute(Constants.USER_SESSION_NAME) == null) { - view = request(super.createRequestPageTempletResponse("/register")); - } - if (StringUtils.isNotBlank(msg)) { - view.addObject("msg", msg); - } - return view; - } - - @RequestMapping("/addAdmin") - @Menu(type = "apps", subtype = "user", access = true) - public ModelAndView addAdmin(HttpServletRequest request, HttpServletResponse response, @Valid User user) { - String msg = ""; - msg = validUser(user); - if (StringUtils.isNotBlank(msg)) { - return request(super.createRequestPageTempletResponse("redirect:/register.html?msg=" + msg)); - } else { - user.setUname(user.getUsername()); - user.setAdmin(true); - if (StringUtils.isNotBlank(user.getPassword())) { - user.setPassword(MainUtils.md5(user.getPassword())); - } - user.setOrgi(super.getOrgiByTenantshare(request)); - /*if(StringUtils.isNotBlank(super.getUser(request).getOrgid())) { - user.setOrgid(super.getUser(request).getOrgid()); - }else { - user.setOrgid(MainContext.SYSTEM_ORGI); - }*/ - userRepository.save(user); - OnlineUserProxy.clean(super.getOrgi(request)); - - } - ModelAndView view = this.processLogin(request, user, ""); - //当前用户 企业id为空 调到创建企业页面 - if (StringUtils.isBlank(user.getOrgid())) { - view = request(super.createRequestPageTempletResponse("redirect:/apps/organization/add.html")); - } - return view; - } - - private String validUser(User user) { - String msg = ""; - User tempUser = userRepository.findByUsernameAndDatastatus(user.getUsername(), false); - if (tempUser != null) { - msg = "username_exist"; - return msg; - } - tempUser = userRepository.findByEmailAndDatastatus(user.getEmail(), false); - if (tempUser != null) { - msg = "email_exist"; - return msg; - } - tempUser = userRepository.findByMobileAndDatastatus(user.getMobile(), false); - if (tempUser != null) { - msg = "mobile_exist"; - return msg; - } - return msg; - } -} \ No newline at end of file +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.controller; + +import com.chatopera.cc.acd.ACDWorkMonitor; +import com.chatopera.cc.basic.Constants; +import com.chatopera.cc.basic.MainContext; +import com.chatopera.cc.basic.MainUtils; +import com.chatopera.cc.basic.auth.AuthToken; +import com.chatopera.cc.model.AgentStatus; +import com.chatopera.cc.model.SystemConfig; +import com.chatopera.cc.model.User; +import com.chatopera.cc.model.UserRole; +import com.chatopera.cc.persistence.repository.UserRepository; +import com.chatopera.cc.persistence.repository.UserRoleRepository; +import com.chatopera.cc.proxy.AgentProxy; +import com.chatopera.cc.proxy.AgentSessionProxy; +import com.chatopera.cc.proxy.OnlineUserProxy; +import com.chatopera.cc.proxy.UserProxy; +import com.chatopera.cc.util.Menu; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.jasypt.exceptions.EncryptionOperationNotPossibleException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.lang.NonNull; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Date; +import java.util.List; +import java.util.Optional; + +/** + * @author CSKefu + * @version 1.0.1 + */ +@Controller +@RequiredArgsConstructor +public class LoginController extends Handler { + private final static Logger logger = LoggerFactory.getLogger(LoginController.class); + + @NonNull + private final UserRepository userRepository; + + @NonNull + private final UserRoleRepository userRoleRes; + + @NonNull + private final AuthToken authToken; + + @NonNull + private final AgentProxy agentProxy; + + @NonNull + private final AgentSessionProxy agentSessionProxy; + + @NonNull + private final UserProxy userProxy; + + @NonNull + private final ACDWorkMonitor acdWorkMonitor; + + /** + * 登录页面 + */ + @RequestMapping(value = "/login", method = RequestMethod.GET) + @Menu(type = "apps", subtype = "user", access = true) + public ModelAndView login(HttpServletRequest request, @RequestHeader(value = "referer", required = false) String referer, @Valid String msg) { + ModelAndView view = new ModelAndView("redirect:/"); + if (request.getSession(true).getAttribute(Constants.USER_SESSION_NAME) == null) { + view = new ModelAndView("/login"); + if (StringUtils.isNotBlank(request.getParameter("referer"))) { + referer = request.getParameter("referer"); + } + if (StringUtils.isNotBlank(referer)) { + view.addObject("referer", referer); + } + Cookie[] cookies = request.getCookies(); // 这样便可以获取一个cookie数组 + if (cookies != null) { + for (Cookie cookie : cookies) { + if (cookie != null && StringUtils.isNotBlank(cookie.getName()) && StringUtils.isNotBlank( + cookie.getValue())) { + if (cookie.getName().equals(Constants.CSKEFU_SYSTEM_COOKIES_FLAG)) { + String flagid; + try { + flagid = MainUtils.decryption(cookie.getValue()); + if (StringUtils.isNotBlank(flagid)) { + Optional optional = userRepository.findById(flagid); + if (optional.isPresent()) { + view = this.processLogin(request, optional.get(), referer); + } + } + } catch (EncryptionOperationNotPossibleException e) { + logger.error("[login] error:", e); + view = request(super.createRequestPageTempletResponse("/public/clearcookie")); + return view; + } + } + } + } + } + } + if (StringUtils.isNotBlank(msg)) { + view.addObject("msg", msg); + } + SystemConfig systemConfig = MainUtils.getSystemConfig(); + if (systemConfig != null && systemConfig.isEnableregorgi()) { + view.addObject("show", true); + } + if (systemConfig != null) { + view.addObject("systemConfig", systemConfig); + } + return view; + } + + /** + * 提交登录表单 + */ + @RequestMapping(value = "/login", method = RequestMethod.POST) + @Menu(type = "apps", subtype = "user", access = true) + public ModelAndView login( + final HttpServletRequest request, + final HttpServletResponse response, + @Valid User user, + @Valid String referer, + @Valid String sla) { + ModelAndView view = new ModelAndView("redirect:/"); + if (request.getSession(true).getAttribute(Constants.USER_SESSION_NAME) == null) { + if (user != null && user.getUsername() != null) { + final User loginUser = userRepository.findByUsernameAndPasswordAndDatastatus( + user.getUsername(), MainUtils.md5(user.getPassword()), false); + if (loginUser != null && StringUtils.isNotBlank(loginUser.getId())) { + view = this.processLogin(request, loginUser, referer); + + // 自动登录 + if (StringUtils.equals("1", sla)) { + Cookie flagid = new Cookie( + Constants.CSKEFU_SYSTEM_COOKIES_FLAG, MainUtils.encryption(loginUser.getId())); + flagid.setMaxAge(7 * 24 * 60 * 60); + response.addCookie(flagid); + } + + // add authorization code for rest api + final String orgi = loginUser.getOrgi(); + String auth = MainUtils.getUUID(); + authToken.putUserByAuth(auth, loginUser); + userRepository.save(loginUser); // 更新登录状态到数据库 + response.addCookie((new Cookie("authorization", auth))); + + // 该登录用户是坐席，并且具有坐席对话的角色 + if ((loginUser.isAgent() && + loginUser.getRoleAuthMap().containsKey("A01") && + ((boolean) loginUser.getRoleAuthMap().get("A01"))) + || loginUser.isAdmin()) { + try { + //**************************************** + //* 登录成功，设置该坐席为就绪状态（默认） + //**************************************** + // https://gitlab.chatopera.com/chatopera/cosinee.w4l/issues/306 + final AgentStatus agentStatus = agentProxy.resolveAgentStatusByAgentnoAndOrgi( + loginUser.getId(), orgi, loginUser.getSkills()); + agentStatus.setBusy(false); + agentProxy.ready(loginUser, agentStatus, false); + + // 工作状态记录 + acdWorkMonitor.recordAgentStatus(agentStatus.getAgentno(), + agentStatus.getUsername(), + agentStatus.getAgentno(), + user.isAdmin(), // 0代表admin + agentStatus.getAgentno(), + MainContext.AgentStatusEnum.OFFLINE.toString(), + MainContext.AgentStatusEnum.READY.toString(), + MainContext.AgentWorkType.MEIDIACHAT.toString(), + orgi, null); + + } catch (Exception e) { + logger.error("[login] set agent status", e); + } + } + } else { + view = request(super.createRequestPageTempletResponse("/login")); + if (StringUtils.isNotBlank(referer)) { + view.addObject("referer", referer); + } + view.addObject("msg", "0"); + } + } + } + SystemConfig systemConfig = MainUtils.getSystemConfig(); + if (systemConfig != null && systemConfig.isEnableregorgi()) { + view.addObject("show", true); + } + if (systemConfig != null) { + view.addObject("systemConfig", systemConfig); + } + + return view; + } + + /** + * 处理登录事件 + */ + private ModelAndView processLogin(final HttpServletRequest request, final User loginUser, String referer) { + ModelAndView view = new ModelAndView(); + if (loginUser != null) { + // 设置登录用户的状态 + loginUser.setLogin(true); + // 更新redis session信息，用以支持sso + agentSessionProxy.updateUserSession( + loginUser.getId(), MainUtils.getContextID(request.getSession().getId()), loginUser.getOrgi()); + loginUser.setSessionid(MainUtils.getContextID(request.getSession().getId())); + + + if (StringUtils.isNotBlank(referer)) { + view = new ModelAndView("redirect:" + referer); + } else { + view = new ModelAndView("redirect:/"); + } + + // 登录成功 判断是否进入多租户页面 + SystemConfig systemConfig = MainUtils.getSystemConfig(); + if (systemConfig != null && systemConfig.isEnabletneant() && systemConfig.isTenantconsole() && !loginUser.isAdmin()) { + view = new ModelAndView("redirect:/apps/tenant/index"); + } + List userRoleList = userRoleRes.findByOrgiAndUser(loginUser.getOrgi(), loginUser); + if (userRoleList != null && userRoleList.size() > 0) { + for (UserRole userRole : userRoleList) { + loginUser.getRoleList().add(userRole.getRole()); + } + } + + // 获取用户部门以及下级部门 + userProxy.attachOrgansPropertiesForUser(loginUser); + + // 添加角色信息 + userProxy.attachRolesMap(loginUser); + + loginUser.setLastlogintime(new Date()); + if (StringUtils.isNotBlank(loginUser.getId())) { + userRepository.save(loginUser); + } + + super.setUser(request, loginUser); + // 当前用户 企业id为空 调到创建企业页面 + if (StringUtils.isBlank(loginUser.getOrgid())) { + view = new ModelAndView("redirect:/apps/organization/add.html"); + } + } + return view; + } + + + /** + * 登出用户 + * code代表登出的原因 + * + * @param code 登出的代码 + */ + @RequestMapping("/logout") + public String logout(HttpServletRequest request, HttpServletResponse response, @RequestParam(value = "code", required = false) String code) { + request.getSession().removeAttribute(Constants.USER_SESSION_NAME); + request.getSession().invalidate(); + Cookie[] cookies = request.getCookies(); + if (cookies != null) { + for (Cookie cookie : cookies) { + if (cookie != null && StringUtils.isNotBlank(cookie.getName()) && StringUtils.isNotBlank( + cookie.getValue())) { + if (cookie.getName().equals(Constants.CSKEFU_SYSTEM_COOKIES_FLAG)) { + cookie.setMaxAge(0); + response.addCookie(cookie); + } + } + } + } + + if (StringUtils.isNotBlank(code)) { + return "redirect:/?msg=" + code; + } + + return "redirect:/"; + } + + @RequestMapping(value = "/register") + @Menu(type = "apps", subtype = "user", access = true) + public ModelAndView register(HttpServletRequest request, @Valid String msg) { + ModelAndView view = request(super.createRequestPageTempletResponse("redirect:/")); + if (request.getSession(true).getAttribute(Constants.USER_SESSION_NAME) == null) { + view = request(super.createRequestPageTempletResponse("/register")); + } + if (StringUtils.isNotBlank(msg)) { + view.addObject("msg", msg); + } + return view; + } + + @RequestMapping("/addAdmin") + @Menu(type = "apps", subtype = "user", access = true) + public ModelAndView addAdmin(HttpServletRequest request, @Valid User user) { + String msg = validUser(user); + if (StringUtils.isNotBlank(msg)) { + return request(super.createRequestPageTempletResponse("redirect:/register.html?msg=" + msg)); + } else { + user.setUname(user.getUsername()); + user.setAdmin(true); + if (StringUtils.isNotBlank(user.getPassword())) { + user.setPassword(MainUtils.md5(user.getPassword())); + } + user.setOrgi(super.getOrgiByTenantshare(request)); + /*if(StringUtils.isNotBlank(super.getUser(request).getOrgid())) { + user.setOrgid(super.getUser(request).getOrgid()); + }else { + user.setOrgid(MainContext.SYSTEM_ORGI); + }*/ + userRepository.save(user); + OnlineUserProxy.clean(super.getOrgi(request)); + + } + ModelAndView view = this.processLogin(request, user, ""); + //当前用户 企业id为空 调到创建企业页面 + if (StringUtils.isBlank(user.getOrgid())) { + view = request(super.createRequestPageTempletResponse("redirect:/apps/organization/add.html")); + } + return view; + } + + private String validUser(User user) { + String msg = ""; + User tempUser = userRepository.findByUsernameAndDatastatus(user.getUsername(), false); + if (tempUser != null) { + msg = "username_exist"; + return msg; + } + tempUser = userRepository.findByEmailAndDatastatus(user.getEmail(), false); + if (tempUser != null) { + msg = "email_exist"; + return msg; + } + tempUser = userRepository.findByMobileAndDatastatus(user.getMobile(), false); + if (tempUser != null) { + msg = "mobile_exist"; + return msg; + } + return msg; + } +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java index 9e93c3f3..ab657905 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java @@ -23,11 +23,11 @@ import com.chatopera.cc.persistence.repository.UserRepository; import com.chatopera.cc.persistence.repository.UserRoleRepository; import com.chatopera.cc.proxy.OnlineUserProxy; import com.chatopera.cc.util.Menu; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,28 +35,27 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.io.IOException; import java.util.List; /** - * @author 程序猿DD + * @author userRole = userRoleRes.findByOrgiAndUser(super.getOrgiByTenantshare(request), user); - userRoleRes.delete(userRole); //删除用户的时候，同时删除用户对应的 + userRoleRes.deleteAll(userRole); //删除用户的时候，同时删除用户对应的 user = userRepository.getOne(user.getId()); user.setDatastatus(true); userRepository.save(user); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java index 7f7c2f8e..b03794ad 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/api/auth/ApiLoginController.java @@ -1,119 +1,110 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.controller.api.auth; - -import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.basic.auth.AuthToken; -import com.chatopera.cc.cache.Cache; -import com.chatopera.cc.controller.Handler; -import com.chatopera.cc.model.User; -import com.chatopera.cc.model.UserRole; -import com.chatopera.cc.persistence.repository.UserRepository; -import com.chatopera.cc.persistence.repository.UserRoleRepository; -import com.chatopera.cc.util.Menu; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; -import java.util.Date; -import java.util.List; - -/** - * 账号密码登录 - */ -@RestController -@RequestMapping("/tokens") -public class ApiLoginController extends Handler { - private final static Logger logger = LoggerFactory.getLogger(ApiLoginController.class); - - @Autowired - private UserRepository userRepository; - - @Autowired - private UserRoleRepository userRoleRes; - - @Autowired - private Cache cache; - - @Autowired - private AuthToken authToken; - - /** - * 登录服务，传入登录账号和密码 - * - * @param request - * @param response - * @param username - * @param password - * @return - */ - @SuppressWarnings("rawtypes") - @RequestMapping(method = RequestMethod.POST) - @Menu(type = "apps", subtype = "token", access = true) - public ResponseEntity login(HttpServletRequest request, HttpServletResponse response, @Valid String username, @Valid String password) { - User loginUser = userRepository.findByUsernameAndPassword(username, MainUtils.md5(password)); - ResponseEntity entity = null; - if (loginUser != null && !StringUtils.isBlank(loginUser.getId())) { - loginUser.setLogin(true); - List userRoleList = userRoleRes.findByOrgiAndUser(loginUser.getOrgi(), loginUser); - if (userRoleList != null && userRoleList.size() > 0) { - for (UserRole userRole : userRoleList) { - loginUser.getRoleList().add(userRole.getRole()); - } - } - loginUser.setLastlogintime(new Date()); - if (!StringUtils.isBlank(loginUser.getId())) { - userRepository.save(loginUser); - } - String auth = MainUtils.getUUID(); - authToken.putUserByAuth(auth, loginUser); - - entity = new ResponseEntity<>(auth, HttpStatus.OK); - response.addCookie(new Cookie("authorization", auth)); - } else { - entity = new ResponseEntity<>(HttpStatus.UNAUTHORIZED); - } - return entity; - } - - @SuppressWarnings("rawtypes") - @RequestMapping(method = RequestMethod.GET) - @Menu(type = "apps", subtype = "token", access = true) - public ResponseEntity error(HttpServletRequest request) { - User data = super.getUser(request); - return new ResponseEntity<>(data, data != null ? HttpStatus.OK : HttpStatus.UNAUTHORIZED); - } - - @SuppressWarnings("rawtypes") - @RequestMapping(method = RequestMethod.DELETE) - public ResponseEntity logout(HttpServletRequest request, @RequestHeader(value = "authorization") String authorization) { - authToken.deleteUserByAuth(authorization); - return new ResponseEntity<>(HttpStatus.OK); - } - -} \ No newline at end of file +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.controller.api.auth; + +import com.chatopera.cc.basic.MainUtils; +import com.chatopera.cc.basic.auth.AuthToken; +import com.chatopera.cc.controller.Handler; +import com.chatopera.cc.model.User; +import com.chatopera.cc.model.UserRole; +import com.chatopera.cc.persistence.repository.UserRepository; +import com.chatopera.cc.persistence.repository.UserRoleRepository; +import com.chatopera.cc.util.Menu; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.lang.NonNull; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.Date; +import java.util.List; + +/** + * 账号密码登录 + */ +@Slf4j +@RestController +@RequestMapping("/tokens") +@RequiredArgsConstructor +public class ApiLoginController extends Handler { + + @NonNull + private final UserRepository userRepository; + + @NonNull + private final UserRoleRepository userRoleRes; + + @NonNull + private final AuthToken authToken; + + /** + * 登录服务，传入登录账号和密码 + */ + @SuppressWarnings("rawtypes") + @RequestMapping(method = RequestMethod.POST) + @Menu(type = "apps", subtype = "token", access = true) + public ResponseEntity login(HttpServletResponse response, @Valid String username, @Valid String password) { + User loginUser = userRepository.findByUsernameAndPassword(username, MainUtils.md5(password)); + ResponseEntity entity; + if (loginUser != null && !StringUtils.isBlank(loginUser.getId())) { + loginUser.setLogin(true); + List userRoleList = userRoleRes.findByOrgiAndUser(loginUser.getOrgi(), loginUser); + if (userRoleList != null && userRoleList.size() > 0) { + for (UserRole userRole : userRoleList) { + loginUser.getRoleList().add(userRole.getRole()); + } + } + loginUser.setLastlogintime(new Date()); + if (!StringUtils.isBlank(loginUser.getId())) { + userRepository.save(loginUser); + } + String auth = MainUtils.getUUID(); + authToken.putUserByAuth(auth, loginUser); + + entity = new ResponseEntity<>(auth, HttpStatus.OK); + response.addCookie(new Cookie("authorization", auth)); + } else { + entity = new ResponseEntity<>(HttpStatus.UNAUTHORIZED); + } + return entity; + } + + @SuppressWarnings("rawtypes") + @RequestMapping(method = RequestMethod.GET) + @Menu(type = "apps", subtype = "token", access = true) + public ResponseEntity error(HttpServletRequest request) { + User data = super.getUser(request); + return new ResponseEntity<>(data, data != null ? HttpStatus.OK : HttpStatus.UNAUTHORIZED); + } + + @SuppressWarnings("rawtypes") + @RequestMapping(method = RequestMethod.DELETE) + public ResponseEntity logout(@RequestHeader(value = "authorization") String authorization) { + authToken.deleteUserByAuth(authorization); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/persistence/repository/UserRoleRepository.java b/contact-center/app/src/main/java/com/chatopera/cc/persistence/repository/UserRoleRepository.java index af66d77c..6333c86d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/persistence/repository/UserRoleRepository.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/persistence/repository/UserRoleRepository.java @@ -1,42 +1,42 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.persistence.repository; - -import com.chatopera.cc.model.Role; -import com.chatopera.cc.model.User; -import com.chatopera.cc.model.UserRole; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; - -public interface UserRoleRepository extends JpaRepository -{ - - Page findByOrgiAndRole(String orgi, Role role, Pageable paramPageable); - - List findByOrgiAndRole(String orgi, Role role); - - List findByOrgiAndUser(String orgi, User user); - - @Query(value = "SELECT u.user_id FROM uk_userrole u WHERE u.orgi = ?1 AND u.role_id = ?2", nativeQuery = true) - List findByOrgiAndRoleId(final String orgi, final String roleid); - -} - +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.persistence.repository; + +import com.chatopera.cc.model.Role; +import com.chatopera.cc.model.User; +import com.chatopera.cc.model.UserRole; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface UserRoleRepository extends JpaRepository { + + Page findByOrgiAndRole(String orgi, Role role, Pageable paramPageable); + + List findByOrgiAndRole(String orgi, Role role); + + List findByOrgiAndUser(String orgi, User user); + + @SuppressWarnings("SpringDataRepositoryMethodReturnTypeInspection") + @Query(value = "SELECT u.user_id FROM uk_userrole u WHERE u.orgi = ?1 AND u.role_id = ?2", nativeQuery = true) + List findByOrgiAndRoleId(final String orgi, final String roleid); + +} +