1

youxiw2000
1 parent 9227cfcc
Showing 7 changed files with 146 additions and 44 deletions
bsthLineProfiles/pom.xml
bsthLineProfiles/src/main/java/com/ruoyi/framework/web/service/TokenService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
bsthLineProfiles/src/main/resources/mybatis/system/MenuMapper.xml
@@ -287,6 +287,19 @@
             <artifactId>poi-ooxml</artifactId>
             <version>${poi.version}</version>
         </dependency>
+        
+                <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.10</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
  
     </dependencies>
  
@@ -50,17 +50,11 @@ public class TokenService
      *
      * @return 用户信息
      */
-    public User getUser(HttpServletRequest request)
+    public User getUser(String token)
     {
-        // 获取请求携带的令牌
-        String token = getToken(request);
         if (StringUtils.isNotEmpty(token))
         {
-            Claims claims = parseToken(token);
-            // 解析对应的权限以及用户信息
-            String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
-            String userKey = getTokenKey(uuid);
-            User user = redisCache.getCacheObject(userKey);
+            User user = redisCache.getCacheObject(token);
             return user;
         }
         return null;
@@ -174,10 +168,7 @@ public class TokenService
      */
     private Claims parseToken(String token)
     {
-        return Jwts.parser()
-                .setSigningKey(secret)
-                .parseClaimsJws(token)
-                .getBody();
+        return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
     }
  
     /**
@@ -121,4 +121,6 @@ public interface MenuMapper
      * @return 结果
      */
     public Menu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
+
+	public List<Menu> selectMenuNormalByMenuIds(String[] ids);
 }
@@ -124,4 +124,6 @@ public interface IMenuService
      * @return 结果
      */
     public String checkMenuNameUnique(Menu menu);
+
+	public List<Menu> selectMenuNormalByMenuIds(String[] strings);
 }
@@ -48,17 +48,22 @@ public class MenuServiceImpl implements IMenuService
     {
         List<Menu> menus = new LinkedList<Menu>();
         // 管理员显示所有菜单信息
-        if (user.isAdmin())
-        {
+//        if (user.isAdmin())
+//        {
             menus = menuMapper.selectMenuNormalAll();
-        }
-        else
-        {
-            menus = menuMapper.selectMenusByUserId(user.getUserId());
-        }
+//        }
+//        else
+//        {
+//            menus = menuMapper.selectMenusByUserId(user.getUserId());
+//        }
         return TreeUtils.getChildPerms(menus, 0);
     }
