Commit c0ef3bff authored by 樊国敬's avatar 樊国敬

error

parent d54cb379
Pipeline #139 failed with stages
...@@ -17,8 +17,8 @@ namespace HYH.Registry.Services.Encryption ...@@ -17,8 +17,8 @@ namespace HYH.Registry.Services.Encryption
public class EncryptionService : ApplicationService public class EncryptionService : ApplicationService
{ {
private readonly ICurrentUser _currentUser; private readonly ICurrentUser _currentUser;
private readonly RegistryDbContext _dbContext; //private readonly RegistryDbContext _dbContext;
private readonly DbContext<Tenant> _dbTenant; //private readonly DbContext<Tenant> _dbTenant;
private readonly IRepository<Tenant, int> _repTenant; private readonly IRepository<Tenant, int> _repTenant;
/// <summary> /// <summary>
...@@ -26,13 +26,14 @@ namespace HYH.Registry.Services.Encryption ...@@ -26,13 +26,14 @@ namespace HYH.Registry.Services.Encryption
///</summary> ///</summary>
public EncryptionService( public EncryptionService(
ICurrentUser currentUser, ICurrentUser currentUser,
RegistryDbContext dbContext, // RegistryDbContext dbContext,
DbContext<Tenant> dbTenant, // DbContext<Tenant> dbTenant,
IRepository<Tenant, int> repTenant) IRepository<Tenant, int> repTenant
)
{ {
_currentUser = currentUser; _currentUser = currentUser;
_dbContext = dbContext; // _dbContext = dbContext;
_dbTenant = dbTenant; // _dbTenant = dbTenant;
_repTenant = repTenant; _repTenant = repTenant;
......
using Abp.EntityFrameworkCore; using Abp.EntityFrameworkCore;
using HYH.Core.DbModels;
using HYH.Registry.DbModels; using HYH.Registry.DbModels;
//using HYH.Registry.DbModels; //using HYH.Registry.DbModels;
using HYH.Registry.Nodes; using HYH.Registry.Nodes;
...@@ -11,6 +12,8 @@ namespace HYH.Registry.EntityFrameworkCore ...@@ -11,6 +12,8 @@ namespace HYH.Registry.EntityFrameworkCore
public DbSet<Node> Nodes { get; set; } public DbSet<Node> Nodes { get; set; }
public DbSet<MaterialPowder> MaterialPowders { get; set; } public DbSet<MaterialPowder> MaterialPowders { get; set; }
public DbSet<Tenant> Tenants { get; set; }
public RegistryDbContext(DbContextOptions<RegistryDbContext> options) public RegistryDbContext(DbContextOptions<RegistryDbContext> options)
: base(options) : base(options)
{ {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</summary> </summary>
</member> </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>
构造函数 构造函数
</summary> </summary>
......
using Microsoft.Extensions.DependencyInjection; using HYH.SqlSugarCore;
using Microsoft.Extensions.DependencyInjection;
namespace HYH.Registry namespace HYH.Registry
{ {
...@@ -6,7 +7,7 @@ namespace HYH.Registry ...@@ -6,7 +7,7 @@ namespace HYH.Registry
{ {
public static IServiceCollection AddRegistry(this IServiceCollection services) public static IServiceCollection AddRegistry(this IServiceCollection services)
{ {
services.AddTransient(typeof(DbContext<>));
return services; return services;
} }
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"ServerAddress": "http://*:10160" "ServerAddress": "http://*:10160"
}, },
"apollo": { "apollo": {
"AppId": "saas_mes_registry", "AppId": "saas_mes_Registry",
"Env": "Pro", "Env": "Pro",
"Meta": { "Meta": {
//"MetaServer": "http://39.100.148.168:8080", //"MetaServer": "http://39.100.148.168:8080",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment