清除cookie登录失效后刷新验证码请求无法显示的问题

pom.xml

@@ -48,6 +48,18 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.13</version>
+        </dependency>
+
         <!-- 单元测试 start -->
         <dependency>
             <groupId>org.testng</groupId>

src/main/java/net/chenlin/dp/common/excel/BusClick.java

@@ -0,0 +1,69 @@
+package net.chenlin.dp.common.excel;
+
+/**
+ *
+ *
+ * @author Lynch
+ */
+public class BusClick {
+    @ExcelColumn(value = "地区编码", col = 1)
+    private String cityCode;
+
+    @ExcelColumn(value = "标志", col = 2)
+    private String markId;
+
+    @ExcelColumn(value = "toaluv", col = 3)
+    private String toaluv;
+
+    @ExcelColumn(value = "date", col = 4)
+    private String date;
+
+    @ExcelColumn(value = "clientVer", col = 5)
+    private String clientVer;
+
+    @Override
+    public String toString() {
+        return "BusClick [cityCode=" + cityCode + ", markId=" + markId + ", toaluv=" + toaluv + ", date=" + date
+                + ", clientVer=" + clientVer + "]";
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getMarkId() {
+        return markId;
+    }
+
+    public void setMarkId(String markId) {
+        this.markId = markId;
+    }
+
+    public String getToaluv() {
+        return toaluv;
+    }
+
+    public void setToaluv(String toaluv) {
+        this.toaluv = toaluv;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getClientVer() {
+        return clientVer;
+    }
+
+    public void setClientVer(String clientVer) {
+        this.clientVer = clientVer;
+    }
+}

src/main/java/net/chenlin/dp/common/excel/ExcelColumn.java

@@ -0,0 +1,34 @@
+package net.chenlin.dp.common.excel;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义实体类所需要的bean(Excel属性标题、位置等)
+ *
+ * @author Lynch
+ *
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExcelColumn {
+    /**
+     * Excel标题
+     *
+     * @return
+     * @author Lynch
+     */
+    String value() default "";
+
+    /**
+     * Excel从左往右排列位置
+     *
+     * @return
+     * @author Lynch
+     */
+    int col() default 0;
+}

src/main/java/net/chenlin/dp/common/excel/ExcelUtils.java

@@ -0,0 +1,346 @@
+package net.chenlin.dp.common.excel;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletResponse;
+
+//import org.apache.commons.collections.CollectionUtils;
+//import org.apache.commons.lang3.BooleanUtils;
+//import org.apache.commons.lang3.CharUtils;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.CharUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+
+public class ExcelUtils {
+
+    private final static Logger log = LoggerFactory.getLogger(ExcelUtils.class);
+
+    private final static String EXCEL2003 = "xls";
+    private final static String EXCEL2007 = "xlsx";
+
+    public static <T> List<T> readExcel(String path, Class<T> cls,MultipartFile file){
+
+        String fileName = file.getOriginalFilename();
+        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+            log.error("上传文件格式不正确");
+        }
+        List<T> dataList = new ArrayList<>();
+        Workbook workbook = null;
+        try {
+            InputStream is = file.getInputStream();
+            if (fileName.endsWith(EXCEL2007)) {
+//                FileInputStream is = new FileInputStream(new File(path));
+                workbook = new XSSFWorkbook(is);
+            }
+            if (fileName.endsWith(EXCEL2003)) {
+//                FileInputStream is = new FileInputStream(new File(path));
+                workbook = new HSSFWorkbook(is);
+            }
+            if (workbook != null) {
+                //类映射  注解 value-->bean columns
+                Map<String, List<Field>> classMap = new HashMap<>();
+                List<Field> fields = Stream.of(cls.getDeclaredFields()).collect(Collectors.toList());
+                fields.forEach(
+                        field -> {
+                            ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                            if (annotation != null) {
+                                String value = annotation.value();
+                                if (StringUtils.isBlank(value)) {
+                                    return;//return起到的作用和continue是相同的 语法
+                                }
+                                if (!classMap.containsKey(value)) {
+                                    classMap.put(value, new ArrayList<>());
+                                }
+                                field.setAccessible(true);
+                                classMap.get(value).add(field);
+                            }
+                        }
+                );
+                //索引-->columns
+                Map<Integer, List<Field>> reflectionMap = new HashMap<>(16);
+                //默认读取第一个sheet
+                Sheet sheet = workbook.getSheetAt(0);
+
+                boolean firstRow = true;
+                for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
+                    Row row = sheet.getRow(i);
+                    //首行  提取注解
+                    if (firstRow) {
+                        for (int j = row.getFirstCellNum(); j <= row.getLastCellNum(); j++) {
+                            Cell cell = row.getCell(j);
+                            String cellValue = getCellValue(cell);
+                            if (classMap.containsKey(cellValue)) {
+                                reflectionMap.put(j, classMap.get(cellValue));
+                            }
+                        }
+                        firstRow = false;
+                    } else {
+                        //忽略空白行
+                        if (row == null) {
+                            continue;
+                        }
+                        try {
+                            T t = cls.newInstance();
+                            //判断是否为空白行
+                            boolean allBlank = true;
+                            for (int j = row.getFirstCellNum(); j <= row.getLastCellNum(); j++) {
+                                if (reflectionMap.containsKey(j)) {
+                                    Cell cell = row.getCell(j);
+                                    String cellValue = getCellValue(cell);
+                                    if (StringUtils.isNotBlank(cellValue)) {
+                                        allBlank = false;
+                                    }
+                                    List<Field> fieldList = reflectionMap.get(j);
+                                    fieldList.forEach(
+                                            x -> {
+                                                try {
+                                                    handleField(t, cellValue, x);
+                                                } catch (Exception e) {
+                                                    log.error(String.format("reflect field:%s value:%s exception!", x.getName(), cellValue), e);
+                                                }
+                                            }
+                                    );
+                                }
+                            }
+                            if (!allBlank) {
+                                dataList.add(t);
+                            } else {
+                                log.warn(String.format("row:%s is blank ignore!", i));
+                            }
+                        } catch (Exception e) {
+                            log.error(String.format("parse row:%s exception!", i), e);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error(String.format("parse excel exception!"), e);
+        } finally {
+            if (workbook != null) {
+                try {
+                    workbook.close();
+                } catch (Exception e) {
+                    log.error(String.format("parse excel exception!"), e);
+                }
+            }
+        }
+        return dataList;
+    }
+
+    private static <T> void handleField(T t, String value, Field field) throws Exception {
+        Class<?> type = field.getType();
+        if (type == null || type == void.class || StringUtils.isBlank(value)) {
+            return;
+        }
+        if (type == Object.class) {
+            field.set(t, value);
+            //数字类型
+        } else if (type.getSuperclass() == null || type.getSuperclass() == Number.class) {
+            if (type == int.class || type == Integer.class) {
+                field.set(t, NumberUtils.toInt(value));
+            } else if (type == long.class || type == Long.class) {
+                field.set(t, NumberUtils.toLong(value));
+            } else if (type == byte.class || type == Byte.class) {
+                field.set(t, NumberUtils.toByte(value));
+            } else if (type == short.class || type == Short.class) {
+                field.set(t, NumberUtils.toShort(value));
+            } else if (type == double.class || type == Double.class) {
+                field.set(t, NumberUtils.toDouble(value));
+            } else if (type == float.class || type == Float.class) {
+                field.set(t, NumberUtils.toFloat(value));
+            } else if (type == char.class || type == Character.class) {
+                field.set(t, CharUtils.toChar(value));
+            } else if (type == boolean.class) {
+                field.set(t, BooleanUtils.toBoolean(value));
+            } else if (type == BigDecimal.class) {
+                field.set(t, new BigDecimal(value));
+            }
+        } else if (type == Boolean.class) {
+            field.set(t, BooleanUtils.toBoolean(value));
+        } else if (type == Date.class) {
+            //
+            field.set(t, value);
+        } else if (type == String.class) {
+            field.set(t, value);
+        } else {
+            Constructor<?> constructor = type.getConstructor(String.class);
+            field.set(t, constructor.newInstance(value));
+        }
+    }
+
+    private static String getCellValue(Cell cell) {
+        if (cell == null) {
+            return "";
+        }
+        if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
+            if (HSSFDateUtil.isCellDateFormatted(cell)) {
+                return HSSFDateUtil.getJavaDate(cell.getNumericCellValue()).toString();
+            } else {
+                return new BigDecimal(cell.getNumericCellValue()).toString();
+            }
+        } else if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
+            return StringUtils.trimToEmpty(cell.getStringCellValue());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
+            return StringUtils.trimToEmpty(cell.getCellFormula());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_BLANK) {
+            return "";
+        } else if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
+            return String.valueOf(cell.getBooleanCellValue());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_ERROR) {
+            return "ERROR";
+        } else {
+            return cell.toString().trim();
+        }
+
+    }
+
+    public static <T> void writeExcel(String fileName,HttpServletResponse response, List<T> dataList, Class<T> cls){
+        Field[] fields = cls.getDeclaredFields();
+        List<Field> fieldList = Arrays.stream(fields)
+                .filter(field -> {
+                    ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                    if (annotation != null && annotation.col() > 0) {
+                        field.setAccessible(true);
+                        return true;
+                    }
+                    return false;
+                }).sorted(Comparator.comparing(field -> {
+                    int col = 0;
+                    ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                    if (annotation != null) {
+                        col = annotation.col();
+                    }
+                    return col;
+                })).collect(Collectors.toList());
+
+        Workbook wb = new XSSFWorkbook();
+        Sheet sheet = wb.createSheet("Sheet1");
+        AtomicInteger ai = new AtomicInteger();
+        {
+            Row row = sheet.createRow(ai.getAndIncrement());
+            AtomicInteger aj = new AtomicInteger();
+            //写入头部
+            fieldList.forEach(field -> {
+                ExcelColumn annotation = field.getAnnotation(ExcelColumn.class);
+                String columnName = "";
+                if (annotation != null) {
+                    columnName = annotation.value();
+                }
+                Cell cell = row.createCell(aj.getAndIncrement());
+
+                CellStyle cellStyle = wb.createCellStyle();
+                cellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+                cellStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
+                cellStyle.setAlignment(CellStyle.ALIGN_CENTER);
+
+                Font font = wb.createFont();
+                font.setBoldweight(Font.BOLDWEIGHT_NORMAL);
+                cellStyle.setFont(font);
+                cell.setCellStyle(cellStyle);
+                cell.setCellValue(columnName);
+            });
+        }
+        if (!dataList.isEmpty()) {
+            dataList.forEach(t -> {
+                Row row1 = sheet.createRow(ai.getAndIncrement());
+                AtomicInteger aj = new AtomicInteger();
+                fieldList.forEach(field -> {
+                    Class<?> type = field.getType();
+                    Object value = "";
+                    try {
+                        value = field.get(t);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    Cell cell = row1.createCell(aj.getAndIncrement());
+                    if (value != null) {
+                        if (type == Date.class) {
+                            cell.setCellValue(value.toString());
+                        } else {
+                            cell.setCellValue(value.toString());
+                        }
+                        cell.setCellValue(value.toString());
+                    }
+                });
+            });
+        }
+        //冻结窗格
+        wb.getSheet("Sheet1").createFreezePane(0, 1, 0, 1);
+        //浏览器下载excel
+        buildExcelDocument(fileName,wb,response);
+        //生成excel文件
+//        buildExcelFile("D:\\WPS\\default.xlsx",wb);
+    }
+
+    /**
+     * 浏览器下载excel
+     * @param fileName
+     * @param wb
+     * @param response
+     */
+
+    private static  void  buildExcelDocument(String fileName, Workbook wb,HttpServletResponse response){
+        try {
+            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+            response.setHeader("Content-Disposition", "attachment;filename="+URLEncoder.encode(fileName, "utf-8"));
+            response.flushBuffer();
+            wb.write(response.getOutputStream());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 生成excel文件
+     * @param path 生成excel路径
+     * @param wb
+     */
+    private static  void  buildExcelFile(String path, Workbook wb){
+
+        File file = new File(path);
+        if (file.exists()) {
+            file.delete();
+        }
+        try {
+            wb.write(new FileOutputStream(file));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/net/chenlin/dp/modules/Generator.java

@@ -11,14 +11,14 @@ public class Generator {
     public static void main(String[] args) throws Exception {
 
         String jdbcDriver = "com.mysql.jdbc.Driver";
-        String jdbcUrl = "jdbc:mysql://127.0.0.1:3306/dp-lte-boot?useUnicode=true&characterEncoding=utf-8";
+        String jdbcUrl = "jdbc:mysql://localhost:3306/yiqing?useUnicode=true&characterEncoding=utf-8";
         String jdbcUsername = "root";
         String jdbcPassword = "root";
 
-        String tablePrefix = "gen_";
+        String tablePrefix = "basics_";
 
-        String javaModule = "test";
-        String webModule = "test";
+        String javaModule = "basics";
+        String webModule = "basics";
 
         JdbcGenUtils.generatorCode(jdbcDriver, jdbcUrl, jdbcUsername, jdbcPassword, tablePrefix, javaModule, webModule);
 

src/main/java/net/chenlin/dp/modules/basics/controller/InterfaceController.java

@@ -0,0 +1,129 @@
+package net.chenlin.dp.modules.basics.controller;
+
+import net.chenlin.dp.common.annotation.RestAnon;
+import net.chenlin.dp.common.annotation.SysLog;
+import net.chenlin.dp.common.entity.Page;
+import net.chenlin.dp.common.entity.R;
+import net.chenlin.dp.common.excel.BusClick;
+import net.chenlin.dp.common.excel.ExcelUtils;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelEntity;
+import net.chenlin.dp.modules.basics.entity.BasicsPersonnelFillinEntity;
+import net.chenlin.dp.modules.basics.service.BasicsPersonnelFillinService;
+import net.chenlin.dp.modules.sys.controller.AbstractController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信小程序调用接口
+ * @author ZhouChenglin<yczclcn@163.com>
+ */
+@RestController
+@RequestMapping("/rest/interface")
+public class InterfaceController extends AbstractController {
+	
+	@Autowired
+	private BasicsPersonnelFillinService basicsPersonnelFillinService;
+	
+	/**
+	 * 列表
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public Page<BasicsPersonnelFillinEntity> list(@RequestBody Map<String, Object> params) {
+		return basicsPersonnelFillinService.listBasicsPersonnelFillin(params);
+	}
+		
+	/**
+	 * 新增
+	 * @param basicsPersonnelFillin
+	 * @return
+	 */
+	@RestAnon
+	@SysLog("新增人员每日填报温度信息")
+	@RequestMapping(value="save",method = RequestMethod.POST)
+	public R save(@RequestBody BasicsPersonnelFillinEntity basicsPersonnelFillin) {
+		basicsPersonnelFillin.setGmtCreate(new Date());
+		return basicsPersonnelFillinService.saveBasicsPersonnelFillin(basicsPersonnelFillin);
+	}
+	
+	/**
+	 * 根据id查询详情
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping("/info")
+	public R getById(@RequestBody Long id) {
+		return basicsPersonnelFillinService.getBasicsPersonnelFillinById(id);
+	}
+
+	/**
+	 * 根据id查询详情
+	 * @param id
+	 * @return
+	 */
+	@RestAnon
+	@RequestMapping("/getByUserCode")
+	public List<BasicsPersonnelEntity> getByUserCode(String id) {
+		return basicsPersonnelFillinService.getByUserCode(id);
+	}
+
+	/**
+	 * 修改
+	 * @param basicsPersonnelFillin
+	 * @return
+	 */
+	@SysLog("修改人员每日填报温度信息")
+	@RequestMapping("/update")
+	public R update(@RequestBody BasicsPersonnelFillinEntity basicsPersonnelFillin) {
+		return basicsPersonnelFillinService.updateBasicsPersonnelFillin(basicsPersonnelFillin);
+	}
+	
+	/**
+	 * 删除
+	 * @param id
+	 * @return
+	 */
+	@SysLog("删除人员每日填报温度信息")
+	@RequestMapping("/remove")
+	public R batchRemove(@RequestBody Long[] id) {
+		return basicsPersonnelFillinService.batchRemove(id);
+	}
+
+	@RestAnon
+	@RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
+	public void exportExcel(HttpServletResponse response)  throws IOException {
+		List<BusClick> resultList = new ArrayList<BusClick>();
+		BusClick busClick = new BusClick();
+		busClick.setCityCode("a1");
+		busClick.setClientVer("a2");
+		busClick.setDate("a3");
+		busClick.setMarkId("a4");
+		busClick.setToaluv("a5");
+		resultList.add(busClick);
+
+		busClick = new BusClick();
+		busClick.setCityCode("b1");
+		busClick.setClientVer("b2");
+		busClick.setDate("b3");
+		busClick.setMarkId("b4");
+		busClick.setToaluv("b5");
+		resultList.add(busClick);
+
+		long t1 = System.currentTimeMillis();
+		ExcelUtils.writeExcel("导出.xlsx",response, resultList, BusClick.class);
+		long t2 = System.currentTimeMillis();
+		System.out.println(String.format("write over! cost:%sms", (t2 - t1)));
+	}
+	
+}

src/main/java/net/chenlin/dp/modules/sys/controller/SysPageController.java

@@ -1,62 +1,63 @@
-package net.chenlin.dp.modules.sys.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-/**
- * 系统页面视图
- * @author zcl<yczclcn@163.com>
- */
-@Controller
-public class SysPageController {
-
-	/**
-	 * 页面跳转
-	 * @param module
-	 * @param function
-	 * @param url
-	 * @return
-	 */
-	@RequestMapping("/{module}/{function}/{url}.html")
-	public String page(@PathVariable("module") String module, @PathVariable("function") String function,
-			@PathVariable("url") String url) {
-		return "/" + module + "/" + function + "/" + url + ".html";
-	}
-
-	/**
-	 * 404页面
-	 * @return
-	 */
-	@RequestMapping("/error/404")
-	public String notFoundPage() {
-		return "/error/404.html";
-	}
-
-	/**
-	 * 403页面
-	 * @return
-	 */
-	@RequestMapping("/error/403")
-	public String noAuthPage() {
-		return "/error/403.html";
-	}
-
-	/**
-	 * 500页面
-	 * @return
-	 */
-	@RequestMapping("/error/500")
-	public String sysError() {
-		return "/error/500.html";
-	}
-
-	/**
-	 * 系统首页
-	 * @return
-	 */
-	@RequestMapping("/dashboard")
-	public String main() {
-		return "/system/dashboard.html";
-	}
-
-}
+package net.chenlin.dp.modules.sys.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+/**
+ * 系统页面视图
+ * @author zcl<yczclcn@163.com>
+ */
+@Controller
+public class SysPageController {
+
+	/**
+	 * 页面跳转
+	 * @param module
+	 * @param function
+	 * @param url
+	 * @return
+	 */
+	@RequestMapping("/{module}/{function}/{url}.html")
+	public String page(@PathVariable("module") String module, @PathVariable("function") String function,
+			@PathVariable("url") String url) {
+		return "/" + module + "/" + function + "/" + url + ".html";
+	}
+
+	/**
+	 * 404页面
+	 * @return
+	 */
+	@RequestMapping("/error/404")
+	public String notFoundPage() {
+		return "/error/404.html";
+	}
+
+	/**
+	 * 403页面
+	 * @return
+	 */
+	@RequestMapping("/error/403")
+	public String noAuthPage() {
+		return "/error/403.html";
+	}
+
+	/**
+	 * 500页面
+	 * @return
+	 */
+	@RequestMapping("/error/500")
+	public String sysError() {
+		return "/error/500.html";
+	}
+
+	/**
+	 * 系统首页
+	 * @return
+	 */
+	@RequestMapping("/dashboard")
+	public String main() {
+//		return "/system/dashboard.html";
+		return "/basics/basicspersonnelfillin/list.html";
+	}
+
+}

src/main/resources/application-sit.yml

@@ -4,13 +4,13 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     druid:
       master-data-source:  #主库数据源
-        url: jdbc:mysql://localhost:3306/yiqing?serverTimezone=UTC&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://103.40.192.17:3306/yiqing?serverTimezone=UTC&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
         username: root
-        password: root
+        password: CuiDian1234
       slave-data-source:  #从库数据源
-        url: jdbc:mysql://localhost:3306/yiqing?serverTimezone=UTC&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://103.40.192.17:3306/yiqing?serverTimezone=UTC&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
         username: root
-        password: root
+        password: CuiDian1234
       initial-size: 10
       max-active: 100
       min-idle: 10

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
     uri-encoding: UTF-8
     max-threads: 1000
     min-spare-threads: 30
-  port: 8080
+  port: 8899
   servlet:
     context-path: /
 

src/main/webapp/WEB-INF/view/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>疫情填报</title>
+<title>体温检测登记</title>
 <meta
 	content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
 	name="viewport">
@@ -16,7 +16,7 @@
 	<div class="wrapper" id="dpLTE" v-cloak>
 		<header class="main-header">
 			<a href="javascript:void(0);" class="logo"> <span
-				class="logo-mini"><b>DP</b></span> <span class="logo-lg"><b>疫情填报</b></span>
+				class="logo-mini"><b>DP</b></span> <span class="logo-lg"><b>体温检测登记</b></span>
 			</a>
 			<nav class="navbar navbar-static-top" role="navigation">
 				<a href="#" class="sidebar-toggle" data-toggle="offcanvas"

src/main/webapp/WEB-INF/view/login.html

@@ -3,13 +3,13 @@
 <head>
 <meta charset="utf-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-<title>疫情填报</title>
+<title>体温检测登记</title>
 <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"/>
 <link rel="stylesheet" href="${ctxPath}/static/css/login.min.css"/>
 </head>
 <body>
 	<div class="login">
-		<div class="message">疫情填报 管理登录</div>
+		<div class="message">体温检测登记系统登录</div>
 		<div id="darkbannerwrap"></div>
 		<form action="${ctxPath}/login" method="post" id="loginForm">
             <h4 class="tip">${errorMsg!}</h4>