登录查询的修改的修改

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -68,7 +68,8 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
 //            throw new SystemException("验证码错误,请重新输入");
 //        }
 
-        SysUser byId = sysUserService.getById(username);
+
+        SysUser byId = sysUserService.getByUserName(username);
         String salt = byId.getSalt();
 
         // 加密密码和盐值

authentication/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.entity.SysUser;
 import com.jzg.entity.vo.SysUserJzgVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
@@ -13,4 +14,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     public SysUserJzgVo getJzgUserInfo(String userId);
+
+    /**
+     * 获取用户信息
+     * @param username
+     * @return
+     */
+    public SysUser selectByUserName(@Param("username") String username);
 }

authentication/src/main/java/com/jzg/service/SysUserService.java

@@ -22,4 +22,12 @@ public interface SysUserService extends IService<SysUser> {
      * @return
      */
     public SysUserJzgVo getJzgUserInfo(String userId);
+
+
+    /**
+     *
+     * @param username
+     * @return
+     */
+    SysUser getByUserName(String username);
 }

authentication/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.entity.SysUser;
 import com.jzg.entity.vo.SysUserJzgVo;
@@ -21,4 +22,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserJzgVo jzgUserInfo = baseMapper.getJzgUserInfo(userId);
         return jzgUserInfo;
     }
+
+    @Override
+    public SysUser getByUserName(String username) {
+        return baseMapper.selectByUserName(username);
+    }
 }

authentication/src/main/resources/mapper/SysUserMapper.xml

@@ -13,4 +13,16 @@
         WHERE
             su.id = #{userId}
     </select>
-</mapper>
+
+    <select id="selectByUserName" resultType="com.jzg.entity.SysUser">
+        SELECT
+            su.*
+        FROM
+            sys_user su
+        WHERE
+        account_status = 1 AND is_delete = 0
+        <if test="username != null and username != ''">
+           AND (su.username = #{username} or su.mobile = #{username})
+        </if>
+    </select>
+</mapper>

commons/src/main/java/com/jzg/commons/entity/po/SysOperLog.java

@@ -1,73 +0,0 @@
-package com.jzg.commons.entity.po;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 操作日志记录表 oper_log
- * 
- * @author dongxin
- */
-@Data
-public class SysOperLog {
-
-    /** 日志主键 */
-    private String Id;
-
-    /** 操作模块 */
-    private String title;
-
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    private Integer businessType;
-
-    /** 业务类型数组 */
-    private Integer[] businessTypes;
-
-    /** 请求方法 */
-    private String method;
-
-    /** 请求方式 */
-    private String requestMethod;
-
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    private Integer operatorType;
-
-    /** 操作人员 */
-    private String operName;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 租户CODE */
-    private String sysCode;
-
-    /** 请求url */
-    private String operUrl;
-
-    /** 操作地址 */
-    private String operIp;
-
-    /** 操作地点 */
-    private String operLocation;
-
-    /** 请求参数 */
-    private String operParam;
-
-    /** 返回参数 */
-    private String jsonResult;
-
-    /** 操作状态（0正常 1异常） */
-    private Integer status;
-
-    /** 错误消息 */
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    /** 消耗时间 */
-    private Long costTime;
-}

platform/src/main/java/com/jzg/mapper/SysOperLogMapper.java

@@ -1,52 +0,0 @@
-package com.jzg.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.commons.entity.po.SysOperLog;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 操作日志 数据层
- * 
- * @author dongxin
- */
-@Mapper
-public interface SysOperLogMapper extends BaseMapper<SysOperLog>
-{
-    /**
-     * 新增操作日志
-     * 
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
-
-    /**
-     * 查询系统操作日志集合
-     * 
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     * 
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     * 
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
-}

platform/src/main/java/com/jzg/service/SysOperLogService.java

@@ -1,49 +0,0 @@
-package com.jzg.service;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.po.SysOperLog;
-
-import java.util.List;
-
-/**
- * 操作日志 服务层
- *
- * @author dongxin
- */
-public interface SysOperLogService extends IService<SysOperLog>
-{
-    /**
-     * 新增操作日志
-     *
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
-
-    /**
-     * 查询系统操作日志集合
-     *
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     *
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     *
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
-}

platform/src/main/java/com/jzg/service/impl/SysOperLogServiceImpl.java

@@ -1,79 +0,0 @@
-package com.jzg.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.po.SysOperLog;
-import com.jzg.mapper.SysOperLogMapper;
-import com.jzg.service.SysOperLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 操作日志 服务层处理
- * 
- * @author dongxin
- */
-@Service
-public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog>
-        implements SysOperLogService
-{
-    @Autowired
-    private SysOperLogMapper sysOperLogMapper;
-
-    /**
-     * 新增操作日志
-     * 
-     * @param operLog 操作日志对象
-     */
-    @Override
-    public void insertOperlog(SysOperLog operLog)
-    {
-        sysOperLogMapper.insertOperlog(operLog);
-    }
-
-    /**
-     * 查询系统操作日志集合
-     * 
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
-    {
-        return sysOperLogMapper.selectOperLogList(operLog);
-    }
-
-    /**
-     * 批量删除系统操作日志
-     * 
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    @Override
-    public int deleteOperLogByIds(Long[] operIds)
-    {
-        return sysOperLogMapper.deleteOperLogByIds(operIds);
-    }
-
-    /**
-     * 查询操作日志详细
-     * 
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    @Override
-    public SysOperLog selectOperLogById(Long operId)
-    {
-        return sysOperLogMapper.selectOperLogById(operId);
-    }
-
-    /**
-     * 清空操作日志
-     */
-    @Override
-    public void cleanOperLog()
-    {
-        sysOperLogMapper.cleanOperLog();
-    }
-}