Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in
Toggle navigation
G
GS.Terminal.VisitorSelfService
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
终端组
GS.Terminal.VisitorSelfService
Commits
939974cd
Commit
939974cd
authored
May 28, 2021
by
姜春辉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正注册设备卡住的bug
parent
71dceab5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
9 deletions
+22
-9
GS.Terminal.VisitorSelfService.Logic.dll
...elfService.Logic/GS.Terminal.VisitorSelfService.Logic.dll
+0
-0
Program.cs
...ice/Logic/GS.Terminal.VisitorSelfService.Logic/Program.cs
+13
-9
WebApi.cs
...gic/GS.Terminal.VisitorSelfService.Logic/Remote/WebApi.cs
+9
-0
No files found.
Publish/Addons/GS.Terminal.VisitorSelfService.Logic/GS.Terminal.VisitorSelfService.Logic.dll
View file @
939974cd
No preview for this file type
Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Program.cs
View file @
939974cd
...
...
@@ -18,7 +18,7 @@ namespace GS.Terminal.VisitorSelfService.Logic
internal
static
IAddonContext
_Context
;
internal
static
IObjectSpace
_ObjectSpace
;
internal
static
Locator
vmLocator
;
internal
static
string
_logicVersion
=
"0528"
;
internal
static
string
_logicVersion
=
"0528
.17
"
;
public
void
Start
(
IAddonContext
Context
)
{
...
...
@@ -45,15 +45,19 @@ namespace GS.Terminal.VisitorSelfService.Logic
_ObjectSpace
=
manager
.
CreateObjectSpace
(
_Context
,
"c1"
);
_ObjectSpace
.
UpdateDataSchema
();
Handlers
.
Product
();
var
signature
=
WebApi
.
Signature
();
if
(!
signature
.
success
)
Task
.
Run
(
async
()
=>
{
var
ex
=
new
Exception
(
$"终端注册失败,失败原因:
{
signature
.
message
}
"
);
_Context
.
Logger
.
Error
(
"启动失败"
,
ex
);
throw
ex
;
}
TerminalConsole
.
StartHeart
(
LocalSetting
.
AppConfig
.
ServerIP
,
LocalSetting
.
AddonDefaultConfig
.
HeartPort
,
30
*
1000
);
ThirdAddon
.
LogicShell
.
ShowView
(
vmLocator
.
MenuPage
);
var
signature
=
await
WebApi
.
SignatureAsync
();
if
(!
signature
.
success
)
{
var
ex
=
new
Exception
(
$"终端注册失败,失败原因:
{
signature
.
message
}
"
);
_Context
.
Logger
.
Error
(
"启动失败"
,
ex
);
throw
ex
;
}
TerminalConsole
.
StartHeart
(
LocalSetting
.
AppConfig
.
ServerIP
,
LocalSetting
.
AddonDefaultConfig
.
HeartPort
,
30
*
1000
);
ThirdAddon
.
LogicShell
.
ShowView
(
vmLocator
.
MenuPage
);
});
}
public
void
Stop
(
IAddonContext
Context
)
...
...
Src/GS.Terminal.VisitorSelfService/Logic/GS.Terminal.VisitorSelfService.Logic/Remote/WebApi.cs
View file @
939974cd
...
...
@@ -140,6 +140,15 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote
_token
=
token
.
tToken
;
return
(
true
,
_token
);
}
public
static
async
Task
<(
bool
success
,
string
message
)>
SignatureAsync
()
{
var
token
=
await
GetTAsync
<
TerminalToken
>(
$"/api/GS.WebApi.Terminal/TerminalConsole/Signature?tCode=
{
LocalSetting
.
AppConfig
.
tCode
}
&tMacCode=
{
GetMACAddress
()}
"
);
if
(
token
==
null
)
return
(
false
,
"网络异常,设备注册失败"
);
if
(!
token
.
Status
)
return
(
false
,
$"设备注册失败.原因:
{
token
.
Message
}
"
);
_token
=
token
.
tToken
;
return
(
true
,
_token
);
}
}
public
class
TerminalToken
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment