From a5f892212f0a877b0242122d921e0eaab18dddbd Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Thu, 9 Apr 2020 16:48:46 +0800 Subject: [PATCH] 日志 --- cloud/lapi/pom.xml | 2 +- cloud/lapi/src/main/java/com/sincere/lapi/LapiApplication.java | 18 ++++++++++++++++++ cloud/lapi/src/main/java/com/sincere/lapi/LapiDemoApplication.java | 18 ------------------ cloud/lapi/src/main/java/com/sincere/lapi/controller/LapiController.java | 22 +++------------------- cloud/lapi/src/main/java/com/sincere/lapi/pojo/IdentificationInfo.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/pojo/LAPIResponse.java | 4 ---- cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonImageInfo.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfo.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfoList.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonTimeTemplateInfo.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/server/ServerRun.java | 22 +--------------------- cloud/lapi/src/main/java/com/sincere/lapi/server/handler/HttpClientHandler.java | 5 ----- cloud/lapi/src/main/java/com/sincere/lapi/server/init/LapiServerInitializer.java | 22 ---------------------- cloud/lapi/src/main/java/com/sincere/lapi/server/init/NettyFactory.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/server/pojo/HeartBack.java | 21 --------------------- cloud/lapi/src/main/java/com/sincere/lapi/server/thread/ServerThread.java | 22 ---------------------- cloud/lapi/src/main/java/com/sincere/lapi/service/request/TerminalHttpCall.java | 5 ----- 17 files changed, 23 insertions(+), 264 deletions(-) create mode 100644 cloud/lapi/src/main/java/com/sincere/lapi/LapiApplication.java delete mode 100644 cloud/lapi/src/main/java/com/sincere/lapi/LapiDemoApplication.java diff --git a/cloud/lapi/pom.xml b/cloud/lapi/pom.xml index 9a7976e..9a179b1 100644 --- a/cloud/lapi/pom.xml +++ b/cloud/lapi/pom.xml @@ -128,7 +128,7 @@ - com.sincere.lapi.LapiDemoApplication + com.sincere.lapi.LapiApplication true lib/ diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/LapiApplication.java b/cloud/lapi/src/main/java/com/sincere/lapi/LapiApplication.java new file mode 100644 index 0000000..f274c30 --- /dev/null +++ b/cloud/lapi/src/main/java/com/sincere/lapi/LapiApplication.java @@ -0,0 +1,18 @@ +package com.sincere.lapi; + +import com.sincere.lapi.server.ServerRun; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@EnableFeignClients(basePackages = "com.sincere.lapi.feign") +@SpringBootApplication +public class LapiApplication { + + public static void main(String[] args) { + SpringApplication.run(LapiApplication.class, args); + ServerRun serverRun = new ServerRun(); + serverRun.start(5300); + } + +} diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/LapiDemoApplication.java b/cloud/lapi/src/main/java/com/sincere/lapi/LapiDemoApplication.java deleted file mode 100644 index d605377..0000000 --- a/cloud/lapi/src/main/java/com/sincere/lapi/LapiDemoApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.sincere.lapi; - -import com.sincere.lapi.server.ServerRun; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; - -@EnableFeignClients(basePackages = "com.sincere.lapi.feign") -@SpringBootApplication -public class LapiDemoApplication { - - public static void main(String[] args) { - SpringApplication.run(LapiDemoApplication.class, args); - ServerRun serverRun = new ServerRun(); - serverRun.start(5300); - } - -} diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/controller/LapiController.java b/cloud/lapi/src/main/java/com/sincere/lapi/controller/LapiController.java index 60fd775..758d21f 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/controller/LapiController.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/controller/LapiController.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/7 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.controller; import com.alibaba.fastjson.JSONArray; @@ -39,9 +23,9 @@ import sun.misc.BASE64Encoder; import java.util.*; /** - * description - * - * @author dW5565 + * @author chen + * @version 1.0 + * @date 2019/11/28 0028 9:17 */ @RestController public class LapiController { diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/IdentificationInfo.java b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/IdentificationInfo.java index 4ac40f4..e5148e8 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/IdentificationInfo.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/IdentificationInfo.java @@ -1,28 +1,7 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/13 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.pojo; import com.alibaba.fastjson.annotation.JSONField; -/** - * description - * - * @author dW5565 - */ public class IdentificationInfo { @JSONField(name = "Type", ordinal = 1) diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/LAPIResponse.java b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/LAPIResponse.java index b807045..ff88fe1 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/LAPIResponse.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/LAPIResponse.java @@ -4,10 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField; import java.io.Serializable; -/** - * @author wW4799 - * @date 2018/10/18. - */ public class LAPIResponse implements Serializable { /** * 响应URL diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonImageInfo.java b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonImageInfo.java index 95d802d..6be4a4c 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonImageInfo.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonImageInfo.java @@ -1,28 +1,7 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/13 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.pojo; import com.alibaba.fastjson.annotation.JSONField; -/** - * description - * - * @author dW5565 - */ public class PersonImageInfo { @JSONField(name = "FaceID", ordinal = 1) private Long faceID; diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfo.java b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfo.java index 103222c..285fda7 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfo.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfo.java @@ -1,30 +1,9 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/13 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.pojo; import com.alibaba.fastjson.annotation.JSONField; import java.util.List; -/** - * description - * - * @author dW5565 - */ public class PersonInfo { @JSONField(name = "PersonID", ordinal = 1) diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfoList.java b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfoList.java index 8525864..81de02c 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfoList.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonInfoList.java @@ -1,30 +1,9 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/13 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.pojo; import com.alibaba.fastjson.annotation.JSONField; import java.util.List; -/** - * description - * - * @author dW5565 - */ public class PersonInfoList { @JSONField(name = "Num", ordinal = 1) diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonTimeTemplateInfo.java b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonTimeTemplateInfo.java index 2c36715..5bafc61 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonTimeTemplateInfo.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/pojo/PersonTimeTemplateInfo.java @@ -1,28 +1,7 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/13 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.pojo; import com.alibaba.fastjson.annotation.JSONField; -/** - * description - * - * @author dW5565 - */ public class PersonTimeTemplateInfo { diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/server/ServerRun.java b/cloud/lapi/src/main/java/com/sincere/lapi/server/ServerRun.java index 8674bd8..8fc7734 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/server/ServerRun.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/server/ServerRun.java @@ -1,28 +1,8 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/7 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.server; import com.sincere.lapi.server.thread.ServerThread; -/** - * description - * - * @author dW5565 - */ + public class ServerRun { public void start(int port){ try { diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/server/handler/HttpClientHandler.java b/cloud/lapi/src/main/java/com/sincere/lapi/server/handler/HttpClientHandler.java index 17730ff..163a592 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/server/handler/HttpClientHandler.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/server/handler/HttpClientHandler.java @@ -25,11 +25,6 @@ import java.util.Date; import static io.netty.buffer.Unpooled.copiedBuffer; -/** - * description - * - * @author dW5565 - */ public class HttpClientHandler extends ChannelInboundHandlerAdapter { Logger logger = LoggerFactory.getLogger(HttpClientHandler.class); diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/server/init/LapiServerInitializer.java b/cloud/lapi/src/main/java/com/sincere/lapi/server/init/LapiServerInitializer.java index e65cb91..da4ba19 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/server/init/LapiServerInitializer.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/server/init/LapiServerInitializer.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/8 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.server.init; import com.sincere.lapi.server.handler.HttpClientHandler; @@ -25,12 +9,6 @@ import io.netty.handler.codec.string.StringDecoder; import io.netty.handler.timeout.ReadTimeoutHandler; - -/** - * description - * - * @author dW5565 - */ public class LapiServerInitializer extends ChannelInitializer { @Override diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/server/init/NettyFactory.java b/cloud/lapi/src/main/java/com/sincere/lapi/server/init/NettyFactory.java index 1c6d4dc..ad97ad9 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/server/init/NettyFactory.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/server/init/NettyFactory.java @@ -1,19 +1,3 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/8 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.server.init; import io.netty.bootstrap.ServerBootstrap; @@ -23,11 +7,6 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; -/** - * description - * - * @author dW5565 - */ public class NettyFactory { public void createNetty(int port) { diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/server/pojo/HeartBack.java b/cloud/lapi/src/main/java/com/sincere/lapi/server/pojo/HeartBack.java index c9fac0d..658feb9 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/server/pojo/HeartBack.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/server/pojo/HeartBack.java @@ -1,28 +1,7 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/9 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.server.pojo; import com.alibaba.fastjson.annotation.JSONField; -/** - * 本用例未做心跳回包,请自行回包 - * - * @author dW5565 - */ public class HeartBack { @JSONField(name = "ResponseURL", ordinal = 1) diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/server/thread/ServerThread.java b/cloud/lapi/src/main/java/com/sincere/lapi/server/thread/ServerThread.java index 128deac..681babe 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/server/thread/ServerThread.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/server/thread/ServerThread.java @@ -1,29 +1,7 @@ -/* - * Copyright (c) 2018, ZheJiang Uniview Technologies Co., Ltd. All rights reserved. - * - *------------------------------------------------------------------------------ - * Product : 速通门 - * Module Name : com.unv.fastgate.server.service - * Date Created: 2019/5/7 - * Creator : dW5565 dongchenghao - * Description : - * - *------------------------------------------------------------------------------ - * Modification History - * DATE NAME DESCRIPTION - *------------------------------------------------------------------------------ - *------------------------------------------------------------------------------ - */ package com.sincere.lapi.server.thread; import com.sincere.lapi.server.init.NettyFactory; - -/** - * description - * - * @author dW5565 - */ public class ServerThread implements Runnable { private int port; diff --git a/cloud/lapi/src/main/java/com/sincere/lapi/service/request/TerminalHttpCall.java b/cloud/lapi/src/main/java/com/sincere/lapi/service/request/TerminalHttpCall.java index e8b633e..b3a0496 100644 --- a/cloud/lapi/src/main/java/com/sincere/lapi/service/request/TerminalHttpCall.java +++ b/cloud/lapi/src/main/java/com/sincere/lapi/service/request/TerminalHttpCall.java @@ -14,11 +14,6 @@ import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -/** - * 终端http调用 - * - * @author dW5565 - */ @Component("terminalHttpCall") public class TerminalHttpCall { -- libgit2 0.21.0