From f71aa6316f8570cc7927a3710fd614bb974aa32b Mon Sep 17 00:00:00 2001
From: Github_lizhw <171332584@qq.com>
Date: Wed, 1 Jan 2025 17:19:21 +0800
Subject: [PATCH] saas h5

---
 .../org/dromara/web/config/MybatisPlusAutoConfigTenant.java  | 5 +++++
 .../com/luban/api/config/MybatisPlusAutoConfigTenant.java    | 5 +++++
 .../ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java | 2 ++
 .../ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java    | 2 ++
 .../src/main/java/com/luban/api/dao/WorkFormsDao.java        | 2 ++
 .../ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java | 3 +++
 .../src/main/resources/mapper/{ => ruoyi-h5}/ScriptsDao.xml  | 0
 .../src/main/resources/mapper/{ => ruoyi-h5}/WorkDao.xml     | 0
 .../main/resources/mapper/{ => ruoyi-h5}/WorkFormsDao.xml    | 0
 9 files changed, 19 insertions(+)
 rename ruoyi-site/ruoyi-h5/src/main/resources/mapper/{ => ruoyi-h5}/ScriptsDao.xml (100%)
 rename ruoyi-site/ruoyi-h5/src/main/resources/mapper/{ => ruoyi-h5}/WorkDao.xml (100%)
 rename ruoyi-site/ruoyi-h5/src/main/resources/mapper/{ => ruoyi-h5}/WorkFormsDao.xml (100%)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java b/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java
index cdbd13adf..ea2c69ea7 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java
@@ -1,11 +1,16 @@
 package org.dromara.web.config;
 
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.dromara.common.mybatis.config.MybatisPlusConfig;
 import org.dromara.common.tenant.properties.TenantProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnBean(MybatisPlusConfig.class)
+@AutoConfiguration(after = {MybatisPlusConfig.class})
 public class MybatisPlusAutoConfigTenant {
 
     @Bean
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java
index 3fa3b9f92..acc0d5d73 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/config/MybatisPlusAutoConfigTenant.java
@@ -1,11 +1,16 @@
 package com.luban.api.config;
 
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.dromara.common.mybatis.config.MybatisPlusConfig;
 import org.dromara.common.tenant.properties.TenantProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
+@ConditionalOnBean(MybatisPlusConfig.class)
+@AutoConfiguration(after = {MybatisPlusConfig.class})
 public class MybatisPlusAutoConfigTenant {
 
     @Bean
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java
index b9bc16b95..fdcb108a3 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java
@@ -2,6 +2,7 @@ package com.luban.api.dao;
 
 import com.luban.api.entity.Scripts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author lizhengwei
  * @since 2024-06-21
  */
+@Mapper
 public interface ScriptsDao extends BaseMapper<Scripts> {
 
 }
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java
index 2830e7d02..3b9cffb92 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkDao.java
@@ -2,6 +2,7 @@ package com.luban.api.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.luban.api.entity.Work;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.luban.api.entity.Work;
  * @author WeiHongBin
  * @since 2019-11-26
  */
+@Mapper
 public interface WorkDao extends BaseMapper<Work> {
 
 }
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java
index 685f5a2f6..440f69bdf 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/WorkFormsDao.java
@@ -2,6 +2,7 @@ package com.luban.api.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.luban.api.entity.WorkForms;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.luban.api.entity.WorkForms;
  * @author WeiHongBin
  * @since 2019-11-26
  */
+@Mapper
 public interface WorkFormsDao extends BaseMapper<WorkForms> {
 
 }
diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java
index 10e864999..dcd1fa149 100644
--- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java
+++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -19,11 +20,13 @@ import java.time.LocalDateTime;
  * @since 2024-06-21
  */
 @Data
+
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @Schema(name = "Scripts对象", description = "作品")
 public class Scripts implements Serializable {
 
+    @Serial
     private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.AUTO)
diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ScriptsDao.xml b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/ScriptsDao.xml
similarity index 100%
rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/ScriptsDao.xml
rename to ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/ScriptsDao.xml
diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/WorkDao.xml b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkDao.xml
similarity index 100%
rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/WorkDao.xml
rename to ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkDao.xml
diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/WorkFormsDao.xml b/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkFormsDao.xml
similarity index 100%
rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/WorkFormsDao.xml
rename to ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/WorkFormsDao.xml