不含新个险登录的万能险

CZKJ.GBRS2.WebMVC/Controllers/UserController.cs

@@ -9,11 +9,13 @@ using System.Threading.Tasks;
 using System.Web;
 using CZFW.Core;
 using CZFW.Framework.Interface;
+using CZFW.Framework.Model;
 using CZKJ.GBRS2.Interface;
 using CZKJ.GBRS2.Model;
 using CZKJ.GBRS2.ViewModel;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -38,14 +40,9 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
         public IActionResult Index(string code = null)
         {
             string session = HttpContext.Session.GetString("GBRS2018");
-            //个人登录跳转链接
-            var loginurl = ConfigHelper.GetValue<string>("LoginCallback:Url");
             if (session != null)
             {
-                var userinfo = JsonConvert.DeserializeObject<UserInfoModel>(session);
-                var userIndexUrl = $"{loginurl}?personalId={userinfo.User_id}";
-                return Redirect(userIndexUrl);
-                //return View(JsonConvert.DeserializeObject<UserInfoModel>(session));
+                return View(JsonConvert.DeserializeObject<UserInfoModel>(session));
             }
             //获取当前请求地址
             var url = HttpUtility.UrlEncode($"{ConfigHelper.GetValue<string>("Login:Scheme")}://{Request.Host}{Request.Path}").Replace("%3a", "%3A").Replace("%2f", "%2F");
@@ -152,33 +149,7 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
             //    //_clogic.ExcuteSql($"UPDATE gbrs2_customerinfo SET LastLoginTime='{DateTime.Now.ToString()}' WHERE User_id={user.User_id}");
             //    _clogic.EditEntity(queryUser);
             //}         
-            //if (string.IsNullOrWhiteSpace(user.Core_customer_code))
-            //{
-            //    return View("Notice",user);
-            //}
-            //:http://uat01.guobaojinrong.com/wef/pc/api/personaluser/callback?personalId=xxxx&openId=xxx   
-            var personalRedirectUrl = $"{loginurl}?personalId={user.User_id}";
-            return Redirect(personalRedirectUrl);
-            //return View(user);
-        }
-        //回调官网
-        public IActionResult CallBackHome(string personalId)
-        {
-            string session = HttpContext.Session.GetString("GBRS2018");
-            if (session != null)
-            {
-                var user = JsonConvert.DeserializeObject<UserInfoModel>(session);
-                if (user.User_id != personalId)
-                {
-                    //从session获取用户信息
-                    string sessiontoken = HttpContext.Session.GetString("token");
-                    //拼接登出链接
-                    var logOutUrl = $"{ConfigHelper.GetValue<string>("Login:Url")}/uai/api/oauth20/logout?access_token={sessiontoken}";
-                    var res = HttpHelper.HttpGet(logOutUrl);
-                    HttpContext.Session.Remove("GBRS2018");
-                }
-            }
-            return Redirect("/");
+            return View(user);
         }
 
 
@@ -186,7 +157,7 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
         /// 登出
         /// </summary>
         /// <returns></returns>
-        public IActionResult LogOut(string personalId)
+        public IActionResult LogOut()
         {
             //从session获取用户信息
             string session = HttpContext.Session.GetString("token");
@@ -322,11 +293,7 @@ namespace CZKJ.GBRS2.WebMVC.Controllers
                 //_clogic.ExcuteSql($"UPDATE gbrs2_customerinfo SET LastLoginTime='{DateTime.Now.ToString()}' WHERE User_id={user.User_id}");
                 _clogic.EditEntity(queryUser);
             }
-
-            var loginurl = ConfigHelper.GetValue<string>("LoginCallback:Url");
-            var personalRedirectUrl = $"{loginurl}?personalId={user.User_id}";
-            return Redirect(personalRedirectUrl);
-            //return RedirectToAction("Index", "User");
+            return RedirectToAction("Index", "User");
         }
         /// <summary>
         /// 根据保单号查询保单详情