-
+
账号登录
@@ -70,6 +70,19 @@
<%--
忘记密码了?--%>
+
+
+
+
二维码登录
+
+
+
![]()
+
+
diff --git a/power-admin/src/main/webapp/static/js/login.js b/power-admin/src/main/webapp/static/js/login.js
index 5856034..1d2758d 100644
--- a/power-admin/src/main/webapp/static/js/login.js
+++ b/power-admin/src/main/webapp/static/js/login.js
@@ -64,6 +64,77 @@ function login(){
}
}
+var interval ="";
+var qrCodeIdentity ="";
+ function handoffLogin(){
+ $.ajax({
+ type : "POST",
+ data:{loginTypeBitValue:16,type:3,projectUid:"cloudkey-fstth",ApplicationId:"fstth-wzh"},
+ url : path+'/font/getQRcode',
+ success : function(data) {
+ qrCodeIdentity = data.qrCodeIdentity;
+ $("#QRcordImg").prop("src","data:image/jpeg;base64,"+data.qrCodeBase64);
+ interval = setInterval(scanCodeLogin, 1000,qrCodeIdentity);
+ }
+
+ })
+ $("#switchHandoff").css("display","none");
+ $("#switchHandoff2").css("display","block");
+
+
+}
+
+function scanCodeLogin() {
+ $.ajax({
+ type:"POST",
+ data:{qrCodeIdentity:qrCodeIdentity},
+ url : path+'/font/getScanCode',
+ success : function (body) {
+ if (body.verifyStatus ==0) {
+ clearInterval(interval);
+ $.ajax({
+ type:"POST",
+ data:{userToken:body.userToken},
+ url : path+'/font/getUserInfo',
+ success : function (tlte) {
+ if (tlte.msgType==1){
+ $.ajax({
+ type:"POST",
+ data:{userName:tlte.uid },
+ url : path+'/font/qRCodeLogin',
+ success:function (tltel) {
+ if(tltel.code == 100){
+
+ window.location.href = tltel.extend.url;
+ }else{
+ $("#msg").text(tltel.msg);
+ }
+ }
+ })
+ }else {
+ alert("登录失败请重新登录")
+ }
+ }
+ })
+ }
+ }
+ })
+
+}
+
+
+
+
+
+function handoffLogin2(){
+
+ $("#switchHandoff").css("display","block");
+ $("#switchHandoff2").css("display","none");
+ clearInterval(interval);
+
+}
+
+
$('body').keydown(function () {
if(event.keyCode == '13'){
login();
diff --git a/power-dao/power-dao.iml b/power-dao/power-dao.iml
deleted file mode 100644
index 7721c2d..0000000
--- a/power-dao/power-dao.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
index 1e6415a..d0c52b6 100644
--- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
+++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
@@ -1,6 +1,8 @@
package com.manage.dao;
+import com.manage.entity.CodeLogin;
import com.manage.entity.Power_User;
+import com.manage.vo.CodeLoginVO;
import com.manage.vo.Power_UserVo;
import com.manage.vo.User;
import org.apache.ibatis.annotations.Param;
@@ -70,4 +72,6 @@ public interface Power_UserMapper {
Power_UserVo selectByUserName(String userName);
void updatePersonal(Power_User user);
+
+ public Power_UserVo findUserName(Power_User powerUser);
}
\ No newline at end of file
diff --git a/power-dao/src/main/java/com/manage/entity/CodeLogin.java b/power-dao/src/main/java/com/manage/entity/CodeLogin.java
new file mode 100644
index 0000000..fa4e124
--- /dev/null
+++ b/power-dao/src/main/java/com/manage/entity/CodeLogin.java
@@ -0,0 +1,77 @@
+package com.manage.entity;
+
+import com.manage.vo.User_Dept_Menu;
+
+import java.util.List;
+import java.util.Set;
+
+public class CodeLogin {
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ private String userName;
+
+ private Integer roleId;
+
+ public Integer getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(Integer roleId) {
+ this.roleId = roleId;
+ }
+ private Integer userId;
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ private Set
menus;
+
+ public Set getMenus() {
+ return menus;
+ }
+
+ public void setMenus(Set menus) {
+ this.menus = menus;
+ }
+
+ public List getMenuList() {
+ return menuList;
+ }
+
+ public void setMenuList(List menuList) {
+ this.menuList = menuList;
+ }
+
+ private List menuList;
+
+
+ private String deptId;
+
+ public String getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(String deptId) {
+ this.deptId = deptId;
+ }
+ private String remark;
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+}
diff --git a/power-dao/src/main/java/com/manage/vo/CodeLoginVO.java b/power-dao/src/main/java/com/manage/vo/CodeLoginVO.java
new file mode 100644
index 0000000..633b897
--- /dev/null
+++ b/power-dao/src/main/java/com/manage/vo/CodeLoginVO.java
@@ -0,0 +1,55 @@
+package com.manage.vo;
+
+import com.manage.entity.CodeLogin;
+
+import java.util.List;
+import java.util.Set;
+
+public class CodeLoginVO extends CodeLogin {
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ private String userName;
+ private Integer roleId;
+
+ public Integer getRoleId() {
+ return roleId;
+ }
+
+ public void setRoleId(Integer roleId) {
+ this.roleId = roleId;
+ }
+ private Integer userId;
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+ private Set menus;
+
+ public Set getMenus() {
+ return menus;
+ }
+
+ public void setMenus(Set menus) {
+ this.menus = menus;
+ }
+
+ public List getMenuList() {
+ return menuList;
+ }
+
+ public void setMenuList(List menuList) {
+ this.menuList = menuList;
+ }
+
+ private List menuList;
+}
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 529600e..bb39646 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -745,4 +745,9 @@
where user_id = #{userId,jdbcType=INTEGER}
+
+
+
\ No newline at end of file
diff --git a/power-service/src/main/java/com/manage/service/Power_UserService.java b/power-service/src/main/java/com/manage/service/Power_UserService.java
index f6c3b5e..573ded7 100644
--- a/power-service/src/main/java/com/manage/service/Power_UserService.java
+++ b/power-service/src/main/java/com/manage/service/Power_UserService.java
@@ -1,6 +1,8 @@
package com.manage.service;
+import com.manage.entity.CodeLogin;
import com.manage.entity.Power_User;
+import com.manage.vo.CodeLoginVO;
import com.manage.vo.Power_UserVo;
import javax.servlet.http.HttpServletRequest;
@@ -95,4 +97,6 @@ public interface Power_UserService {
public Power_UserVo findPowerUserByUserNameAndRemark(Power_User powerUser);
void updatePersonal(Power_User user);
+
+ public Power_UserVo findUserName(Power_User powerUser);
}
diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
index 72ec245..f366211 100644
--- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
+++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
@@ -4,6 +4,7 @@ import com.manage.dao.Power_UserMapper;
import com.manage.dao.User_Dept_MenuMapper;
import com.manage.encrypt.Base64;
import com.manage.encrypt.MD5;
+import com.manage.entity.CodeLogin;
import com.manage.entity.Power_Dept;
import com.manage.entity.Power_User;
import com.manage.service.Power_DeptService;
@@ -11,6 +12,7 @@ import com.manage.service.Power_RoleService;
import com.manage.service.Power_UserService;
import com.manage.util.ActionScopeUtils;
import com.manage.util.Constant;
+import com.manage.vo.CodeLoginVO;
import com.manage.vo.Power_UserVo;
import com.manage.vo.User_Dept_Menu;
import org.apache.commons.lang3.StringUtils;
@@ -269,4 +271,10 @@ public class Power_UserServiceImpl implements Power_UserService {
public void updatePersonal(Power_User user) {
powerUserMapper.updatePersonal(user);
}
+
+ @Override
+ public Power_UserVo findUserName(Power_User powerUser) {
+ return powerUserMapper.findUserName(powerUser);
+ }
+
}