Commit 1d650805 authored by Yelli's avatar Yelli Committed by lgcareer
Browse files

#1300 Add right alignment function in sql email content (#1542) 

* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl
parent 0f909fca

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell; 
import org.apache.poi.hssf.usermodel.HSSFRow;

import org.apache.poi.hssf.usermodel.HSSFSheet;

import org.apache.poi.hssf.usermodel.HSSFWorkbook;

import org.apache.poi.ss.usermodel.CellStyle;

import org.apache.poi.ss.usermodel.HorizontalAlignment;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -71,10 +73,14 @@ public class ExcelUtils { 
               //set the height of the first line

               row.setHeight((short)500);



               //set Horizontal right

               CellStyle cellStyle = wb.createCellStyle();

               cellStyle.setAlignment(HorizontalAlignment.RIGHT);



               //setting excel headers

               for (int i = 0; i < headerList.size(); i++) {

                   HSSFCell cell = row.createCell(i);

                   cell.setCellStyle(cellStyle);

                   cell.setCellValue(headerList.get(i));

               }
@@ -88,6 +94,7 @@ public class ExcelUtils { 
                   rowIndex++;

                   for (int j = 0 ; j < values.length ; j++){

                       HSSFCell cell1 = row.createCell(j);

                       cell1.setCellStyle(cellStyle);

                       cell1.setCellValue(String.valueOf(values[j]));

                   }

               }

dolphinscheduler-alert/src/main/resources/mail_templates/alert_mail_template.ftl

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

-->

<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title> dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type="text/css">table {            margin-top:0px;            padding-top:0px;            border:1px solid;            font-size: 14px;            color: #333333;            border-width: 1px;            border-color: #666666;            border-collapse: collapse;        }        table th {            border-width: 1px;            padding: 8px;            border-style: solid;            border-color: #666666;            background-color: #dedede;        }        table td {            border-width: 1px;            padding: 8px;            border-style: solid;            border-color: #666666;            background-color: #ffffff;        }</style></head><body style="margin:0;padding:0"><table border="1px" cellpadding="5px" cellspacing="-10px"><thead><#if title??> ${title}</#if></thead><#if content??> ${content}</#if></table></body></html>
 
 No newline at end of file
 
<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'><html><head><title> dolphinscheduler</title><meta name='Keywords' content=''><meta name='Description' content=''><style type="text/css">table {            margin-top:0px;            padding-top:0px;            border:1px solid;            font-size: 14px;            color: #333333;            border-width: 1px;            border-color: #666666;            border-collapse: collapse;        }        table th {            border-width: 1px;            padding: 8px;            border-style: solid;            border-color: #666666;            background-color: #dedede;        text-align: right;}        table td {            border-width: 1px;            padding: 8px;            border-style: solid;            border-color: #666666;            background-color: #ffffff;        text-align: right;}</style></head><body style="margin:0;padding:0"><table border="1px" cellpadding="5px" cellspacing="-10px"><thead><#if title??> ${title}</#if></thead><#if content??> ${content}</#if></table></body></html>
 
 No newline at end of file