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 00000000..32828fc1 Binary files /dev/null and b/src.rar differ