Merge commit 'd1108700e0ad43b6bfea3f9a79bbb14799a2d29c'

ZR.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -93,9 +93,10 @@ namespace ZR.Admin.WebApi.Controllers.System
             }
 
             user.Create_by = HttpContext.GetName();
+            user.Create_time = DateTime.Now;
             user.Password = NETCore.Encrypt.EncryptProvider.Md5(user.Password);
 
-            return ToResponse(UserService.InsertUser(user));
+            return SUCCESS(UserService.InsertUser(user));
         }
 
         /// <summary>

ZR.Admin.WebApi/Extensions/DbExtension.cs

@@ -68,27 +68,30 @@ namespace ZR.Admin.WebApi.Extensions
         private static void SetSugarAop(SqlSugarClient db, IocConfig iocConfig, ICacheService cache)
         {
             var config = db.GetConnectionScope(iocConfig.ConfigId).CurrentConnectionConfig;
-
+            var showDbLog = AppSettings.Get<bool>("ShowDbLog");
             string configId = config.ConfigId;
             db.GetConnectionScope(configId).Aop.OnLogExecuting = (sql, pars) =>
             {
-                string log = $"【db{configId} SQL语句】{UtilMethods.GetSqlString(config.DbType, sql, pars)}\n";
-                if (sql.TrimStart().StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+                if (showDbLog)
                 {
-                    logger.Info(log);
-                }
-                else if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase))
-                {
-                    logger.Warn(log);
-                }
-                else if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("TRUNCATE", StringComparison.OrdinalIgnoreCase))
-                {
-                    logger.Error(log);
-                }
-                else
-                {
-                    log = $"【db{configId} SQL语句】dbo.{sql} {string.Join(", ", pars.Select(x => x.ParameterName + " = " + GetParsValue(x)))};\n";
-                    logger.Info(log);
+                    string log = $"【db{configId} SQL语句】{UtilMethods.GetSqlString(config.DbType, sql, pars)}\n";
+                    if (sql.TrimStart().StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+                    {
+                        logger.Info(log);
+                    }
+                    else if (sql.StartsWith("UPDATE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("INSERT", StringComparison.OrdinalIgnoreCase))
+                    {
+                        logger.Warn(log);
+                    }
+                    else if (sql.StartsWith("DELETE", StringComparison.OrdinalIgnoreCase) || sql.StartsWith("TRUNCATE", StringComparison.OrdinalIgnoreCase))
+                    {
+                        logger.Error(log);
+                    }
+                    else
+                    {
+                        log = $"【db{configId} SQL语句】dbo.{sql} {string.Join(", ", pars.Select(x => x.ParameterName + " = " + GetParsValue(x)))};\n";
+                        logger.Info(log);
+                    }
                 }
             };
             db.GetConnectionScope(configId).Aop.OnError = (ex) =>

ZR.Admin.WebApi/appsettings.json

@@ -33,6 +33,7 @@
     "Expire": 1440 //jwt登录过期时间（分）
   },
   "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks" ], //自动注入类
+  "ShowDbLog": true,//是否打印db日志
   "InitDb": false, //是否初始化db
   "DemoMode": false, //是否演示模式
   "Upload": {
@@ -64,7 +65,10 @@
   },
   //代码生成配置
   "gen": {
-    "autoPre": true, //自动去除表前缀
+    //是否显示移动端代码生成
+    "showApp": false,
+    //自动去除表前缀
+    "autoPre": true,
     "author": "admin",
     "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
     "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt

@@ -117,7 +117,7 @@ $end
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
 $else
-            return Insertable(model).IgnoreColumns(true).ExecuteReturnEntity();
+            return Context.Insertable(model).ExecuteReturnEntity();
 $end
         }
 

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt

@@ -778,7 +778,22 @@ function handlePreview(row) {
   open.value = true
   title.value = '查看'
   opertype.value = 3
-  form.value = row
+  form.value = { ...row }
+}
+$end
+
+$if(replaceDto.ShowBtnImport)
+// 导入数据成功处理
+const handleFileSuccess = (response) => {
+  const { item1, item2 } = response.data
+  var error = ''
+  item2.forEach((item) => {
+    error += item.storageMessage + ','
+  })
+  proxy.${alert}alert(item1 + '<p>' + error + '</p>', '导入结果', {
+    dangerouslyUseHTMLString: true
+  })
+  getList()
 }
 $end