From b0744c82dbb0bb2a15763dbbd83a924f54312821 Mon Sep 17 00:00:00 2001
From: fs-danaus <danaus314@qq.com>
Date: 星期二, 26 七月 2022 17:02:48 +0800
Subject: [PATCH] 完善小程序端登录日志记录

---
 src/com/yc/sdk/oauth2/action/OAuth2Login.java |   38 ++++----------------------------------
 1 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/com/yc/sdk/oauth2/action/OAuth2Login.java b/src/com/yc/sdk/oauth2/action/OAuth2Login.java
index 947b2fc..dd6f69d 100644
--- a/src/com/yc/sdk/oauth2/action/OAuth2Login.java
+++ b/src/com/yc/sdk/oauth2/action/OAuth2Login.java
@@ -109,42 +109,12 @@
 				this.print(response, "<script> alert('" + ip + "绂佹鐧诲綍" + "');window.location='/login.jsp"+(redirect != null && !"".equals(redirect)?"?redirect="+redirect:"") + "';</script>");
 				return ;
 			}
-
-		    //
-		    
-//		  //璁剧疆鏉冮檺
-//			PerssionEntity perssionEntity = new PerssionEntity() ;
-//			perssionEntity.setRole(rIfc.getRole(userAccount.getUserCode()));
-//			perssionEntity.setPerssion(userAccountService.getUserProfiles(userAccount.getUserCode()));
-//			if (userAccount.getDefaultSet() != null && !"".equals(userAccount.getDefaultSet())) {
-//				perssionEntity.setDefaultSet(userAccountService.getDefaultSet(userAccount.getDefaultSet()));
-//			}
-//
-//			//淇濆瓨浼氳瘽 session 淇℃伅
-//		     LoginAction.setSessionValues(dbId,userAccount, session,perssionEntity);
-			 loginAction.processLoginUserToSessionV2(ip,dbId,request,userAccount);
-			// 鐧诲綍鎴愬姛娓呴櫎鐧诲綍閿欒淇℃伅
-			//record.clearLoginRecord(userAccount.getUserCode());
-		    
-		    // --------------
-		    //String ucode = account + Math.random();// 鏄负浜嗗尯鍒嗙敤鎴烽噸澶嶉棶棰橈紝鍚屼竴鐢ㄦ埛鍙互澶氫汉浣跨敤銆�
-		    //session.setAttribute(SessionKey.SAIL_USERCODE, ucode);
-		    //OnLineUser.setOnlineUser(dataString, ucode, session);
-		    /*
-		     * WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext(); ServletContext servletContext = webApplicationContext.getServletContext();//鍙栧緱ServletContext瀵硅薄瀹炰緥 if((OnLineUser)servletContext.getAttribute("onlineuserlistener")==null) { OnLineUser
-		     * onuser=new OnLineUser();//鍙缃竴娆★紝涓嶅悓浜庝笂闈㈡棩蹇楁枃浠剁殑璁板綍姣忔浼氳瘽鍧囪缃�傚嵆褰撶涓�涓鎴疯繛鎺ュ埌鏈嶅姟鍣ㄦ椂鍚姩涓�涓叏灞�鍙橀噺锛屾鍚庢墍鏈夌殑瀹㈡埛灏嗕娇鐢ㄧ浉鍚岀殑涓婁笅鏂囥�� servletContext.setAttribute("onlineuserlistener",onuser);//灏嗙洃鍚櫒瀵硅薄璁剧疆鎴怱ervletContext鐨勫睘鎬э紝鍏锋湁鍏ㄥ眬鑼冨洿鏈夋晥鎬э紝鍗虫墍鏈夌殑瀹㈡埛鍧囧彲浠ュ彇寰楀畠鐨勫疄渚嬨�� }
-		     * session.setAttribute("onlineuserlistener",(OnLineUser)servletContext.getAttribute("onlineuserlistener"));//鍙栧嚭姝ゅ叏灞�瀵硅薄锛屽苟涓斿皢姝ゅ璞$粦瀹氬埌鏌愪釜浼氳瘽涓紝姝や妇灏嗕績浣跨洃鍚櫒璋冪敤valueBound锛岃鏁板櫒鍔犱竴銆�
-		     */
-		    //session.setAttribute(SessionKey.ONLINE_USERS, new OnLineUser());// 鍦ㄧ嚎浜烘暟缁熻
-		    // ------------------
-			
 			session.setAttribute("NickName",oauth2InfoEntity.getNickName());   //鏄电О
 			session.setAttribute("headimgurl",oauth2InfoEntity.getHeadimgurl());  //澶村儚
-			
-			//淇濆瓨鐧诲綍淇℃伅
-		   // userAccountService.loginLog(userAccount.getUserCode(), userAccount.getUserName(), ip,session.getId());
-		    
-		    try {
+			//by danaus 2022/7/26 16:34
+			session.setAttribute(SessionKey.USER_LOGIN_TYPE, SessionKey.USER_LOGIN_TYPE_MINIAPP);//miniapp 灏忕▼搴忕被鍨�
+			loginAction.processLoginUserToSessionV2(ip,dbId,request,userAccount);
+			try {
 		    	//鍒犻櫎 redis 涓婄殑淇℃伅
 		    	redisTemplate.delete(oauth2UUID) ;
 			}catch(Exception e) {

--
Gitblit v1.8.0