更新数据库模型

Models/Push/Merchant.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class Merchant
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string RsaPubKey { get; set; }
+        public string RsaPriKey { get; set; }
+        public string AesSecret { get; set; }
+        public string MerchantNo { get; set; }
+        public string MerchantName { get; set; }
+    }
+}

Models/Push/PushObj.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class PushObj
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string FieldList { get; set; }
+        public string TableName { get; set; }
+        public int EncryptMode { get; set; }
+        public string NoticeUrl { get; set; }
+        public string Title { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

Models/Push/PushRecord.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class PushRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string PushData { get; set; }
+        public string PushDataEncrypt { get; set; }
+        public int PushObjId { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

Models/Push/RePushQueue.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class RePushQueue
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string RePushUrl { get; set; }
+        public DateTime? RePushDate { get; set; }
+        public int Times { get; set; }
+        public string PushData { get; set; }
+        public string PushDataEncrypt { get; set; }
+        public int PushObjId { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

Models/Push/SourceCondition.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class SourceCondition
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public int QueryCondition { get; set; }
+        public string QueryVal { get; set; }
+        public string QueryField { get; set; }
+        public int SourceId { get; set; }
+    }
+}

Models/Push/SourceData.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class SourceData
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string FieldList { get; set; }
+        public string TableName { get; set; }
+        public string Title { get; set; }
+    }
+}

Models/Push/SourceDataSubTable.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Push
+{
+    public partial class SourceDataSubTable
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string ReturnField { get; set; }
+        public string QueryField { get; set; }
+        public int SourceId { get; set; }
+        public string TableName { get; set; }
+    }
+}

Models/Push/WebCMSEntities.cs

