tsurumure пре 4 месеци
родитељ
комит
6ac5d0947e

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

@@ -37,17 +37,12 @@ public class SiteInfoServiceImpl implements SiteInfoService {
 
         // [Header] 从头部信息来的 Lang
         HttpServletRequest request = httpRequestUtil.getRequest();
-        String headerLang = request.getHeader("lang");
-        if (StrUtil.isNotEmpty(headerLang)) {
-            lang = paramLang;
-        }
+        String headerLang = request.getHeader("Lang");
+        if (StrUtil.isNotEmpty(headerLang)) lang = headerLang;
         // [Param] 从参数来的 Lang
-        if (StrUtil.isNotEmpty(paramLang)) {
-            lang = paramLang;
-        }
+        if (StrUtil.isNotEmpty(paramLang)) lang = paramLang;
 
         // [入参] 比 [头部] 优先级高
-
         LambdaQueryWrapper<SiteInfo> wrapper = new LambdaQueryWrapper();
         wrapper.eq(SiteInfo::getLanguage, lang);
         return siteInfoDao.selectOne(wrapper);

+ 1 - 2
src/main/java/com/backendsys/modules/upload/service/impl/SysFileMultipartServiceImpl.java

@@ -65,6 +65,7 @@ public class SysFileMultipartServiceImpl implements SysFileMultipartService {
             object_key = uploadResult.getKey();
         }
 
+        // 如果没有获得以上参数,则抛出报错
         if (StrUtil.isEmpty(upload_id) || StrUtil.isEmpty(object_key)) {
             throw new CustException("upload_id 或 object_key 不能为空");
         }
@@ -76,13 +77,11 @@ public class SysFileMultipartServiceImpl implements SysFileMultipartService {
         sysFileEntity.setUpload_id(upload_id);
         sysFileEntity.setName(FileNameUtil.getName(object_key));
         sysFileEntity.setObject_key(object_key);
-
         sysFileEntity.setTarget(UPLOAD_TARGET.get());
         sysFileEntity.setContent_type(multipartFile.getContentType());
         sysFileEntity.setSize(multipartFile.getSize());
         sysFileDao.insert(sysFileEntity);
 
-
         Map<String, Object> resp = new LinkedHashMap<>();
         resp.put("upload_id", upload_id);
         resp.put("object_key", object_key);