会员管理代码

baqing-shop/src/main/java/com/ruoyi/web/modules/mall/constant/MallConfigConstants.java

@@ -37,8 +37,6 @@ public final class MallConfigConstants
 
     public static final String MSG_DEFAULT_AVATAR_REQUIRED = "请上传会员默认头像";
 
-    public static final String MSG_DEFAULT_AVATAR_URL_INVALID = "会员默认头像须为有效的图片地址";
-
     public static final String MSG_AUTO_CONFIRM_DAYS_INVALID = "自动确认收货天数须在 1～90 之间";
 
     public static final String MSG_AFTERSALE_DAYS_INVALID = "售后申请限制天数须在 1～365 之间";

baqing-shop/src/main/java/com/ruoyi/web/modules/mall/service/impl/MallConfigServiceImpl.java

@@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.web.modules.mall.constant.MallConfigConstants;
 import com.ruoyi.web.modules.mall.domain.BizMallConfig;
 import com.ruoyi.web.modules.mall.dto.MallSettingSaveDTO;
@@ -25,9 +24,6 @@ public class MallConfigServiceImpl implements IMallConfigService, IMallConfigFac
     @Autowired
     private BizMallConfigMapper mallConfigMapper;
 
-    @Autowired
-    private ServerConfig serverConfig;
-
     @Override
     public MallSettingVO getSettings()
     {
@@ -49,10 +45,7 @@ public class MallConfigServiceImpl implements IMallConfigService, IMallConfigFac
         update.setShowSales(dto.getShowSales());
         update.setAutoConfirmDays(dto.getAutoConfirmDays());
         update.setAftersaleLimitDays(dto.getAftersaleLimitDays());
-        String avatarUrl = MallConfigSupport.normalizeDefaultAvatarUrl(
-                dto.getDefaultAvatar().trim(), serverConfig.getUrl());
-        MallConfigSupport.validateDefaultAvatarUrl(avatarUrl);
-        update.setDefaultAvatar(avatarUrl);
+        update.setDefaultAvatar(dto.getDefaultAvatar().trim());
         update.setUpdateBy(operator);
         mallConfigMapper.update(update);
     }
@@ -84,7 +77,7 @@ public class MallConfigServiceImpl implements IMallConfigService, IMallConfigFac
             vo.setPsbLink(config.getPsbLink());
         }
         vo.setShowSales(MallConfigSupport.isYes(config.getShowSales()));
-        vo.setDefaultAvatar(resolveDefaultAvatarUrl(config.getDefaultAvatar()));
+        vo.setDefaultAvatar(StringUtils.isNotEmpty(config.getDefaultAvatar()) ? config.getDefaultAvatar() : null);
         vo.setCurrencySymbol(config.getCurrencySymbol());
         return vo;
     }
@@ -119,7 +112,8 @@ public class MallConfigServiceImpl implements IMallConfigService, IMallConfigFac
     @Override
     public String getDefaultAvatarUrl()
     {
-        return resolveDefaultAvatarUrl(requireConfig().getDefaultAvatar());
+        String avatar = requireConfig().getDefaultAvatar();
+        return StringUtils.isNotEmpty(avatar) ? avatar : null;
     }
 
     @Override
@@ -165,27 +159,10 @@ public class MallConfigServiceImpl implements IMallConfigService, IMallConfigFac
         vo.setAftersaleLimitDays(config.getAftersaleLimitDays());
         vo.setPaidOrderCancelable(Boolean.FALSE);
         vo.setShippedOrderCancelable(Boolean.FALSE);
-        vo.setDefaultAvatar(resolveDefaultAvatarUrl(config.getDefaultAvatar()));
+        vo.setDefaultAvatar(config.getDefaultAvatar());
         return vo;
     }
 
-    private String resolveDefaultAvatarUrl(String stored)
-    {
-        if (StringUtils.isEmpty(stored))
-        {
-            return null;
-        }
-        String serverUrl = null;
-        try
-        {
-            serverUrl = serverConfig.getUrl();
-        }
-        catch (Exception ignored)
-        {
-        }
-        return MallConfigSupport.normalizeDefaultAvatarUrl(stored, serverUrl);
-    }
-
     private String trimToNull(String value)
     {
         if (StringUtils.isEmpty(value))

baqing-shop/src/main/java/com/ruoyi/web/modules/mall/support/MallConfigSupport.java

@@ -45,47 +45,6 @@ public final class MallConfigSupport
         validateOptionalUrl(dto.getPsbLink());
     }
 
