协作场景邮件 回车

src/main/java/com/fdkankan/ucenter/common/BaseController.java

@@ -88,7 +88,7 @@ public class BaseController {
         return request.getHeader("token");
     }
     protected String getLang(){
-        return request.getHeader("lang");
+        return StringUtils.isEmpty(request.getHeader("lang")) ? "en":request.getHeader("lang");
     }
     protected String getSign(){
         return request.getHeader("sign");

src/main/java/com/fdkankan/ucenter/service/impl/MailTemplateServiceImpl.java

@@ -96,12 +96,12 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
             }
             StringBuilder webSites = new StringBuilder();
             for (ScenePro scenePro : proList) {
-                webSites.append(scenePro.getWebSite()).append("\n");
+                webSites.append(scenePro.getWebSite()).append("<br>");
             }
             for (ScenePlus scenePlus : plusList) {
                 ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
                 if(scenePlusExt != null){
-                    webSites.append(scenePlusExt.getWebSite()).append("\n");
+                    webSites.append(scenePlusExt.getWebSite()).append("<br>");
                 }
             }
             if(StringUtils.isBlank(webSites)){
@@ -131,7 +131,7 @@ public class MailTemplateServiceImpl extends ServiceImpl<IMailTemplateMapper, Ma
             StringBuilder snCodes = new StringBuilder();
             for (Long cameraId : cameraMap.keySet()) {
                 if(cameraMap.get(cameraId) != null){
-                    snCodes.append(cameraMap.get(cameraId).getSnCode()).append("\n");
+                    snCodes.append(cameraMap.get(cameraId).getSnCode()).append("<br>");
                 }
             }
             if(StringUtils.isBlank(snCodes)){