优化后的发布版本

pom.xml

@@ -153,15 +153,34 @@
             <version>3.1</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.28</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-to-slf4j</artifactId>
+            <version>2.10.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>1.7.25</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.46</version>
         </dependency>
+
     </dependencies>
 
 

src/main/java/com/cx/cn/cxquartz/controller/ExtController.java

@@ -64,6 +64,10 @@ public class ExtController {
 
     @Value("${voice.unionId}")
     private String unionId;
+    @Value("${countryside.callbackurl}")
+    private String callbackurl;
+
+
 
     @Autowired
     private RestTemplate restTemplate;
@@ -195,14 +199,9 @@ public class ExtController {
                     mapparam.put("deviceCode", devicecode);
                     mapparam.put("model", model);
                     //mapparam.put("roi", roiarray);
-                    logger.info("recogurl="+recogurl);
+//                    logger.info("recogurl="+recogurl);
                     Map objectList = restTemplate.getForObject(recogurl + "?deviceCode={deviceCode}&model={model}&roi=[]", Map.class, mapparam);
-                    try {
-                        logger.info(" param:{}", new ObjectMapper().writeValueAsString(mapparam));
-                        logger.info("  objectList result:{}", new ObjectMapper().writeValueAsString(objectList));
-                    }catch (Exception ex){
 
-                    }
                     if (String.valueOf(objectList.get("ret")).equals("0")) {
                         //变成为已分析
                      //   transferRecord.setProcessstatus("-1");
@@ -236,14 +235,14 @@ public class ExtController {
                             eventWriteService.uploadPicture(traffpictureParamresult,imageurl, points, basepath, filename);
                             String filenameurl=webrl+File.separator+outpath+File.separator+basepath+File.separator+filename;
                             jobTjParam.setImageUrl(filenameurl);
-                            logger.info("file path:{}",filenameurl);
+//                            logger.info("file path:{}",filenameurl);
                             traffpictureParamresult.setImagedata(filenameurl);
-                            traffpictureParamresult.setTargetnum( Integer.parseInt(taskinfo.getMetatype()));
+                            //traffpictureParamresult.setTargetnum( Integer.parseInt(taskinfo.getMetatype()));
                             traffPictureService.updateTraffpicture(traffpictureParamresult);
 
                             //回调
-                            logger.info("send to dianxin data:{}",JSONObject.toJSONString(jobTjParam));
-                            eventWriteService.sendEventByCallUrl(traffpictureParamresult, jobTjParam, taskinfo.getUrl());
+//                            logger.info("send to dianxin data:{}",JSONObject.toJSONString(jobTjParam));
+                            eventWriteService.sendEventByCallUrl(traffpictureParamresult, jobTjParam, taskinfo.getUrl().equals("")?callbackurl:taskinfo.getUrl());
                             //推送告警到前端
                             webSocket.GroupSending(new ObjectMapper().writeValueAsString(traffpictureParamresult));
                             if (unionId.contains(devicecode)) {
@@ -254,7 +253,7 @@ public class ExtController {
                                 voice.setEventId(eventId);
                                 voice.setUnionId(unionId);
                                 voicedata.setRequestData(voice);
-                                logger.info(" send to  voice: {}", new ObjectMapper().writeValueAsString(voicedata));
+                               // logger.info(" send to  voice: {}", new ObjectMapper().writeValueAsString(voicedata));
                                 eventWriteService.sendVoice(voicedata);
                             }
                         } catch (Exception ex) {

src/main/java/com/cx/cn/cxquartz/controller/QuartzController.java

@@ -278,7 +278,7 @@ public class QuartzController {
     @ResponseBody
     public String getRTSP(@RequestBody JSONObject devicecode) {
         //判断rtsp  是否过期http://212.129.142.17:8281/gh/device/test?deviceCode=3YSCA44445TFCPX
-//判断是否是rtsp  地址
+         //判断是否是rtsp  地址
         String rtspValue = devicecode.getString("data");
         if (!rtspValue.contains("rtsp://")) {
             Map<String, String> map = new HashMap<>();

src/main/java/com/cx/cn/cxquartz/service/quartz/FtpService.java

 package com.cx.cn.cxquartz.service.quartz;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.cx.cn.cxquartz.controller.IndexController;
 import com.cx.cn.cxquartz.util.RedisEnum;
 import com.cx.cn.cxquartz.vo.Ftp;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,15 +12,12 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-/**
- * ftp��ַ��ȡ���߷�����
- * @author cp
- */
 @Service
 public class FtpService {
-
-    private static final Logger log = LoggerFactory.getLogger(FtpService.class);
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final Logger logger = LoggerFactory.getLogger(FtpService.class);
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
     private List<Ftp> ftpList;
@@ -32,7 +28,7 @@ public class FtpService {
         try {
             this.ftpList = getFtpList(stringRedisTemplate.opsForValue().get(RedisEnum.FTPLIST.getValue()));
         }catch (Exception e){
-            log.error("ftpList��ȡʧ��:"+e.toString());
+            logger.error("ftpList error:"+e.toString());
         }
     }
 
@@ -44,14 +40,14 @@ public class FtpService {
             }
             ftpList = getFtpList(stringRedisTemplate.opsForValue().get(RedisEnum.FTPLIST.getValue()));
         }catch (Exception e){
-            log.error("ftpListerror:"+e.toString());
+            logger.error("ftpListerror:"+e.toString());
         }
 
         Long count = null;
         try {
             count = stringRedisTemplate.opsForValue().increment(RedisEnum.FTPLIST_INDEX.getValue(), 1L);
         } catch (Exception e) {
-            log.error("redis error" + e.toString());
+            logger.error("redis error" + e.toString());
         }
         if (count == null) {
             count = 0L;
@@ -63,16 +59,21 @@ public class FtpService {
 
 
     private List<Ftp> getFtpList(String ftpJson) {
-        JSONArray jsonArr = JSONObject.parseArray(ftpJson);
-        List<Ftp> ftpList = new ArrayList<>();
-        for (int i = 0; i < jsonArr.size(); i++) {
-            Ftp ftp = new Ftp();
-            JSONObject jsonObject = jsonArr.getJSONObject(i);
-            ftp.setFtpIp(jsonObject.getString("serveip"));
-            ftp.setFtpPort(jsonObject.getInteger("serverport"));
-            ftp.setFtpUsername(jsonObject.getString("serveruser"));
-            ftp.setFtpPassword(jsonObject.getString("serverpassword"));
-            ftpList.add(ftp);
+        try {
+            JavaType javaType =OBJECT_MAPPER.getTypeFactory().constructParametricType(ArrayList.class, Map.class);
+            List<Map> jsonArr = OBJECT_MAPPER.readValue(ftpJson, javaType);
+            List<Ftp> ftpList = new ArrayList<>();
+            for (int i = 0; i < jsonArr.size(); i++) {
+                Ftp ftp = new Ftp();
+                Map jsonObject = jsonArr.get(i);
+                ftp.setFtpIp(jsonObject.get("serveip").toString());
+                ftp.setFtpPort(Integer.parseInt(jsonObject.get("serverport")==null?"21":jsonObject.get("serverport").toString()));
+                ftp.setFtpUsername(jsonObject.get("serveruser").toString());
+                ftp.setFtpPassword(jsonObject.get("serverpassword").toString());
+                ftpList.add(ftp);
+            }
+        }catch (Exception ex){
+            logger.error("ftpListerror:"+ex.toString());
         }
         return ftpList;
     }

src/main/java/com/cx/cn/cxquartz/service/quartz/impl/EventWriteService.java

@@ -166,7 +166,7 @@ public class EventWriteService {
             /* 成功 */
             if ("0".equals(resultObj.getCode())) {
                 traffpictureParamresult.setPushstatus(0);
-                traffpictureParamresult.setPushdesc("推送第三方成功");
+                //traffpictureParamresult.setPushdesc("推送第三方成功");
                 traffPictureMapper.updateTraffpicturePushStatus(traffpictureParamresult);
                 return;
             }

src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java

@@ -118,11 +118,19 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
         //说明要暂停
         if (ResultEnum.FROZEN.name().equals(status)) {
             //删除
+            //暂停
+            scheduler.pauseTrigger(new TriggerKey(taskNo));
+            // 移除触发器中的任务
+            scheduler.unscheduleJob(new TriggerKey(taskNo));
             scheduler.deleteJob(new JobKey(taskNo));
             task.setFrozentime(currentTimeMillis);
             task.setFrozenstatus(ResultEnum.FROZEN.name());
         } else if (ResultEnum.UNFROZEN.name().equals(status)) {
             //删除后启动
+            //暂停
+            scheduler.pauseTrigger(new TriggerKey(taskNo));
+            // 移除触发器中的任务
+            scheduler.unscheduleJob(new TriggerKey(taskNo));
             scheduler.deleteJob(new JobKey(taskNo));
             this.schedule(quartzTaskInformation, scheduler);
             task.setUnfrozentime(currentTimeMillis);
@@ -145,14 +153,16 @@ public class QuartzServiceImpl implements QuartzService, InitializingBean {
         task.setId(quartzTaskInformation.getId());
         task.setVersion(quartzTaskInformation.getVersion());
         //暂停
+        scheduler.pauseTrigger(new TriggerKey(taskNo));
+        // 移除触发器中的任务
+        scheduler.unscheduleJob(new TriggerKey(taskNo));
         scheduler.deleteJob(new JobKey(taskNo));
+        task.setFrozentime(currentTimeMillis);
         if (ResultEnum.FROZEN.name().equals(status)) {
-            task.setFrozentime(currentTimeMillis);
             task.setFrozenstatus(ResultEnum.FROZEN.name());
             //启动
         } else if (ResultEnum.UNFROZEN.name().equals(status)) {
             this.schedule(quartzTaskInformation, scheduler);
-            task.setUnfrozentime(currentTimeMillis);
             task.setFrozenstatus(ResultEnum.UNFROZEN.name());
         }
         task.setLastmodifytime(currentTimeMillis);

src/main/java/com/cx/cn/cxquartz/service/quartz/impl/SbtdspsrImpl.java

 package com.cx.cn.cxquartz.service.quartz.impl;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.cx.cn.cxquartz.bean.QuartzTaskInformations;
 import com.cx.cn.cxquartz.dao.SbtdspsrMapper;
 import com.cx.cn.cxquartz.service.quartz.SbtdspsrService;
 import com.cx.cn.cxquartz.vo.Sbtdspsr;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/cx/cn/cxquartz/service/quartz/impl/TokenCacheService.java

 package com.cx.cn.cxquartz.service.quartz.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.cx.cn.cxquartz.util.DateUtils;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,8 +10,6 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.PostConstruct;
-import java.lang.reflect.Type;
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -47,14 +42,14 @@ public class TokenCacheService {
             String tokencache = stringRedisTemplate.opsForValue().get(qztoken);
             if (tokencache != null) {
                 //判断是否过期
-               String datetime=stringRedisTemplate.opsForValue().get(expiretoken);
+                String datetime=stringRedisTemplate.opsForValue().get(expiretoken);
                 if( null!=datetime){
                     //预留1分钟过期时间
-                   Long expireminiseconds =Long.parseLong(datetime);
-                  if(new Date().getTime()<expireminiseconds)
-                  {
-                    return tokencache;
-                  }
+                    Long expireminiseconds =Long.parseLong(datetime);
+                    if(new Date().getTime()<expireminiseconds)
+                    {
+                        return tokencache;
+                    }
                 }
                 return loginServer();
             } else {
@@ -84,14 +79,14 @@ public class TokenCacheService {
         try {
             if (response != null && response.getBody() != null && response.getBody().contains("code")) {
                 String ret = response.getBody();
-                JSONObject map=  JSONObject.parseObject(ret);
-                if ( null !=map && null!=map.get("obj") &&("0").equals(map.getString("code"))) {
-                    JSONObject object=  JSONObject.parseObject(map.getString("obj"));
-                    if(null!=object   && null!=object.getString("accessToken")) {
-                        Long  time=object.getLong("expire")-new Date().getTime();
+                Map map=  new ObjectMapper().readValue(ret,Map.class);
+                if ( null !=map && null!=map.get("obj") &&("0").equals(map.get("code"))) {
+                    Map object=  new  ObjectMapper().readValue(map.get("obj").toString(),Map.class);
+                    if(null!=object   && null!=object.get("accessToken")) {
+                        Long  time=Long.parseLong(object.get("expire").toString())-new Date().getTime();
                         stringRedisTemplate.opsForValue().set(expiretoken,time.toString(),time,TimeUnit.MILLISECONDS);
-                        stringRedisTemplate.opsForValue().set(qztoken, object.getString("accessToken"),  time,TimeUnit.MILLISECONDS);
-                        return object.getString("accessToken");
+                        stringRedisTemplate.opsForValue().set(qztoken, String.valueOf(object.get("accessToken")),  time,TimeUnit.MILLISECONDS);
+                        return String.valueOf(object.get("accessToken"));
                     }
                 } else {
                     log.error("getTokenData error :" + response.getBody());
@@ -106,3 +101,4 @@ public class TokenCacheService {
         return null;
     }
 }
+

src/main/java/com/cx/cn/cxquartz/util/AdminInterceptor.java

 package com.cx.cn.cxquartz.util;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
@@ -78,19 +76,4 @@ public class AdminInterceptor implements HandlerInterceptor {
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
 //        System.out.println("执行了TestInterceptor的afterCompletion方法");
     }
-
-    public String  dologin(RestTemplate restTemplate,HttpHeaders headers){
-
-        MultiValueMap<String, String> mulmap = new LinkedMultiValueMap<>();
-        mulmap.add("userName", "guest");
-        mulmap.add("password", "e10adc3949ba59abbe56e057f20f883e");
-        HttpEntity<MultiValueMap<String, String>> req = new HttpEntity<>(mulmap, headers);
-        //执行HTTP请求
-        ResponseEntity<String> result  = restTemplate.exchange("http://www.zjwwzf.cn/xzzfSpv/open/auth/login.do", HttpMethod.POST, req, String.class);
-        String body = result.getBody();
-        JSONObject json = JSONObject.parseObject(result.getBody());
-        JSONObject jsontoken = JSONObject.parseObject(json.get("data").toString());
-        return  String.valueOf(jsontoken.get("token"));
-
-    }
 }

src/main/java/com/cx/cn/cxquartz/util/FileTransferManager.java

@@ -92,7 +92,7 @@ public class FileTransferManager {
     public static GoalStructureParam getGoalStructureParam(Long[] roiarray, int model, BASE64Encoder base64Encoder, TraffAlarmRecord transferRecord) {
         //获得图片进行分析
         GoalStructureParam param = new GoalStructureParam();
-        param.setOutput(new Output(1, 1, -1, 3));
+        param.setOutput(new Output(1));
         param.setModel(model);
         param.setApiout("1");////打开1400标准输出，默认可以不填
         List<ImageList> list = new ArrayList<>();

src/main/java/com/cx/cn/cxquartz/vo/GoalStructureParam.java

 package com.cx.cn.cxquartz.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+
 public class GoalStructureParam {
-    private Output Output;
+    @JsonProperty("Output")
+    private Output  Output;
 
+    @JsonProperty("Model")
     private int Model;
 
     @JsonIgnore
     private String apiout;
 
+    @JsonProperty("ImageList")
     private List<ImageList> ImageList;
 
     public void setOutput(Output Output) {
         this.Output = Output;
     }
 
-    @JSONField(name = "Output")
+
     public Output getOutput() {
         return this.Output;
     }
@@ -28,7 +34,7 @@ public class GoalStructureParam {
         this.Model = Model;
     }
 
-    @JSONField(name = "Model")
+
     public int getModel() {
         return this.Model;
     }
@@ -45,8 +51,8 @@ public class GoalStructureParam {
         this.ImageList = ImageList;
     }
 
-    @JSONField(name = "ImageList")
+
     public List<ImageList> getImageList() {
         return this.ImageList;
     }
-}
+}
\ No newline at end of file

src/main/java/com/cx/cn/cxquartz/vo/ImageList.java

 package com.cx.cn.cxquartz.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ImageList {
+    @JsonProperty("ImageID")
     private String ImageID;
 
-
+    @JsonProperty("Roi")
     private Long[] Roi;
-    private Integer RoiPadding;
+
+    @JsonIgnore
+    private int Format;
+    @JsonProperty("Data")
+    private String Data;
+
+    //    private Integer RoiPadding;
     private Integer CropObjectImage;
     private Integer CropObjectImagePadding;
-    private Integer CropImageQuality;
+    private Integer CropObjectImageQuality;
+
 
-    @JSONField(name = "Roi")
     public Long[] getRoi() {
         return Roi;
     }
@@ -24,13 +29,13 @@ public class ImageList {
         Roi = roi;
     }
 
-    public Integer getRoiPadding() {
-        return RoiPadding;
-    }
-
-    public void setRoiPadding(Integer roiPadding) {
-        RoiPadding = roiPadding;
-    }
+//    public Integer getRoiPadding() {
+//        return RoiPadding;
+//    }
+//
+//    public void setRoiPadding(Integer roiPadding) {
+//        RoiPadding = roiPadding;
+//    }
 
     public Integer getCropObjectImage() {
         return CropObjectImage;
@@ -48,63 +53,52 @@ public class ImageList {
         CropObjectImagePadding = cropObjectImagePadding;
     }
 
-    public Integer getCropImageQuality() {
-        return CropImageQuality;
+    public Integer getCropObjectImageQuality() {
+        return CropObjectImageQuality;
     }
 
-    public void setCropImageQuality(Integer cropImageQuality) {
-        CropImageQuality = cropImageQuality;
+    public void setCropObjectImageQuality(Integer cropObjectImageQuality) {
+        CropObjectImageQuality = cropObjectImageQuality;
     }
 
-    @JsonIgnore
-    private int Format;
-
-    private String Data;
 
     public ImageList(String imageID,  String data) {
         ImageID = imageID;
         Data = data;
     }
 
-    public ImageList(String imageID, Long[] roi, Integer roiPadding, Integer cropObjectImage, Integer cropObjectImagePadding, Integer cropImageQuality, String data) {
+    public ImageList(String imageID, Long[] roi, Integer roiPadding, Integer cropObjectImage, Integer cropObjectImagePadding, Integer cropObjectImageQuality, String data) {
         ImageID = imageID;
         Roi = roi;
-        RoiPadding = roiPadding;
+//        RoiPadding = roiPadding;
         CropObjectImage = cropObjectImage;
         CropObjectImagePadding = cropObjectImagePadding;
-        CropImageQuality = cropImageQuality;
+        CropObjectImageQuality = cropObjectImageQuality;
         Data = data;
     }
 
-    public ImageList(String imageID, Long[] roi, Integer roiPadding, Integer cropObjectImage, Integer cropObjectImagePadding, Integer cropImageQuality, int format, String data) {
-        ImageID = imageID;
-        Roi = roi;
-        RoiPadding = roiPadding;
-        CropObjectImage = cropObjectImage;
-        CropObjectImagePadding = cropObjectImagePadding;
-        CropImageQuality = cropImageQuality;
-        Format = format;
-        Data = data;
+    public ImageList() {
     }
 
     public void setImageID(String ImageID){
         this.ImageID = ImageID;
     }
-    @JSONField(name = "ImageID")
+
     public String getImageID(){
         return this.ImageID;
     }
     public void setFormat(int Format){
         this.Format = Format;
     }
-    @JSONField(name = "Format",serialize = false)
+
+
     public int getFormat(){
         return this.Format;
     }
     public void setData(String Data){
         this.Data = Data;
     }
-    @JSONField(name = "Data")
+
     public String getData(){
         return this.Data;
     }

src/main/java/com/cx/cn/cxquartz/vo/Output.java

 package com.cx.cn.cxquartz.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Output {
     private int SubClass;
@@ -17,18 +17,21 @@ public class Output {
 //    @JsonIgnore
 //    private int MaxBikeSubClassNum;
 
-    public Output(int subClass, int maxHumanSubClassNum, int maxVehicleSubClassNum, int maxBikeSubClassNum) {
+    public Output(int subClass) {
         SubClass = subClass;
 //        MaxHumanSubClassNum = maxHumanSubClassNum;
 //        MaxVehicleSubClassNum = maxVehicleSubClassNum;
 //        MaxBikeSubClassNum = maxBikeSubClassNum;
     }
 
+    public Output() {
+    }
+
     public void setSubClass(int SubClass) {
         this.SubClass = SubClass;
     }
 
-    @JSONField(name = "SubClass")
+    @JsonProperty("SubClass")
     public int getSubClass() {
         return this.SubClass;
     }
@@ -59,4 +62,4 @@ public class Output {
 //    public int getMaxBikeSubClassNum() {
 //        return this.MaxBikeSubClassNum;
 //    }
-}
+}
\ No newline at end of file

src/main/resources/application-dev.yml

+spring:
+  datasource:
+    url: jdbc:mysql://172.16.24.29:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    username: root
+    password: 123456
+    driver-class-name: com.mysql.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 1000
+    initialSize: 100
+    maxWait: 60000
+    minIdle: 500
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    cache: false
+    enabled: true
+    encoding: UTF-8
+    mode: HTML
+redis:
+    database:   0
+    host: 172.16.24.29
+    #    host: 127.0.0.1
+    port: 6379
+logging:
+      config:
+        classpath: log/logback-spring.xml
+      path: /home/prod/deploy/nmys
+#logging:
+#  level:
+#    root:
+#      info
+local:
+  czurl: http://localhost:8089/ext/getRTSP/1
+  fxurl: http://localhost:8089/ext/getDeviceSnapshotAndRecognize
+file:
+  rtspurl: http://172.16.24.29:7080/getDeviceSnapshot
+  recogurl: http://172.16.24.29:7080/getDeviceSnapshotAndRecognize
+  uploadurl: http://172.16.24.29:7080/uploadResultFile
+countryside:
+  callbackurl: http://kvideo.51iwifi.com/hesc-mq/hesc/mq/receive/aiCallback
+
+#logging:
+#  level:
+#    com.cx.cn.cxquartz.dao:
+#      debug
\ No newline at end of file

src/main/resources/application-local.yml

+spring:
+  datasource:
+    url: jdbc:mysql://192.168.168.110:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    username: root
+    password: 123456
+    driver-class-name: com.mysql.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 1000
+    initialSize: 100
+    maxWait: 60000
+    minIdle: 500
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+thymeleaf:
+    prefix: classpath:/templates/
+    suffix: .html
+    cache: false
+    enabled: true
+    encoding: UTF-8
+    mode: HTML
+redis:
+    database:   0
+#    host: 172.16.24.29
+    host: 127.0.0.1
+    port: 6379
+logging:
+    config:
+      classpath: log/logback-spring.xml
+    path: /home/prod/deploy/nmys
+#logging:
+#  level:
+#    root:
+#      info
+local:
+  czurl: http://localhost:8089/ext/getRTSP/1
+  fxurl: http://localhost:8089/ext/getDeviceSnapshotAndRecognize
+
+file:
+  rtspurl: http://zjh189.ncpoi.cc:7080/getDeviceSnapshot
+  recogurl: http://zjh189.ncpoi.cc:7080/getDeviceSnapshotAndRecognize
+  uploadurl: http://home2.ncpoi.cc:7080/uploadResultFile
+countryside:
+  callbackurl: http://kvideo.51iwifi.com/hesc-mq/hesc/mq/receive/aiCallback11
+#logging:
+#  level:
+#    com.cx.cn.cxquartz.dao:
+#      debug
\ No newline at end of file

src/main/resources/application.yml

 server:
-  port: 8089
-# mybatis
+  port: 4085
+
+spring:
+  profiles:
+    active: local
+
 mybatis:
   type-aliases-package: com.cx.cn.cxquartz.bean
   configuration:
@@ -8,51 +12,3 @@ mybatis:
     default-fetch-size: 100
     default-statement-timeout: 3000
   mapper-locations: classpath:mapper/*.xml
-
-spring:
-  datasource:
-    url: jdbc:mysql://172.16.24.29:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
-    username: root
-    password: 123456
-#    url: jdbc:mysql://192.168.168.110:3306/imagepro?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
-#    username: root
-#    password: 123456
-    driver-class-name: com.mysql.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    filters: stat
-    maxActive: 1000
-    initialSize: 100
-    maxWait: 60000
-    minIdle: 500
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
-  thymeleaf:
-    prefix: classpath:/templates/
-    suffix: .html
-    cache: false
-    enabled: true
-    encoding: UTF-8
-    mode: HTML
-  redis:
-    database:   0
-    host: 172.16.24.29
-#    host: 127.0.0.1
-    port: 6379
-
-#logging:
-#  level:
-#    root:
-#      info
-local:
-  czurl: http://localhost:8089/ext/getRTSP/1
-  fxurl: http://localhost:8089/ext/getDeviceSnapshotAndRecognize
-
-#logging:
-#  level:
-#    com.cx.cn.cxquartz.dao:
-#      debug
\ No newline at end of file

src/main/resources/file.properties

 #file.rtspurl=http://172.16.24.29:7080/getrealcamerasnapshot.php
 #file.recogurl=http://172.16.24.29:9098/images/recog
 
-
-#
-#file.rtspurl=http://zjh189.ncpoi.cc:7080/getDeviceSnapshot
-#file.recogurl=http://zjh189.ncpoi.cc:7080/getDeviceSnapshotAndRecognize
-#file.uploadurl=http://home2.ncpoi.cc:7080/uploadResultFile
-#
-file.rtspurl=http://172.16.24.29:7080/getDeviceSnapshot
-file.recogurl=http://172.16.24.29:7080/getDeviceSnapshotAndRecognize
-file.uploadurl=http://172.16.24.29:7080/uploadResultFile
-
 redis.cachekey.ftplist=gs:traff:global:cache:ftplist
 file.getrtspbyurl=http://212.129.142.17:8888/heschome_api/api/hesc/open/getRtsp
 
@@ -23,15 +13,19 @@ countryside.appid=05744e80b2c211ebe32a8e271066b19e
 countryside.appsecret=a55a8870b2e911ebe32a8e271066b19e
 countryside.tokenurl=http://countryside.51iwifi.com/gw/getAccessToken
 
+
 file.publicpictureurl=http://zjh189.ncpoi.cc:10001/api/alg/files
 file.ftppath=jiuling:9ling.cn@172.16.24.29:21
 
+
 voice.url=http://106.13.41.128:9102/giant-sound/api/voice/1.0/play
 voice.appKey=9555a51a08a2e1b1c9f02a5b3e9bea11
 voice.corpId=587c9d56ee324c0186a86aea85fc7691
 voice.eventId=5
 voice.unionId=3YSCA450426N3XP
-file.rootpath=/home/ubuntu/pictures
+file.rootpath=/home/prod/pictures
 file.outpath=result
 file.webrl=http://zjh189.ncpoi.cc:7080
 
+
+

src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+    <property name="log.path" value="logs/${spring.application.name}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+
+    <!--nacos 心跳 INFO 屏蔽-->
+    <logger name="com.alibaba.nacos" level="OFF">
+        <appender-ref ref="error"/>
+    </logger>
+
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="debug"/>
+        <appender-ref ref="error"/>
+    </root>
+</configuration>
\ No newline at end of file