commit

src/main/java/com/budwk/app/sys/models/Sys_user.java

@@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
-import org.nutz.json.JsonField;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -47,7 +45,7 @@ public class Sys_user extends BaseModel implements Serializable {
 
     @Column
     @Comment("性别")
-    @DataCenterColumn(name = "性别", key = "xbm")
+    @DataCenterColumn(name = "性别", key = "xbm", dict = "USER_SEX")
     @ColDefine(type = ColType.VARCHAR, width = 10)
     private String sex;
 

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -2,10 +2,8 @@ package com.budwk.app.sys.services.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.codec.Base64Decoder;
-import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
 import com.budwk.app.base.constant.RedisConstant;
 import com.budwk.app.base.enums.LoginType;
 import com.budwk.app.base.exception.BaseException;
@@ -13,7 +11,6 @@ import com.budwk.app.base.exception.UnknownAccountException;
 import com.budwk.app.base.interceptor.sLog.SLogService;
 import com.budwk.app.base.service.impl.BaseServiceImpl;
 import com.budwk.app.base.utils.PwdUtil;
-import com.budwk.app.base.utils.SysMenuUtil;
 import com.budwk.app.sys.models.*;
 import com.budwk.app.sys.services.SysMenuService;
 import com.budwk.app.sys.services.SysRoleService;
@@ -32,7 +29,6 @@ import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
-import org.nutz.lang.random.R;
 import org.nutz.plugins.wkcache.annotation.CacheDefaults;
 import org.nutz.plugins.wkcache.annotation.CacheRemove;
 import org.nutz.plugins.wkcache.annotation.CacheRemoveAll;
@@ -308,7 +304,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         String decodePwd = Base64Decoder.decodeStr(passowrd);
         String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt());
         if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-            throw new BaseException("用户名或者密码不正确");
+            if (!Globals.sso) {
+                throw new BaseException("用户名或者密码不正确");
+            }
         }
         user = this.fetchLinks(user, "unit");
         if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) {