暂存

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -139,11 +139,11 @@ namespace MySystem.Areas.Admin.Controllers
                 //所属人信息
                 int Id = int.Parse(dic["Id"].ToString());
                 SysAdmin sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
-                var dic["ExpiredStatus"] = 0; // 是否过期(0 未过期 1 已过期)
-                if (sysAdmin.ExpiredDate < DateTimeConstantAttribute.Now)
-                {
-                    dic["ExpiredStatus"] = 1;
-                }
+                // var dic["ExpiredStatus"] = 0; // 是否过期(0 未过期 1 已过期)
+                // if (sysAdmin.ExpiredDate < DateTimeConstantAttribute.Now)
+                // {
+                //     dic["ExpiredStatus"] = 1;
+                // }
                 var userInfo = db.Users.FirstOrDefault(m => m.Id == sysAdmin.UserId) ?? new Models.Users();
                 if (userInfo.UserType == 0) dic["Kind"] = "";
                 if (userInfo.UserType == 1) dic["Kind"] = "运营中心";

Startup.cs

@@ -176,17 +176,10 @@ namespace MySystem
         private void initMainServer(string Env)
         {
             string dbName = "KxsMainServer";
-<<<<<<< HEAD
             // if (Env == "Production")
             // {
             //     dbName = "KxsProfitServer";
             // }
-=======
-            if(Env == "Production")
-            {
-                dbName = "KxsProfitServer";
-            }
->>>>>>> feature-dgy-运营中心过期
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Library.OtherMySqlConn.connstr = Configuration["Setting:SqlConnStr"];
             System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = '" + dbName + "'");