Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
2b90afd9
Commit
2b90afd9
authored
Oct 06, 2017
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup code.
parent
39e1b310
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
59 deletions
+12
-59
DotNetCore.CAP.MySql.csproj
src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj
+1
-1
ModelBindingResult.cs
...tCore.CAP/Abstractions/ModelBinding/ModelBindingResult.cs
+1
-1
CapCache.cs
src/DotNetCore.CAP/CapCache.cs
+2
-0
Strings.zh.resx
src/DotNetCore.CAP/Dashboard/Content/resx/Strings.zh.resx
+0
-45
DotNetCore.CAP.csproj
src/DotNetCore.CAP/DotNetCore.CAP.csproj
+2
-7
ObjectId.cs
src/DotNetCore.CAP/Infrastructure/ObjectId.cs
+1
-1
CapMessageDto.cs
src/DotNetCore.CAP/Models/CapMessageDto.cs
+1
-0
INodeDiscoveryProvider.Consul.cs
...etCore.CAP/NodeDiscovery/INodeDiscoveryProvider.Consul.cs
+2
-2
IState.Succeeded.cs
src/DotNetCore.CAP/Processor/States/IState.Succeeded.cs
+2
-2
No files found.
src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj
View file @
2b90afd9
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<PackageReference Include="Dapper" Version="1.50.2" />
<PackageReference Include="Dapper" Version="1.50.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
<PackageReference Include="MySqlConnector" Version="0.2
6.5
" />
<PackageReference Include="MySqlConnector" Version="0.2
7.0
" />
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
...
...
src/DotNetCore.CAP/Abstractions/ModelBinding/ModelBindingResult.cs
View file @
2b90afd9
...
@@ -43,7 +43,7 @@ namespace DotNetCore.CAP.Abstractions.ModelBinding
...
@@ -43,7 +43,7 @@ namespace DotNetCore.CAP.Abstractions.ModelBinding
{
{
if
(
IsSuccess
)
if
(
IsSuccess
)
return
$"Success '
{
Model
}
'"
;
return
$"Success '
{
Model
}
'"
;
return
$
"Failed"
;
return
"Failed"
;
}
}
public
override
bool
Equals
(
object
obj
)
public
override
bool
Equals
(
object
obj
)
...
...
src/DotNetCore.CAP/CapCache.cs
View file @
2b90afd9
...
@@ -13,6 +13,8 @@ namespace DotNetCore.CAP
...
@@ -13,6 +13,8 @@ namespace DotNetCore.CAP
/// Cache is thread safe and will delete expired entries on its own using System.Threading.Timers (which run on
/// Cache is thread safe and will delete expired entries on its own using System.Threading.Timers (which run on
/// <see cref="ThreadPool" /> threads).
/// <see cref="ThreadPool" /> threads).
/// </summary>
/// </summary>
// ReSharper disable once InheritdocConsiderUsage
// ReSharper disable once InconsistentNaming
public
class
Cache
<
K
,
T
>
:
IDisposable
public
class
Cache
<
K
,
T
>
:
IDisposable
{
{
#
region
Constructor
and
class
members
#
region
Constructor
and
class
members
...
...
src/DotNetCore.CAP/Dashboard/Content/resx/Strings.zh.resx
View file @
2b90afd9
...
@@ -150,9 +150,6 @@
...
@@ -150,9 +150,6 @@
<data
name=
"Common_MoreDetails"
xml:space=
"preserve"
>
<data
name=
"Common_MoreDetails"
xml:space=
"preserve"
>
<value>
更多...
</value>
<value>
更多...
</value>
</data>
</data>
<data
name=
"Common_NotAvailable"
xml:space=
"preserve"
>
<value>
N/A
</value>
</data>
<data
name=
"Common_PeriodDay"
xml:space=
"preserve"
>
<data
name=
"Common_PeriodDay"
xml:space=
"preserve"
>
<value>
天
</value>
<value>
天
</value>
</data>
</data>
...
@@ -213,27 +210,6 @@
...
@@ -213,27 +210,6 @@
<data
name=
"PerPageSelector_ItemsPerPage"
xml:space=
"preserve"
>
<data
name=
"PerPageSelector_ItemsPerPage"
xml:space=
"preserve"
>
<value>
每页条数
</value>
<value>
每页条数
</value>
</data>
</data>
<data
name=
"QueuesPage_NoJobs"
xml:space=
"preserve"
>
<value>
没有作业
</value>
</data>
<data
name=
"QueuesPage_NoQueues"
xml:space=
"preserve"
>
<value>
队列中不存在。尝试添加作业到队列
</value>
</data>
<data
name=
"QueuesPage_Table_Length"
xml:space=
"preserve"
>
<value>
长度
</value>
</data>
<data
name=
"QueuesPage_Table_NextsJobs"
xml:space=
"preserve"
>
<value>
下一个作业
</value>
</data>
<data
name=
"QueuesPage_Table_Queue"
xml:space=
"preserve"
>
<value>
队列
</value>
</data>
<data
name=
"QueuesPage_Title"
xml:space=
"preserve"
>
<value>
队列
</value>
</data>
<data
name=
"ServersPage_NoServers"
xml:space=
"preserve"
>
<value>
没有活动服务器。后台作业将不会被执行。
</value>
</data>
<data
name=
"ServersPage_Table_Heartbeat"
xml:space=
"preserve"
>
<data
name=
"ServersPage_Table_Heartbeat"
xml:space=
"preserve"
>
<value>
心跳
</value>
<value>
心跳
</value>
</data>
</data>
...
@@ -276,36 +252,18 @@
...
@@ -276,36 +252,18 @@
<data
name=
"NavigationMenu_Servers"
xml:space=
"preserve"
>
<data
name=
"NavigationMenu_Servers"
xml:space=
"preserve"
>
<value>
服务器
</value>
<value>
服务器
</value>
</data>
</data>
<data
name=
"Common_CannotFindTargetMethod"
xml:space=
"preserve"
>
<value>
Can not find the target method.
</value>
</data>
<data
name=
"Common_Enqueued"
xml:space=
"preserve"
>
<data
name=
"Common_Enqueued"
xml:space=
"preserve"
>
<value>
队列
</value>
<value>
队列
</value>
</data>
</data>
<data
name=
"Common_NoState"
xml:space=
"preserve"
>
<value>
No state
</value>
</data>
<data
name=
"Metrics_ActiveConnections"
xml:space=
"preserve"
>
<value>
Active Connections
</value>
</data>
<data
name=
"Metrics_DeletedJobs"
xml:space=
"preserve"
>
<data
name=
"Metrics_DeletedJobs"
xml:space=
"preserve"
>
<value>
删除
</value>
<value>
删除
</value>
</data>
</data>
<data
name=
"Metrics_ProcessingJobs"
xml:space=
"preserve"
>
<value>
执行中
</value>
</data>
<data
name=
"Metrics_Servers"
xml:space=
"preserve"
>
<data
name=
"Metrics_Servers"
xml:space=
"preserve"
>
<value>
服务器
</value>
<value>
服务器
</value>
</data>
</data>
<data
name=
"Metrics_TotalConnections"
xml:space=
"preserve"
>
<data
name=
"Metrics_TotalConnections"
xml:space=
"preserve"
>
<value>
总连接数
</value>
<value>
总连接数
</value>
</data>
</data>
<data
name=
"Common_Condition"
xml:space=
"preserve"
>
<value>
Condition
</value>
</data>
<data
name=
"Common_Continuations"
xml:space=
"preserve"
>
<value>
Continuations
</value>
</data>
<data
name=
"Metrics_AwaitingCount"
xml:space=
"preserve"
>
<data
name=
"Metrics_AwaitingCount"
xml:space=
"preserve"
>
<value>
等待中
</value>
<value>
等待中
</value>
</data>
</data>
...
@@ -357,9 +315,6 @@
...
@@ -357,9 +315,6 @@
<data
name=
"MessagesPage_Table_Retries"
xml:space=
"preserve"
>
<data
name=
"MessagesPage_Table_Retries"
xml:space=
"preserve"
>
<value>
重试次数
</value>
<value>
重试次数
</value>
</data>
</data>
<data
name=
"MesssagesPage_NoMessages"
xml:space=
"preserve"
>
<value>
没有消息
</value>
</data>
<data
name=
"PublishedPage_Title"
xml:space=
"preserve"
>
<data
name=
"PublishedPage_Title"
xml:space=
"preserve"
>
<value>
已发送消息
</value>
<value>
已发送消息
</value>
</data>
</data>
...
...
src/DotNetCore.CAP/DotNetCore.CAP.csproj
View file @
2b90afd9
...
@@ -100,10 +100,10 @@
...
@@ -100,10 +100,10 @@
<Compile Update="Dashboard\Pages\PublishedPage.cs">
<Compile Update="Dashboard\Pages\PublishedPage.cs">
<DependentUpon>PublishedPage.cshtml</DependentUpon>
<DependentUpon>PublishedPage.cshtml</DependentUpon>
</Compile>
</Compile>
<Compile Update="Dashboard\Pages\PublishedPage
1.generated
.cs">
<Compile Update="Dashboard\Pages\PublishedPage
*
.cs">
<DependentUpon>PublishedPage.cshtml</DependentUpon>
<DependentUpon>PublishedPage.cshtml</DependentUpon>
</Compile>
</Compile>
<Compile Update="Dashboard\Pages\LayoutPage
1.generated
.cs">
<Compile Update="Dashboard\Pages\LayoutPage
.*
.cs">
<DependentUpon>LayoutPage.cshtml</DependentUpon>
<DependentUpon>LayoutPage.cshtml</DependentUpon>
</Compile>
</Compile>
<Compile Update="Dashboard\Pages\LayoutPage.cs">
<Compile Update="Dashboard\Pages\LayoutPage.cs">
...
@@ -138,9 +138,4 @@
...
@@ -138,9 +138,4 @@
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
</EmbeddedResource>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<None Update="Dashboard\Pages\HomePage.cshtml">
<Generator>RazorGenerator</Generator>
</None>
</ItemGroup>
</Project>
</Project>
\ No newline at end of file
src/DotNetCore.CAP/Infrastructure/ObjectId.cs
View file @
2b90afd9
...
@@ -6,7 +6,7 @@ using System.Security.Cryptography;
...
@@ -6,7 +6,7 @@ using System.Security.Cryptography;
using
System.Text
;
using
System.Text
;
using
System.Threading
;
using
System.Threading
;
namespace
DotNetCore.CAP
namespace
DotNetCore.CAP
.Infrastructure
{
{
/// <summary>
/// <summary>
/// Represents an ObjectId
/// Represents an ObjectId
...
...
src/DotNetCore.CAP/Models/CapMessageDto.cs
View file @
2b90afd9
using
System
;
using
System
;
using
DotNetCore.CAP.Infrastructure
;
namespace
DotNetCore.CAP.Models
namespace
DotNetCore.CAP.Models
{
{
...
...
src/DotNetCore.CAP/NodeDiscovery/INodeDiscoveryProvider.Consul.cs
View file @
2b90afd9
...
@@ -57,7 +57,7 @@ namespace DotNetCore.CAP.NodeDiscovery
...
@@ -57,7 +57,7 @@ namespace DotNetCore.CAP.NodeDiscovery
{
{
CapCache
.
Global
.
AddOrUpdate
(
"cap.nodes.count"
,
0
,
TimeSpan
.
FromSeconds
(
20
));
CapCache
.
Global
.
AddOrUpdate
(
"cap.nodes.count"
,
0
,
TimeSpan
.
FromSeconds
(
20
));
_logger
.
LogError
(
"Get consul nodes raised an exception. Exception:"
+
ex
.
Message
);
_logger
.
LogError
(
$"Get consul nodes raised an exception. Exception:
{
ex
.
Message
}
,
{
ex
.
InnerException
.
Message
}
"
);
return
null
;
return
null
;
}
}
}
}
...
@@ -85,7 +85,7 @@ namespace DotNetCore.CAP.NodeDiscovery
...
@@ -85,7 +85,7 @@ namespace DotNetCore.CAP.NodeDiscovery
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
_logger
.
LogError
(
"Register consul nodes raised an exception. Exception:"
+
ex
.
Message
);
_logger
.
LogError
(
$"Get consul nodes raised an exception. Exception:
{
ex
.
Message
}
,
{
ex
.
InnerException
.
Message
}
"
);
return
null
;
return
null
;
}
}
}
}
...
...
src/DotNetCore.CAP/Processor/States/IState.Succeeded.cs
View file @
2b90afd9
...
@@ -12,9 +12,9 @@ namespace DotNetCore.CAP.Processor.States
...
@@ -12,9 +12,9 @@ namespace DotNetCore.CAP.Processor.States
ExpiresAfter
=
TimeSpan
.
FromHours
(
1
);
ExpiresAfter
=
TimeSpan
.
FromHours
(
1
);
}
}
public
SucceededState
(
int
E
xpireAfterSeconds
)
public
SucceededState
(
int
e
xpireAfterSeconds
)
{
{
ExpiresAfter
=
TimeSpan
.
FromSeconds
(
E
xpireAfterSeconds
);
ExpiresAfter
=
TimeSpan
.
FromSeconds
(
e
xpireAfterSeconds
);
}
}
public
TimeSpan
?
ExpiresAfter
{
get
;
}
public
TimeSpan
?
ExpiresAfter
{
get
;
}
...
...
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