@@ -0,0 +1,502 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace MySystem.Models.Push
+{
+    public partial class WebCMSEntities : DbContext
+    {
+        public WebCMSEntities()
+        {
+        }
+
+        public WebCMSEntities(DbContextOptions<WebCMSEntities> options)
+            : base(options)
+        {
+        }
+
+        public virtual DbSet<Merchant> Merchant { get; set; }
+        public virtual DbSet<PushObj> PushObj { get; set; }
+        public virtual DbSet<PushRecord> PushRecord { get; set; }
+        public virtual DbSet<RePushQueue> RePushQueue { get; set; }
+        public virtual DbSet<SourceCondition> SourceCondition { get; set; }
+        public virtual DbSet<SourceData> SourceData { get; set; }
+        public virtual DbSet<SourceDataSubTable> SourceDataSubTable { get; set; }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (!optionsBuilder.IsConfigured)
+            {
+                optionsBuilder.UseMySql(Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString(), x => x.ServerVersion("5.7.17-mysql"));
+            }
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<Merchant>(entity =>
+            {
+                entity.ToTable("merchant");
+
+                entity.HasComment("商户表");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.AesSecret)
+                    .HasColumnName("aes_secret")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("AES密钥")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.MerchantName)
+                    .HasColumnName("merchant_name")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户名称")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantNo)
+                    .HasColumnName("merchant_no")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RsaPriKey)
+                    .HasColumnName("rsa_pri_key")
+                    .HasColumnType("mediumtext")
+                    .HasComment("RSA私钥")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.RsaPubKey)
+                    .HasColumnName("rsa_pub_key")
+                    .HasColumnType("mediumtext")
+                    .HasComment("RSA公钥")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<PushObj>(entity =>
+            {
+                entity.ToTable("push_obj");
+
+                entity.HasComment("推送项目");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.EncryptMode)
+                    .HasColumnName("encrypt_mode")
+                    .HasColumnType("int(11)")
+                    .HasComment("加密方式");
+
+                entity.Property(e => e.FieldList)
+                    .HasColumnName("field_list")
+                    .HasColumnType("varchar(500)")
+                    .HasComment("数据字段")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnName("merchant_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("商户");
+
+                entity.Property(e => e.NoticeUrl)
+                    .HasColumnName("notice_url")
+                    .HasColumnType("varchar(500)")
+                    .HasComment("推送地址")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TableName)
+                    .HasColumnName("table_name")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("数据表名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Title)
+                    .HasColumnName("title")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("标题说明")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<PushRecord>(entity =>
+            {
+                entity.ToTable("push_record");
+
+                entity.HasComment("推送记录");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnName("merchant_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("商户");
+
+                entity.Property(e => e.PushData)
+                    .HasColumnName("push_data")
+                    .HasColumnType("mediumtext")
+                    .HasComment("推送数据")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PushDataEncrypt)
+                    .HasColumnName("push_data_encrypt")
+                    .HasColumnType("mediumtext")
+                    .HasComment("推送数据加密")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PushObjId)
+                    .HasColumnName("push_obj_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("推送项目");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<RePushQueue>(entity =>
+            {
+                entity.ToTable("re_push_queue");
+
+                entity.HasComment("重推队列");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnName("merchant_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("商户");
+
+                entity.Property(e => e.PushData)
+                    .HasColumnName("push_data")
+                    .HasColumnType("mediumtext")
+                    .HasComment("推送数据")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PushDataEncrypt)
+                    .HasColumnName("push_data_encrypt")
+                    .HasColumnType("mediumtext")
+                    .HasComment("推送数据加密")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.PushObjId)
+                    .HasColumnName("push_obj_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("推送项目");
+
+                entity.Property(e => e.RePushDate)
+                    .HasColumnName("re_push_date")
+                    .HasColumnType("datetime")
+                    .HasComment("再次重推时间");
+
+                entity.Property(e => e.RePushUrl)
+                    .HasColumnName("re_push_url")
+                    .HasColumnType("varchar(500)")
+                    .HasComment("重推地址")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.Times)
+                    .HasColumnName("times")
+                    .HasColumnType("int(11)")
+                    .HasComment("次数");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<SourceCondition>(entity =>
+            {
+                entity.ToTable("source_condition");
+
+                entity.HasComment("原始数据抓取条件");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.QueryCondition)
+                    .HasColumnName("query_condition")
+                    .HasColumnType("int(11)")
+                    .HasComment("查询条件");
+
+                entity.Property(e => e.QueryField)
+                    .HasColumnName("query_field")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("查询字段")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.QueryVal)
+                    .HasColumnName("query_val")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("查询值")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.SourceId)
+                    .HasColumnName("source_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("原始数据");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<SourceData>(entity =>
+            {
+                entity.ToTable("source_data");
+
+                entity.HasComment("原始数据配置");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.FieldList)
+                    .HasColumnName("field_list")
+                    .HasColumnType("varchar(500)")
+                    .HasComment("数据字段")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TableName)
+                    .HasColumnName("table_name")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("数据表名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Title)
+                    .HasColumnName("title")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("标题说明")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<SourceDataSubTable>(entity =>
+            {
+                entity.ToTable("source_data_sub_table");
+
+                entity.HasComment("原始数据关联表");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnName("create_date")
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.QueryField)
+                    .HasColumnName("query_field")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("查询字段")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ReturnField)
+                    .HasColumnName("return_field")
+                    .HasColumnType("varchar(500)")
+                    .HasComment("返回字段")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnName("sort")
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.SourceId)
+                    .HasColumnName("source_id")
+                    .HasColumnType("int(11)")
+                    .HasComment("原始数据");
+
+                entity.Property(e => e.Status)
+                    .HasColumnName("status")
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.TableName)
+                    .HasColumnName("table_name")
+                    .HasColumnType("varchar(50)")
+                    .HasComment("表名")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnName("update_date")
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.Version)
+                    .HasColumnName("version")
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            OnModelCreatingPartial(modelBuilder);
+        }
+
+        partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
+    }
+}

appsettings.Development.json

@@ -8,13 +8,12 @@
   },
   "AllowedHosts": "*",
   "Setting": {
-    "Host": "http://localhost:5501/",
-    "OssHost": "http://admanager.yunmic.com",
-    "SourceHost": "https://adv-sources.oss-cn-chengdu.aliyuncs.com",
-    "Database": "AdAdminServer",
-    "SqlConnStr": "server=47.109.81.183;port=3306;user=AdMainServer;password=9uTIFI8hzsUQLWkE;database=AdMainServer;charset=utf8;",
-    "BsSqlConnStr": "server=47.109.81.183;port=3306;user=AdConfigServer;password=aSALhtfc7A7XqR6G;database=AdConfigServer;charset=utf8;",
-    "RedisConnStr": "47.109.81.183:6379,password=ym87540628,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "Host": "",
+    "OssHost": "",
+    "SourceHost": "",
+    "Database": "KxsPushServer",
+    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsPushServer;password=DaMSJxexJMW7i0Jb;database=KxsPushServer;charset=utf8;",
+    "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "",
@@ -23,7 +22,7 @@
     "OSSBucketName": "",
     "AppSource": "/skin/app/default/",
     "JwtSecret": "JvDHuowbOnWiyxMIFc9gG5rw1LSSc0xx68L31oRfxS0",
-    "JwtIss": "AdAdminServer",
+    "JwtIss": "KxsPushServer",
     "JwtAud": "api"
   }
 }