test commit
This commit is contained in:
@@ -16,7 +16,6 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Ewide.Application\Ewide.Application.csproj" />
|
|
||||||
<ProjectReference Include="..\Ewide.Database.Migrations\Ewide.Database.Migrations.csproj" />
|
<ProjectReference Include="..\Ewide.Database.Migrations\Ewide.Database.Migrations.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using Ewide.Application;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\..\Ewide.NbzsZheliban\Ewide.NbzsZheliban.csproj" />
|
||||||
<ProjectReference Include="..\Ewide.Web.Core\Ewide.Web.Core.csproj" />
|
<ProjectReference Include="..\Ewide.Web.Core\Ewide.Web.Core.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.Logging.Seril
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.ObjectMapper.Mapster", "Furion\framework\Furion.Extras.ObjectMapper.Mapster\Furion.Extras.ObjectMapper.Mapster.csproj", "{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Furion.Extras.ObjectMapper.Mapster", "Furion\framework\Furion.Extras.ObjectMapper.Mapster\Furion.Extras.ObjectMapper.Mapster.csproj", "{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ewide.NbzsZheliban", "..\..\Ewide.NbzsZheliban\Ewide.NbzsZheliban.csproj", "{6873597B-2322-40B3-B627-402C2912968B}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FrameFolder", "FrameFolder", "{3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -83,11 +87,22 @@ Global
|
|||||||
{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Release|Any CPU.Build.0 = Release|Any CPU
|
{E12B30F8-E10C-496D-BDA2-2A9ABCF89752}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{6873597B-2322-40B3-B627-402C2912968B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{6873597B-2322-40B3-B627-402C2912968B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{6873597B-2322-40B3-B627-402C2912968B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{6873597B-2322-40B3-B627-402C2912968B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(NestedProjects) = preSolution
|
GlobalSection(NestedProjects) = preSolution
|
||||||
|
{AB699EE9-43A8-46F2-A855-04A26DE63372} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
|
{4BD77E5C-138D-4F2D-B709-F9020F306AF3} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
|
{9D14BB78-DA2A-4040-B9DB-5A515B599181} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
|
{4FB30091-15C7-4FD9-AB7D-266814F360F5} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
|
{EA769D36-9D55-47A6-945F-1687EA95179F} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
|
{DECE4796-6B13-4607-9C27-C1FE093D4DC8} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
|
{6268B595-60F2-49E5-9A8F-AC6C0CA2DB41} = {3EA9BBB0-4D6D-47FE-90E4-70DD8FF1DFEA}
|
||||||
{5890EF6C-26A0-4574-AF65-72328ABD0BF6} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
|
{5890EF6C-26A0-4574-AF65-72328ABD0BF6} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
|
||||||
{DA30BF70-B175-4E27-B63F-38C417EACB14} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
|
{DA30BF70-B175-4E27-B63F-38C417EACB14} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
|
||||||
{A58BF039-040D-4542-A3BE-6355F4F2BCEE} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
|
{A58BF039-040D-4542-A3BE-6355F4F2BCEE} = {6268B595-60F2-49E5-9A8F-AC6C0CA2DB41}
|
||||||
|
|||||||
12531
Web/package-lock.json
generated
Normal file
12531
Web/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -10,8 +10,9 @@ const doLogin = (args) => {
|
|||||||
let { account, password } = args
|
let { account, password } = args
|
||||||
password = encryptByRSA(password, RSA_PUBLIC_KEY)
|
password = encryptByRSA(password, RSA_PUBLIC_KEY)
|
||||||
api.login({ account, password }).then(({ success, data, message }) => {
|
api.login({ account, password }).then(({ success, data, message }) => {
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
token.value = data
|
token.value = data.token
|
||||||
app.$message.success('登录成功')
|
app.$message.success('登录成功')
|
||||||
if (app.$route.query.return) {
|
if (app.$route.query.return) {
|
||||||
const r = decryptByDES(app.$route.query.return)
|
const r = decryptByDES(app.$route.query.return)
|
||||||
|
|||||||
Reference in New Issue
Block a user