Merge remote-tracking branch 'origin/main' into main

edu-travel-oauth/src/main/java/edu/travel/service/impl/UserServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -43,7 +44,6 @@ public class UserServiceImpl implements UserDetailsService {
         }
         if ("admin".equals(request.getParameter("loginFrom"))) {
             redisTemplate.opsForValue().set(username+"_info", JSON.toJSONString(tenant));
-
         }else {
             String code = request.getParameter("password");
             if (StringUtils.isBlank(code)) {
@@ -55,17 +55,14 @@ public class UserServiceImpl implements UserDetailsService {
             }
             if (code.equals(object.toString())){
                 redisTemplate.opsForValue().set(username+"_info", JSON.toJSONString(tenant));
-
-                return new User(tenant.getTenantPhone(),code,new ArrayList<>() );
+            }else{
+                throw new UsernameNotFoundException("验证码错误");
             }
-            throw new UsernameNotFoundException("验证码错误");
         }
-
         List<SysRole> roleList = sysRoleService.getRoleListByUserId(tenant.getId());
         Set<String> collect = roleList.stream().map(SysRole::getName).collect(Collectors.toSet());
         String[] arr = new String[collect.size()];
         String[] array = collect.toArray(arr);
         return User.builder().username(tenant.getTenantPhone()).password(tenant.getPassword()).roles(array).build();
-
     }
 }

edu-travel-oauth/src/main/resources/mapper/SysMenuMapper.xml

@@ -12,7 +12,7 @@
     <result column="path" jdbcType="VARCHAR" property="path" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="status" jdbcType="TINYINT" property="status" />
-    <result column="deleted_flag" jdbcType="TINYINT" property="deleteFlag" />
+    <result column="delete_flag" jdbcType="TINYINT" property="deleteFlag" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -21,7 +21,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, parent_id, title, `type`, component, `path`, `name`, `status`, deleted_flag, 
+    id, parent_id, title, `type`, component, `path`, `name`, `status`, delete_flag,
     project, create_user_id, create_time, update_user_id, update_time
   </sql>
 </mapper>

edu-travel-oauth/src/main/resources/mapper/SysRoleMapper.xml

@@ -7,7 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="deleted_flag" jdbcType="TINYINT" property="deleteFlag" />
+    <result column="delete_flag" jdbcType="TINYINT" property="deleteFlag" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -16,7 +16,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `name`, remark, deleted_flag, project, create_user_id, create_time, update_user_id, 
+    id, `name`, remark, delete_flag, project, create_user_id, create_time, update_user_id,
     update_time
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/entity/SysRoleMenu.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +18,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName(value = "sys_role_menu")
-public class SysRoleMenu implements Serializable {
+public class SysRoleMenu  extends BaseEntity implements Serializable{
     /**
      * 主键id
      */

edu-travel-service/edu-travel-service-tenement/src/main/java/edu/travel/tenant/entity/SysUserRole.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +18,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName(value = "sys_user_role")
-public class SysUserRole implements Serializable {
+public class SysUserRole  extends BaseEntity implements Serializable {
     /**
      * 主键id
      */

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/SysMenuExtraDataMapper.xml

@@ -9,7 +9,7 @@
     <result column="icon" jdbcType="VARCHAR" property="icon" />
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="no_cache" jdbcType="BOOLEAN" property="noCache" />
-    <result column="deleted_flag" jdbcType="TINYINT" property="deleteFlag" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -18,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, menu_id, icon, title, no_cache, deleted_flag, project, create_user_id, create_time, 
+    id, menu_id, icon, title, no_cache, delete_flag, project, create_user_id, create_time,
     update_user_id, update_time
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/SysMenuMapper.xml

@@ -12,7 +12,7 @@
     <result column="path" jdbcType="VARCHAR" property="path" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="status" jdbcType="TINYINT" property="status" />
-    <result column="deleted_flag" jdbcType="TINYINT" property="deleteFlag" />
+    <result column="delete_flag" jdbcType="TINYINT" property="deleteFlag" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -21,7 +21,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, parent_id, title, `type`, component, `path`, `name`, `status`, deleted_flag, 
+    id, parent_id, title, `type`, component, `path`, `name`, `status`, delete_flag,
     project, create_user_id, create_time, update_user_id, update_time
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/SysRoleMapper.xml

@@ -7,7 +7,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="deleted_flag" jdbcType="TINYINT" property="deleteFlag" />
+    <result column="delete_flag" jdbcType="TINYINT" property="deleteFlag" />
     <result column="project" jdbcType="VARCHAR" property="project" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -16,7 +16,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, `name`, remark, deleted_flag, project, create_user_id, create_time, update_user_id, 
+    id, `name`, remark, delete_flag, project, create_user_id, create_time, update_user_id,
     update_time
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/SysRoleMenuMapper.xml

@@ -8,9 +8,10 @@
     <id column="role_id" jdbcType="BIGINT" property="roleId" />
     <id column="menu_id" jdbcType="BIGINT" property="menuId" />
     <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id,role_id, menu_id, project
+    id,role_id, menu_id, project,delete_flag
   </sql>
 </mapper>

edu-travel-service/edu-travel-service-tenement/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -8,9 +8,10 @@
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="role_id" jdbcType="BIGINT" property="roleId" />
     <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="delete_flag" jdbcType="TINYINT" property="deleteFlag" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id,user_id, role_id, project
+    id,user_id, role_id, project,delete_flag
   </sql>
 </mapper>