From 321a74059773cfecc01d6313f7c2e2d45545d6d3 Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期五, 18 四月 2025 17:46:31 +0800 Subject: [PATCH] 4.18v1.1.0 --- target/surefire-reports/com.hxzkappboot.HxzkappBootApplicationTests.txt | 2 src/main/java/com/hxzkappboot/service/TbPersonService.java | 2 src/main/java/com/hxzkappboot/pojo/TbWarningRecord.java | 4 target/classes/com/hxzkappboot/service/impl/TbUpappServiceImpl.class | 0 src/main/java/com/hxzkappboot/service/impl/TbPersonServiceImpl.java | 13 + target/classes/com/hxzkappboot/controller/TbFenceController.class | 0 src/main/java/com/hxzkappboot/controller/GpsGuiJiController.java | 5 src/main/java/com/hxzkappboot/controller/TbWarningController.java | 8 + src/main/java/com/hxzkappboot/service/impl/TbWarningServiceImpl.java | 4 target/classes/com/hxzkappboot/service/TbUpappService.class | 0 src/main/java/com/hxzkappboot/pojo/TbTaskScheduling.java | 6 + target/classes/com/hxzkappboot/service/impl/TbFenceServiceImpl.class | 0 src/main/java/com/hxzkappboot/service/impl/TbFakajiServiceImpl.java | 2 target/classes/com/hxzkappboot/service/TbPersonService.class | 0 target/hxzkapp-boot-0.0.1-SNAPSHOT.jar.original | 0 target/classes/com/hxzkappboot/pojo/TbPerson.class | 0 target/classes/com/hxzkappboot/controller/TbUpappController.class | 0 target/classes/com/hxzkappboot/controller/TbWarningController.class | 0 src/main/java/com/hxzkappboot/mapper/TbWarningMapper.java | 6 target/surefire-reports/TEST-com.hxzkappboot.HxzkappBootApplicationTests.xml | 72 ++++++------ src/main/java/com/hxzkappboot/pojo/TbPerson.java | 4 src/main/java/com/hxzkappboot/controller/TbUpappController.java | 4 target/classes/com/hxzkappboot/controller/GpsGuiJiController.class | 0 target/classes/com/hxzkappboot/mapper/TbPersonMapper.class | 0 target/hxzkapp-boot-0.0.1-SNAPSHOT.jar | 0 src/main/java/com/hxzkappboot/service/impl/TbFenceServiceImpl.java | 4 target/classes/com/hxzkappboot/util/WebConfig.class | 0 target/classes/com/hxzkappboot/service/impl/TbPersonServiceImpl.class | 0 target/classes/com/hxzkappboot/pojo/TbTaskScheduling.class | 0 src/main/java/com/hxzkappboot/controller/TbPersonController.java | 11 + target/classes/com/hxzkappboot/pojo/TbAchor.class | 0 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst | 1 src/main/java/com/hxzkappboot/service/impl/TbAchorServiceImpl.java | 12 + target/classes/com/hxzkappboot/pojo/TbWarning.class | 0 target/classes/com/hxzkappboot/mapper/UserDao.class | 0 target/classes/com/hxzkappboot/pojo/TbWarningRecord.class | 0 src/main/java/com/hxzkappboot/service/impl/TbUpappServiceImpl.java | 8 + src/main/java/com/hxzkappboot/util/WebConfig.java | 2 target/classes/com/hxzkappboot/service/impl/TbAchorServiceImpl.class | 0 src/main/java/com/hxzkappboot/service/TbUpappService.java | 2 src/main/java/com/hxzkappboot/controller/TbFenceController.java | 102 +++++++++++++---- target/classes/com/hxzkappboot/controller/TbPersonController.class | 0 src/main/java/com/hxzkappboot/pojo/TbAchor.java | 4 target/classes/com/hxzkappboot/mapper/TbWarningMapper.class | 0 target/classes/com/hxzkappboot/service/impl/TbWarningServiceImpl.class | 0 src/main/java/com/hxzkappboot/mapper/UserDao.java | 2 /dev/null | 5 src/main/java/com/hxzkappboot/pojo/TbWarning.java | 4 src/main/java/com/hxzkappboot/pojo/TbFence.java | 4 target/classes/application.yml | 8 src/main/java/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.java | 1 target/classes/com/hxzkappboot/pojo/TbFence.class | 0 target/classes/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.class | 0 src/main/resources/application.yml | 8 src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java | 6 55 files changed, 201 insertions(+), 115 deletions(-) diff --git a/src/main/java/com/hxzkappboot/controller/GpsGuiJiController.java b/src/main/java/com/hxzkappboot/controller/GpsGuiJiController.java index 4dcca3c..afada11 100644 --- a/src/main/java/com/hxzkappboot/controller/GpsGuiJiController.java +++ b/src/main/java/com/hxzkappboot/controller/GpsGuiJiController.java @@ -46,14 +46,15 @@ @GetMapping({"/api/wx/findBaiDuGuiJi"}) R findBaiDuGuiJi(String tagid, String start, String end, String layer) throws ParseException { + String output = tagid.toUpperCase();//灏嗗皬鍐欏瓧姣嶈浆鎴愬ぇ鍐欏瓧姣� R response ; response = new R(StatusCode.Success); new ArrayList(); List gui; if (layer.equals("榛樿鍦板浘")) { - gui = this.gpsGuiJiService.findGuiJi(tagid, start, end); + gui = this.gpsGuiJiService.findGuiJi(output, start, end); } else { - gui = this.gpsGuiJiService.findGuiJiFloor(tagid, start, end, layer); + gui = this.gpsGuiJiService.findGuiJiFloor(output, start, end, layer); } List<TbMarsHomeset> disTime = this.marsHomeSetService.findDistanceAndTime(); diff --git a/src/main/java/com/hxzkappboot/controller/TbFenceController.java b/src/main/java/com/hxzkappboot/controller/TbFenceController.java index a0edd80..bf78a09 100644 --- a/src/main/java/com/hxzkappboot/controller/TbFenceController.java +++ b/src/main/java/com/hxzkappboot/controller/TbFenceController.java @@ -1,7 +1,6 @@ package com.hxzkappboot.controller; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,7 +32,7 @@ /** * <p> - * 鍓嶇鎺у埗鍣� + * 鍓嶇鎺у埗鍣� * </p> * * @author wangfei @@ -51,8 +50,8 @@ @GetMapping("/api/wx/findAllFence") - public R findAllFence(String company){ - R response ; + public R findAllFence(String company) { + R response; response = new R(StatusCode.Success); response.setData(tbFenceService.findAllFence(company)); return response; @@ -63,7 +62,7 @@ public R earlyWarning(String name) throws ParseException { String xieyi = "BSTOCS1,DELETEFENCE," + name + ",END"; Udp_Out.udp_to_cs(xieyi); - R response ; + R response; // List<TbFence> fenceList = new ArrayList(); System.out.println(name); // fenceList = tbFenceService.earlyWarning(); @@ -73,9 +72,9 @@ } @GetMapping("/api/wx/findFence") - public R findAll(Page page, String objectid,String company) { + public R findAll(Page page, String objectid, String company) { R response; - IPage<TbFence> ipage = tbFenceService.findFence(page,objectid,company); + IPage<TbFence> ipage = tbFenceService.findFence(page, objectid, company); response = new R(StatusCode.Success); response.setData(ipage); return response; @@ -83,36 +82,43 @@ @PostMapping("/api/wx/updateFence") public R processingWarn(@Valid @RequestBody TbFence tbFence) { - R response ; + R response; response = new R(StatusCode.Success); - TbFence gpsList =tbFenceService.updateFence(tbFence); + TbFence gpsList = tbFenceService.updateFence(tbFence); response.setData(gpsList); return response; } @GetMapping("/api/wx/FenceKaiQi") - public void fenceKai(TbFence fence){ + public void fenceKai(TbFence fence) { // TbUser user = sessionManager.getCurrentUser(request); - String xieyi = "BSTOCS1,FENCE,OPEN," +fence.getName()+",END"; + String xieyi = "BSTOCS1,FENCE,OPEN," + fence.getName() + ",END"; Udp_Out.udp_to_cs(xieyi); // String content = "寮�鍚簡涓�涓洿鏍忚鍥存爮鍚嶇О涓猴細"+fence.getName(); // String contentew = "袨褌泻褉褘胁邪械褌褋褟 蟹邪斜芯褉, 泻芯褌芯褉褘泄 薪邪蟹褘胁邪械褌褋褟锛�"+fence.getName(); // SystemLogController.InsertSystemLog(user.getUsername(),gettime(),content,contentew); } + @GetMapping("/api/wx/FenceGuanBi") - public void fenceGuan(TbFence fence){ + public void fenceGuan(TbFence fence) { // TbUser user = sessionManager.getCurrentUser(request); - String xieyi = "BSTOCS1,FENCE,CLOSE," +fence.getName()+",END"; + String xieyi = "BSTOCS1,FENCE,CLOSE," + fence.getName() + ",END"; System.out.println(); Udp_Out.udp_to_cs(xieyi); // String content = "鍏抽棴浜嗕竴涓洿鏍忚鍥存爮鍚嶇О涓猴細"+fence.getName(); // String contentew= "袟邪泻褉褘谢懈 蟹邪斜芯褉, 泻芯褌芯褉褘泄 薪邪蟹褘胁邪械褌褋褟锛�"+fence.getName(); // SystemLogController.InsertSystemLog(user.getUsername(),gettime(),content,contentew); } - + public static double ublox_d2dm(double deg) { + double deg0 =Math.floor(deg); + double ddeg = deg-deg0; + double m = ddeg*60; + double ddmm = deg0*100+m; + return ddmm; + } @PostMapping("/api/wx/submitper") public R submitper(@Valid @RequestBody TbFence tbFence) { - R response ; + R response; // for (int i = 0; i < ; i++) { // @@ -120,14 +126,14 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); // queryWrapper.eq("status","鏈鐞�"); // if (objectid!=null){ - queryWrapper.eq("name",tbFence.getName()); + queryWrapper.eq("name", tbFence.getName()); // } // queryWrapper.orderByDesc("addtime"); - List<TbFence> CompanyPage = tbPersonMapper.selectList( queryWrapper); - if (CompanyPage.size()>0){ + List<TbFence> CompanyPage = tbPersonMapper.selectList(queryWrapper); + if (CompanyPage.size() > 0) { response = new R(StatusCode.Fail); response.setData("鍥存爮鍚嶇О閲嶅锛屼繚瀛樺洿鏍忓け璐ワ紒"); - }else{ + } else { response = new R(StatusCode.Success); LocalDateTime now = LocalDateTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -135,14 +141,44 @@ String shengxiao = "00:00:00"; String shixiao = "23:59:59"; String xieyi = ""; - if (Objects.equals(tbFence.getShape(), "鍦嗗舰")){ + if (Objects.equals(tbFence.getShape(), "鍦嗗舰")) { + String[] zuobiao1 = tbFence.getZuobiao().split(":"); + double jingdu = ublox_d2dm(Double.parseDouble(zuobiao1[0])); + double weidu = ublox_d2dm(Double.parseDouble(zuobiao1[1].replace(";",""))); + String zuobiao = jingdu+";"+weidu; // xieyi = "BSTOCS1,ADDFENCE," + layer + ","+weilanleixing+","+guanlianduixiang+","+quyumingcheng+","+sd+","+xingzhuang+","+shengxiao+","+shixiao+","+formattedDateTime+","+yanse+","+gao+",END"; - xieyi = "BSTOCS1,ADDFENCEYUAN,鐧惧害鍦板浘" + ","+tbFence.getType()+","+tbFence.getBumen()+","+tbFence.getBanjing()+","+tbFence.getName()+","+tbFence.getZuobiao().split(":")[0] +";"+tbFence.getZuobiao().split(":")[0]+","+"鍦嗗舰"+","+"00:00:00"+","+"23:59:59"+","+formattedDateTime+","+"绾㈣壊"+",END"; - }else{ - xieyi = "BSTOCS1,ADDFENCE,鐧惧害鍦板浘,"+tbFence.getType()+","+tbFence.getBumen()+","+tbFence.getName()+","+tbFence.getZuobiao()+","+tbFence.getShape()+","+shengxiao+","+shixiao+","+formattedDateTime+","+"绾㈣壊"+","+tbFence.getBaoliu1()+",END"; - } + xieyi = "BSTOCS1,ADDFENCEYUAN,鐧惧害鍦板浘" + "," + tbFence.getType() + "," + tbFence.getBumen() + "," + tbFence.getBanjing() + "," + tbFence.getName() + "," + zuobiao + "," + "鍦嗗舰" + "," + "00:00:00" + "," + "23:59:59" + "," + formattedDateTime + "," + "绾㈣壊" + ",END"; + } else { + xieyi = "BSTOCS1,ADDFENCE,鐧惧害鍦板浘," + tbFence.getType() + "," + tbFence.getBumen() + "," + tbFence.getName() + "," + tbFence.getZuobiao() + "," + tbFence.getShape() + "," + shengxiao + "," + shixiao + "," + formattedDateTime + "," + "绾㈣壊" + "," + tbFence.getBaoliu1() + ",END"; + } System.out.println(xieyi); Udp_Out.udp_to_cs(xieyi); + + QueryWrapper queryWrapper1= new QueryWrapper<>(); +// queryWrapper.eq("status","鏈鐞�"); +// if (objectid!=null){ + queryWrapper1.eq("name",tbFence.getName()); + +// 缁檆s浼犲�煎欢鏃朵竴绉掍慨鏀逛慨鏀筩s淇濆瓨鐨勫唴瀹� + try { + Thread.sleep(1000); + + }catch (InterruptedException e){ + Thread.currentThread().interrupt(); +// logUtil.error("绾跨▼涓柇"+e.getMessage()); + } +// queryWrapper.orderByDesc("addtime"); + + TbFence CompanyPage1 = tbPersonMapper.selectOne(queryWrapper1); + CompanyPage1.setCompany(tbFence.getCompany()); + CompanyPage1.setBaoliu1(tbFence.getBaoliu1()); +// if (CompanyPage1==null){ +// this.findfence(name); +// }else{ + TbFence gpsList = tbFenceService.updateFence(CompanyPage1); +// } +// +// this.findfence(tbFence.getName()); } //淇濆瓨鏁版嵁鍒癱s鐨勬牸寮� @@ -153,5 +189,23 @@ return response; } + public TbFence findfence( String name) { + + QueryWrapper queryWrapper1= new QueryWrapper<>(); +// queryWrapper.eq("status","鏈鐞�"); +// if (objectid!=null){ + queryWrapper1.eq("name",name); + +// } +// queryWrapper.orderByDesc("addtime"); + TbFence CompanyPage1 = tbPersonMapper.selectOne( queryWrapper1); + if (CompanyPage1==null){ + this.findfence(name); + }else{ + TbFence gpsList = tbFenceService.updateFence(CompanyPage1); + } + return CompanyPage1; + } + } diff --git a/src/main/java/com/hxzkappboot/controller/TbPersonController.java b/src/main/java/com/hxzkappboot/controller/TbPersonController.java index 5a79a47..47b528b 100644 --- a/src/main/java/com/hxzkappboot/controller/TbPersonController.java +++ b/src/main/java/com/hxzkappboot/controller/TbPersonController.java @@ -53,11 +53,12 @@ @GetMapping("/api/wx/findPerson") public R findIdPerson(String name,String company) { R response; - if (personService.findIdPerson(name,company) != null) { + String output = name.toUpperCase();//灏嗗皬鍐欏瓧姣嶈浆鎴愬ぇ鍐欏瓧姣� + if (personService.findIdPerson(output,company) != null) { response = new R(StatusCode.Success); // String token = wechatService.getToken(loginRequest); // tbUser1.setToken(token); - response.setData(personService.findIdPerson(name,company)); + response.setData(personService.findIdPerson(output,company)); // return personService.findIdPerson(name); } else { response = new R(StatusCode.Fail); @@ -68,9 +69,11 @@ } @GetMapping("/api/wx/acquisition") - public R acquisition(String baoliu3) { + public R acquisition(String baoliu3,String company) { R response; - TbPerson tbPerson = personService.acquisition(baoliu3); + String output = baoliu3.toUpperCase();//灏嗗皬鍐欏瓧姣嶈浆鎴愬ぇ鍐欏瓧姣� + + TbPerson tbPerson = personService.acquisition(output,company); if (tbPerson != null) { if (Objects.equals(tbPerson.getBaoliu13(), "楂樼簿搴�") && Objects.equals(tbPerson.getPOnline(), "1")) { diff --git a/src/main/java/com/hxzkappboot/controller/TbUpappController.java b/src/main/java/com/hxzkappboot/controller/TbUpappController.java index c78a0a8..087a47c 100644 --- a/src/main/java/com/hxzkappboot/controller/TbUpappController.java +++ b/src/main/java/com/hxzkappboot/controller/TbUpappController.java @@ -21,10 +21,10 @@ TbUpappService tbUpappService; @GetMapping({"/api/wx/findTbUpapp"}) - public R findTbUpapp() throws ParseException { + public R findTbUpapp(String name) throws ParseException { R response ; TbUpapp appList = new TbUpapp(); - appList = tbUpappService.findTbUpapp(); + appList = tbUpappService.findTbUpapp(name); response = new R(StatusCode.Success); response.setData(appList); return response; diff --git a/src/main/java/com/hxzkappboot/controller/TbWarningController.java b/src/main/java/com/hxzkappboot/controller/TbWarningController.java index e0fd3b2..ed5e1a5 100644 --- a/src/main/java/com/hxzkappboot/controller/TbWarningController.java +++ b/src/main/java/com/hxzkappboot/controller/TbWarningController.java @@ -65,6 +65,14 @@ String xieyi = "BSTOCS1,DELLWARN," +warning.getObjectid()+","+warning.getType()+",END"; // String xieyi = "BSTOCS1,DELETEFENCE," + name + ",END"; Udp_Out.udp_to_cs(xieyi); + + try { + Thread.sleep(1000); + + }catch (InterruptedException e){ + Thread.currentThread().interrupt(); +// logUtil.error("绾跨▼涓柇"+e.getMessage()); + } R response ; response = new R(StatusCode.Success); TbWarning gpsList =tbWarningService.processingWarn(warning); diff --git a/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java b/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java index eb68bef..9a4a707 100644 --- a/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java +++ b/src/main/java/com/hxzkappboot/mapper/TbPersonMapper.java @@ -23,7 +23,7 @@ // @Select({"select * from tb_person where p_fencename = #{name}"}) // List<TbPerson> findAllperson(String name); - @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p_online = '1' AND p.companyid = #{company} AND (p.p_tagid = #{name} or p.p_name = #{name})") + @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p_online = '1' AND p.company = #{company} AND (p.p_tagid = #{name} or p.p_name = #{name})") TbPerson findOnePerson(@Param("name")String name,@Param("company")String company); @Select("SELECT\n" + @@ -37,10 +37,10 @@ "\tLIMIT 1;") TbPerson upTag(); - @Select("SELECT p.p_tagid,p.p_power,p.p_name,p_online,p.p_image,p.baoliu2,p.baoliu3,p.baoliu13,p.baoliu4,p.baoliu19,p.p_sos,p.p_addtiem,p.p_department,p.companyid as companyid,d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_online = 1 and p.companyid = #{company}") + @Select("SELECT p.p_tagid,p.p_power,p.p_name,p_online,p.p_image,p.baoliu2,p.baoliu3,p.baoliu13,p.baoliu4,p.baoliu19,p.p_sos,p.p_addtiem,p.p_department,p.company as company,d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_online = 1 and p.company = #{company}") List<TbPersonAndDepartment> findAllBuMen(@Param("company")String company); - @Select("SELECT p.p_tagid as id,p.p_name as name,p.baoliu2 as baoliu2,p.baoliu3 as baoliu3,p.baoliu19 as baoliu19,p.p_department as pdepartment,p.baoliu4 as baoliu4,p.companyid as companyid,p.p_power as ppower,p.p_online as online FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.companyid = #{company}") + @Select("SELECT p.p_tagid as id,p.p_name as name,p.baoliu2 as baoliu2,p.baoliu3 as baoliu3,p.baoliu19 as baoliu19,p.p_department as pdepartment,p.baoliu4 as baoliu4,p.company as company,p.p_power as ppower,p.p_online as online FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.company = #{company}") List<PersonCesium> findAllBuMenCesium(@Param("company")String company); } diff --git a/src/main/java/com/hxzkappboot/mapper/TbWarningMapper.java b/src/main/java/com/hxzkappboot/mapper/TbWarningMapper.java index d166e39..2b42e09 100644 --- a/src/main/java/com/hxzkappboot/mapper/TbWarningMapper.java +++ b/src/main/java/com/hxzkappboot/mapper/TbWarningMapper.java @@ -28,19 +28,19 @@ @Select("SELECT w.*,p.p_name as pName,p.p_x as pX,p.p_y as pY,p.p_floor as pFloor,p.baoliu2 as lat,p.baoliu3 as lng,p.baoliu4 as gao\n" + "FROM tb_warning w\n" + "INNER JOIN tb_person p ON w.objectid = p.p_tagid\n" + - "WHERE status='鏈鐞�' and p.companyid = #{company} LIMIT #{current}, #{size}") + "WHERE status='鏈鐞�' and p.company = #{company} LIMIT #{current}, #{size}") List<TbWarning> findwarper(@Param("company")String company,@Param("current") long current, @Param("size") long size); @Select("SELECT w.*,p.*\n" + "FROM tb_warning w\n" + "INNER JOIN tb_person p ON w.objectid = p.p_tagid\n" + - "WHERE status='鏈鐞�' and w.objectid = #{objectid} and p.companyid = #{company} LIMIT #{current}, #{size}") + "WHERE status='鏈鐞�' and w.objectid = #{objectid} and p.company = #{company} LIMIT #{current}, #{size}") List<TbWarning> findwarper1(@Param("company")String company, @Param("objectid")String objectid,@Param("current") long current, @Param("size") long size); @Select("SELECT w.*,p.p_name as pName,p.p_x as pX,p.p_y as pY,p.p_floor as pFloor,p.baoliu2 as lat,p.baoliu3 as lng,p.baoliu4 as gao\n" + "FROM tb_warning w\n" + "INNER JOIN tb_person p ON w.objectid = p.p_tagid\n" + - "WHERE status='鏈鐞�' and p.companyid = #{company}") + "WHERE status='鏈鐞�' and p.company = #{company}") List<TbWarning> findwarper2(@Param("company")String company); diff --git a/src/main/java/com/hxzkappboot/mapper/UserDao.java b/src/main/java/com/hxzkappboot/mapper/UserDao.java index fc5dcda..bb34e45 100644 --- a/src/main/java/com/hxzkappboot/mapper/UserDao.java +++ b/src/main/java/com/hxzkappboot/mapper/UserDao.java @@ -7,7 +7,7 @@ import java.util.List; public interface UserDao extends BaseMapper<TbUser> { - @Select("select u.*,c.id as companyid from tb_user u LEFT JOIN tb_company c ON u.company=c.companyname where username = #{username} and password = #{password}") + @Select("select u.*,c.id as company from tb_user u LEFT JOIN tb_company c ON u.company=c.companyname where username = #{username} and password = #{password}") public TbUser findUser(TbUser user); @Select("select * from tb_user where cid != 'null' and cid != ''") diff --git a/src/main/java/com/hxzkappboot/pojo/TbAchor.java b/src/main/java/com/hxzkappboot/pojo/TbAchor.java index 6afa04e..d9e853b 100644 --- a/src/main/java/com/hxzkappboot/pojo/TbAchor.java +++ b/src/main/java/com/hxzkappboot/pojo/TbAchor.java @@ -139,8 +139,8 @@ @TableField("baoliu13") private String baoliu13; - @TableField("companyid") - private String companyid; + @TableField("company") + private String company; } diff --git a/src/main/java/com/hxzkappboot/pojo/TbFence.java b/src/main/java/com/hxzkappboot/pojo/TbFence.java index 43d9bf0..47a663d 100644 --- a/src/main/java/com/hxzkappboot/pojo/TbFence.java +++ b/src/main/java/com/hxzkappboot/pojo/TbFence.java @@ -141,8 +141,8 @@ private String baoliu20; // - @TableField("companyid") - private String companyid; + @TableField("company") + private String company; @TableField(exist = false) private List<TbPerson> personList; diff --git a/src/main/java/com/hxzkappboot/pojo/TbPerson.java b/src/main/java/com/hxzkappboot/pojo/TbPerson.java index 78da142..69227cd 100644 --- a/src/main/java/com/hxzkappboot/pojo/TbPerson.java +++ b/src/main/java/com/hxzkappboot/pojo/TbPerson.java @@ -232,8 +232,8 @@ @TableField("baoliu40") private String baoliu40; - @TableField("companyid") - private String companyid; + @TableField("company") + private String company; @TableField(exist = false) diff --git a/src/main/java/com/hxzkappboot/pojo/TbTaskScheduling.java b/src/main/java/com/hxzkappboot/pojo/TbTaskScheduling.java index e6d6f90..5f8f85a 100644 --- a/src/main/java/com/hxzkappboot/pojo/TbTaskScheduling.java +++ b/src/main/java/com/hxzkappboot/pojo/TbTaskScheduling.java @@ -73,6 +73,12 @@ @TableField("checktask") private String checktask; + @ApiModelProperty(value = "鍏徃") + @TableField("company") + private String company; + + + @TableField(exist = false) private List<TbPerson> personList; diff --git a/src/main/java/com/hxzkappboot/pojo/TbWarning.java b/src/main/java/com/hxzkappboot/pojo/TbWarning.java index f8405f5..b47000c 100644 --- a/src/main/java/com/hxzkappboot/pojo/TbWarning.java +++ b/src/main/java/com/hxzkappboot/pojo/TbWarning.java @@ -83,6 +83,10 @@ @TableField("baoliu10") private String baoliu10; +// @ApiModelProperty(value = "鍏徃") +// @TableField("company") +// private String company; + @TableField(exist = false) private String pName; diff --git a/src/main/java/com/hxzkappboot/pojo/TbWarningRecord.java b/src/main/java/com/hxzkappboot/pojo/TbWarningRecord.java index c02e1bb..092fd79 100644 --- a/src/main/java/com/hxzkappboot/pojo/TbWarningRecord.java +++ b/src/main/java/com/hxzkappboot/pojo/TbWarningRecord.java @@ -53,5 +53,7 @@ private String addtime; - + @ApiModelProperty(value = "鍏徃") + @TableField("company") + private String company; } diff --git a/src/main/java/com/hxzkappboot/service/TbPersonService.java b/src/main/java/com/hxzkappboot/service/TbPersonService.java index b885134..c145850 100644 --- a/src/main/java/com/hxzkappboot/service/TbPersonService.java +++ b/src/main/java/com/hxzkappboot/service/TbPersonService.java @@ -22,7 +22,7 @@ public interface TbPersonService extends IService<TbPerson> { TbPerson findIdPerson(String name,String company); - TbPerson acquisition(String baoliu3); + TbPerson acquisition(String baoliu3,String company); TbPerson upperson(String baoliu3,String baoliu38,String phone); diff --git a/src/main/java/com/hxzkappboot/service/TbUpappService.java b/src/main/java/com/hxzkappboot/service/TbUpappService.java index fb089c5..ba45904 100644 --- a/src/main/java/com/hxzkappboot/service/TbUpappService.java +++ b/src/main/java/com/hxzkappboot/service/TbUpappService.java @@ -8,6 +8,6 @@ import java.util.List; public interface TbUpappService extends IService<TbUpapp> { - TbUpapp findTbUpapp() throws ParseException; + TbUpapp findTbUpapp(String name) throws ParseException; } diff --git a/src/main/java/com/hxzkappboot/service/impl/TbAchorServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbAchorServiceImpl.java index dd8d208..63e4df7 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbAchorServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbAchorServiceImpl.java @@ -36,9 +36,11 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); // queryWrapper.eq("status","鏈鐞�"); if (objectid!=null){ - queryWrapper.eq("anchorid",objectid); + String output = objectid.toUpperCase();//灏嗗皬鍐欏瓧姣嶈浆鎴愬ぇ鍐欏瓧姣� + + queryWrapper.eq("anchorid",output); } - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.orderByDesc("GreateTime"); IPage<TbAchor> CompanyPage = baseMapper.selectPage(page, queryWrapper); @@ -48,7 +50,7 @@ @Override public Integer findonline(String company) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.eq("anchormode",1); List<TbAchor> CompanyPage = baseMapper.selectList(queryWrapper); return CompanyPage.size(); @@ -57,7 +59,7 @@ @Override public Integer findoffline(String company) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.ne("anchormode",1); List<TbAchor> CompanyPage = baseMapper.selectList(queryWrapper); return CompanyPage.size(); @@ -68,7 +70,7 @@ @Override public List<TbAchor> getBaseGPSCesium( String company) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); // List<TbAchor> people = tbAchorMapper.getBaseGPSCesium(); return baseMapper.selectList(queryWrapper); } diff --git a/src/main/java/com/hxzkappboot/service/impl/TbFakajiServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbFakajiServiceImpl.java index a06bc35..7cf01fd 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbFakajiServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbFakajiServiceImpl.java @@ -32,7 +32,7 @@ @Override public List<TbFakaji> findFakagui(String company) { // QueryWrapper<TbFakaji> queryWrapper = new QueryWrapper<>(); -//// queryWrapper.eq("companyid",company); +//// queryWrapper.eq("company",company); // queryWrapper.groupBy("deviceid"); return baseMapper.getfakjigui(); } diff --git a/src/main/java/com/hxzkappboot/service/impl/TbFenceServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbFenceServiceImpl.java index ad056d5..4de5759 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbFenceServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbFenceServiceImpl.java @@ -38,7 +38,7 @@ @Override public List<TbFence> findAllFence(String company) { QueryWrapper<TbFence> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); return baseMapper.selectList(queryWrapper); } @@ -76,7 +76,7 @@ if (objectid!=null){ queryWrapper.eq("name",objectid); } - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.orderByDesc("addtime"); IPage<TbFence> CompanyPage = baseMapper.selectPage(page, queryWrapper); diff --git a/src/main/java/com/hxzkappboot/service/impl/TbPersonServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbPersonServiceImpl.java index 43e49a8..24f9dbc 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbPersonServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbPersonServiceImpl.java @@ -45,10 +45,11 @@ @Override - public TbPerson acquisition(String baoliu3) { + public TbPerson acquisition(String baoliu3,String company) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("p_tagid",baoliu3); + queryWrapper.eq("company",company); return baseMapper.selectOne(queryWrapper); } @@ -87,9 +88,11 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); // queryWrapper.eq("status","鏈鐞�"); if (objectid!=null){ - queryWrapper.eq("p_tagid",objectid); + String output = objectid.toUpperCase();//灏嗗皬鍐欏瓧姣嶈浆鎴愬ぇ鍐欏瓧姣� + + queryWrapper.eq("p_tagid",output); } - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.orderByDesc("p_addtiem"); IPage<TbPerson> CompanyPage = baseMapper.selectPage(page, queryWrapper); @@ -99,7 +102,7 @@ @Override public Integer findonline(String company) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.eq("p_online",1); List<TbAchor> CompanyPage = baseMapper.selectList(queryWrapper); return CompanyPage.size(); @@ -108,7 +111,7 @@ @Override public Integer findoffline(String company) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("companyid",company); + queryWrapper.eq("company",company); queryWrapper.ne("p_online",1); List<TbAchor> CompanyPage = baseMapper.selectList(queryWrapper); return CompanyPage.size(); diff --git a/src/main/java/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.java index 89e90af..ef915e5 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.java @@ -81,6 +81,7 @@ tbWarningRecord.setYjcontent(fenceList.get(i).getYjcontent()); tbWarningRecord.setYjtime(fenceList.get(i).getBegtime()); tbWarningRecord.setTaskname(fenceList.get(i).getTaskname()); + tbWarningRecord.setCompany(fenceList.get(i).getCompany()); tbWarningRecord.setAddtime(s); tbWarningRecordMapper.insert(tbWarningRecord); diff --git a/src/main/java/com/hxzkappboot/service/impl/TbUpappServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbUpappServiceImpl.java index 69290a7..328380c 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbUpappServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbUpappServiceImpl.java @@ -19,8 +19,14 @@ public class TbUpappServiceImpl extends ServiceImpl<TbUpappMapper, TbUpapp> implements TbUpappService { @Override - public TbUpapp findTbUpapp() { + public TbUpapp findTbUpapp(String name) { QueryWrapper queryWrapper = new QueryWrapper<>(); + if (name==null){ + queryWrapper.eq("name", "瀹氫綅app"); + }else{ + queryWrapper.eq("name", name); + } + queryWrapper.orderByDesc("time"); // 鍋囪鏃堕棿瀛楁鍚嶄负"time" queryWrapper.last("LIMIT 1"); // 闄愬埗鍙繑鍥炰竴鏉¤褰� return baseMapper.selectOne(queryWrapper); diff --git a/src/main/java/com/hxzkappboot/service/impl/TbWarningServiceImpl.java b/src/main/java/com/hxzkappboot/service/impl/TbWarningServiceImpl.java index a762983..a2515b6 100644 --- a/src/main/java/com/hxzkappboot/service/impl/TbWarningServiceImpl.java +++ b/src/main/java/com/hxzkappboot/service/impl/TbWarningServiceImpl.java @@ -34,7 +34,9 @@ queryWrapper.eq("status","鏈鐞�"); List<TbWarning> CompanyPage = new ArrayList<TbWarning>(); if (objectid!=null){ - CompanyPage = baseMapper.findwarper1(company,objectid,page.getCurrent()-1,page.getSize()); + String output = objectid.toUpperCase();//灏嗗皬鍐欏瓧姣嶈浆鎴愬ぇ鍐欏瓧姣� + + CompanyPage = baseMapper.findwarper1(company,output,page.getCurrent()-1,page.getSize()); }else{ CompanyPage = baseMapper.findwarper(company,page.getCurrent()-1,page.getSize()); diff --git a/src/main/java/com/hxzkappboot/util/WebConfig.java b/src/main/java/com/hxzkappboot/util/WebConfig.java index 4cbc954..b8cf2c2 100644 --- a/src/main/java/com/hxzkappboot/util/WebConfig.java +++ b/src/main/java/com/hxzkappboot/util/WebConfig.java @@ -14,7 +14,7 @@ @Override public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(tokenInterceptor).addPathPatterns("/**") - .excludePathPatterns("/api/wx/login", "/api/wx/checkLogin","/api/wx/findWarningNum","/api/wx/addpicqwe","/public/**"); + .excludePathPatterns("/api/wx/login", "/api/wx/checkLogin","/api/wx/findWarningNum","/api/wx/addpicqwe","/api/wx/findTbUpapp","/api/wx/MarsHome","/public/**"); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d6e3d5a..6b542a0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -51,11 +51,11 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.31.99:3306/hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql:///hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://192.168.5.121:3306/hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql:///hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: root -# password: hxzk20151102 - password: 123456 + password: hxzk20151102 +# password: 123456 jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 diff --git a/target/classes/application.yml b/target/classes/application.yml index d6e3d5a..6b542a0 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -51,11 +51,11 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.31.99:3306/hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull -# url: jdbc:mysql:///hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://192.168.5.121:3306/hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql:///hxzkuwb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: root -# password: hxzk20151102 - password: 123456 + password: hxzk20151102 +# password: 123456 jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 diff --git a/target/classes/com/hxzkappboot/controller/GpsGuiJiController.class b/target/classes/com/hxzkappboot/controller/GpsGuiJiController.class index 18d984d..c30fe87 100644 --- a/target/classes/com/hxzkappboot/controller/GpsGuiJiController.class +++ b/target/classes/com/hxzkappboot/controller/GpsGuiJiController.class Binary files differ diff --git a/target/classes/com/hxzkappboot/controller/TbFenceController.class b/target/classes/com/hxzkappboot/controller/TbFenceController.class index 4152455..9515a19 100644 --- a/target/classes/com/hxzkappboot/controller/TbFenceController.class +++ b/target/classes/com/hxzkappboot/controller/TbFenceController.class Binary files differ diff --git a/target/classes/com/hxzkappboot/controller/TbPersonController.class b/target/classes/com/hxzkappboot/controller/TbPersonController.class index d078601..6c16894 100644 --- a/target/classes/com/hxzkappboot/controller/TbPersonController.class +++ b/target/classes/com/hxzkappboot/controller/TbPersonController.class Binary files differ diff --git a/target/classes/com/hxzkappboot/controller/TbUpappController.class b/target/classes/com/hxzkappboot/controller/TbUpappController.class index 38753b6..b1b8082 100644 --- a/target/classes/com/hxzkappboot/controller/TbUpappController.class +++ b/target/classes/com/hxzkappboot/controller/TbUpappController.class Binary files differ diff --git a/target/classes/com/hxzkappboot/controller/TbWarningController.class b/target/classes/com/hxzkappboot/controller/TbWarningController.class index 7cbc7ff..b79c151 100644 --- a/target/classes/com/hxzkappboot/controller/TbWarningController.class +++ b/target/classes/com/hxzkappboot/controller/TbWarningController.class Binary files differ diff --git a/target/classes/com/hxzkappboot/mapper/TbPersonMapper.class b/target/classes/com/hxzkappboot/mapper/TbPersonMapper.class index 81cb764..4fe0fe7 100644 --- a/target/classes/com/hxzkappboot/mapper/TbPersonMapper.class +++ b/target/classes/com/hxzkappboot/mapper/TbPersonMapper.class Binary files differ diff --git a/target/classes/com/hxzkappboot/mapper/TbWarningMapper.class b/target/classes/com/hxzkappboot/mapper/TbWarningMapper.class index 7bc18ef..bb45a31 100644 --- a/target/classes/com/hxzkappboot/mapper/TbWarningMapper.class +++ b/target/classes/com/hxzkappboot/mapper/TbWarningMapper.class Binary files differ diff --git a/target/classes/com/hxzkappboot/mapper/UserDao.class b/target/classes/com/hxzkappboot/mapper/UserDao.class index c4c7e6a..8cd5dd2 100644 --- a/target/classes/com/hxzkappboot/mapper/UserDao.class +++ b/target/classes/com/hxzkappboot/mapper/UserDao.class Binary files differ diff --git a/target/classes/com/hxzkappboot/pojo/TbAchor.class b/target/classes/com/hxzkappboot/pojo/TbAchor.class index 19e053b..f2e44c3 100644 --- a/target/classes/com/hxzkappboot/pojo/TbAchor.class +++ b/target/classes/com/hxzkappboot/pojo/TbAchor.class Binary files differ diff --git a/target/classes/com/hxzkappboot/pojo/TbFence.class b/target/classes/com/hxzkappboot/pojo/TbFence.class index bbcd9ea..ae8cee5 100644 --- a/target/classes/com/hxzkappboot/pojo/TbFence.class +++ b/target/classes/com/hxzkappboot/pojo/TbFence.class Binary files differ diff --git a/target/classes/com/hxzkappboot/pojo/TbPerson.class b/target/classes/com/hxzkappboot/pojo/TbPerson.class index b32ad49..dd5d02c 100644 --- a/target/classes/com/hxzkappboot/pojo/TbPerson.class +++ b/target/classes/com/hxzkappboot/pojo/TbPerson.class Binary files differ diff --git a/target/classes/com/hxzkappboot/pojo/TbTaskScheduling.class b/target/classes/com/hxzkappboot/pojo/TbTaskScheduling.class index 14a5caf..126140d 100644 --- a/target/classes/com/hxzkappboot/pojo/TbTaskScheduling.class +++ b/target/classes/com/hxzkappboot/pojo/TbTaskScheduling.class Binary files differ diff --git a/target/classes/com/hxzkappboot/pojo/TbWarning.class b/target/classes/com/hxzkappboot/pojo/TbWarning.class index cac3c1c..3c8a476 100644 --- a/target/classes/com/hxzkappboot/pojo/TbWarning.class +++ b/target/classes/com/hxzkappboot/pojo/TbWarning.class Binary files differ diff --git a/target/classes/com/hxzkappboot/pojo/TbWarningRecord.class b/target/classes/com/hxzkappboot/pojo/TbWarningRecord.class index 4b1fece..f732790 100644 --- a/target/classes/com/hxzkappboot/pojo/TbWarningRecord.class +++ b/target/classes/com/hxzkappboot/pojo/TbWarningRecord.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/TbPersonService.class b/target/classes/com/hxzkappboot/service/TbPersonService.class index 5dd0250..7b760a3 100644 --- a/target/classes/com/hxzkappboot/service/TbPersonService.class +++ b/target/classes/com/hxzkappboot/service/TbPersonService.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/TbUpappService.class b/target/classes/com/hxzkappboot/service/TbUpappService.class index d9aec7e..992cab7 100644 --- a/target/classes/com/hxzkappboot/service/TbUpappService.class +++ b/target/classes/com/hxzkappboot/service/TbUpappService.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/impl/TbAchorServiceImpl.class b/target/classes/com/hxzkappboot/service/impl/TbAchorServiceImpl.class index 52fb302..e0e7780 100644 --- a/target/classes/com/hxzkappboot/service/impl/TbAchorServiceImpl.class +++ b/target/classes/com/hxzkappboot/service/impl/TbAchorServiceImpl.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/impl/TbFenceServiceImpl.class b/target/classes/com/hxzkappboot/service/impl/TbFenceServiceImpl.class index 42152ac..67213b3 100644 --- a/target/classes/com/hxzkappboot/service/impl/TbFenceServiceImpl.class +++ b/target/classes/com/hxzkappboot/service/impl/TbFenceServiceImpl.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/impl/TbPersonServiceImpl.class b/target/classes/com/hxzkappboot/service/impl/TbPersonServiceImpl.class index 3354f5b..20f62c4 100644 --- a/target/classes/com/hxzkappboot/service/impl/TbPersonServiceImpl.class +++ b/target/classes/com/hxzkappboot/service/impl/TbPersonServiceImpl.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.class b/target/classes/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.class index 9177cb4..43d83a5 100644 --- a/target/classes/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.class +++ b/target/classes/com/hxzkappboot/service/impl/TbTaskSchedulingServiceImpl.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/impl/TbUpappServiceImpl.class b/target/classes/com/hxzkappboot/service/impl/TbUpappServiceImpl.class index 3fa7a51..0e7fede 100644 --- a/target/classes/com/hxzkappboot/service/impl/TbUpappServiceImpl.class +++ b/target/classes/com/hxzkappboot/service/impl/TbUpappServiceImpl.class Binary files differ diff --git a/target/classes/com/hxzkappboot/service/impl/TbWarningServiceImpl.class b/target/classes/com/hxzkappboot/service/impl/TbWarningServiceImpl.class index ec4e4b0..090786e 100644 --- a/target/classes/com/hxzkappboot/service/impl/TbWarningServiceImpl.class +++ b/target/classes/com/hxzkappboot/service/impl/TbWarningServiceImpl.class Binary files differ diff --git a/target/classes/com/hxzkappboot/util/WebConfig.class b/target/classes/com/hxzkappboot/util/WebConfig.class index 3f9cc40..00546d7 100644 --- a/target/classes/com/hxzkappboot/util/WebConfig.class +++ b/target/classes/com/hxzkappboot/util/WebConfig.class Binary files differ diff --git a/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar b/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar index fbd1981..0db7a57 100644 --- a/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar +++ b/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar Binary files differ diff --git a/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar.original b/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar.original index 9b52524..29b27b4 100644 --- a/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar.original +++ b/target/hxzkapp-boot-0.0.1-SNAPSHOT.jar.original Binary files differ diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst index e98296f..e69de29 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -1 +0,0 @@ -com\hxzkappboot\HxzkappBootApplicationTests.class diff --git a/target/surefire-reports/2025-01-21T09-47-48_904.dumpstream b/target/surefire-reports/2025-01-21T09-47-48_904.dumpstream deleted file mode 100644 index 2cf3e51..0000000 --- a/target/surefire-reports/2025-01-21T09-47-48_904.dumpstream +++ /dev/null @@ -1,5 +0,0 @@ -# Created at 2025-01-21T09:47:49.657 -Boot Manifest-JAR contains absolute paths in classpath 'D:\hxzkapp\hxzkapp-boot\target\test-classes' -Hint: <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine> -'other' has different root - diff --git a/target/surefire-reports/TEST-com.hxzkappboot.HxzkappBootApplicationTests.xml b/target/surefire-reports/TEST-com.hxzkappboot.HxzkappBootApplicationTests.xml index af9d78b..4c2a82d 100644 --- a/target/surefire-reports/TEST-com.hxzkappboot.HxzkappBootApplicationTests.xml +++ b/target/surefire-reports/TEST-com.hxzkappboot.HxzkappBootApplicationTests.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="com.hxzkappboot.HxzkappBootApplicationTests" time="10.213" tests="1" errors="0" skipped="0" failures="0"> +<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="com.hxzkappboot.HxzkappBootApplicationTests" time="9.9" tests="1" errors="0" skipped="0" failures="0"> <properties> <property name="sun.desktop" value="windows"/> <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/> @@ -18,7 +18,7 @@ <property name="user.country" value="CN"/> <property name="sun.java.launcher" value="SUN_STANDARD"/> <property name="sun.boot.library.path" value="C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\bin"/> - <property name="sun.java.command" value="C:\Users\wangf\AppData\Local\Temp\surefire6586503054113209614\surefirebooter-20250121094749609_3.jar C:\Users\wangf\AppData\Local\Temp\surefire6586503054113209614 2025-01-21T09-47-48_904-jvmRun1 surefire-20250121094749609_1tmp surefire_0-20250121094749609_2tmp"/> + <property name="sun.java.command" value="C:\Users\wangf\AppData\Local\Temp\surefire2805895865388876351\surefirebooter-20250418150852055_3.jar C:\Users\wangf\AppData\Local\Temp\surefire2805895865388876351 2025-04-18T15-08-51_333-jvmRun1 surefire-20250418150852055_1tmp surefire_0-20250418150852055_2tmp"/> <property name="surefire.test.class.path" value="D:\hxzkapp\hxzkapp-boot\target\test-classes;D:\hxzkapp\hxzkapp-boot\target\classes;C:\Users\wangf\.m2\repository\com\auth0\java-jwt\3.4.0\java-jwt-3.4.0.jar;C:\Users\wangf\.m2\repository\com\fasterxml\jackson\core\jackson-databind\2.13.4.2\jackson-databind-2.13.4.2.jar;C:\Users\wangf\.m2\repository\com\fasterxml\jackson\core\jackson-annotations\2.13.4\jackson-annotations-2.13.4.jar;C:\Users\wangf\.m2\repository\com\fasterxml\jackson\core\jackson-core\2.13.4\jackson-core-2.13.4.jar;C:\Users\wangf\.m2\repository\commons-codec\commons-codec\1.15\commons-codec-1.15.jar;C:\Users\wangf\.m2\repository\org\freemarker\freemarker\2.3.28\freemarker-2.3.28.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-security\2.6.13\spring-boot-starter-security-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter\2.6.13\spring-boot-starter-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-logging\2.6.13\spring-boot-starter-logging-2.6.13.jar;C:\Users\wangf\.m2\repository\ch\qos\logback\logback-classic\1.2.11\logback-classic-1.2.11.jar;C:\Users\wangf\.m2\repository\ch\qos\logback\logback-core\1.2.11\logback-core-1.2.11.jar;C:\Users\wangf\.m2\repository\org\apache\logging\log4j\log4j-to-slf4j\2.17.2\log4j-to-slf4j-2.17.2.jar;C:\Users\wangf\.m2\repository\org\apache\logging\log4j\log4j-api\2.17.2\log4j-api-2.17.2.jar;C:\Users\wangf\.m2\repository\org\slf4j\jul-to-slf4j\1.7.36\jul-to-slf4j-1.7.36.jar;C:\Users\wangf\.m2\repository\org\yaml\snakeyaml\1.29\snakeyaml-1.29.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-aop\5.3.23\spring-aop-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-beans\5.3.23\spring-beans-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\security\spring-security-config\5.6.8\spring-security-config-5.6.8.jar;C:\Users\wangf\.m2\repository\org\springframework\security\spring-security-core\5.6.8\spring-security-core-5.6.8.jar;C:\Users\wangf\.m2\repository\org\springframework\security\spring-security-crypto\5.6.8\spring-security-crypto-5.6.8.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-context\5.3.23\spring-context-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\security\spring-security-web\5.6.8\spring-security-web-5.6.8.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-expression\5.3.23\spring-expression-5.3.23.jar;C:\Users\wangf\.m2\repository\io\jsonwebtoken\jjwt-api\0.11.2\jjwt-api-0.11.2.jar;C:\Users\wangf\.m2\repository\io\jsonwebtoken\jjwt-impl\0.11.2\jjwt-impl-0.11.2.jar;C:\Users\wangf\.m2\repository\io\jsonwebtoken\jjwt-jackson\0.11.2\jjwt-jackson-0.11.2.jar;C:\Users\wangf\.m2\repository\com\alibaba\fastjson\1.2.75\fastjson-1.2.75.jar;C:\Users\wangf\.m2\repository\com\baomidou\mybatis-plus-boot-starter\3.4.0\mybatis-plus-boot-starter-3.4.0.jar;C:\Users\wangf\.m2\repository\com\baomidou\mybatis-plus\3.4.0\mybatis-plus-3.4.0.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-autoconfigure\2.6.13\spring-boot-autoconfigure-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-jdbc\2.6.13\spring-boot-starter-jdbc-2.6.13.jar;C:\Users\wangf\.m2\repository\com\zaxxer\HikariCP\4.0.3\HikariCP-4.0.3.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-jdbc\5.3.23\spring-jdbc-5.3.23.jar;C:\Users\wangf\.m2\repository\com\baomidou\mybatis-plus-generator\3.4.0\mybatis-plus-generator-3.4.0.jar;C:\Users\wangf\.m2\repository\com\baomidou\mybatis-plus-extension\3.4.0\mybatis-plus-extension-3.4.0.jar;C:\Users\wangf\.m2\repository\com\baomidou\mybatis-plus-core\3.4.0\mybatis-plus-core-3.4.0.jar;C:\Users\wangf\.m2\repository\com\baomidou\mybatis-plus-annotation\3.4.0\mybatis-plus-annotation-3.4.0.jar;C:\Users\wangf\.m2\repository\org\mybatis\mybatis\3.5.5\mybatis-3.5.5.jar;C:\Users\wangf\.m2\repository\org\mybatis\mybatis-spring\2.0.5\mybatis-spring-2.0.5.jar;C:\Users\wangf\.m2\repository\com\github\binarywang\weixin-java-miniapp\4.1.0\weixin-java-miniapp-4.1.0.jar;C:\Users\wangf\.m2\repository\com\github\binarywang\weixin-java-common\4.1.0\weixin-java-common-4.1.0.jar;C:\Users\wangf\.m2\repository\com\thoughtworks\xstream\xstream\1.4.17\xstream-1.4.17.jar;C:\Users\wangf\.m2\repository\io\github\x-stream\mxparser\1.2.1\mxparser-1.2.1.jar;C:\Users\wangf\.m2\repository\xmlpull\xmlpull\1.1.3.1\xmlpull-1.1.3.1.jar;C:\Users\wangf\.m2\repository\org\apache\httpcomponents\httpmime\4.5.13\httpmime-4.5.13.jar;C:\Users\wangf\.m2\repository\org\slf4j\jcl-over-slf4j\1.7.36\jcl-over-slf4j-1.7.36.jar;C:\Users\wangf\.m2\repository\commons-io\commons-io\2.7\commons-io-2.7.jar;C:\Users\wangf\.m2\repository\org\apache\commons\commons-lang3\3.12.0\commons-lang3-3.12.0.jar;C:\Users\wangf\.m2\repository\org\dom4j\dom4j\2.1.3\dom4j-2.1.3.jar;C:\Users\wangf\.m2\repository\org\bouncycastle\bcpkix-jdk15on\1.68\bcpkix-jdk15on-1.68.jar;C:\Users\wangf\.m2\repository\org\bouncycastle\bcprov-jdk15on\1.68\bcprov-jdk15on-1.68.jar;C:\Users\wangf\.m2\repository\com\alibaba\druid-spring-boot-starter\1.2.20\druid-spring-boot-starter-1.2.20.jar;C:\Users\wangf\.m2\repository\com\alibaba\druid\1.2.20\druid-1.2.20.jar;C:\Users\wangf\.m2\repository\org\slf4j\slf4j-api\1.7.36\slf4j-api-1.7.36.jar;C:\Users\wangf\.m2\repository\org\glassfish\jaxb\jaxb-runtime\2.3.7\jaxb-runtime-2.3.7.jar;C:\Users\wangf\.m2\repository\org\glassfish\jaxb\txw2\2.3.7\txw2-2.3.7.jar;C:\Users\wangf\.m2\repository\com\sun\istack\istack-commons-runtime\3.0.12\istack-commons-runtime-3.0.12.jar;C:\Users\wangf\.m2\repository\com\sun\activation\jakarta.activation\1.2.2\jakarta.activation-1.2.2.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-swagger2\2.9.2\springfox-swagger2-2.9.2.jar;C:\Users\wangf\.m2\repository\io\swagger\swagger-annotations\1.5.20\swagger-annotations-1.5.20.jar;C:\Users\wangf\.m2\repository\io\swagger\swagger-models\1.5.20\swagger-models-1.5.20.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-spi\2.9.2\springfox-spi-2.9.2.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-core\2.9.2\springfox-core-2.9.2.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-schema\2.9.2\springfox-schema-2.9.2.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-swagger-common\2.9.2\springfox-swagger-common-2.9.2.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-spring-web\2.9.2\springfox-spring-web-2.9.2.jar;C:\Users\wangf\.m2\repository\com\google\guava\guava\20.0\guava-20.0.jar;C:\Users\wangf\.m2\repository\com\fasterxml\classmate\1.5.1\classmate-1.5.1.jar;C:\Users\wangf\.m2\repository\org\springframework\plugin\spring-plugin-core\1.2.0.RELEASE\spring-plugin-core-1.2.0.RELEASE.jar;C:\Users\wangf\.m2\repository\org\springframework\plugin\spring-plugin-metadata\1.2.0.RELEASE\spring-plugin-metadata-1.2.0.RELEASE.jar;C:\Users\wangf\.m2\repository\org\mapstruct\mapstruct\1.2.0.Final\mapstruct-1.2.0.Final.jar;C:\Users\wangf\.m2\repository\io\springfox\springfox-swagger-ui\2.9.2\springfox-swagger-ui-2.9.2.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-web\2.6.13\spring-boot-starter-web-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-json\2.6.13\spring-boot-starter-json-2.6.13.jar;C:\Users\wangf\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jdk8\2.13.4\jackson-datatype-jdk8-2.13.4.jar;C:\Users\wangf\.m2\repository\com\fasterxml\jackson\datatype\jackson-datatype-jsr310\2.13.4\jackson-datatype-jsr310-2.13.4.jar;C:\Users\wangf\.m2\repository\com\fasterxml\jackson\module\jackson-module-parameter-names\2.13.4\jackson-module-parameter-names-2.13.4.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-web\5.3.23\spring-web-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-webmvc\5.3.23\spring-webmvc-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-tomcat\2.6.13\spring-boot-starter-tomcat-2.6.13.jar;C:\Users\wangf\.m2\repository\jakarta\annotation\jakarta.annotation-api\1.3.5\jakarta.annotation-api-1.3.5.jar;C:\Users\wangf\.m2\repository\org\apache\tomcat\embed\tomcat-embed-core\9.0.68\tomcat-embed-core-9.0.68.jar;C:\Users\wangf\.m2\repository\org\apache\tomcat\embed\tomcat-embed-el\9.0.68\tomcat-embed-el-9.0.68.jar;C:\Users\wangf\.m2\repository\org\apache\tomcat\embed\tomcat-embed-websocket\9.0.68\tomcat-embed-websocket-9.0.68.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-web-services\2.6.13\spring-boot-starter-web-services-2.6.13.jar;C:\Users\wangf\.m2\repository\com\sun\xml\messaging\saaj\saaj-impl\1.5.3\saaj-impl-1.5.3.jar;C:\Users\wangf\.m2\repository\jakarta\xml\soap\jakarta.xml.soap-api\1.4.2\jakarta.xml.soap-api-1.4.2.jar;C:\Users\wangf\.m2\repository\org\jvnet\staxex\stax-ex\1.8.3\stax-ex-1.8.3.jar;C:\Users\wangf\.m2\repository\jakarta\xml\ws\jakarta.xml.ws-api\2.3.3\jakarta.xml.ws-api-2.3.3.jar;C:\Users\wangf\.m2\repository\jakarta\jws\jakarta.jws-api\2.1.0\jakarta.jws-api-2.1.0.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-oxm\5.3.23\spring-oxm-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\ws\spring-ws-core\3.1.3\spring-ws-core-3.1.3.jar;C:\Users\wangf\.m2\repository\org\springframework\ws\spring-xml\3.1.3\spring-xml-3.1.3.jar;C:\Users\wangf\.m2\repository\org\springframework\session\spring-session-core\2.6.3\spring-session-core-2.6.3.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-jcl\5.3.23\spring-jcl-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-devtools\2.6.13\spring-boot-devtools-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot\2.6.13\spring-boot-2.6.13.jar;C:\Users\wangf\.m2\repository\com\mysql\mysql-connector-j\8.0.31\mysql-connector-j-8.0.31.jar;C:\Users\wangf\.m2\repository\com\github\pagehelper\pagehelper\5.3.1\pagehelper-5.3.1.jar;C:\Users\wangf\.m2\repository\com\github\jsqlparser\jsqlparser\4.2\jsqlparser-4.2.jar;C:\Users\wangf\.m2\repository\io\jsonwebtoken\jjwt\0.9.1\jjwt-0.9.1.jar;C:\Users\wangf\.m2\repository\com\tencentcloudapi\tencentcloud-sdk-java-sms\3.1.811\tencentcloud-sdk-java-sms-3.1.811.jar;C:\Users\wangf\.m2\repository\com\tencentcloudapi\tencentcloud-sdk-java-common\3.1.811\tencentcloud-sdk-java-common-3.1.811.jar;C:\Users\wangf\.m2\repository\commons-logging\commons-logging\1.2\commons-logging-1.2.jar;C:\Users\wangf\.m2\repository\com\squareup\okio\okio\3.2.0\okio-3.2.0.jar;C:\Users\wangf\.m2\repository\com\squareup\okio\okio-jvm\3.2.0\okio-jvm-3.2.0.jar;C:\Users\wangf\.m2\repository\org\jetbrains\kotlin\kotlin-stdlib-jdk8\1.6.21\kotlin-stdlib-jdk8-1.6.21.jar;C:\Users\wangf\.m2\repository\org\jetbrains\kotlin\kotlin-stdlib\1.6.21\kotlin-stdlib-1.6.21.jar;C:\Users\wangf\.m2\repository\org\jetbrains\annotations\13.0\annotations-13.0.jar;C:\Users\wangf\.m2\repository\org\jetbrains\kotlin\kotlin-stdlib-jdk7\1.6.21\kotlin-stdlib-jdk7-1.6.21.jar;C:\Users\wangf\.m2\repository\org\jetbrains\kotlin\kotlin-stdlib-common\1.6.21\kotlin-stdlib-common-1.6.21.jar;C:\Users\wangf\.m2\repository\com\squareup\okhttp3\okhttp\3.14.9\okhttp-3.14.9.jar;C:\Users\wangf\.m2\repository\javax\xml\bind\jaxb-api\2.3.1\jaxb-api-2.3.1.jar;C:\Users\wangf\.m2\repository\javax\activation\javax.activation-api\1.2.0\javax.activation-api-1.2.0.jar;C:\Users\wangf\.m2\repository\com\squareup\okhttp3\logging-interceptor\3.14.9\logging-interceptor-3.14.9.jar;C:\Users\wangf\.m2\repository\org\ini4j\ini4j\0.5.4\ini4j-0.5.4.jar;C:\Users\wangf\.m2\repository\org\projectlombok\lombok\1.18.24\lombok-1.18.24.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-test\2.6.13\spring-boot-starter-test-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-test\2.6.13\spring-boot-test-2.6.13.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-test-autoconfigure\2.6.13\spring-boot-test-autoconfigure-2.6.13.jar;C:\Users\wangf\.m2\repository\com\jayway\jsonpath\json-path\2.6.0\json-path-2.6.0.jar;C:\Users\wangf\.m2\repository\net\minidev\json-smart\2.4.8\json-smart-2.4.8.jar;C:\Users\wangf\.m2\repository\net\minidev\accessors-smart\2.4.8\accessors-smart-2.4.8.jar;C:\Users\wangf\.m2\repository\org\ow2\asm\asm\9.1\asm-9.1.jar;C:\Users\wangf\.m2\repository\jakarta\xml\bind\jakarta.xml.bind-api\2.3.3\jakarta.xml.bind-api-2.3.3.jar;C:\Users\wangf\.m2\repository\jakarta\activation\jakarta.activation-api\1.2.2\jakarta.activation-api-1.2.2.jar;C:\Users\wangf\.m2\repository\org\assertj\assertj-core\3.21.0\assertj-core-3.21.0.jar;C:\Users\wangf\.m2\repository\org\hamcrest\hamcrest\2.2\hamcrest-2.2.jar;C:\Users\wangf\.m2\repository\org\junit\jupiter\junit-jupiter\5.8.2\junit-jupiter-5.8.2.jar;C:\Users\wangf\.m2\repository\org\junit\jupiter\junit-jupiter-api\5.8.2\junit-jupiter-api-5.8.2.jar;C:\Users\wangf\.m2\repository\org\opentest4j\opentest4j\1.2.0\opentest4j-1.2.0.jar;C:\Users\wangf\.m2\repository\org\junit\platform\junit-platform-commons\1.8.2\junit-platform-commons-1.8.2.jar;C:\Users\wangf\.m2\repository\org\apiguardian\apiguardian-api\1.1.2\apiguardian-api-1.1.2.jar;C:\Users\wangf\.m2\repository\org\junit\jupiter\junit-jupiter-params\5.8.2\junit-jupiter-params-5.8.2.jar;C:\Users\wangf\.m2\repository\org\junit\jupiter\junit-jupiter-engine\5.8.2\junit-jupiter-engine-5.8.2.jar;C:\Users\wangf\.m2\repository\org\junit\platform\junit-platform-engine\1.8.2\junit-platform-engine-1.8.2.jar;C:\Users\wangf\.m2\repository\org\mockito\mockito-core\4.0.0\mockito-core-4.0.0.jar;C:\Users\wangf\.m2\repository\net\bytebuddy\byte-buddy\1.11.22\byte-buddy-1.11.22.jar;C:\Users\wangf\.m2\repository\net\bytebuddy\byte-buddy-agent\1.11.22\byte-buddy-agent-1.11.22.jar;C:\Users\wangf\.m2\repository\org\objenesis\objenesis\3.2\objenesis-3.2.jar;C:\Users\wangf\.m2\repository\org\mockito\mockito-junit-jupiter\4.0.0\mockito-junit-jupiter-4.0.0.jar;C:\Users\wangf\.m2\repository\org\skyscreamer\jsonassert\1.5.1\jsonassert-1.5.1.jar;C:\Users\wangf\.m2\repository\com\vaadin\external\google\android-json\0.0.20131108.vaadin1\android-json-0.0.20131108.vaadin1.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-core\5.3.23\spring-core-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-test\5.3.23\spring-test-5.3.23.jar;C:\Users\wangf\.m2\repository\org\xmlunit\xmlunit-core\2.8.4\xmlunit-core-2.8.4.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-data-redis\2.6.13\spring-boot-starter-data-redis-2.6.13.jar;C:\Users\wangf\.m2\repository\io\lettuce\lettuce-core\6.1.10.RELEASE\lettuce-core-6.1.10.RELEASE.jar;C:\Users\wangf\.m2\repository\io\netty\netty-common\4.1.84.Final\netty-common-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\netty\netty-handler\4.1.84.Final\netty-handler-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\netty\netty-resolver\4.1.84.Final\netty-resolver-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\netty\netty-buffer\4.1.84.Final\netty-buffer-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\netty\netty-transport-native-unix-common\4.1.84.Final\netty-transport-native-unix-common-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\netty\netty-codec\4.1.84.Final\netty-codec-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\netty\netty-transport\4.1.84.Final\netty-transport-4.1.84.Final.jar;C:\Users\wangf\.m2\repository\io\projectreactor\reactor-core\3.4.24\reactor-core-3.4.24.jar;C:\Users\wangf\.m2\repository\org\reactivestreams\reactive-streams\1.0.4\reactive-streams-1.0.4.jar;C:\Users\wangf\.m2\repository\org\springframework\data\spring-data-redis\2.7.2\spring-data-redis-2.7.2.jar;C:\Users\wangf\.m2\repository\org\springframework\data\spring-data-keyvalue\2.6.9\spring-data-keyvalue-2.6.9.jar;C:\Users\wangf\.m2\repository\org\springframework\data\spring-data-commons\2.6.9\spring-data-commons-2.6.9.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-tx\5.3.23\spring-tx-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\spring-context-support\5.3.23\spring-context-support-5.3.23.jar;C:\Users\wangf\.m2\repository\org\springframework\boot\spring-boot-starter-validation\2.6.13\spring-boot-starter-validation-2.6.13.jar;C:\Users\wangf\.m2\repository\org\hibernate\validator\hibernate-validator\6.2.5.Final\hibernate-validator-6.2.5.Final.jar;C:\Users\wangf\.m2\repository\jakarta\validation\jakarta.validation-api\2.0.2\jakarta.validation-api-2.0.2.jar;C:\Users\wangf\.m2\repository\org\jboss\logging\jboss-logging\3.4.3.Final\jboss-logging-3.4.3.Final.jar;C:\Users\wangf\.m2\repository\org\apache\httpcomponents\httpclient\4.5.2\httpclient-4.5.2.jar;C:\Users\wangf\.m2\repository\org\apache\httpcomponents\httpcore\4.4.15\httpcore-4.4.15.jar;C:\Users\wangf\.m2\repository\cn\hutool\hutool-all\5.7.1\hutool-all-5.7.1.jar;C:\Users\wangf\.m2\repository\net\coobird\thumbnailator\0.4.20\thumbnailator-0.4.20.jar;C:\Users\wangf\.m2\repository\com\getui\push\restful-sdk\1.0.4.0\restful-sdk-1.0.4.0.jar;C:\Users\wangf\.m2\repository\com\google\code\gson\gson\2.8.9\gson-2.8.9.jar;"/> <property name="sun.cpu.endian" value="little"/> <property name="user.home" value="C:\Users\wangf"/> @@ -33,7 +33,7 @@ <property name="FILE_LOG_CHARSET" value="GBK"/> <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> <property name="java.awt.headless" value="true"/> - <property name="surefire.real.class.path" value="C:\Users\wangf\AppData\Local\Temp\surefire6586503054113209614\surefirebooter-20250121094749609_3.jar"/> + <property name="surefire.real.class.path" value="C:\Users\wangf\AppData\Local\Temp\surefire2805895865388876351\surefirebooter-20250418150852055_3.jar"/> <property name="sun.boot.class.path" value="C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\resources.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\rt.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\sunrsasign.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\jsse.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\jce.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\charsets.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\lib\jfr.jar;C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\classes"/> <property name="user.script" value=""/> <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/> @@ -55,11 +55,11 @@ <property name="user.dir" value="D:\hxzkapp\hxzkapp-boot"/> <property name="os.arch" value="amd64"/> <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> - <property name="PID" value="27880"/> + <property name="PID" value="8492"/> <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/> <property name="sun.os.patch.level" value=""/> <property name="CONSOLE_LOG_CHARSET" value="GBK"/> - <property name="java.library.path" value="C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;D:\hxzkoa\zkeco_dlls\;D:\hxzkoa\Python3\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\Git\cmd;D:\Java\jre1.8.0_341\bin;%CATALINA_HOME%\bin\;D:\apache-maven-3.9.6-bin\apache-maven-3.9.6\bin;%NODE_PATH%;D:\nodejs\;C:\Users\wangf\AppData\Local\Microsoft\WindowsApps;D:\Microsoft VS Code\bin;D:\nodejs;;D:\IntelliJ IDEA 2023.3.4\bin;;C:\Users\wangf\AppData\Local\Microsoft\WinGet\Links;C:\Users\wangf\AppData\Roaming\npm;."/> + <property name="java.library.path" value="C:\Users\wangf\.jdks\corretto-1.8.0_402\jre\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;D:\hxzkoa\zkeco_dlls\;D:\hxzkoa\Python3\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;D:\Git\cmd;D:\Java\jre1.8.0_341\bin;%CATALINA_HOME%\bin\;D:\apache-maven-3.9.6-bin\apache-maven-3.9.6\bin;%NODE_PATH%;D:\nodejs\;C:\Users\wangf\AppData\Local\Android\Sdk\platform-tools;C:\Users\wangf\AppData\Local\Android\Sdk\emulator;C:\Users\wangf\AppData\Local\Android\Sdk\tools;C:\Users\wangf\AppData\Local\Android\Sdk\tools\bin;C:\Users\wangf\AppData\Local\Microsoft\WindowsApps;D:\Microsoft VS Code\bin;D:\nodejs;;D:\IntelliJ IDEA 2023.3.4\bin;;C:\Users\wangf\AppData\Local\Microsoft\WinGet\Links;C:\Users\wangf\AppData\Roaming\npm;."/> <property name="java.vm.info" value="mixed mode"/> <property name="java.vendor" value="Amazon.com Inc."/> <property name="java.vm.version" value="25.402-b08"/> @@ -68,22 +68,22 @@ <property name="sun.io.unicode.encoding" value="UnicodeLittle"/> <property name="java.class.version" value="52.0"/> </properties> - <testcase name="contextLoads" classname="com.hxzkappboot.HxzkappBootApplicationTests" time="0.373"> - <system-out><![CDATA[09:47:50.779 [main] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating CacheAwareContextLoaderDelegate from class [org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate] -09:47:50.796 [main] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating BootstrapContext using constructor [public org.springframework.test.context.support.DefaultBootstrapContext(java.lang.Class,org.springframework.test.context.CacheAwareContextLoaderDelegate)] -09:47:50.841 [main] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating TestContextBootstrapper for test class [com.hxzkappboot.HxzkappBootApplicationTests] from class [org.springframework.boot.test.context.SpringBootTestContextBootstrapper] -09:47:50.866 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Neither @ContextConfiguration nor @ContextHierarchy found for test class [com.hxzkappboot.HxzkappBootApplicationTests], using SpringBootContextLoader -09:47:50.870 [main] DEBUG org.springframework.test.context.support.AbstractContextLoader - Did not detect default resource location for test class [com.hxzkappboot.HxzkappBootApplicationTests]: class path resource [com/hxzkappboot/HxzkappBootApplicationTests-context.xml] does not exist -09:47:50.870 [main] DEBUG org.springframework.test.context.support.AbstractContextLoader - Did not detect default resource location for test class [com.hxzkappboot.HxzkappBootApplicationTests]: class path resource [com/hxzkappboot/HxzkappBootApplicationTestsContext.groovy] does not exist -09:47:50.870 [main] INFO org.springframework.test.context.support.AbstractContextLoader - Could not detect default resource locations for test class [com.hxzkappboot.HxzkappBootApplicationTests]: no resource found for suffixes {-context.xml, Context.groovy}. -09:47:50.871 [main] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils - Could not detect default configuration classes for test class [com.hxzkappboot.HxzkappBootApplicationTests]: HxzkappBootApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration. -09:47:50.938 [main] DEBUG org.springframework.test.context.support.ActiveProfilesUtils - Could not find an 'annotation declaring class' for annotation type [org.springframework.test.context.ActiveProfiles] and class [com.hxzkappboot.HxzkappBootApplicationTests] -09:47:51.035 [main] DEBUG org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider - Identified candidate component class: file [D:\hxzkapp\hxzkapp-boot\target\classes\com\hxzkappboot\HxzkappBootApplication.class] -09:47:51.037 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Found @SpringBootConfiguration com.hxzkappboot.HxzkappBootApplication for test class com.hxzkappboot.HxzkappBootApplicationTests -09:47:51.149 [main] DEBUG org.springframework.boot.test.context.SpringBootTestContextBootstrapper - @TestExecutionListeners is not present for class [com.hxzkappboot.HxzkappBootApplicationTests]: using defaults. -09:47:51.149 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Loaded default TestExecutionListener class names from location [META-INF/spring.factories]: [org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener, org.springframework.test.context.web.ServletTestExecutionListener, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener, org.springframework.test.context.event.ApplicationEventsTestExecutionListener, org.springframework.test.context.support.DependencyInjectionTestExecutionListener, org.springframework.test.context.support.DirtiesContextTestExecutionListener, org.springframework.test.context.transaction.TransactionalTestExecutionListener, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener, org.springframework.test.context.event.EventPublishingTestExecutionListener] -09:47:51.177 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Using TestExecutionListeners: [org.springframework.test.context.web.ServletTestExecutionListener@72d6b3ba, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener@1787f2a0, org.springframework.test.context.event.ApplicationEventsTestExecutionListener@7de62196, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener@163370c2, org.springframework.boot.test.autoconfigure.SpringBootDependencyInjectionTestExecutionListener@51bf5add, org.springframework.test.context.support.DirtiesContextTestExecutionListener@7905a0b8, org.springframework.test.context.transaction.TransactionalTestExecutionListener@35a3d49f, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener@389b0789, org.springframework.test.context.event.EventPublishingTestExecutionListener@13d9cbf5, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener@478db956, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener@6ca18a14, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener@c667f46, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener@51bd8b5c, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener@7b50df34, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener@1b410b60] -09:47:51.184 [main] DEBUG org.springframework.test.context.support.AbstractDirtiesContextTestExecutionListener - Before test class: context [DefaultTestContext@a1f72f5 testClass = HxzkappBootApplicationTests, testInstance = [null], testMethod = [null], testException = [null], mergedContextConfiguration = [WebMergedContextConfiguration@4b2c5e02 testClass = HxzkappBootApplicationTests, locations = '{}', classes = '{class com.hxzkappboot.HxzkappBootApplication}', contextInitializerClasses = '[]', activeProfiles = '{}', propertySourceLocations = '{}', propertySourceProperties = '{org.springframework.boot.test.context.SpringBootTestContextBootstrapper=true}', contextCustomizers = set[org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizer@1f59a598, org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory$DuplicateJsonObjectContextCustomizer@26b3fd41, org.springframework.boot.test.mock.mockito.MockitoContextCustomizer@0, org.springframework.boot.test.web.client.TestRestTemplateContextCustomizer@762ef0ea, org.springframework.boot.test.autoconfigure.actuate.metrics.MetricsExportContextCustomizerFactory$DisableMetricExportContextCustomizer@7b02881e, org.springframework.boot.test.autoconfigure.properties.PropertyMappingContextCustomizer@0, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverContextCustomizerFactory$Customizer@6236eb5f, org.springframework.boot.test.context.SpringBootTestArgs@1, org.springframework.boot.test.context.SpringBootTestWebEnvironment@2353b3e6], resourceBasePath = 'src/main/webapp', contextLoader = 'org.springframework.boot.test.context.SpringBootContextLoader', parent = [null]], attributes = map['org.springframework.test.context.web.ServletTestExecutionListener.activateListener' -> true]], class annotated with @DirtiesContext [false] with mode [null]. + <testcase name="contextLoads" classname="com.hxzkappboot.HxzkappBootApplicationTests" time="0.374"> + <system-out><![CDATA[15:08:53.372 [main] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating CacheAwareContextLoaderDelegate from class [org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate] +15:08:53.396 [main] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating BootstrapContext using constructor [public org.springframework.test.context.support.DefaultBootstrapContext(java.lang.Class,org.springframework.test.context.CacheAwareContextLoaderDelegate)] +15:08:53.456 [main] DEBUG org.springframework.test.context.BootstrapUtils - Instantiating TestContextBootstrapper for test class [com.hxzkappboot.HxzkappBootApplicationTests] from class [org.springframework.boot.test.context.SpringBootTestContextBootstrapper] +15:08:53.485 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Neither @ContextConfiguration nor @ContextHierarchy found for test class [com.hxzkappboot.HxzkappBootApplicationTests], using SpringBootContextLoader +15:08:53.490 [main] DEBUG org.springframework.test.context.support.AbstractContextLoader - Did not detect default resource location for test class [com.hxzkappboot.HxzkappBootApplicationTests]: class path resource [com/hxzkappboot/HxzkappBootApplicationTests-context.xml] does not exist +15:08:53.490 [main] DEBUG org.springframework.test.context.support.AbstractContextLoader - Did not detect default resource location for test class [com.hxzkappboot.HxzkappBootApplicationTests]: class path resource [com/hxzkappboot/HxzkappBootApplicationTestsContext.groovy] does not exist +15:08:53.490 [main] INFO org.springframework.test.context.support.AbstractContextLoader - Could not detect default resource locations for test class [com.hxzkappboot.HxzkappBootApplicationTests]: no resource found for suffixes {-context.xml, Context.groovy}. +15:08:53.491 [main] INFO org.springframework.test.context.support.AnnotationConfigContextLoaderUtils - Could not detect default configuration classes for test class [com.hxzkappboot.HxzkappBootApplicationTests]: HxzkappBootApplicationTests does not declare any static, non-private, non-final, nested classes annotated with @Configuration. +15:08:53.555 [main] DEBUG org.springframework.test.context.support.ActiveProfilesUtils - Could not find an 'annotation declaring class' for annotation type [org.springframework.test.context.ActiveProfiles] and class [com.hxzkappboot.HxzkappBootApplicationTests] +15:08:53.654 [main] DEBUG org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider - Identified candidate component class: file [D:\hxzkapp\hxzkapp-boot\target\classes\com\hxzkappboot\HxzkappBootApplication.class] +15:08:53.655 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Found @SpringBootConfiguration com.hxzkappboot.HxzkappBootApplication for test class com.hxzkappboot.HxzkappBootApplicationTests +15:08:53.777 [main] DEBUG org.springframework.boot.test.context.SpringBootTestContextBootstrapper - @TestExecutionListeners is not present for class [com.hxzkappboot.HxzkappBootApplicationTests]: using defaults. +15:08:53.778 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Loaded default TestExecutionListener class names from location [META-INF/spring.factories]: [org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener, org.springframework.test.context.web.ServletTestExecutionListener, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener, org.springframework.test.context.event.ApplicationEventsTestExecutionListener, org.springframework.test.context.support.DependencyInjectionTestExecutionListener, org.springframework.test.context.support.DirtiesContextTestExecutionListener, org.springframework.test.context.transaction.TransactionalTestExecutionListener, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener, org.springframework.test.context.event.EventPublishingTestExecutionListener] +15:08:53.801 [main] INFO org.springframework.boot.test.context.SpringBootTestContextBootstrapper - Using TestExecutionListeners: [org.springframework.test.context.web.ServletTestExecutionListener@72d6b3ba, org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener@1787f2a0, org.springframework.test.context.event.ApplicationEventsTestExecutionListener@7de62196, org.springframework.boot.test.mock.mockito.MockitoTestExecutionListener@163370c2, org.springframework.boot.test.autoconfigure.SpringBootDependencyInjectionTestExecutionListener@51bf5add, org.springframework.test.context.support.DirtiesContextTestExecutionListener@7905a0b8, org.springframework.test.context.transaction.TransactionalTestExecutionListener@35a3d49f, org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener@389b0789, org.springframework.test.context.event.EventPublishingTestExecutionListener@13d9cbf5, org.springframework.boot.test.mock.mockito.ResetMocksTestExecutionListener@478db956, org.springframework.boot.test.autoconfigure.restdocs.RestDocsTestExecutionListener@6ca18a14, org.springframework.boot.test.autoconfigure.web.client.MockRestServiceServerResetTestExecutionListener@c667f46, org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrintOnlyOnFailureTestExecutionListener@51bd8b5c, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverTestExecutionListener@7b50df34, org.springframework.boot.test.autoconfigure.webservices.client.MockWebServiceServerTestExecutionListener@1b410b60] +15:08:53.805 [main] DEBUG org.springframework.test.context.support.AbstractDirtiesContextTestExecutionListener - Before test class: context [DefaultTestContext@a1f72f5 testClass = HxzkappBootApplicationTests, testInstance = [null], testMethod = [null], testException = [null], mergedContextConfiguration = [WebMergedContextConfiguration@4b2c5e02 testClass = HxzkappBootApplicationTests, locations = '{}', classes = '{class com.hxzkappboot.HxzkappBootApplication}', contextInitializerClasses = '[]', activeProfiles = '{}', propertySourceLocations = '{}', propertySourceProperties = '{org.springframework.boot.test.context.SpringBootTestContextBootstrapper=true}', contextCustomizers = set[org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizer@1f59a598, org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory$DuplicateJsonObjectContextCustomizer@26b3fd41, org.springframework.boot.test.mock.mockito.MockitoContextCustomizer@0, org.springframework.boot.test.web.client.TestRestTemplateContextCustomizer@762ef0ea, org.springframework.boot.test.autoconfigure.actuate.metrics.MetricsExportContextCustomizerFactory$DisableMetricExportContextCustomizer@7b02881e, org.springframework.boot.test.autoconfigure.properties.PropertyMappingContextCustomizer@0, org.springframework.boot.test.autoconfigure.web.servlet.WebDriverContextCustomizerFactory$Customizer@6236eb5f, org.springframework.boot.test.context.SpringBootTestArgs@1, org.springframework.boot.test.context.SpringBootTestWebEnvironment@2353b3e6], resourceBasePath = 'src/main/webapp', contextLoader = 'org.springframework.boot.test.context.SpringBootContextLoader', parent = [null]], attributes = map['org.springframework.test.context.web.ServletTestExecutionListener.activateListener' -> true]], class annotated with @DirtiesContext [false] with mode [null]. . ____ _ __ _ _ /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ @@ -93,32 +93,32 @@ =========|_|==============|___/=/_/_/_/ :: Spring Boot :: (v2.6.13) -2025-01-21 09:47:51.729 INFO 27880 --- [ main] c.h.HxzkappBootApplicationTests : Starting HxzkappBootApplicationTests using Java 1.8.0_402 on DESKTOP-RLP2BIH with PID 27880 (started by wangf in D:\hxzkapp\hxzkapp-boot) -2025-01-21 09:47:51.731 INFO 27880 --- [ main] c.h.HxzkappBootApplicationTests : No active profile set, falling back to 1 default profile: "default" -2025-01-21 09:47:53.127 INFO 27880 --- [ main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode -2025-01-21 09:47:53.130 INFO 27880 --- [ main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode. -2025-01-21 09:47:53.166 INFO 27880 --- [ main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 19 ms. Found 0 Redis repository interfaces. -2025-01-21 09:47:53.630 INFO 27880 --- [ main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.ws.config.annotation.DelegatingWsConfiguration' of type [org.springframework.ws.config.annotation.DelegatingWsConfiguration$$EnhancerBySpringCGLIB$$6d0a8c4e] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -2025-01-21 09:47:53.697 INFO 27880 --- [ main] .w.s.a.s.AnnotationActionEndpointMapping : Supporting [WS-Addressing August 2004, WS-Addressing 1.0] -2025-01-21 09:47:53.990 INFO 27880 --- [ main] c.a.d.s.b.a.DruidDataSourceAutoConfigure : Init DruidDataSource -2025-01-21 09:47:54.267 INFO 27880 --- [ main] com.alibaba.druid.pool.DruidDataSource : {dataSource-1} inited +2025-04-18 15:08:54.327 INFO 8492 --- [ main] c.h.HxzkappBootApplicationTests : Starting HxzkappBootApplicationTests using Java 1.8.0_402 on DESKTOP-RLP2BIH with PID 8492 (started by wangf in D:\hxzkapp\hxzkapp-boot) +2025-04-18 15:08:54.328 INFO 8492 --- [ main] c.h.HxzkappBootApplicationTests : No active profile set, falling back to 1 default profile: "default" +2025-04-18 15:08:55.464 INFO 8492 --- [ main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode +2025-04-18 15:08:55.467 INFO 8492 --- [ main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data Redis repositories in DEFAULT mode. +2025-04-18 15:08:55.500 INFO 8492 --- [ main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 17 ms. Found 0 Redis repository interfaces. +2025-04-18 15:08:56.001 INFO 8492 --- [ main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.ws.config.annotation.DelegatingWsConfiguration' of type [org.springframework.ws.config.annotation.DelegatingWsConfiguration$$EnhancerBySpringCGLIB$$519690d] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2025-04-18 15:08:56.069 INFO 8492 --- [ main] .w.s.a.s.AnnotationActionEndpointMapping : Supporting [WS-Addressing August 2004, WS-Addressing 1.0] +2025-04-18 15:08:56.385 INFO 8492 --- [ main] c.a.d.s.b.a.DruidDataSourceAutoConfigure : Init DruidDataSource +2025-04-18 15:08:56.631 INFO 8492 --- [ main] com.alibaba.druid.pool.DruidDataSource : {dataSource-1} inited Logging initialized using 'class org.apache.ibatis.logging.stdout.StdOutImpl' adapter. -Registered plugin: 'com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor@5c9934da' +Registered plugin: 'com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor@39ee94de' Property 'mapperLocations' was not specified. _ _ |_ _ _|_. ___ _ | _ | | |\/|_)(_| | |_\ |_)||_|_\ / | 3.4.0 This "id" is the table primary key by default name for `id` in Class: "com.hxzkappboot.pojo.TbTag",So @TableField will not work! -2025-01-21 09:47:58.017 WARN 27880 --- [ main] .s.s.UserDetailsServiceAutoConfiguration : +2025-04-18 15:09:00.056 WARN 8492 --- [ main] .s.s.UserDetailsServiceAutoConfiguration : -Using generated security password: 9d769ec3-a819-4303-9da4-1f71ad2d91b1 +Using generated security password: bc6230f6-553f-4203-9af7-4a29ac22c7aa This generated password is for development use only. Your security configuration must be updated before running your application in production. -2025-01-21 09:47:58.213 INFO 27880 --- [ main] o.s.s.web.DefaultSecurityFilterChain : Will secure any request with [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@584ca390, org.springframework.security.web.context.SecurityContextPersistenceFilter@44dfdd58, org.springframework.security.web.header.HeaderWriterFilter@52ba685a, org.springframework.web.filter.CorsFilter@33324c05, org.springframework.security.web.authentication.logout.LogoutFilter@47fcefb3, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@72a8361b, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@4652c74d, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@37d3e140, org.springframework.security.web.session.SessionManagementFilter@681e913c, org.springframework.security.web.access.ExceptionTranslationFilter@52f8a6f4, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@49232c6f] -2025-01-21 09:47:59.150 INFO 27880 --- [ main] o.s.b.a.w.s.WelcomePageHandlerMapping : Adding welcome page: class path resource [META-INF/resources/index.html] -2025-01-21 09:48:00.517 INFO 27880 --- [ main] c.h.HxzkappBootApplicationTests : Started HxzkappBootApplicationTests in 9.265 seconds (JVM running for 10.554) +2025-04-18 15:09:00.270 INFO 8492 --- [ main] o.s.s.web.DefaultSecurityFilterChain : Will secure any request with [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@79252c83, org.springframework.security.web.context.SecurityContextPersistenceFilter@756808cc, org.springframework.security.web.header.HeaderWriterFilter@5939e24, org.springframework.web.filter.CorsFilter@6fbf5db2, org.springframework.security.web.authentication.logout.LogoutFilter@c48b543, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@5012c571, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@3a0b6a, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@509a6095, org.springframework.security.web.session.SessionManagementFilter@5f8f1712, org.springframework.security.web.access.ExceptionTranslationFilter@62f9c790, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@14d8e132] +2025-04-18 15:09:01.337 INFO 8492 --- [ main] o.s.b.a.w.s.WelcomePageHandlerMapping : Adding welcome page: class path resource [META-INF/resources/index.html] +2025-04-18 15:09:02.747 INFO 8492 --- [ main] c.h.HxzkappBootApplicationTests : Started HxzkappBootApplicationTests in 8.886 seconds (JVM running for 10.485) ]]></system-out> </testcase> </testsuite> \ No newline at end of file diff --git a/target/surefire-reports/com.hxzkappboot.HxzkappBootApplicationTests.txt b/target/surefire-reports/com.hxzkappboot.HxzkappBootApplicationTests.txt index 1e5bd91..901fff9 100644 --- a/target/surefire-reports/com.hxzkappboot.HxzkappBootApplicationTests.txt +++ b/target/surefire-reports/com.hxzkappboot.HxzkappBootApplicationTests.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.hxzkappboot.HxzkappBootApplicationTests ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.21 s -- in com.hxzkappboot.HxzkappBootApplicationTests +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.900 s -- in com.hxzkappboot.HxzkappBootApplicationTests -- Gitblit v1.9.3