tsurumure 5 сар өмнө
parent
commit
041a61a718

+ 1 - 2
db/cms_site_info.sql

@@ -14,12 +14,11 @@ CREATE TABLE `cms_site_info` (
     `meta_description` VARCHAR(500) COMMENT 'SEO-Description',
     `meta_description` VARCHAR(500) COMMENT 'SEO-Description',
     `copyright` VARCHAR(255) COMMENT '版权信息',
     `copyright` VARCHAR(255) COMMENT '版权信息',
     `icp`  VARCHAR(255) COMMENT '备案信息',
     `icp`  VARCHAR(255) COMMENT '备案信息',
-    `status` TINYINT(1) DEFAULT '1' COMMENT '网站状态 (-1禁用, 1启用)',
     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `create_time` DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
     `update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统信息表';
 ) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='系统信息表';
 
 
-INSERT INTO cms_site_info(language, name, meta_keyword, meta_description, copyright, icp ) VALUES
+INSERT INTO cms_site_info(language, name, meta_keyword, meta_description, copyright, icp) VALUES
     ('zh', '示例网站', '示例网站, 网页设计, 网络技术, 用户体验', '这是一个示例网站,专注于网页设计和网络技术,致力于提供优质的用户体验。欢迎来到示例网站,探索我们的服务和创意。', 'Copyright © 2024 示例网站. 保留所有权利.', '备案号: 京ICP备12345678号'),
     ('zh', '示例网站', '示例网站, 网页设计, 网络技术, 用户体验', '这是一个示例网站,专注于网页设计和网络技术,致力于提供优质的用户体验。欢迎来到示例网站,探索我们的服务和创意。', 'Copyright © 2024 示例网站. 保留所有权利.', '备案号: 京ICP备12345678号'),
     ('en', 'Example Website', 'Example Website, Web Design, Web Technology, User Experience', 'This is an example website, focusing on web design and web technology. We are committed to providing a high-quality user experience. Welcome to Example Website, explore our services and creativity.', 'Copyright © 2024 Example Website. All rights reserved.', 'Record number: Beijing ICP No. 12345678')
     ('en', 'Example Website', 'Example Website, Web Design, Web Technology, User Experience', 'This is an example website, focusing on web design and web technology. We are committed to providing a high-quality user experience. Welcome to Example Website, explore our services and creativity.', 'Copyright © 2024 Example Website. All rights reserved.', 'Record number: Beijing ICP No. 12345678')
 ;
 ;

+ 0 - 3
src/main/java/com/backendsys/modules/cms/siteinfo/entity/SiteInfo.java

@@ -35,9 +35,6 @@ public class SiteInfo {
     @Size(max = 50, message = "备案信息长度不超过 {max} 字符", groups = { Update.class })
     @Size(max = 50, message = "备案信息长度不超过 {max} 字符", groups = { Update.class })
     private String icp;
     private String icp;
 
 
-    @RangeArray(message="状态取值有误,范围应是(-1禁用, 1启用)", value = {"-1", "1"}, groups = { Update.class })
-    private Integer status;
-
     private String create_time;
     private String create_time;
     private String update_time;
     private String update_time;
 
 

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

@@ -6,9 +6,11 @@ import com.backendsys.modules.cms.siteinfo.entity.SiteInfo;
 import com.backendsys.modules.cms.siteinfo.service.SiteInfoService;
 import com.backendsys.modules.cms.siteinfo.service.SiteInfoService;
 import com.backendsys.modules.common.config.security.utils.HttpRequestUtil;
 import com.backendsys.modules.common.config.security.utils.HttpRequestUtil;
 import com.backendsys.modules.common.utils.CookieUtil;
 import com.backendsys.modules.common.utils.CookieUtil;
+import com.backendsys.utils.LanguageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.Map;
 import java.util.Map;
@@ -16,6 +18,9 @@ import java.util.Map;
 @Service
 @Service
 public class SiteInfoServiceImpl implements SiteInfoService {
 public class SiteInfoServiceImpl implements SiteInfoService {
 
 
+    @Value("${DEFAULT_LANGUAGE}")
+    private String DEFAULT_LANGUAGE;
+    
     @Autowired
     @Autowired
     private HttpRequestUtil httpRequestUtil;
     private HttpRequestUtil httpRequestUtil;
 
 
@@ -29,8 +34,8 @@ public class SiteInfoServiceImpl implements SiteInfoService {
     public SiteInfo selectSiteInfo() {
     public SiteInfo selectSiteInfo() {
 
 
         HttpServletRequest request = httpRequestUtil.getRequest();
         HttpServletRequest request = httpRequestUtil.getRequest();
-        String lang = CookieUtil.getCookie("lang", request);
-        if (StrUtil.isEmpty(lang)) lang = "zh";
+        String lang = request.getHeader("lang");
+        if (StrUtil.isEmpty(lang)) lang = DEFAULT_LANGUAGE;
 
 
         LambdaQueryWrapper<SiteInfo> wrapper = new LambdaQueryWrapper();
         LambdaQueryWrapper<SiteInfo> wrapper = new LambdaQueryWrapper();
         wrapper.eq(SiteInfo::getLanguage, lang);
         wrapper.eq(SiteInfo::getLanguage, lang);
@@ -42,7 +47,14 @@ public class SiteInfoServiceImpl implements SiteInfoService {
      */
      */
     @Override
     @Override
     public Map<String, Object> updateSiteInfo(SiteInfo siteInfo) {
     public Map<String, Object> updateSiteInfo(SiteInfo siteInfo) {
-        siteInfoDao.updateById(siteInfo);
+
+        HttpServletRequest request = httpRequestUtil.getRequest();
+        String lang = request.getHeader("lang");
+        if (StrUtil.isEmpty(lang)) lang = DEFAULT_LANGUAGE;
+
+        LambdaQueryWrapper<SiteInfo> wrapper = new LambdaQueryWrapper();
+        wrapper.eq(SiteInfo::getLanguage, lang);
+        siteInfoDao.update(siteInfo, wrapper);
         return Map.of("id", siteInfo.getId());
         return Map.of("id", siteInfo.getId());
     }
     }