+	@Override
+	public List<Menu> selectMenuNormalByMenuIds(String[] ids) {
+		// TODO Auto-generated method stub
  
+        return TreeUtils.getChildPerms(menuMapper.selectMenuNormalByMenuIds(ids), 0);
+	}
     /**
      * 查询菜单集合
      * 
@@ -321,4 +326,6 @@ public class MenuServiceImpl implements IMenuService
         }
         return UserConstants.MENU_NAME_UNIQUE;
     }
+
+
 }
 package com.ruoyi.project.system.user.controller;
  
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -18,6 +27,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
  
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -26,13 +38,15 @@ import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.shiro.service.PasswordService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.project.system.config.service.IConfigService;
 import com.ruoyi.project.system.menu.domain.Menu;
 import com.ruoyi.project.system.menu.service.IMenuService;
-import com.ruoyi.project.system.menu.service.MenuServiceImpl;
 import com.ruoyi.project.system.user.domain.User;
  
+import io.jsonwebtoken.lang.Assert;
+
 /**
  * 登录验证
  * 
@@ -55,6 +69,7 @@ public class LoginController extends BaseController
  
     @Autowired
     private RuoYiConfig ruoYiConfig;
+    
  
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response)
@@ -74,16 +89,55 @@ public class LoginController extends BaseController
  
     	if(token != null) {
  
-    		login("admin","admin123",false);
+    		User user = tokenService.getUser(token);
+    	    if (user == null && token != null) {    	        
+    	        
+    	        String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
+    	        
+    	        
+    	        JSONObject jsonObject = JSON.parseObject(dataJsonStr);
+
+    	        
+    	        JSONObject dataJson = jsonObject.getJSONObject("data");
+
+    	        Assert.notNull(dataJson, "获取用户信息异常");
+    	        
+    	        
+    	        JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList");
+    	        
+
+    	        Map<Long,Menu> menuMap = new HashMap<Long,Menu>();
+    	        
+    	        String ids = "";
+    	        
+	        	for(Object json:jsonMenu) {
+	        		ids += ((JSONObject)json).getLongValue("menuId") + ",";
+    	        }
+	        	
+	        	ids.substring(0,ids.length() -1);
+
+    	        List<Menu> allMenus = menuService.selectMenuNormalByMenuIds(ids.split(","));
+	        
+	        	
+
+        		login("admin","admin123",false);
+        		user = getSysUser();
+    	        user.setToken(token);
+//    	        user.setPermissions(permissionService.getMenuPermission());
+    	        tokenService.createToken(user);
+    	        
+    	      
+    	        //String username = dataJson.getString("account");
+//    	        String username = "admin";
+//    	        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+//    	        SysUser sysUser = sysUserService.selectUserByUserName(username);
+
+//    	        user.setPermissions(permissionService.getMenuPermission(sysUser));
+//    	        user.setUser(sysUser);
+    	
  
-    		// 取身份信息
-            User user = getSysUser();
-            // 根据用户id取出菜单
-            List<Menu> menus = menuService.selectMenusByUser(user);
-            mmap.put("menus", menus);
+            mmap.put("menus", allMenus);
             mmap.put("user", user);
-            mmap.put("sideTheme", "theme-dark");
-            mmap.put("skinName", "skin-blue");
             mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
             mmap.put("copyrightYear", ruoYiConfig.getCopyrightYear());
             mmap.put("demoEnabled", ruoYiConfig.isDemoEnabled());
@@ -95,23 +149,12 @@ public class LoginController extends BaseController
             // 移动端，默认使左侧导航菜单，否则取默认配置
             String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle;
  
-            // 优先Cookie配置导航菜单
-            Cookie[] cookies = ServletUtils.getRequest().getCookies();
-            for (Cookie cookie : cookies)
-            {
-                if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName()))
-                {
-                    indexStyle = cookie.getValue();
-                    break;
-                }
-            }
  
             return "index";
  
-    	}else {
-    		return "login";
     	}
-    	
+    	    
+    	}
 //        User loginUser = tokenService.getUser(ServletUtils.getRequest());
  
  
@@ -121,10 +164,35 @@ public class LoginController extends BaseController
 //            subject.login(token);
 //            return success();
  
-
-        
+        return "index";
     }
  
+public String sendPost(String url,String token) {
+	    String strresponse = null;
+	    try{
+	    	HttpClient hc = HttpClientBuilder.create().build();//获取DefaultHttpClient请求
+	       HttpPost hp = new HttpPost(url);
+	       JSONObject jsonParam = new JSONObject();
+
+	       jsonParam.put("token", token);
+	       jsonParam.put("systemCode", "SYS0015");
+	       //设置数据为utf-8编码
+	       StringEntity entity = new StringEntity(jsonParam.toString(),"utf-8");
+	       //设置请求编码
+	       entity.setContentEncoding("utf-8");
+	       //设置请求类型
+	       entity.setContentType("application/json");
+	       hp.setEntity(entity);
+	       //请求并得到结果
+	       HttpResponse result = hc.execute(hp);
+	       strresponse = EntityUtils.toString(result.getEntity(),"utf-8").trim();
+	    }catch(Exception e){
+	       e.printStackTrace();
+	}
+	return strresponse;
+	
+}
+
     // 检查初始密码是否提醒修改
     public boolean initPasswordIsModify(Date pwdUpdateDate)
     {
@@ -45,6 +45,25 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		where m.menu_type in ('M', 'C') and m.visible = 0
 		order by m.parent_id, m.order_num
 	</select>
+	
+	<select id="selectMenuNormalByMenuIds" resultMap="MenuResult" parameterType="String">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m
+		<where> 
+		    <if test="ids != null">
+		        menu_id in
+			   <foreach item="id" collection="array" open="(" separator=","
+				close=")">
+				#{id}
+				</foreach>
+			</if>
+		    and m.menu_type in ('M', 'C') 
+		    and m.visible = 0
+		</where>
+		
+		order by m.parent_id, m.order_num
+	</select>
+	
  
 	<select id="selectMenuAll" resultMap="MenuResult">
 		<include refid="selectMenuVo"/>