From c4e8237d02ab56fbd1598b4638dd789d8e01a6db Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Mon, 30 Oct 2023 21:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 - JNGame | 1 - JisolGameServer/pom.xml | 19 +++++++ .../java/cn/jisol/game/JGameApplication.java | 19 ------- .../java/cn/jisol/game/config/CorsConfig.java | 17 ------ .../jisol/game/controller/DemoController.java | 53 ------------------ .../jisol/game/network/NSocketConfigurer.java | 32 ----------- .../java/cn/jisol/game/network/WebSocket.java | 41 -------------- .../src/main/resources/META-INF/MANIFEST.MF | 3 - src.rar | Bin 0 -> 3186 bytes 10 files changed, 19 insertions(+), 169 deletions(-) delete mode 160000 JNGame delete mode 100644 JisolGameServer/src/main/java/cn/jisol/game/JGameApplication.java delete mode 100644 JisolGameServer/src/main/java/cn/jisol/game/config/CorsConfig.java delete mode 100644 JisolGameServer/src/main/java/cn/jisol/game/controller/DemoController.java delete mode 100644 JisolGameServer/src/main/java/cn/jisol/game/network/NSocketConfigurer.java delete mode 100644 JisolGameServer/src/main/java/cn/jisol/game/network/WebSocket.java delete mode 100644 JisolGameServer/src/main/resources/META-INF/MANIFEST.MF create mode 100644 src.rar diff --git a/.gitmodules b/.gitmodules index 68d08cb2..e0ae5901 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "JNGame"] - path = JNGame - url = https://gitee.com/jisol/jngame-pro-server [submodule "JisolGameCocos/extensions/ngame"] path = JisolGameCocos/extensions/ngame url = https://gitee.com/jisol/jngame-pro-cocos diff --git a/JNGame b/JNGame deleted file mode 160000 index bce1ad35..00000000 --- a/JNGame +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bce1ad3522fb8ed1497eee9e01bba38d53e97279 diff --git a/JisolGameServer/pom.xml b/JisolGameServer/pom.xml index 3b73f5c1..00136ddd 100644 --- a/JisolGameServer/pom.xml +++ b/JisolGameServer/pom.xml @@ -23,4 +23,23 @@ + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + cn.jisol.game.JGameApplication + + + + jar-with-dependencies + + + + + + \ No newline at end of file diff --git a/JisolGameServer/src/main/java/cn/jisol/game/JGameApplication.java b/JisolGameServer/src/main/java/cn/jisol/game/JGameApplication.java deleted file mode 100644 index df9fd0c4..00000000 --- a/JisolGameServer/src/main/java/cn/jisol/game/JGameApplication.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.jisol.game; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScans; - -@ComponentScans({ - @ComponentScan( - value = "cn.jisol.ngame" - ) -}) -@SpringBootApplication -public class JGameApplication { - public static void main(String[] args) { - ApplicationContext applicationContext = SpringApplication.run(JGameApplication.class); - } -} diff --git a/JisolGameServer/src/main/java/cn/jisol/game/config/CorsConfig.java b/JisolGameServer/src/main/java/cn/jisol/game/config/CorsConfig.java deleted file mode 100644 index b52857f5..00000000 --- a/JisolGameServer/src/main/java/cn/jisol/game/config/CorsConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.jisol.game.config; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -class CorsConfig implements WebMvcConfigurer { - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowedMethods("GET","HEAD","POST","PUT","DELETE","OPTIONS") - .allowCredentials(true) - .maxAge(3600) - .allowedHeaders("*"); - } -} diff --git a/JisolGameServer/src/main/java/cn/jisol/game/controller/DemoController.java b/JisolGameServer/src/main/java/cn/jisol/game/controller/DemoController.java deleted file mode 100644 index 80f80ac6..00000000 --- a/JisolGameServer/src/main/java/cn/jisol/game/controller/DemoController.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.jisol.game.controller; - - -import cn.jisol.ngame.actions.SystemAction; -import cn.jisol.ngame.proto.JNSyncMessage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.http.HttpHeaders; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Objects; - -@Api(value = "JNGameDemo - API", tags = {"WorldCard - API"}) -@RestController -@RequestMapping() -@ResponseBody -public class DemoController { - - @ApiImplicitParams({ - @ApiImplicitParam(name="start",value="帧开始"), - @ApiImplicitParam(name="end",value="帧结束") - }) - @ApiOperation(value = "获取帧同步数据") - @GetMapping("/sync/frame") - public ResponseEntity getSyncFrame(Integer start, Integer end){ - - HttpHeaders headers = new HttpHeaders(); - headers.set("Content-Type", "application/json"); - - if(Objects.isNull(SystemAction.frame)) - return ResponseEntity.ok().headers(headers).body(new byte[0]); - - JNSyncMessage.JNFrameInfos infos = SystemAction.frame.vGetFrame(start, end); - return ResponseEntity.ok().headers(headers).body(infos.toByteArray()); - } - - @ApiImplicitParams({ - @ApiImplicitParam(name="start",value="帧开始"), - @ApiImplicitParam(name="end",value="帧结束") - }) - @ApiOperation(value = "获取帧同步数据") - @GetMapping("/sync/hello") - public String getSyncHello(Integer start, Integer end){ - return "HelloWorld"; - } - -} diff --git a/JisolGameServer/src/main/java/cn/jisol/game/network/NSocketConfigurer.java b/JisolGameServer/src/main/java/cn/jisol/game/network/NSocketConfigurer.java deleted file mode 100644 index 6717e22b..00000000 --- a/JisolGameServer/src/main/java/cn/jisol/game/network/NSocketConfigurer.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.jisol.game.network; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; -import org.springframework.web.socket.config.annotation.StompEndpointRegistry; -import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; - -@Configuration -@EnableWebSocketMessageBroker -public class NSocketConfigurer implements WebSocketMessageBrokerConfigurer { - - /** - * 添加一个服务端点，来接收客户端的连接 - * @param registry - */ - @Override - public void registerStompEndpoints(StompEndpointRegistry registry) { - registry.addEndpoint("/websocket").setAllowedOrigins("*"); - } - - /** - * 开启WebSocket支持 - * @return - */ - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } - -} diff --git a/JisolGameServer/src/main/java/cn/jisol/game/network/WebSocket.java b/JisolGameServer/src/main/java/cn/jisol/game/network/WebSocket.java deleted file mode 100644 index 185cb626..00000000 --- a/JisolGameServer/src/main/java/cn/jisol/game/network/WebSocket.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.jisol.game.network; - -import cn.jisol.ngame.client.NClient; -import cn.jisol.ngame.network.JNetwork; -import org.springframework.stereotype.Controller; - -import javax.websocket.OnClose; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; -import java.io.InputStream; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -@ServerEndpoint( - value = "/websocket" -) -@Controller -public class WebSocket { - - public static final Map CLIENTS = new ConcurrentHashMap<>(); - - - @OnOpen - public void onOpen(Session session){ - CLIENTS.put(session.getId(),new NClient(session)); - System.out.printf("[WebSocket] %s 连接成功.\n",session.getId()); - } - - @OnMessage - public void onMessage(Session session, InputStream inputStream){ - JNetwork.onMessage(inputStream,CLIENTS.get(session.getId()),CLIENTS); - } - - @OnClose - public void onClose(Session session){ - CLIENTS.remove(session.getId()); - } - -} diff --git a/JisolGameServer/src/main/resources/META-INF/MANIFEST.MF b/JisolGameServer/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 30abd302..00000000 --- a/JisolGameServer/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: cn.jisol.game.JGameApplication - diff --git a/src.rar b/src.rar new file mode 100644 index 0000000000000000000000000000000000000000..32828fc19bd3451031d596c7bc7a8b7991d9bdf6 GIT binary patch literal 3186 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 literal 0 HcmV?d00001