!1394 几个地方改良一下

Merge pull request !1394 from koy0755/几个地方改良一下

Admin.NET/Admin.NET.Application/Configuration/App.json

@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
   "Urls": "http://*:5005", // 配置默认端口
@@ -46,6 +46,8 @@
     "PasswordStrengthValidation": "(?=^.{6,16}$)(?=.*\\d)(?=.*\\W+)(?=.*[A-Z])(?=.*[a-z])(?!.*\\n).*$", // 密码强度验证正则表达式，必须须包含大小写字母、数字和特殊字符的组合，长度在6-16之间
     "PasswordStrengthValidationMsg": "密码必须包含大小写字母、数字和特殊字符的组合，长度在6-16之间", // 密码强度验证消息提示
     "CryptoType": "SM2", // 密码加密算法：MD5、SM2、SM4
+    //新业务系统一定要改私钥，通过接口(http://localhost:5005/api/sysCommon/smKeyPair)获取
+    //获取后要同时修改前端文件：VITE_SM_PUBLIC_KEY 配置地项
     "PublicKey": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312", // 公钥
     "PrivateKey": "8EDB615B1D48B8BE188FC0F18EC08A41DF50EA731FA28BF409E6552809E3A111" // 私钥
   }

Admin.NET/Admin.NET.Application/Configuration/Captcha.json

@@ -1,6 +1,6 @@
-{
+{
   "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
-
+  // Lazy.Captcha.Core 配置：详细文档(https://api.gitee.com/pojianbing/lazy-captcha/)
   "CaptchaOptions": {
     "CaptchaType": 10, // 验证码类型0、1、2、3、4、5、6、7、8、9、10、11
     "CodeLength": 1, // 验证码长度, 要放在CaptchaType设置后  当类型为算术表达式时，长度代表操作的个数, 例如2

Admin.NET/Admin.NET.Core/Logging/LoggingSetup.cs

@@ -45,7 +45,7 @@ public static class LoggingSetup
                     options.WithTraceId = true; // 显示线程Id
                     options.WithStackFrame = true; // 显示程序集
                     options.FileNameRule = fileName => string.Format(fileName, DateTime.Now, logLevel.ToString()); // 每天创建一个文件
-                    options.WriteFilter = logMsg => logMsg.LogLevel == logLevel; // 日志级别
+                    options.WriteFilter = logMsg => logMsg.LogLevel >= logLevel; // 日志级别
                     options.HandleWriteError = (writeError) => // 写入失败时启用备用文件
                     {
                         writeError.UseRollbackFileName(Path.GetFileNameWithoutExtension(writeError.CurrentFileName) + "-oops" + Path.GetExtension(writeError.CurrentFileName));

Web/.env

@@ -10,5 +10,11 @@ VITE_OPEN_CDN = false
 # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
 VITE_PUBLIC_PATH =
 
+# 登陆界面默认填入用户
+VITE_DEFAULT_USER = superadmin1
+
+# 登陆界面默认填入密码
+VITE_DEFAULT_USER_PASSWORD = 123456
+
 # SM公钥
 VITE_SM_PUBLIC_KEY = "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312"

Web/src/views/login/component/account.vue

@@ -110,8 +110,8 @@ const dragRef: any = ref(null);
 const state = reactive({
 	isShowPassword: false,
 	ruleForm: {
-		account: '',
-		password: '',
+		account: window.__env__.VITE_DEFAULT_USER,
+		password: window.__env__.VITE_DEFAULT_USER_PASSWORD,
 		code: '',
 		codeId: 0,
 	},