-    /**
-     * 将会员默认头像规范为可访问的 HTTP(S) 地址；已是完整 URL 则原样返回。
-     */
-    public static String normalizeDefaultAvatarUrl(String avatar, String serverBaseUrl)
-    {
-        if (StringUtils.isEmpty(avatar))
-        {
-            return avatar;
-        }
-        String trimmed = avatar.trim();
-        if (trimmed.startsWith("http://") || trimmed.startsWith("https://"))
-        {
-            return trimmed;
-        }
-        if (StringUtils.isEmpty(serverBaseUrl))
-        {
-            return trimmed;
-        }
-        String base = serverBaseUrl.endsWith("/")
-                ? serverBaseUrl.substring(0, serverBaseUrl.length() - 1)
-                : serverBaseUrl;
-        if (!trimmed.startsWith("/"))
-        {
-            trimmed = "/" + trimmed;
-        }
-        return base + trimmed;
-    }
-
-    public static void validateDefaultAvatarUrl(String url)
-    {
-        if (StringUtils.isEmpty(url))
-        {
-            throw new ServiceException(MallConfigConstants.MSG_DEFAULT_AVATAR_REQUIRED);
-        }
-        String trimmed = url.trim();
-        if (!trimmed.startsWith("http://") && !trimmed.startsWith("https://"))
-        {
-            throw new ServiceException(MallConfigConstants.MSG_DEFAULT_AVATAR_URL_INVALID);
-        }
-    }
-
     public static boolean isYes(String flag)
     {
         return MallConfigConstants.FLAG_YES.equals(flag);

baqing-shop/src/test/java/com/ruoyi/web/modules/mall/service/MallConfigServiceImplTest.java

@@ -8,12 +8,10 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.web.modules.mall.constant.MallConfigConstants;
 import com.ruoyi.web.modules.mall.domain.BizMallConfig;
 import com.ruoyi.web.modules.mall.dto.MallSettingSaveDTO;
@@ -27,9 +25,6 @@ class MallConfigServiceImplTest
     @Mock
     private BizMallConfigMapper mallConfigMapper;
 
-    @Mock
-    private ServerConfig serverConfig;
-
     @InjectMocks
     private MallConfigServiceImpl mallConfigService;
 
@@ -68,39 +63,12 @@ class MallConfigServiceImplTest
     void updateSettings_success()
     {
         when(mallConfigMapper.selectById(MallConfigConstants.CONFIG_ID)).thenReturn(config());
-        when(serverConfig.getUrl()).thenReturn("http://localhost:8020");
 
         mallConfigService.updateSettings(validDto(), "admin");
 
         verify(mallConfigMapper).update(any(BizMallConfig.class));
     }
 
-    @Test
-    void updateSettings_normalizesRelativeAvatarToHttpUrl()
-    {
-        when(mallConfigMapper.selectById(MallConfigConstants.CONFIG_ID)).thenReturn(config());
-        when(serverConfig.getUrl()).thenReturn("http://localhost:8020");
-        MallSettingSaveDTO dto = validDto();
-        dto.setDefaultAvatar("/profile/upload/2026/05/26/a.png");
-
-        mallConfigService.updateSettings(dto, "admin");
-
-        ArgumentCaptor<BizMallConfig> captor = ArgumentCaptor.forClass(BizMallConfig.class);
-        verify(mallConfigMapper).update(captor.capture());
-        assertEquals("http://localhost:8020/profile/upload/2026/05/26/a.png", captor.getValue().getDefaultAvatar());
-    }
-
-    @Test
-    void getDefaultAvatarUrl_resolvesLegacyRelativePath()
-    {
-        BizMallConfig c = config();
-        c.setDefaultAvatar("/profile/upload/default.png");
-        when(mallConfigMapper.selectById(MallConfigConstants.CONFIG_ID)).thenReturn(c);
-        when(serverConfig.getUrl()).thenReturn("http://localhost:8020");
-
-        assertEquals("http://localhost:8020/profile/upload/default.png", mallConfigService.getDefaultAvatarUrl());
-    }
-
     private MallSettingSaveDTO validDto()
     {
         MallSettingSaveDTO dto = new MallSettingSaveDTO();

baqing-shop/src/test/java/com/ruoyi/web/modules/mall/support/MallConfigSupportTest.java

@@ -1,45 +0,0 @@
-package com.ruoyi.web.modules.mall.support;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.jupiter.api.Test;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.web.modules.mall.constant.MallConfigConstants;
-
-class MallConfigSupportTest
-{
-    @Test
-    void normalizeDefaultAvatarUrl_keepsHttpUrl()
-    {
-        assertEquals("https://cdn.example.com/a.png",
-                MallConfigSupport.normalizeDefaultAvatarUrl("https://cdn.example.com/a.png", "http://localhost:8020"));
-    }
-
-    @Test
-    void normalizeDefaultAvatarUrl_prependsServerBase()
-    {
-        assertEquals("http://localhost:8020/profile/upload/a.png",
-                MallConfigSupport.normalizeDefaultAvatarUrl("/profile/upload/a.png", "http://localhost:8020"));
-    }
-
-    @Test
-    void validateDefaultAvatarUrl_rejectsRelativePath()
-    {
-        assertThrows(ServiceException.class,
-                () -> MallConfigSupport.validateDefaultAvatarUrl("/profile/upload/a.png"));
-    }
-
-    @Test
-    void validateDefaultAvatarUrl_acceptsHttpUrl()
-    {
-        MallConfigSupport.validateDefaultAvatarUrl("https://example.com/a.png");
-    }
-
-    @Test
-    void validateDefaultAvatarUrl_emptyThrowsRequiredMessage()
-    {
-        ServiceException ex = assertThrows(ServiceException.class,
-                () -> MallConfigSupport.validateDefaultAvatarUrl(""));
-        assertEquals(MallConfigConstants.MSG_DEFAULT_AVATAR_REQUIRED, ex.getMessage());
-    }
-}