From 65ba9258f8e95e04772eb582f3aa5d9c938318a7 Mon Sep 17 00:00:00 2001
From: YuDongying <987425112@qq.com>
Date: Mon, 13 Mar 2023 10:06:14 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: YuDongying <987425112@qq.com>
---
pom.xml | 4 ++--
.../JavaSipWebApplication.java} | 10 +++++-----
.../config/MessageProcessor.java | 2 +-
.../{javaswitch => javasipweb}/config/SipConfig.java | 2 +-
.../{javaswitch => javasipweb}/config/SipPhone.java | 7 +++----
.../config/TcpDecoderHandler.java | 2 +-
.../config/UdpDecoderHandler.java | 3 +--
.../controller/InfoController.java | 7 +++----
.../{javaswitch => javasipweb}/dto/LoginUserDTO.java | 2 +-
.../sip/stack/UserTransaction.java | 4 +---
.../{javaswitch => javasipweb}/test/SdpTest.java | 2 +-
.../test/Sip2ApplicationTests.java | 2 +-
12 files changed, 21 insertions(+), 26 deletions(-)
rename src/main/java/net/yun789/{javaswitch/JavaSwitchApplication.java => javasipweb/JavaSipWebApplication.java} (89%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/config/MessageProcessor.java (89%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/config/SipConfig.java (69%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/config/SipPhone.java (96%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/config/TcpDecoderHandler.java (91%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/config/UdpDecoderHandler.java (95%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/controller/InfoController.java (75%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/dto/LoginUserDTO.java (86%)
rename src/main/java/net/yun789/{javaswitch => javasipweb}/sip/stack/UserTransaction.java (71%)
rename src/test/java/net/yun789/{javaswitch => javasipweb}/test/SdpTest.java (97%)
rename src/test/java/net/yun789/{javaswitch => javasipweb}/test/Sip2ApplicationTests.java (84%)
diff --git a/pom.xml b/pom.xml
index c553c7e..acf400b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
net.yun789
- java-switch
+ java-sip-web
0.0.1-SNAPSHOT
- java-switch
+ java-sip-web
Demo project for Spring Boot
8
diff --git a/src/main/java/net/yun789/javaswitch/JavaSwitchApplication.java b/src/main/java/net/yun789/javasipweb/JavaSipWebApplication.java
similarity index 89%
rename from src/main/java/net/yun789/javaswitch/JavaSwitchApplication.java
rename to src/main/java/net/yun789/javasipweb/JavaSipWebApplication.java
index afdd6be..6f2defc 100644
--- a/src/main/java/net/yun789/javaswitch/JavaSwitchApplication.java
+++ b/src/main/java/net/yun789/javasipweb/JavaSipWebApplication.java
@@ -1,8 +1,8 @@
-package net.yun789.javaswitch;
+package net.yun789.javasipweb;
-import net.yun789.javaswitch.config.TcpDecoderHandler;
-import net.yun789.javaswitch.config.UdpDecoderHandler;
+import net.yun789.javasipweb.config.TcpDecoderHandler;
+import net.yun789.javasipweb.config.UdpDecoderHandler;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,11 +14,11 @@ import reactor.netty.udp.UdpServer;
import java.time.Duration;
@SpringBootApplication
-public class JavaSwitchApplication {
+public class JavaSipWebApplication {
public static void main(String[] args) {
// new SipPhone().init();
- SpringApplication.run(JavaSwitchApplication.class, args);
+ SpringApplication.run(JavaSipWebApplication.class, args);
}
@Bean
diff --git a/src/main/java/net/yun789/javaswitch/config/MessageProcessor.java b/src/main/java/net/yun789/javasipweb/config/MessageProcessor.java
similarity index 89%
rename from src/main/java/net/yun789/javaswitch/config/MessageProcessor.java
rename to src/main/java/net/yun789/javasipweb/config/MessageProcessor.java
index 526f179..8c33a34 100644
--- a/src/main/java/net/yun789/javaswitch/config/MessageProcessor.java
+++ b/src/main/java/net/yun789/javasipweb/config/MessageProcessor.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.config;
+package net.yun789.javasipweb.config;
import javax.sip.SipProvider;
import javax.sip.message.MessageFactory;
import javax.sip.message.Request;
diff --git a/src/main/java/net/yun789/javaswitch/config/SipConfig.java b/src/main/java/net/yun789/javasipweb/config/SipConfig.java
similarity index 69%
rename from src/main/java/net/yun789/javaswitch/config/SipConfig.java
rename to src/main/java/net/yun789/javasipweb/config/SipConfig.java
index 5559972..e78bc95 100644
--- a/src/main/java/net/yun789/javaswitch/config/SipConfig.java
+++ b/src/main/java/net/yun789/javasipweb/config/SipConfig.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.config;
+package net.yun789.javasipweb.config;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/net/yun789/javaswitch/config/SipPhone.java b/src/main/java/net/yun789/javasipweb/config/SipPhone.java
similarity index 96%
rename from src/main/java/net/yun789/javaswitch/config/SipPhone.java
rename to src/main/java/net/yun789/javasipweb/config/SipPhone.java
index 9806322..8e9209d 100644
--- a/src/main/java/net/yun789/javaswitch/config/SipPhone.java
+++ b/src/main/java/net/yun789/javasipweb/config/SipPhone.java
@@ -1,14 +1,13 @@
-package net.yun789.javaswitch.config;
+package net.yun789.javasipweb.config;
import gov.nist.javax.sdp.SessionDescriptionImpl;
import gov.nist.javax.sdp.parser.SDPAnnounceParser;
import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.header.*;
import gov.nist.javax.sip.message.SIPRequest;
-import net.yun789.javaswitch.dto.LoginUserDTO;
-import net.yun789.javaswitch.sip.stack.UserTransaction;
+import net.yun789.javasipweb.dto.LoginUserDTO;
+import net.yun789.javasipweb.sip.stack.UserTransaction;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/yun789/javaswitch/config/TcpDecoderHandler.java b/src/main/java/net/yun789/javasipweb/config/TcpDecoderHandler.java
similarity index 91%
rename from src/main/java/net/yun789/javaswitch/config/TcpDecoderHandler.java
rename to src/main/java/net/yun789/javasipweb/config/TcpDecoderHandler.java
index c426a5c..c9cae2f 100644
--- a/src/main/java/net/yun789/javaswitch/config/TcpDecoderHandler.java
+++ b/src/main/java/net/yun789/javasipweb/config/TcpDecoderHandler.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.config;
+package net.yun789.javasipweb.config;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder;
diff --git a/src/main/java/net/yun789/javaswitch/config/UdpDecoderHandler.java b/src/main/java/net/yun789/javasipweb/config/UdpDecoderHandler.java
similarity index 95%
rename from src/main/java/net/yun789/javaswitch/config/UdpDecoderHandler.java
rename to src/main/java/net/yun789/javasipweb/config/UdpDecoderHandler.java
index 46ccbb8..b054c35 100644
--- a/src/main/java/net/yun789/javaswitch/config/UdpDecoderHandler.java
+++ b/src/main/java/net/yun789/javasipweb/config/UdpDecoderHandler.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.config;
+package net.yun789.javasipweb.config;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
@@ -8,7 +8,6 @@ import io.netty.handler.codec.MessageToMessageDecoder;
import io.netty.util.CharsetUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/net/yun789/javaswitch/controller/InfoController.java b/src/main/java/net/yun789/javasipweb/controller/InfoController.java
similarity index 75%
rename from src/main/java/net/yun789/javaswitch/controller/InfoController.java
rename to src/main/java/net/yun789/javasipweb/controller/InfoController.java
index daf0ba9..4b33566 100644
--- a/src/main/java/net/yun789/javaswitch/controller/InfoController.java
+++ b/src/main/java/net/yun789/javasipweb/controller/InfoController.java
@@ -1,8 +1,7 @@
-package net.yun789.javaswitch.controller;
+package net.yun789.javasipweb.controller;
-import net.yun789.javaswitch.config.SipPhone;
-import net.yun789.javaswitch.dto.LoginUserDTO;
-import net.yun789.javaswitch.sip.stack.UserTransaction;
+import net.yun789.javasipweb.config.SipPhone;
+import net.yun789.javasipweb.dto.LoginUserDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/net/yun789/javaswitch/dto/LoginUserDTO.java b/src/main/java/net/yun789/javasipweb/dto/LoginUserDTO.java
similarity index 86%
rename from src/main/java/net/yun789/javaswitch/dto/LoginUserDTO.java
rename to src/main/java/net/yun789/javasipweb/dto/LoginUserDTO.java
index 37e6382..cee1d61 100644
--- a/src/main/java/net/yun789/javaswitch/dto/LoginUserDTO.java
+++ b/src/main/java/net/yun789/javasipweb/dto/LoginUserDTO.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.dto;
+package net.yun789.javasipweb.dto;
import lombok.Data;
diff --git a/src/main/java/net/yun789/javaswitch/sip/stack/UserTransaction.java b/src/main/java/net/yun789/javasipweb/sip/stack/UserTransaction.java
similarity index 71%
rename from src/main/java/net/yun789/javaswitch/sip/stack/UserTransaction.java
rename to src/main/java/net/yun789/javasipweb/sip/stack/UserTransaction.java
index 721ec09..ceb6136 100644
--- a/src/main/java/net/yun789/javaswitch/sip/stack/UserTransaction.java
+++ b/src/main/java/net/yun789/javasipweb/sip/stack/UserTransaction.java
@@ -1,9 +1,7 @@
-package net.yun789.javaswitch.sip.stack;
+package net.yun789.javasipweb.sip.stack;
import lombok.Data;
-import net.yun789.javaswitch.dto.LoginUserDTO;
-import javax.sip.ServerTransaction;
import javax.sip.Transaction;
import java.io.Serializable;
diff --git a/src/test/java/net/yun789/javaswitch/test/SdpTest.java b/src/test/java/net/yun789/javasipweb/test/SdpTest.java
similarity index 97%
rename from src/test/java/net/yun789/javaswitch/test/SdpTest.java
rename to src/test/java/net/yun789/javasipweb/test/SdpTest.java
index 1ab886b..64b9581 100644
--- a/src/test/java/net/yun789/javaswitch/test/SdpTest.java
+++ b/src/test/java/net/yun789/javasipweb/test/SdpTest.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.test;
+package net.yun789.javasipweb.test;
import gov.nist.javax.sdp.SessionDescriptionImpl;
import gov.nist.javax.sdp.parser.SDPAnnounceParser;
diff --git a/src/test/java/net/yun789/javaswitch/test/Sip2ApplicationTests.java b/src/test/java/net/yun789/javasipweb/test/Sip2ApplicationTests.java
similarity index 84%
rename from src/test/java/net/yun789/javaswitch/test/Sip2ApplicationTests.java
rename to src/test/java/net/yun789/javasipweb/test/Sip2ApplicationTests.java
index a3ff7e2..22c3fc0 100644
--- a/src/test/java/net/yun789/javaswitch/test/Sip2ApplicationTests.java
+++ b/src/test/java/net/yun789/javasipweb/test/Sip2ApplicationTests.java
@@ -1,4 +1,4 @@
-package net.yun789.javaswitch.test;
+package net.yun789.javasipweb.test;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
--
Gitee