【优化】 文件域名拼接优化

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElAIOController.java

@@ -79,24 +79,17 @@ public class ElAIOController extends BaseController {
      */
     @GetMapping("/course/list")
     @ApiOperation(value = "查询学习资源列表")
-    public TableDataInfo<ElCourse> courseList(ElCourse elCourse, HttpServletRequest request) {
+    public TableDataInfo<ElCourse> courseList(ElCourse elCourse) {
         elCourse.setStatus(1);
         startPage();
         List<ElCourse> list = elCourseService.selectElCourseListByUser(elCourse);
-
-        String baseUrl = request.getServerName() ;
-
-        String url;
         for(ElCourse course:list){
-            /*if(baseUrl.contains("192.168")){
-                url = fileConfigUtils.getLocalUrl()+ "/"+course.getImg();
-            }else {
-                url = fileConfigUtils.getRemoteUrl()+ "/"+course.getImg();
-            }*/
-            //通过配置加载文件域名
-            url = fileConfigUtils.getFileDomainApp() + "/" + course.getImg();
-            url=UrlFormatUtils.getHttpsORHttpUrl(url);
-            course.setImg(url);
+            if (course.getImg() != null && course.getImg().length() > 0) {
+                //通过配置加载文件域名
+                String url = fileConfigUtils.getFileDomainApp() + "/" + course.getImg();
+                url = UrlFormatUtils.getHttpsORHttpUrl(url);
+                course.setImg(url);
+            }
         }
         return getDataTable(list);
     }
@@ -108,17 +101,12 @@ public class ElAIOController extends BaseController {
     @GetMapping(value = "/course/{id}")
     public R<ElCourse> getCourseInfo(@PathVariable("id") Long id, HttpServletRequest request) {
         ElCourse elCourse=elCourseService.selectUserCourseById(id,request);
-        /*String baseUrl = request.getServerName() ;
-        String img;
-        if(baseUrl.contains("192.168")){
-            img=fileConfigUtils.getLocalUrl()+"/"+elCourse.getImg();
-        }else {
-            img=fileConfigUtils.getRemoteUrl()+"/"+elCourse.getImg();
-        }*/
-        //通过配置加载文件域名
-        String img = fileConfigUtils.getFileDomainApp() + "/" + elCourse.getImg();
-        img= UrlFormatUtils.getHttpsORHttpUrl(img);
-        elCourse.setImg(img);
+        if (elCourse.getImg() != null && elCourse.getImg().length() > 0) {
+            //通过配置加载文件域名
+            String img = fileConfigUtils.getFileDomainApp() + "/" + elCourse.getImg();
+            img = UrlFormatUtils.getHttpsORHttpUrl(img);
+            elCourse.setImg(img);
+        }
         return R.ok(elCourse);
     }
 
@@ -426,19 +414,13 @@ public class ElAIOController extends BaseController {
         userCert.setJoinUserId(SecurityUtils.getUserId());
         startPage();
         List<ElUserCert> userCerts = userCertService.queryMyCert(userCert);
-        String baseUrl = request.getServerName() ;
-        String url;
-
         for(ElUserCert elUserCert: userCerts){
-            /*if(baseUrl.contains("192.168")){
-                url=fileConfigUtils.getLocalUrl()+ File.separator+elUserCert.getCertUrl();
-            }else {
-                url=fileConfigUtils.getRemoteUrl()+ File.separator+elUserCert.getCertUrl();
-            }*/
-            //通过配置加载文件域名
-            url = fileConfigUtils.getFileDomainApp() + File.separator+elUserCert.getCertUrl();
-            url= UrlFormatUtils.getHttpsORHttpUrl(url);
-            elUserCert.setCertUrl(url);
+            if (elUserCert.getCertUrl() != null && elUserCert.getCertUrl().length() > 0) {
+                //通过配置加载文件域名
+                String url = fileConfigUtils.getFileDomainApp() + File.separator + elUserCert.getCertUrl();
+                url = UrlFormatUtils.getHttpsORHttpUrl(url);
+                elUserCert.setCertUrl(url);
+            }
         }
         return getDataTable(userCerts);
     }

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElOnePcController.java

@@ -41,21 +41,16 @@ public class ElOnePcController extends BaseController {
      */
     @GetMapping("/safetrain")
     @ApiOperation(value = "一体机获取实学习资料列表")
-    public TableDataInfo<ElSafeTrain> safeTrain(ElSafeTrain elSafeTrain, HttpServletRequest request) {
+    public TableDataInfo<ElSafeTrain> safeTrain(ElSafeTrain elSafeTrain) {
         startPage();
         List<ElSafeTrain> list = elSafeTrainService.selectElSafeTrainList(elSafeTrain);
-        //String baseUrl=request.getServerName() ;
-        String cover="";
         for(ElSafeTrain safeTrain:list){
-            /*if(baseUrl.contains("192.168")){
-                cover=fileConfigUtils.getLocalUrl()+"/"+safeTrain.getCover();
-            }else {
-                cover=fileConfigUtils.getRemoteUrl()+"/"+safeTrain.getCover();
-            }*/
-            //通过配置加载文件域名
-            cover = fileConfigUtils.getFileDomainApp() + "/" + safeTrain.getCover();
-            cover= UrlFormatUtils.getHttpsORHttpUrl(cover);
-            safeTrain.setCover(cover);
+            if (safeTrain.getCover() != null && safeTrain.getCover().length() > 0) {
+                //通过配置加载文件域名
+                String cover = fileConfigUtils.getFileDomainApp() + "/" + safeTrain.getCover();
+                cover = UrlFormatUtils.getHttpsORHttpUrl(cover);
+                safeTrain.setCover(cover);
+            }
         }
         return getDataTable(list);
 
@@ -69,17 +64,12 @@ public class ElOnePcController extends BaseController {
     @ApiOperation(value = "一体机获取实学习资料详情")
     public AjaxResult safeTrainDetail(ElSafeTrain elSafeTrain, HttpServletRequest request) {
         ElSafeTrain elSafe=elSafeTrainService.selectElSafeTrainById(elSafeTrain.getId());
-        String baseUrl=request.getServerName() ;
-        /*String cover="";
-        if(baseUrl.contains("192.168")){
-            cover=fileConfigUtils.getLocalUrl()+"/"+elSafe.getCover();
-        }else {
-            cover=fileConfigUtils.getRemoteUrl()+"/"+elSafe.getCover();
-        }*/
-        //通过配置加载文件域名
-        String cover = fileConfigUtils.getFileDomainApp() + "/" + elSafe.getCover();
-        cover= UrlFormatUtils.getHttpsORHttpUrl(cover);
-        elSafe.setCover(cover);
+        if (elSafe.getCover() != null && elSafe.getCover().length() > 0) {
+            //通过配置加载文件域名
+            String cover = fileConfigUtils.getFileDomainApp() + "/" + elSafe.getCover();
+            cover = UrlFormatUtils.getHttpsORHttpUrl(cover);
+            elSafe.setCover(cover);
+        }
         return AjaxResult.success(elSafeTrainService.selectElSafeTrainById(elSafeTrain.getId()));
     }
 

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElUserCertServiceImpl.java

@@ -99,22 +99,16 @@ public class ElUserCertServiceImpl implements IElUserCertService {
         elUserCert.setExpirationTime(DateUtils.getPostdate(certificate.getCertValidity(), 2));
 
         // 此时的登录用户应该等同于交卷用户
-
         SysUser user = tokenService.getLoginUser().getSysUser();
         if(!user.getUserId().equals(myCert.getJoinUserId())){
             throw new ServiceException("证书生成失败，用户不匹配！");
         }
-        /*String baseUrl=request.getServerName() ;
-        String url="";
-        if(baseUrl.contains("192.168")){
-            url=fileConfigUtils.getLocalUrl()+certificate.getCertUrl();
-        }else{
-            url=fileConfigUtils.getRemoteUrl()+certificate.getCertUrl();
-        }*/
-        //通过配置加载文件域名
-        String url = fileConfigUtils.getFileDomainApp() + certificate.getCertUrl();
-        url= UrlFormatUtils.getHttpsORHttpUrl(url);
-        elUserCert.setCertUrl(url);
+        if (certificate.getCertUrl() != null && certificate.getCertUrl().length() > 0) {
+            //通过配置加载文件域名
+            String url = fileConfigUtils.getFileDomainApp() + certificate.getCertUrl();
+            url = UrlFormatUtils.getHttpsORHttpUrl(url);
+            elUserCert.setCertUrl(url);
+        }
         elUserCert.setUserNickName(user.getNickName());
         elUserCert.setUserName(user.getUserName());
         elUserCert.setDeptId(user.getDeptId());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSafeBookController.java

@@ -146,16 +146,12 @@ public class LabSafeBookController extends BaseController {
         //String baseUrls=request.getHeader("X-Forwarded-For");
         //logger.info("X-Real-IP:"+baseUrl+"  "+"X-Forwarded-For:"+baseUrls);
         LabSafeBook labSafeBook=labSafeBookService.selectLabSafeBookById(id);
-        /*String url="";
-        if(baseUrl.contains("192.168")){
-            url=fileConfigUtils.getLocalUrl()+labSafeBook.getContent();
-        }else{
-            url=fileConfigUtils.getRemoteUrl()+labSafeBook.getContent();
-        }*/
-        //通过配置动态获取域名
-        String url = fileConfigUtils.getFileDomainApp() + labSafeBook.getContent();
-        url= UrlFormatUtils.getHttpsORHttpUrl(url);
-        labSafeBook.setContent(url);
+        if (labSafeBook.getContent() != null && labSafeBook.getContent().length() > 0) {
+            //通过配置动态获取域名
+            String url = fileConfigUtils.getFileDomainApp() + labSafeBook.getContent();
+            url = UrlFormatUtils.getHttpsORHttpUrl(url);
+            labSafeBook.setContent(url);
+        }
         return ResultData.success(labSafeBook);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabViolationController.java

@@ -6,6 +6,7 @@ import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.UrlFormatUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.exam.api.feign.RemoteExamService;
@@ -392,10 +393,11 @@ public class LabViolationController extends BaseController {
             return r;
         }
         LabViolationInfoVO labViolat= (LabViolationInfoVO) r.getData();
-        String avatar=labViolat.getAvatar();
-        String url=fileConfigUtils.getFileDomainAdmin()+ File.separator+avatar;
-        url= UrlFormatUtils.getHttpsORHttpUrl(url);
-        labViolat.setAvatar(url);
+        if (StringUtils.isNotEmpty(labViolat.getAvatar())) {
+            String url = fileConfigUtils.getFileDomainAdmin() + File.separator + labViolat.getAvatar();
+            url = UrlFormatUtils.getHttpsORHttpUrl(url);
+            labViolat.setAvatar(url);
+        }
         r.setData(labViolat);
         return r;
     }