DG
/
TG.WXCRM.V4
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DG:d1ae0bd562cc51d15db9b2d78926449a77a424e5
Branches Tags
DG:main
..
compare: DG:c3a234bfee1082bad7a8b9f91cfeb054525c412d
Branches Tags
DG:main

No commits in common. "d1ae0bd562cc51d15db9b2d78926449a77a424e5" and "c3a234bfee1082bad7a8b9f91cfeb054525c412d" have entirely different histories.
d1ae0bd562 ... c3a234bfee

2 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
WEB/Controllers/Base/AccountController.cs
View File

@ -180,7 +180,6 @@ namespace WX.CRM.WEB.Controllers.Base
user.map_FJH = extensionNumber; user.map_FJH = extensionNumber;
} }
var logOnResultJson = LogOn(user, returnUrl, "", true); var logOnResultJson = LogOn(user, returnUrl, "", true);
LogHelper.Info("logOnResultJson：" + logOnResultJson.ToJson());
var logOnResult = (retMsg)logOnResultJson.Data; var logOnResult = (retMsg)logOnResultJson.Data;
HttpContext.Response.Cookies.Add(new HttpCookie("AuthToken", response.Data.AccessToken)); HttpContext.Response.Cookies.Add(new HttpCookie("AuthToken", response.Data.AccessToken));
if (logOnResult.result) if (logOnResult.result)

2
WEB/WEB.csproj
View File

@ -2089,6 +2089,7 @@
<Content Include="Views\Res\Activity\ResActivityIndex.cshtml" /> <Content Include="Views\Res\Activity\ResActivityIndex.cshtml" />
<Content Include="Views\Res\Allocate\DistbuteNew.cshtml" /> <Content Include="Views\Res\Allocate\DistbuteNew.cshtml" />
<Content Include="Views\Base\EmployeeEmpowerment\Index.cshtml" /> <Content Include="Views\Base\EmployeeEmpowerment\Index.cshtml" />
<Content Include="UploadFile\Download\Retrace_refund.docx" />
<Content Include="Views\Level2\L2Product\List.cshtml" /> <Content Include="Views\Level2\L2Product\List.cshtml" />
<Content Include="Views\Level2\L2Product\Edit.cshtml" /> <Content Include="Views\Level2\L2Product\Edit.cshtml" />
<Content Include="Views\Csvr\ToDoItem\Important.cshtml" /> <Content Include="Views\Csvr\ToDoItem\Important.cshtml" />
@ -3081,7 +3082,6 @@
<Folder Include="Controllers\DeptRpt\" /> <Folder Include="Controllers\DeptRpt\" />
<Folder Include="Scripts\easyui\demo\" /> <Folder Include="Scripts\easyui\demo\" />
<Folder Include="Scripts\ueditor\net\" /> <Folder Include="Scripts\ueditor\net\" />
<Folder Include="UploadFile\Download\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="packages.config" /> <Content Include="packages.config" />