cuimengchao 3 years ago
parent
commit
24ec5febff

+ 1 - 2
src/main/java/com/yx/face/service/impl/UserControlEarlyWarningListLogServiceImpl.java

@@ -88,7 +88,6 @@ public class UserControlEarlyWarningListLogServiceImpl implements UserControlEar
 
     @Override
     public void getListLogExcel(UserEarlyWarningLogQu dto, HttpServletResponse response) {
-        response.reset();//清缓存
         HashMap<String, Object> map = new HashMap<>(2);
         if (dto.getStatus() == null) {
             dto.setStatus(0);
@@ -100,7 +99,7 @@ public class UserControlEarlyWarningListLogServiceImpl implements UserControlEar
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
         try {
-            String fileName = URLEncoder.encode("测试", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode("warning_record", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
             EasyExcel.write(response.getOutputStream(), UserEarlyWarningLogExcel.class).sheet("预警信息").doWrite(listVo);
         } catch (Exception e) {

+ 8 - 5
src/main/resources/application-test.yml

@@ -1,7 +1,7 @@
 server:
-  port: 9100
+  port: 8802
   servlet:
-    context-path: /fyzd
+    context-path: /ldb-airport
     session:
       persistent: false
 
@@ -93,17 +93,20 @@ knife4j:
   basic:
     enable: true
     ## Basic认证用户名
-    username: fyzd
+    username: ldbAirport
     ## Basic认证密码
-    password: fyzd
+    password: ldbAirport
 ##``````````````````````````````````` 上传文件 配置``````````````````````````````````````````````````````````````###
 file.upload.path: file/
 file.upload.path.relative: /file/**
 web.address: http://127.0.0.1:9100/fyzd/
 
+##---------------------------------------健康码是否开启白名单地址------------------------------------------------------##
+
+tb.jkm.device.white.list.url: http://192.168.99.11:1821/Hanghui/deviceWhiteList
 
 ##``````````````````````````````````` 人脸服务 配置``````````````````````````````````````````````````````````````###
-face.service.tb: http://192.168.9.170:1820
+face.service.tb: http://192.168.9.187:1820
 
 #定时任务 每5分钟
 cron.face.clear.user: 0 1/5 * * * ?

+ 1 - 1
src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod
+    active: test