Merge branch 'dev' of shikejing/wlyy2.0 into dev

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoorOrderController.java

@@ -1248,7 +1248,7 @@ public class DoorOrderController extends BaseController {
            //获取相对路径
            String pathName = DoorOrderController.class.getResource("/").getPath().replaceFirst("/", "");
            pathName = pathName.replace("target/classes/", "src/main/resources/conclusion.mht");
            Document doc = Jsoup.parse(new File(pathName), "UTF-8");
//            Document doc = Jsoup.parse(new File(pathName), "UTF-8");
            String txt = "";
            ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
@@ -1266,7 +1266,7 @@ public class DoorOrderController extends BaseController {
                e.printStackTrace();
            }
            txt = buffer.toString();
            System.out.println("txt ===== " + txt);
            Document aa = Jsoup.parse(txt,"UTF-8");
            String html = doorOrderService.handleData(aa,orderId);
            byte b[] = html.getBytes();