Просмотр исходного кода

分离运营中心导表格的线程,rediskey改为ExcelImportOperate

lcl 2 лет назад
Родитель
Сommit
27c037d4e0

+ 1 - 1
AppStart/OpExcelHelper.cs

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

+ 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("ExcelImport", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImportOperate", 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("ExcelImport", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
+            RedisDbconn.Instance.AddList("ExcelImportOperate", ExcelPath + "#cut#OpUserCashRecord#cut#" + key + "#cut#" + SysUserName);
             return "success|" + key;
         }
         public string CheckImport(string key)

+ 6 - 0
Areas/Admin/Views/MainServer/TradeRecord/Import.cshtml

@@ -34,6 +34,12 @@
             <div class="layui-tab" lay-filter="mytabbar">
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">模板下载</label>
+                            <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                                <a href="https://kexiaoshuang.oss-cn-chengdu.aliyuncs.com/ExcelTmplate/default.xlsx">点击下载入库模版</a>
+                            </div>
+                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">excel文件</label>
                             <div class="layui-input-block">

+ 4 - 4
Startup.cs

@@ -167,10 +167,10 @@ namespace MySystem
         private void initMainServer(string Env)
         {
             string dbName = "KxsMainServer";
-            // if(Env == "Production")
-            // {
-            //     dbName = "KxsProfitServer";
-            // }
+            if(Env == "Production")
+            {
+                dbName = "KxsProfitServer";
+            }
             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 + "'");