操作日志

base-framework/src/main/java/com/ozs/framework/web/service/SysLoginService.java

@@ -26,6 +26,7 @@ import com.ozs.framework.manager.factory.AsyncFactory;
 import com.ozs.framework.security.context.AuthenticationContextHolder;
 import com.ozs.system.service.ISysConfigService;
 import com.ozs.system.service.ISysUserService;
+import org.springframework.util.ObjectUtils;
 
 /**
  * 登录校验方法

base-framework/src/main/java/com/ozs/framework/web/service/SysRegisterService.java

@@ -40,10 +40,11 @@ public class SysRegisterService
      */
     public String register(RegisterBody registerBody)
     {
+
         String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
         SysUser sysUser = new SysUser();
         sysUser.setUserName(username);
-
+        userService.getUserByUserName(username);
         // 验证码开关
         boolean captchaEnabled = configService.selectCaptchaEnabled();
         if (captchaEnabled)

base-system/src/main/java/com/ozs/system/domain/SysLoginInfo.java

@@ -32,7 +32,7 @@ public class SysLoginInfo extends BaseEntity {
      * 用户账号
      */
     @Excel(name = "用户账号")
-    private String userId;
+    private String userName;
 
     /**
      * 登录状态 0成功 1失败

base-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -229,6 +229,7 @@ public interface ISysUserService extends JoinIService<SysUser> {
      * @return 结果
      */
     public boolean updateUserAvatarById(Long userId, String avatar);
+
     /**
      * 修改用户密码
      *
@@ -236,5 +237,7 @@ public interface ISysUserService extends JoinIService<SysUser> {
      * @param newPwd 新密码
      * @return 结果
      */
-    public boolean updatePassword(Long userId,String newPwd);
+    public boolean updatePassword(Long userId, String newPwd);
+
+    SysUser getUserByUserName(String username);
 }

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -527,7 +527,12 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      * @return 结果
      */
     @Override
-    public boolean updatePassword(Long userId,String newPwd){
+    public boolean updatePassword(Long userId, String newPwd) {
         return userMapper.updatePassword(userId, newPwd);
     }
+
+    @Override
+    public SysUser getUserByUserName(String username) {
+        return userMapper.selectUserByUserName(username);
+    }
 }

base-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<resultMap type="SysLoginInfo" id="SysLoginInfoesult">
 		<id property="infoId" column="info_id"/>
-		<result property="userId" column="user_id"/>
+		<result property="userName" column="user_name"/>
 		<result property="status" column="status"/>
 		<result property="ipaddr" column="ipaddr"/>
 		<result property="loginLocation" column="login_location"/>
@@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<insert id="insertLogininfor" parameterType="SysLoginInfo">
-		insert into sys_login_info (user_id, status, ipaddr, login_location, browser, os, msg, login_time)
-		values (#{userId}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
+		insert into sys_login_info (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
+		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
 	</insert>
 
 	<select id="selectLogininforList" parameterType="SysLoginInfo" resultMap="SysLoginInfoesult">
-		select info_id, user_id, ipaddr, login_location, browser, os, status, msg, login_time from sys_login_info
+		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_login_info
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
 				AND ipaddr like concat('%', #{ipaddr}, '%')
@@ -30,8 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
-			<if test="userId != null and userId != ''">
-				AND user_id like concat('%', #{userId}, '%')
+			<if test="userName != null and userName != ''">
+				AND user_name like concat('%', #{userName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')