From 61f3b6dada95eaa4305b1232873de9db19983d0e Mon Sep 17 00:00:00 2001 From: limqhz Date: Fri, 31 Jan 2020 00:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/src/main/resources/config/application.yml | 5 + api/src/main/resources/logback.xml | 2 +- .../main/resources/mybatis/mybatis-config.xml | 2 +- api/src/test/java/com/TestDoor.java | 94 ------------------- api/src/test/java/com/VenueServiceTest.java | 8 +- .../src/main/resources/config/application.yml | 8 +- netty-pad/src/main/resources/logback.xml | 40 +++----- .../main/resources/mybatis/mybatis-config.xml | 8 +- oms/src/main/resources/config/application.yml | 5 + .../main/resources/mybatis/mybatis-config.xml | 2 +- 10 files changed, 42 insertions(+), 132 deletions(-) delete mode 100644 api/src/test/java/com/TestDoor.java diff --git a/api/src/main/resources/config/application.yml b/api/src/main/resources/config/application.yml index bbf2498..6e73114 100644 --- a/api/src/main/resources/config/application.yml +++ b/api/src/main/resources/config/application.yml @@ -78,3 +78,8 @@ face: account: test@test.com pwd: 123456 +logging: + level: + com: + sv: + mapper: DEBUG \ No newline at end of file diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml index 0978731..e96e6cc 100644 --- a/api/src/main/resources/logback.xml +++ b/api/src/main/resources/logback.xml @@ -27,7 +27,7 @@ - + diff --git a/api/src/main/resources/mybatis/mybatis-config.xml b/api/src/main/resources/mybatis/mybatis-config.xml index f90db15..c90e151 100644 --- a/api/src/main/resources/mybatis/mybatis-config.xml +++ b/api/src/main/resources/mybatis/mybatis-config.xml @@ -7,7 +7,7 @@ - + diff --git a/api/src/test/java/com/TestDoor.java b/api/src/test/java/com/TestDoor.java deleted file mode 100644 index 217e361..0000000 --- a/api/src/test/java/com/TestDoor.java +++ /dev/null @@ -1,94 +0,0 @@ -package com; - -import Net.PC15.Command.CommandDetial; -import Net.PC15.Command.CommandParameter; -import Net.PC15.Command.INCommand; -import Net.PC15.Command.INCommandResult; -import Net.PC15.Connector.ConnectorAllocator; -import Net.PC15.Connector.ConnectorDetial; -import Net.PC15.Connector.E_ControllerType; -import Net.PC15.Connector.INConnectorEvent; -import Net.PC15.Connector.TCPClient.TCPClientDetial; -import Net.PC15.Data.INData; -import Net.PC15.FC8800.Command.Data.DoorPortDetail; -import Net.PC15.FC8800.Command.Door.CloseDoor; -import Net.PC15.FC8800.Command.Door.OpenDoor; -import Net.PC15.FC8800.Command.Door.Parameter.OpenDoor_Parameter; -import Net.PC15.FC8800.Command.Door.Parameter.RemoteDoor_Parameter; -import Net.PC15.FC8800.Command.FC8800Command; -import Net.PC15.FC8800.FC8800Identity; - -public class TestDoor { - - public static void main(String args[]) throws InterruptedException { - open(); - - - //System.out.println(connector.AddCommand(closeDoor)); - } - - public static void open(){ - ConnectorAllocator connector = ConnectorAllocator.GetAllocator(); - //connector.AddListener(new TestConnect()); - TCPClientDetial c = new TCPClientDetial("192.168.1.150", 8000); - connector.GetCommandCount(c); - //connector.CloseForciblyConnect(new TCPClientDetial("192.168.1.150", 8000)); - connector.OpenForciblyConnect(c); - CommandDetial detial = new CommandDetial(); - detial.Connector = c; - detial.Identity = new FC8800Identity("MC-5824T28085603", "FFFFFFFF", E_ControllerType.FC8900); - - - - OpenDoor_Parameter openDoor_parameter = new OpenDoor_Parameter(detial); - openDoor_parameter.Door.SetDoor(1,1); - OpenDoor openDoor = new OpenDoor(openDoor_parameter); - openDoor.getIsTimeout(); - //openDoor.Release(); - } - - static class TestConnect implements INConnectorEvent { - - @Override - public void CommandCompleteEvent(INCommand inCommand, INCommandResult inCommandResult) { - System.out.println("CommandCompleteEvent"); - - } - - @Override - public void CommandProcessEvent(INCommand inCommand) { - System.out.println("CommandProcessEvent"); - } - - @Override - public void ConnectorErrorEvent(INCommand inCommand, boolean b) { - System.out.println("ConnectorErrorEvent"); - } - - @Override - public void ConnectorErrorEvent(ConnectorDetial connectorDetial) { - System.out.println("ConnectorErrorEvent"); - } - - @Override - public void CommandTimeout(INCommand inCommand) { - System.out.println("CommandTimeout"); - } - - @Override - public void PasswordErrorEvent(INCommand inCommand) { - System.out.println("PasswordErrorEvent"); - } - - @Override - public void ChecksumErrorEvent(INCommand inCommand) { - System.out.println("ChecksumErrorEvent"); - } - - @Override - public void WatchEvent(ConnectorDetial connectorDetial, INData inData) { - System.out.println("WatchEvent"); - } - } - -} diff --git a/api/src/test/java/com/VenueServiceTest.java b/api/src/test/java/com/VenueServiceTest.java index be8c349..f834eb8 100644 --- a/api/src/test/java/com/VenueServiceTest.java +++ b/api/src/test/java/com/VenueServiceTest.java @@ -15,8 +15,8 @@ public class VenueServiceTest { @Resource private VenueService venueService; -// @Test -// public void test(){ -// System.out.println(venueService.enterVenue(12,3,1)); -// } + @Test + public void test(){ +// System.out.println(venueService.enterVenue(12,3)); + } } diff --git a/netty-pad/src/main/resources/config/application.yml b/netty-pad/src/main/resources/config/application.yml index d7fe352..f7812b9 100644 --- a/netty-pad/src/main/resources/config/application.yml +++ b/netty-pad/src/main/resources/config/application.yml @@ -105,4 +105,10 @@ so: keepalive: true backlog: 100 reuseaddr: true -tcp_nodelay: true \ No newline at end of file +tcp_nodelay: true + +logging: + level: + com: + sv: + mapper: DEBUG \ No newline at end of file diff --git a/netty-pad/src/main/resources/logback.xml b/netty-pad/src/main/resources/logback.xml index 37812f0..9e091c9 100644 --- a/netty-pad/src/main/resources/logback.xml +++ b/netty-pad/src/main/resources/logback.xml @@ -1,35 +1,20 @@ - - - - %date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - ${LOG_HOME}/oms.log - - ${LOG_HOME}/oms-sys.%d{yyyy-MM-dd}.log - 30 - - - - %date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - ${LOG_HOME}/oms-spring.log - + ${LOG_HOME}/nettypad-spring.log - ${LOG_HOME}/oms-spring-%d{yyyy-MM-dd_HH}.%i.log + ${LOG_HOME}/nettypad-spring-%d{yyyy-MM-dd_HH}.%i.log @@ -38,14 +23,17 @@ - %d{HH:mm:ss.SSS},%msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + - - + + \ No newline at end of file diff --git a/netty-pad/src/main/resources/mybatis/mybatis-config.xml b/netty-pad/src/main/resources/mybatis/mybatis-config.xml index 0ad92f3..a39c274 100644 --- a/netty-pad/src/main/resources/mybatis/mybatis-config.xml +++ b/netty-pad/src/main/resources/mybatis/mybatis-config.xml @@ -4,11 +4,11 @@ - + + + diff --git a/oms/src/main/resources/config/application.yml b/oms/src/main/resources/config/application.yml index 166fa41..b5365bf 100644 --- a/oms/src/main/resources/config/application.yml +++ b/oms/src/main/resources/config/application.yml @@ -89,3 +89,8 @@ face: account: test@test.com pwd: 123456 +logging: + level: + com: + sv: + mapper: DEBUG \ No newline at end of file diff --git a/oms/src/main/resources/mybatis/mybatis-config.xml b/oms/src/main/resources/mybatis/mybatis-config.xml index f4fd7b2..d4721e6 100644 --- a/oms/src/main/resources/mybatis/mybatis-config.xml +++ b/oms/src/main/resources/mybatis/mybatis-config.xml @@ -7,7 +7,7 @@ - +