Browse Source

[领导免密登录][移动塔台]:合并修复

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
b822bdf228
1 changed files with 0 additions and 7 deletions
  1. +0
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java

+ 0
- 7
mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java View File

@@ -14,11 +14,7 @@ import com.iformall.service.MallRolePermissionService;
import com.iformall.service.MallUserInfoService; import com.iformall.service.MallUserInfoService;
import com.iformall.service.MallUserRoleService; import com.iformall.service.MallUserRoleService;
import com.iformall.shiro.UserSession; import com.iformall.shiro.UserSession;
<<<<<<< HEAD
import com.iformall.utils.IPUtil;
=======
import com.iformall.shiro.UseriFormallToken; import com.iformall.shiro.UseriFormallToken;
>>>>>>> [ADMIN端领导免密登录][移动塔台]:领导手机授权免密登录
import com.iformall.utils.ShiroUtils; import com.iformall.utils.ShiroUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -32,13 +28,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;


import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;


Loading…
Cancel
Save