提交

pom.xml

@@ -340,6 +340,7 @@
 
     <build>
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -380,6 +381,7 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
+
             <!-- 统一版本号管理 -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -406,6 +408,20 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
         <resources>
             <resource>

ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java

@@ -28,7 +28,6 @@ public class PlusTenantLineHandler implements TenantLineHandler {
     public Expression getTenantId() {
         String tenantId = TenantHelper.getTenantId();
         if (StringUtils.isBlank(tenantId)) {
-            log.error("无法获取有效的租户id -> Null");
             return new NullValue();
         }
         // 返回固定租户

ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java

@@ -30,10 +30,7 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
             return super.map(name);
         }
         String tenantId = TenantHelper.getTenantId();
-        if (StringUtils.isBlank(tenantId)) {
-            log.error("无法获取有效的租户id -> Null");
-        }
-        if (StringUtils.startsWith(name, tenantId + "")) {
+        if (StringUtils.startsWith(name, tenantId)) {
             // 如果存在则直接返回
             return super.map(name);
         }
@@ -53,10 +50,7 @@ public class TenantKeyPrefixHandler extends KeyPrefixHandler {
             return super.unmap(name);
         }
         String tenantId = TenantHelper.getTenantId();
-        if (StringUtils.isBlank(tenantId)) {
-            log.error("无法获取有效的租户id -> Null");
-        }
-        if (StringUtils.startsWith(unmap, tenantId + "")) {
+        if (StringUtils.startsWith(unmap, tenantId)) {
             // 如果存在则删除
             return unmap.substring((tenantId + ":").length());
         }

ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java

@@ -23,6 +23,7 @@ import org.dromara.system.domain.bo.SysConfigBo;
 import org.dromara.system.domain.vo.SysConfigVo;
 import org.dromara.system.mapper.SysConfigMapper;
 import org.dromara.system.service.ISysConfigService;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -70,8 +71,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey")
     @Override
     public String selectConfigByKey(String configKey) {
-        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getConfigKey, configKey));
+        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, configKey));
         if (ObjectUtil.isNotNull(retConfig)) {
             return retConfig.getConfigValue();
         }
@@ -86,10 +86,8 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      */
     @Override
     public boolean selectRegisterEnabled(String tenantId) {
-        SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> {
-            return baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-                    .eq(SysConfig::getConfigKey, "sys.account.registerUser"));
-        });
+        SysConfig retConfig = TenantHelper.dynamic(tenantId, () ->
+                baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, "sys.account.registerUser")));
         if (ObjectUtil.isNull(retConfig)) {
             return false;
         }
@@ -146,7 +144,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
     @Override
     public String updateConfig(SysConfigBo bo) {
-        int row = 0;
+        int row;
         SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
         if (config.getConfigId() != null) {
             SysConfig temp = baseMapper.selectById(config.getConfigId());
@@ -205,6 +203,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
         return true;
     }
 
+    @CacheEvict(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey")
     @Override
     public void updateConfigByKey(String configKey, String configValue) {
         SysConfig sysConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, configKey));