Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HYH.Registry
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
张龙涛
HYH.Registry
Commits
c0ef3bff
Commit
c0ef3bff
authored
Aug 17, 2021
by
樊国敬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
error
parent
d54cb379
Pipeline
#139
failed with stages
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
11 deletions
+16
-11
EncryptionService.cs
...stry.Application/Services/Encryption/EncryptionService.cs
+8
-7
RegistryDbContext.cs
...ityFrameworkCore/EntityFrameworkCore/RegistryDbContext.cs
+3
-0
HYH.Registry.Application.xml
src/HYH.Registry.Web.Host/HYH.Registry.Application.xml
+1
-1
ServiceCollectionExtensions.cs
src/HYH.Registry.Web.Host/ServiceCollectionExtensions.cs
+3
-2
appsettings.json
src/HYH.Registry.Web.Host/appsettings.json
+1
-1
No files found.
src/HYH.Registry.Application/Services/Encryption/EncryptionService.cs
View file @
c0ef3bff
...
...
@@ -17,8 +17,8 @@ namespace HYH.Registry.Services.Encryption
public
class
EncryptionService
:
ApplicationService
{
private
readonly
ICurrentUser
_currentUser
;
private
readonly
RegistryDbContext
_dbContext
;
private
readonly
DbContext
<
Tenant
>
_dbTenant
;
//
private readonly RegistryDbContext _dbContext;
//
private readonly DbContext<Tenant> _dbTenant;
private
readonly
IRepository
<
Tenant
,
int
>
_repTenant
;
/// <summary>
...
...
@@ -26,13 +26,14 @@ namespace HYH.Registry.Services.Encryption
///</summary>
public
EncryptionService
(
ICurrentUser
currentUser
,
RegistryDbContext
dbContext
,
DbContext
<
Tenant
>
dbTenant
,
IRepository
<
Tenant
,
int
>
repTenant
)
// RegistryDbContext dbContext,
// DbContext<Tenant> dbTenant,
IRepository
<
Tenant
,
int
>
repTenant
)
{
_currentUser
=
currentUser
;
_dbContext
=
dbContext
;
_dbTenant
=
dbTenant
;
//
_dbContext = dbContext;
//
_dbTenant = dbTenant;
_repTenant
=
repTenant
;
...
...
src/HYH.Registry.EntityFrameworkCore/EntityFrameworkCore/RegistryDbContext.cs
View file @
c0ef3bff
using
Abp.EntityFrameworkCore
;
using
HYH.Core.DbModels
;
using
HYH.Registry.DbModels
;
//using HYH.Registry.DbModels;
using
HYH.Registry.Nodes
;
...
...
@@ -11,6 +12,8 @@ namespace HYH.Registry.EntityFrameworkCore
public
DbSet
<
Node
>
Nodes
{
get
;
set
;
}
public
DbSet
<
MaterialPowder
>
MaterialPowders
{
get
;
set
;
}
public
DbSet
<
Tenant
>
Tenants
{
get
;
set
;
}
public
RegistryDbContext
(
DbContextOptions
<
RegistryDbContext
>
options
)
:
base
(
options
)
{
...
...
src/HYH.Registry.Web.Host/HYH.Registry.Application.xml
View file @
c0ef3bff
...
...
@@ -48,7 +48,7 @@
</summary>
</member>
<member
name=
"M:HYH.Registry.Services.Encryption.EncryptionService.#ctor(HYH.AspNetCore.ICurrentUser,
HYH.Registry.EntityFrameworkCore.RegistryDbContext,HYH.SqlSugarCore.DbContext{HYH.Core.DbModels.Tenant},
Abp.Domain.Repositories.IRepository{HYH.Core.DbModels.Tenant,System.Int32})"
>
<member
name=
"M:HYH.Registry.Services.Encryption.EncryptionService.#ctor(HYH.AspNetCore.ICurrentUser,Abp.Domain.Repositories.IRepository{HYH.Core.DbModels.Tenant,System.Int32})"
>
<summary>
构造函数
</summary>
...
...
src/HYH.Registry.Web.Host/ServiceCollectionExtensions.cs
View file @
c0ef3bff
using
Microsoft.Extensions.DependencyInjection
;
using
HYH.SqlSugarCore
;
using
Microsoft.Extensions.DependencyInjection
;
namespace
HYH.Registry
{
...
...
@@ -6,7 +7,7 @@ namespace HYH.Registry
{
public
static
IServiceCollection
AddRegistry
(
this
IServiceCollection
services
)
{
services
.
AddTransient
(
typeof
(
DbContext
<>));
return
services
;
}
}
...
...
src/HYH.Registry.Web.Host/appsettings.json
View file @
c0ef3bff
...
...
@@ -11,7 +11,7 @@
"ServerAddress"
:
"http://*:10160"
},
"apollo"
:
{
"AppId"
:
"saas_mes_
r
egistry"
,
"AppId"
:
"saas_mes_
R
egistry"
,
"Env"
:
"Pro"
,
"Meta"
:
{
//
"MetaServer"
:
"http://39.100.148.168:8080"
,
...
...
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