MongoDB仓储验证，暂未全部切换到abp默认仓储

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -1267,7 +1267,7 @@ namespace Business.ResourceExamineManagement
         {
             mo_mes_oorder oOrder = new mo_mes_oorder();
             oOrder.id = help.NextId();
-            oOrder.GenerateNewId();
+            oOrder.mysql_id=help.NextId();
             oOrder.oorder_no = getOrderNum("WW");//生产工单编号
             oOrder.oorder_type = "委外工单";//生产工单类型
             oOrder.oorder_date = DateTime.Now;//委外订单日期

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -3035,7 +3035,7 @@ namespace Business.ResourceExamineManagement
                         else
                         {
                             ic_item_stock stock = new ic_item_stock();
-                            stock.GenerateNewId();
+                            stock.GenerateNewId(help.NextId());
                             stock.factory_id = 1001;
                             stock.tenant_id = 1000;
                             stock.icitem_id = num.Id;

MicroServices/Business/Business.Domain/MoBaseEntity.cs

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using MongoDB.Bson.Serialization.Attributes;
+using Business.Core.Utilities;
+using MongoDB.Bson;
+
+namespace Business.Domain
+{
+    public abstract class MoBaseEntity: Entity<long>
+    {
+        /// <summary>
+        /// 生成新的Id
+        /// </summary>
+        public void GenerateNewId(long id)
+        {
+            Id = id;
+        }
+        /// <summary>
+        /// mysql表id
+        /// </summary>
+        [Comment("mysql表id")]
+        public virtual long mysql_id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Comment("创建人id")]
+        public virtual long? create_by { get; set; }
+
+        /// <summary>
+        /// 创建人名称
+        /// </summary>
+        [StringLength(50)]
+        [Comment("创建人名称")]
+        public virtual string? create_by_name { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Comment("创建时间")]
+        public virtual DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        [Comment("修改人")]
+        public virtual long? update_by { get; set; }
+
+        /// <summary>
+        /// 修改人名称
+        /// </summary>
+        [StringLength(50)]
+        [Comment("修改人名称")]
+        public virtual string? update_by_name { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        [Comment("修改时间")]
+        public virtual DateTime? update_time { get; set; }
+
+        /// <summary>
+        /// 企业ID
+        /// </summary>
+        [Required]
+        [Comment("企业ID")]
+        public virtual long tenant_id { get; set; }
+
+        /// <summary>
+        /// 工厂ID
+        /// </summary>
+        [Comment("工厂ID")]
+        public virtual long? factory_id { get; set; }
+
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        [Comment("组织ID")]
+        public virtual long? org_id { get; set; }
+
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        [DefaultValue(false)]
+        [Comment("删除标识")]
+        public bool IsDeleted { get; set; }
+
+    }
+}

MicroServices/Business/Business.Domain/User.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace Business.Domain
+{
+    public class User: MoBaseEntity
+    {
+        public string Username { get; set; }
+
+        public string Password { get; set; }
+
+        public string Type { get; set; }
+
+        public string Identity { get; set; }
+
+        public string Name { get; set; }
+
+        public string Avatar { get; set; }
+
+        public string Email { get; set; }
+
+        public bool IsAdmin { get; set; } = false;
+    }
+}

MicroServices/Business/Business.Host/Business.Host.csproj

@@ -38,6 +38,7 @@
     <ProjectReference Include="..\Business.Core\Business.Core.csproj" />
     <ProjectReference Include="..\Business.EntityFrameworkCore\Business.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Business.HttpApi\Business.HttpApi.csproj" />
+    <ProjectReference Include="..\Bussiness.MongoDB\Bussiness.MongoDB.csproj" />
   </ItemGroup>
 
   <ItemGroup>

MicroServices/Business/Business.Host/BusinessHostModule.cs

@@ -42,6 +42,7 @@ using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Threading;
 using Volo.Abp.VirtualFileSystem;
+using Bussiness.MongoDB;
 
 namespace Business
 {
@@ -51,6 +52,7 @@ namespace Business
         typeof(BusinessHttpApiModule),
         typeof(BusinessApplicationModule),
         typeof(BusinessEntityFrameworkCoreModule),
+        typeof(BussinessMongoDbModule),
         typeof(AbpAspNetCoreMultiTenancyModule),
         typeof(AbpAspNetCoreSerilogModule)
     )]
@@ -342,15 +344,15 @@ namespace Business
             app.UseUnitOfWork();
             app.UseConfiguredEndpoints();
             app.UseQuartz();
-            AsyncHelper.RunSync(async () =>
-            {
-                using (var scope = context.ServiceProvider.CreateScope())
-                {
-                    await scope.ServiceProvider
-                        .GetRequiredService<IDataSeeder>()
-                        .SeedAsync();
-                }
-            });
+            //AsyncHelper.RunSync(async () =>
+            //{
+            //    using (var scope = context.ServiceProvider.CreateScope())
+            //    {
+            //        await scope.ServiceProvider
+            //            .GetRequiredService<IDataSeeder>()
+            //            .SeedAsync();
+            //    }
+            //});
         }
     }
 }

MicroServices/Business/Business.Host/appsettings.json

@@ -17,7 +17,7 @@
     "DOPLog": "Server=123.60.181.157;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     "DOPBang": "Server=123.60.181.157;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     "DOPExt": "Server=123.60.181.157;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
