修改部分功能

Edu.Cache/User/UserReidsCache.cs

@@ -84,9 +84,7 @@ namespace Edu.Cache.User
         /// 获取缓存
         /// </summary>
         /// <param name="cacheKey"></param>
-        /// <param name="Data"></param>
-        /// <param name="JwtExpirTime"></param>
-        public static object Get(string cacheKey, object Data, int JwtExpirTime)
+        public static object Get(string cacheKey)
         {
             try
             {

Edu.Common/Config.cs

@@ -159,6 +159,17 @@ namespace Edu.Common
             }
         }
 
+        /// <summary>
+        /// 企业应用APP地址
+        /// </summary>
+        public static string WorkAPPDomain
+        {
+            get
+            {
+                return ReadConfigKey("WorkAPPDomain");
+            }
+        }
+
         /// <summary>
         /// 获取Oss文件全路径
         /// </summary>

Edu.Module.QYWeChat/QYWeChatModule.cs

@@ -10,6 +10,8 @@ using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.WeChat;
 using Edu.Repository.WeChat;
 using Edu.ThirdCore.QYWinXin;
+using Newtonsoft.Json.Linq;
+using Senparc.Weixin.Work.AdvancedAPIs.OAuth2;
 using VT.FW.DB;
 
 namespace Edu.Module.QYWeChat
@@ -101,6 +103,8 @@ namespace Edu.Module.QYWeChat
             }
         }
 
-        #endregion        
+        #endregion
+
+        
     }
 }

Edu.ThirdCore/QYWinXin/QYWeiXinHelper.cs

 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Web;
+using Edu.Cache.User;
 using Edu.Cache.WeChat;
+using Edu.Common.Plugin;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Senparc.Weixin.Work;
@@ -50,8 +53,8 @@ namespace Edu.ThirdCore.QYWinXin
             var token = GetToken(groupId);
             if (!string.IsNullOrEmpty(token))
             {
-                var result = Senparc.Weixin.Work.AdvancedAPIs.OAuth2Api.GetUserIdAsync(token, code);
-                return (true, result.Result);
+                var result = Senparc.Weixin.Work.AdvancedAPIs.OAuth2Api.GetUserId(token, code);
+                return (true, result);
             }
             else 
             {
@@ -59,6 +62,31 @@ namespace Edu.ThirdCore.QYWinXin
             }
         }
 
+        /// <summary>
+        /// 组装跳转地址
+        /// </summary>
+        /// <param name="groupId">集团编号</param>
+        /// <param name="mark">唯一标识</param>
+        /// <returns></returns>
+        public string GetUserAuthorizationCodePath(int groupId, string mark)
+        {
+            var config = WeChatReidsCache.GetWorkChatConfig(groupId);
+            var token = GetToken(groupId);
+            if (!string.IsNullOrEmpty(token))
+            {
+                string redirect_uri = $"http://mobileapis.kookaku.com/api/QYWeChat/UserCodeCallBack";
+                string state = mark;
+                JObject cacheContent = new JObject();
+                cacheContent.Add("group_id",groupId);
+                UserReidsCache.Set(mark, cacheContent, 60);
+                return Senparc.Weixin.Work.AdvancedAPIs.OAuth2Api.GetCode(config.WX_CorpId, redirect_uri, state, "1000004");
+            }
+            else
+            {
+                return string.Empty;
+            }
+        }
+
         /// <summary>
         /// 获取token
         /// </summary>

Edu.WebApi/Controllers/QYWeChat/QYWeChatController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Edu.Cache.User;
+using Edu.Common;
 using Edu.Common.API;
 using Edu.Common.Enum.Finance;
 using Edu.Common.Plugin;
@@ -128,9 +129,13 @@ namespace Edu.WebApi.Controllers.Finance
             }
         }
 
+        /// <summary>
+        /// 发起登录请求
+        /// </summary>
+        /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        public ApiResult SetUserLogin() 
+        public ApiResult SetUserAutoLogin() 
         {
             var referer = Request.Headers["Origin"].ToString().Replace("http://","");
             if (!string.IsNullOrEmpty(referer))
@@ -139,15 +144,16 @@ namespace Edu.WebApi.Controllers.Finance
                 if (group.GId != 0)
                 {
                     var query = JObject.Parse(RequestParm.Msg.ToString());
-                    var code = query.GetStringValue("code");
-                    var userInfo = new QYWeiXinHelper().GetLoginWorkUserInfo(group.GId,code);
-                    if (userInfo.status)
+                    var mark = query.GetStringValue("mark");
+                    var path = new QYWeiXinHelper().GetUserAuthorizationCodePath(group.GId, mark);
+                    if (!string.IsNullOrEmpty(path))
                     {
-                        return ApiResult.Success(data: userInfo.result);
+                        HttpHelper.HttpGet(path);
+                        return ApiResult.Success(data:path);
                     }
                     else 
                     {
-                        return ApiResult.Failed(message: "解析用户信息失败");
+                        return ApiResult.Failed(message: "获取登录信息失败");
                     }
                     
                 }
@@ -163,6 +169,55 @@ namespace Edu.WebApi.Controllers.Finance
             }
         }
 
+        /// <summary>
+        /// 获取登录信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetLoginUserInfo()
+        {
+            var mark = JObject.FromObject(RequestParm.Msg).GetStringValue("mark");
+            mark += "_Finish";
+            if (UserReidsCache.Exists(mark))
+            {
+                var cacheObj = UserReidsCache.Get(mark);
+                var cacheContent = JObject.FromObject(cacheObj);
+                return ApiResult.Success(data: cacheContent["user"].ToString());
+            }
+            else 
+            {
+                return ApiResult.Success(data:"");
+            }
+        }
+
+        /// <summary>
+        /// 获取用户Code
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public IActionResult UserCodeCallBack()
+        {
+            var mark = Request.Query["state"].ToString();
+            var code = Request.Query["code"].ToString();
+
+            var cacheObj = UserReidsCache.Get(mark);
+            if (cacheObj != null && !string.IsNullOrEmpty(code)) 
+            {
+                var cacheContent = JObject.FromObject(cacheObj);
+                var userInfo = new QYWeiXinHelper().GetLoginWorkUserInfo(cacheContent.GetInt("group_id"),code);
+                if (userInfo.status)
+                {
+                    cacheContent.Add("user", JObject.FromObject(userInfo.result));
+                    UserReidsCache.Set(mark+"_Finish", cacheContent, 60);
+                }
+            }
+
+            var redirect_url = $"{Config.WorkAPPDomain}/login?mark={mark}";
+            return Redirect(redirect_url);
+        }
+
         #endregion
     }
 }

Edu.WebApi/appsettings.json

@@ -29,6 +29,7 @@
     "UploadSiteUrl": "http://192.168.1.36:8120",
     "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
     "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
+    "WorkAPPDomain": "http://mobile.kookaku.com",
     "Mongo": "mongodb://47.96.25.130:27017",
     "MongoDBName": "Edu",
     "WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",