lcl 2 年 前
コミット
079e9ff9b9

+ 2 - 1
.gitignore

@@ -1,3 +1,4 @@
 /bin
 /publish
-/obj
+/obj
+/appsettings.json

+ 20 - 0
.vscode/launch.json

@@ -23,6 +23,26 @@
                 "/Views": "${workspaceFolder}/Views"
             }
         },
+        {
+            "name": ".NET Core Launch (pro)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceFolder}/bin/Debug/netcoreapp3.0/MySystem.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "^\\s*Now listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Production"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",

+ 1 - 1
AppStart/ExcelHelper.cs

@@ -26,7 +26,7 @@ namespace MySystem
         {
             while (true)
             {
-                string data = RedisDbconn.Instance.RPop<string>("ExcelImportV2");
+                string data = RedisDbconn.Instance.RPop<string>("ExcelImport");
                 if (!string.IsNullOrEmpty(data))
                 {
                     string[] dataList = data.Split("#cut#");

+ 1 - 1
AppStart/OpExcelHelper.cs

@@ -26,7 +26,7 @@ namespace MySystem
         {
             while (true)
             {
-                string data = RedisDbconn.Instance.RPop<string>("ExcelImportV3");
+                string data = RedisDbconn.Instance.RPop<string>("ExcelImport");
                 if (!string.IsNullOrEmpty(data))
                 {
                     string[] dataList = data.Split("#cut#");

+ 0 - 4
AppStart/Redis/RedisDbconn.cs

@@ -14,10 +14,6 @@ namespace MySystem
         public static CSRedis.CSRedisClient csredis;
         private RedisDbconn()
         {
-            if (csredis == null)
-            {
-                csredis = new CSRedis.CSRedisClient(ConfigurationManager.AppSettings["RedisConnStr"].ToString());
-            }
         }
 
         #region 设置单个字段

+ 1 - 1
Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -601,7 +601,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#ChangeFee#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#ChangeFee#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 1 - 1
Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -515,7 +515,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#ImportJKCreateData#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#ImportJKCreateData#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 1 - 1
Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -943,7 +943,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath, int Kind = 0)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
+            long ss = RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 1 - 1
Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -475,7 +475,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#UserCashRecord#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#UserCashRecord#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 1 - 1
Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -520,7 +520,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath, int Kind = 0)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#" + Kind + "#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 1 - 1
Areas/Admin/Controllers/OperateServer/UserCashRecordOperateController.cs

@@ -386,7 +386,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV3", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 1 - 1
Areas/Admin/Controllers/OperateServer/UserCashRecordOperatesController.cs

@@ -444,7 +444,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string ImportPost(string ExcelPath)
         {
             string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV3", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 18 - 9
Startup.cs

@@ -103,12 +103,15 @@ namespace MySystem
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
+            string Env = "Develop";
             if (env.IsDevelopment())
             {
+                Env = "Develop";
                 app.UseDeveloperExceptionPage();
             }
-            else
+            else 
             {
+                Env = "Production";
                 app.UseHsts();
             }
             Library.function.WritePage("/", "WebRootPath.txt", env.WebRootPath);
@@ -134,15 +137,21 @@ namespace MySystem
                     name: "default",
                     pattern: "{controller=Home}/{action=Index}/{Id?}");
             });
-            ResetUserTradeService.Instance.Start();
-            ResetMerchantTradeService.Instance.Start();
-            SycnProfitServiceV3.Instance.Start();
-            SycnHelpProfitService.Instance.Start();
-            ExcelHelper.Instance.Start();
-            OpExcelHelper.Instance.Start();
-            SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
+            if(Env == "Develop")
+            {
+            }
+            if(Env == "Production")
+            {
+                // ResetUserTradeService.Instance.Start();
+                // ResetMerchantTradeService.Instance.Start();
+                // SycnProfitServiceV3.Instance.Start();
+                // SycnHelpProfitService.Instance.Start();
+                ExcelHelper.Instance.Start();
+                // OpExcelHelper.Instance.Start();
+                // SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
 
-            TestHelper.Instance.Start(); //生成兑换券
+                // TestHelper.Instance.Start(); //生成兑换券
+            }
         }
 
 

+ 8 - 13
appsettings.json

@@ -8,23 +8,18 @@
   },
   "AllowedHosts": "*",
   "Setting": {
-    "AppKey": "",
-    "AppId": "",
-    "CheckUrl": "",
     "ConnectionStrings": "",
-    "WebServiceUrl": "",
-    "DbSchemeUrl": "",
     "OpHost": "http://operateadmin.kexiaoshuang.com/",
-    "Host": "http://test.bs.kexiaoshuang.com/",
+    "Host": "http://admin.kexiaoshuang.com/",
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
-    "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
-    "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
-    "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
-    "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",
-    "SpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
-    "CashSqlConnStr": "server=47.109.31.237;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
-    "RedisConnStr": "47.109.31.237:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
+    "SqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;Max Pool Size=512",
+    "StatSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
+    "OpSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsOpServer;charset=utf8;",
+    "BsSqlConnStr": "server=rm-2vcs4j67tla603c9d5o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsBsServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.108.229.115;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
+    "CashSqlConnStr": "server=47.108.229.115;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
+    "RedisConnStr": "47.108.207.184:6379,password=skb@redis2022,DefaultDatabase=0,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",
     "OSSKey": "",