-
+    "MongoDBTest": "mongodb://zzydop:h1Q$us3r@123.60.181.157/dopbase",
     "MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.181.157/",
     "DBName": "dopbase"
   },

MicroServices/Business/Business.sln

@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.Domain.Test", "Bus
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.EntityFrameworkCore.Test", "Bussiness.EntityFrameworkCore.Test\Business.EntityFrameworkCore.Test.csproj", "{F55D18B1-65B3-4417-9EA1-032630A2201A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bussiness.MongoDB", "Bussiness.MongoDB\Bussiness.MongoDB.csproj", "{F75F1412-2392-4625-9CAB-2AD1F8D2EFCC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -101,6 +103,10 @@ Global
 		{F55D18B1-65B3-4417-9EA1-032630A2201A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F55D18B1-65B3-4417-9EA1-032630A2201A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F55D18B1-65B3-4417-9EA1-032630A2201A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F75F1412-2392-4625-9CAB-2AD1F8D2EFCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F75F1412-2392-4625-9CAB-2AD1F8D2EFCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F75F1412-2392-4625-9CAB-2AD1F8D2EFCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F75F1412-2392-4625-9CAB-2AD1F8D2EFCC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -26,15 +26,6 @@ namespace Business.Model
         /// <summary>
         /// 生成新的Id
         /// </summary>
-        public void GenerateNewId()
-        { 
-            SnowFlake snow = new SnowFlake();
-            Id = snow.NextId();
-        }
-
-        /// <summary>
-        /// 生成新的Id
-        /// </summary>
         public void GenerateNewId(long id)
         {
             Id = id;

MicroServices/Business/Bussiness.MongoDB/BusinessMongoDbContextModelCreatingExtensions.cs

@@ -0,0 +1,27 @@
+using Business.Domain;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.Xml;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.MongoDB;
+using Volo.Abp;
+
+namespace Bussiness.MongoDB
+{
+    public static class BusinessMongoDbContextModelCreatingExtensions
+    {
+        public static void Configure(this IMongoModelBuilder builder)
+        {
+            Check.NotNull(builder, nameof(builder));
+            builder.Entity<User>(b =>
+            {
+                b.CollectionName = MongoDbConsts.User;
+                b.BsonMap.AutoMap();
+                b.BsonMap.SetIgnoreExtraElements(true);
+            });
+        }
+    }
+}

MicroServices/Business/Bussiness.MongoDB/Bussiness.MongoDB.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AuditLogging.MongoDB" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.PermissionManagement.MongoDB" Version="6.0.2" />
+    <PackageReference Include="Volo.Abp.TenantManagement.MongoDB" Version="6.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
+  </ItemGroup>
+
+</Project>

MicroServices/Business/Bussiness.MongoDB/BussinessMongoDbContext.cs

@@ -0,0 +1,22 @@
+using Business.Domain;
+using MongoDB.Driver;
+using Volo.Abp.Data;
+using Volo.Abp.MongoDB;
+
+namespace Bussiness.MongoDB
+{
+    [ConnectionStringName("MongoDBTest")]
+    public class BussinessMongoDbContext : AbpMongoDbContext
+    {
+        /* Add mongo collections here. Example:
+         * public IMongoCollection<Question> Questions => Collection<Question>();
+         */
+        public IMongoCollection<User> Users => Collection<User>();
+        protected override void CreateModel(IMongoModelBuilder modelBuilder)
+        {
+            base.CreateModel(modelBuilder);
+
+            modelBuilder.Configure();
+        }
+    }
+}

MicroServices/Business/Bussiness.MongoDB/BussinessMongoDbModule.cs

@@ -0,0 +1,37 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Auditing;
+using Volo.Abp.AuditLogging.MongoDB;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.MongoDB;
+using Volo.Abp.TenantManagement.MongoDB;
+using Volo.Abp.Uow;
+
+namespace Bussiness.MongoDB
+{
+    [DependsOn(
+    typeof(AbpPermissionManagementMongoDbModule),
+    typeof(AbpAuditLoggingMongoDbModule),
+    typeof(AbpTenantManagementMongoDbModule)
+    )]
+    public class BussinessMongoDbModule: AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddMongoDbContext<BussinessMongoDbContext>(options =>
+            {
+                options.AddDefaultRepositories(includeAllEntities: true);
+            });
+
+            Configure<AbpUnitOfWorkDefaultOptions>(options =>
+            {
+                options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled;
+            });
+
+            Configure<AbpAuditingOptions>(options =>
+            {
+                options.IsEnabledForGetRequests = true;
+            });
+        }
+    }
+   
+}

MicroServices/Business/Bussiness.MongoDB/MongoDbConsts.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.MongoDB
+{
+    public static class MongoDbConsts
+    {
+        /// <summary>
+        /// User
+        /// </summary>
+        public const string User = "dop_users";
+    }
+}

MicroServices/Business/Bussiness.MongoModel/Base/MoBaseEntity.cs

@@ -18,15 +18,6 @@ namespace Business.MongoModel
     public abstract class MoBaseEntity 
     {
         /// <summary>
-        /// 生成新的mysqlId
-        /// </summary>
-        public void GenerateNewId()
-        {
-            SnowFlake snow = new SnowFlake();
-            mysql_id = snow.NextId();
-        }
-
-        /// <summary>
         /// id
         /// </summary>
         [Comment("id")]