Merge branch 'main' of http://192.168.0.229:3180/OMC/ems_backend

lib/dborm/dborm.go

@@ -728,7 +728,7 @@ func XormCheckLoginUser(name, password, cryptArgo string) (bool, *User, error) {
 	case "Locked":
 		errMsg = "账户已锁定"
 	case "Pending":
-		errMsg = "账户过期"
+		errMsg = "账户已挂起"
 	}
 	if errMsg != "" {
 		log.Error("user Status:%s", errMsg)
@@ -745,6 +745,21 @@ func XormCheckLoginUser(name, password, cryptArgo string) (bool, *User, error) {
 			}
 			if t.Before(time.Now()) {
 				errMsg := "密码到期时间"
+				// 读取配置信息
+				result, err := xEngine.QueryString("SELECT value_json FROM omc_db.config WHERE id=20;")
+				if err != nil {
+					return false, nil, err
+				}
+				if len(result) > 0 {
+					data := make(map[string]any)
+					err := json.Unmarshal([]byte(result[0]["value_json"]), &data)
+					if err != nil {
+						log.Error("json Unmarshal:%s", errMsg, data)
+						return false, nil, err
+					}
+					errMsg = data["outTimeMsg"].(string)
+
+				}
 				log.Error("PasswordExpiration:%s", errMsg)
 				return false, nil, errors.New(errMsg)
 			}
@@ -760,7 +775,7 @@ func XormCheckLoginUser(name, password, cryptArgo string) (bool, *User, error) {
 				return false, nil, err
 			}
 			if t.Before(time.Now()) {
-				errMsg := "用户到期时间"
+				errMsg := "用户账户到期"
 				log.Error("UserExpiration:%s", errMsg)
 				return false, nil, errors.New(errMsg)
 			}