From a4328e3d4fe2894c0ddf378eea9b3c2a3498d62b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 三月 2023 08:52:35 +0800
Subject: [PATCH] 修复关闭接口鉴权后跨域设置失效的问题
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
index 6ecc828..ecaa165 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -4,30 +4,62 @@
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface UserMapper {
- @Insert("INSERT INTO user (username, password, roleId, create_time) VALUES" +
- "('${username}', '${password}', '${roleId}', datetime('now','localtime'))")
+ @Insert("INSERT INTO user (username, password, roleId, pushKey, createTime, updateTime) VALUES" +
+ "(#{username}, #{password}, #{role.id}, #{pushKey}, #{createTime}, #{updateTime})")
int add(User user);
- @Update("UPDATE user " +
- "SET username=#{username}, " +
- "password=#{password}, " +
- "roleId=#{roleId} " +
- "WHERE id=#{id}")
+ @Update(value = {" <script>" +
+ "UPDATE user " +
+ "SET updateTime=#{updateTime} " +
+ "<if test=\"pushKey != null\">, pushKey=#{pushKey}</if>" +
+ "<if test=\"role != null\">, roleId=#{role.id}</if>" +
+ "<if test=\"password != null\">, password=#{password}</if>" +
+ "<if test=\"username != null\">, username=#{username}</if>" +
+ "WHERE id=#{id}" +
+ " </script>"})
int update(User user);
- @Delete("DELETE FROM user WHERE app=#{app} AND id=#{id}")
- int delete(User user);
+ @Delete("DELETE FROM user WHERE id != 1 and id=#{id}")
+ int delete(int id);
- @Select("select * FROM user WHERE username=#{username} AND password=#{password}")
+ @Select("select u.*, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=r.id and u.username=#{username} AND u.password=#{password}")
+ @Results(id = "roleMap", value = {
+ @Result(column = "roleID", property = "role.id"),
+ @Result(column = "roleName", property = "role.name"),
+ @Result(column = "roleAuthority", property = "role.authority"),
+ @Result(column = "roleCreateTime", property = "role.createTime"),
+ @Result(column = "roleUpdateTime", property = "role.updateTime")
+ })
User select(String username, String password);
- @Select("select * FROM user WHERE id=#{id}")
+ @Select("select u.*, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=r.id and u.id=#{id}")
+ @ResultMap(value="roleMap")
User selectById(int id);
- @Select("select * FROM user WHERE username=#{username}")
+ @Select("select u.*, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=r.id and u.username=#{username}")
+ @ResultMap(value="roleMap")
User getUserByUsername(String username);
+
+ @Select("select u.*, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u, user_role r WHERE u.roleId=r.id")
+ @ResultMap(value="roleMap")
+ List<User> selectAll();
+
+ @Select("select * from (select user.*, concat(concat(#{callId}, '_'), pushKey) as str1 from user) as u where md5(u.str1) = #{sign}")
+ List<User> checkPushAuthorityByCallIdAndSign(String callId, String sign);
+
+ @Select("select * from user where md5(pushKey) = #{sign}")
+ List<User> checkPushAuthorityByCallId(String sign);
+
+ @Select("select u.id, u.username,u.pushKey,u.roleId, r.id as roleID, r.name as roleName, r.authority as roleAuthority , r.createTime as roleCreateTime , r.updateTime as roleUpdateTime FROM user u join user_role r on u.roleId=r.id")
+ @ResultMap(value="roleMap")
+ List<User> getUsers();
+
+ @Update("update user set pushKey=#{pushKey} where id=#{id}")
+ int changePushKey(int id, String pushKey);
}
--
Gitblit v1.8.0