Merge branch '塔里木分支' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -84,6 +84,11 @@ namespace Learun.Application.Web.Controllers
                 var userinfo = LoginUserInfo.Get();
                 if (userinfo != null)
                 {
+                    var type = 0;//1学生 0教师
+                    if (userinfo.Description == "学生")
+                    {
+                        type = 1;
+                    }
                     var perm_application = perm_FunctionIBLL.GetPerm_FunctionEntity(Request.QueryString["appid"]);
                     if (perm_application != null)
                     {
@@ -93,12 +98,16 @@ namespace Learun.Application.Web.Controllers
                         var url = perm_application.FInterfaceUrl;
                         if (url.Contains("?"))
                         {
-                            url += "&appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
+                            url += "&appkey=" + Md5Helper.Encrypt("tlmzysso", 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, "tlmzysso") + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, "tlmzysso") + "&type=" + type;
+                            //url += "&appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
                         }
                         else
                         {
-                            url += "?appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
+                            //url += "&appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
+                            url += "?appkey=" + Md5Helper.Encrypt("tlmzysso", 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, "tlmzysso") + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, "tlmzysso") + "&type=" + type;
                         }
+
+
                         return Redirect(url);
                     }
                     else

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SSOApi.cs

@@ -147,6 +147,11 @@ namespace Learun.Application.WebApi.Modules
             var ssoparam = this.GetReqData<SSOParam>();
             if (userinfo != null)
             {
+                var type = 0;//1学生 0教师
+                if (userinfo.Description == "学生")
+                {
+                    type = 1;
+                }
                 var perm_application = perm_FunctionIBLL.GetPerm_FunctionEntity(ssoparam.appid);
                 if (perm_application != null)
                 {
@@ -156,11 +161,13 @@ namespace Learun.Application.WebApi.Modules
                     var url = perm_application.FInterfaceUrl;
                     if (url.Contains("?"))
                     {
-                        url += "&appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
+                        url += "&appkey=" + Md5Helper.Encrypt("tlmzysso", 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, "tlmzysso") + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, "tlmzysso") + "&type=" + type;
+                        //url += "&appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
                     }
                     else
                     {
-                        url += "?appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
+                        //url += "&appkey=" + DESEncrypt.Encrypt(code, "bjqjsso");
+                        url += "?appkey=" + Md5Helper.Encrypt("tlmzysso", 32) + "&name=" + DESEncrypt.Encrypt(userinfo.realName, "tlmzysso") + "&no=" + DESEncrypt.Encrypt(userinfo.enCode, "tlmzysso") + "&type=" + type;
                     }
                     return Success(new{ FInterfaceUrl=url });
                 }