tsurumure пре 5 месеци
родитељ
комит
3e2ce1b968

+ 1 - 1
src/main/java/com/backendsys/modules/cms/siteinfo/controller/SiteInfoController.java

@@ -25,7 +25,7 @@ public class SiteInfoController {
     @PreAuthorize("@sr.hasPermission('10.5')")
     @GetMapping("/api/cms/site/getSiteInfo")
     public Result getSiteInfo() {
-        return Result.success().put("data", siteInfoService.selectSiteInfo());
+        return Result.success().put("data", siteInfoService.selectSiteInfo(null));
     }
 
     @Operation(summary = "编辑站点信息")

+ 1 - 1
src/main/java/com/backendsys/modules/cms/siteinfo/service/SiteInfoService.java

@@ -8,7 +8,7 @@ import java.util.Map;
 public interface SiteInfoService {
 
     // 获取站点信息
-    SiteInfo selectSiteInfo();
+    SiteInfo selectSiteInfo(String lang);
     // 编辑站点信息
     Map<String, Object> updateSiteInfo(SiteInfo siteInfo);
 

+ 14 - 3
src/main/java/com/backendsys/modules/cms/siteinfo/service/impl/SiteInfoServiceImpl.java

@@ -31,11 +31,22 @@ public class SiteInfoServiceImpl implements SiteInfoService {
      * 获取站点信息
      */
     @Override
-    public SiteInfo selectSiteInfo() {
+    public SiteInfo selectSiteInfo(String paramLang) {
 
+        String lang = DEFAULT_LANGUAGE;
+
+        // [Header] 从头部信息来的 Lang
         HttpServletRequest request = httpRequestUtil.getRequest();
-        String lang = request.getHeader("lang");
-        if (StrUtil.isEmpty(lang)) lang = DEFAULT_LANGUAGE;
+        String headerLang = request.getHeader("lang");
+        if (StrUtil.isNotEmpty(headerLang)) {
+            lang = paramLang;
+        }
+        // [Param] 从参数来的 Lang
+        if (StrUtil.isNotEmpty(paramLang)) {
+            lang = paramLang;
+        }
+
+        // [入参] 比 [头部] 优先级高
 
         LambdaQueryWrapper<SiteInfo> wrapper = new LambdaQueryWrapper();
         wrapper.eq(SiteInfo::getLanguage, lang);

+ 1 - 1
src/main/java/com/backendsys/modules/common/aspect/PagesAspect.java

@@ -63,7 +63,7 @@ public class PagesAspect {
 				model.addAttribute("lang", lang);
 
 				// [Get] 获取站点信息
-				model.addAttribute("siteInfo", siteInfoService.selectSiteInfo());
+				model.addAttribute("siteInfo", siteInfoService.selectSiteInfo(lang));
 				// [Get] 获取导航
 				model.addAttribute("navigation", navigationService.selectNavigationTemplate(lang));
 				// 其他信息