Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasy into Dev

EuroTran/EasyBL.WEBAPP/ShowEasy/SystemService.cs

@@ -185,6 +185,15 @@ namespace EasyBL.WEBAPP.SYS
                         ticket.CreateTime = DateTime.Now;
                         db.Insertable(ticket).ExecuteCommand();
                     }
+                    if (!string.IsNullOrEmpty(oUser.MemberPicture))
+                    {
+                        var sFilePath = db.Queryable<OTB_SYS_Files>()
+                                            .Where(x => x.ParentID == oUser.MemberPicture)
+                                            .Single();
+                        string requestUrl = Common.ConfigGetValue("", "ida:RedirectUri");
+                        oUser.MemberPicture = requestUrl + "/" + sFilePath.FilePath.Replace("\\", "/");
+
+                    }
                     //記錄log日誌
                     db.Insertable(new OTB_SYS_LoginLog
                     {
@@ -207,6 +216,8 @@ namespace EasyBL.WEBAPP.SYS
                     var strtoken = string.Format(@"orgid:{0},userid:{1},token:{2}", ticket.OrgID, ticket.UserID, ticket.Token);
                     srm = new SuccessResponseMessage(null, null);
                     srm.DATA.Add("authtoken", SecurityUtil.Encrypt(strtoken));
+                    srm.DATA.Add("memberpicture", oUser.MemberPicture);
+                    srm.DATA.Add("memberlastname", oUser.LastName);
                 } while (false);
             }
             catch (Exception ex)