From 6441c61ff004968291d85b0ef89689dde1fd5d73 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 8 Sep 2021 15:27:19 -0400 Subject: [PATCH] websockenconfig --- ...ence_hibernate_jpa_2_1_api_1_0_2_Final.xml | 13 +++++++ demo.iml | 3 +- pom.xml | 8 +++- .../example/demo/WebsocketApplication.java | 2 +- .../demo/controller/SocketController.java | 17 --------- .../demo/controller/WebSocketController.java | 36 ++++++++++++++++++ src/main/resources/application.properties | 2 +- target/classes/ConnectDatabase.class | Bin 2294 -> 0 bytes target/classes/application.properties | 2 +- .../example/demo/WebsocketApplication$1.class | Bin 1584 -> 1678 bytes .../demo/controller/SocketController.class | Bin 966 -> 0 bytes .../demo/controller/WebSocketController.class | Bin 0 -> 2114 bytes 12 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml delete mode 100644 src/main/java/com/example/demo/controller/SocketController.java create mode 100644 src/main/java/com/example/demo/controller/WebSocketController.java delete mode 100644 target/classes/ConnectDatabase.class delete mode 100644 target/classes/com/example/demo/controller/SocketController.class create mode 100644 target/classes/com/example/demo/controller/WebSocketController.class diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml new file mode 100644 index 000000000..1d8ce4056 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/demo.iml b/demo.iml index 3e6f2e26d..173b7c31f 100644 --- a/demo.iml +++ b/demo.iml @@ -134,6 +134,7 @@ - + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f21303d18..bb3ff4ffd 100644 --- a/pom.xml +++ b/pom.xml @@ -75,9 +75,15 @@ mysql mysql-connector-java + runtime 8.0.26 - + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + 1.0.2.Final + diff --git a/src/main/java/com/example/demo/WebsocketApplication.java b/src/main/java/com/example/demo/WebsocketApplication.java index be848368e..7f9d840d7 100644 --- a/src/main/java/com/example/demo/WebsocketApplication.java +++ b/src/main/java/com/example/demo/WebsocketApplication.java @@ -19,7 +19,7 @@ public WebMvcConfigurer corsConfigurer() { return new WebMvcConfigurer() { @Override public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**").allowCredentials(true).allowedOriginPatterns("*").allowedHeaders("*"); + registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE").allowCredentials(true).allowedOriginPatterns("*").allowedHeaders("*"); } }; } diff --git a/src/main/java/com/example/demo/controller/SocketController.java b/src/main/java/com/example/demo/controller/SocketController.java deleted file mode 100644 index a608632ed..000000000 --- a/src/main/java/com/example/demo/controller/SocketController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.demo.controller; - -import org.springframework.messaging.Message; -import org.springframework.messaging.handler.annotation.MessageMapping; -import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.messaging.handler.annotation.SendTo; -import org.springframework.stereotype.Controller; - -@Controller -public class SocketController { - - @MessageMapping("/profile-all") - @SendTo("/topic/profile") - public Message send(@Payload Message message) { - return message; - } -} \ No newline at end of file diff --git a/src/main/java/com/example/demo/controller/WebSocketController.java b/src/main/java/com/example/demo/controller/WebSocketController.java new file mode 100644 index 000000000..580c7f177 --- /dev/null +++ b/src/main/java/com/example/demo/controller/WebSocketController.java @@ -0,0 +1,36 @@ +package com.example.demo.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.messaging.Message; +import org.springframework.messaging.handler.annotation.MessageMapping; +import org.springframework.messaging.handler.annotation.Payload; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.messaging.simp.SimpMessagingTemplate; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller +public class WebSocketController { + + @Autowired + SimpMessagingTemplate template; + + @PostMapping("/send") + public ResponseEntity sendMessage(@RequestBody Message message) { + template.convertAndSend("/topic/message", message); + return new ResponseEntity<>(HttpStatus.OK); + } + @MessageMapping("/sendMessage") + public void receiveMessage(@Payload Message message) { + // receive message from client + } + + + @SendTo("/topic/message") + public Message broadcastMessage(@Payload Message message) { + return message; + } +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 94980e58a..0de30be77 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,4 +3,4 @@ spring.datasource.username=root spring.datasource.password=zipcode0 spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect \ No newline at end of file +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect diff --git a/target/classes/ConnectDatabase.class b/target/classes/ConnectDatabase.class deleted file mode 100644 index c6944b47028103ae4eab302fbed09ebfd6b90b8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2294 zcmbtWU2_vv7=E_-*mS$KZJm>&exCE5{Qd7Ae*t(K>l$9d zxi08%PLAL$_nCBwrhtu1(Ed7l7eX7s|p1@1=|(HM!h2ZvRQGs zlPq|a=`5MPE!XYMXjroY1$~9Q=eoiQXUx#7n1Pt2p}J|i3XY|(7FNxhrs0_Gict!E z+g+KIjyilQjukAgZd9oigyyE<1%XlZ?VG|k%r)DvJYN{rx?@}xLBk14BBb4j?`6>*C3Yo4}@*2J+F50r7NB7k%E6b!~5GQpk;WOqqHDxSLmoFLR1tXUW zgw^mx#%dKhW7W)%Ml0TC_FH?6-u4$+#T6Z&;|m>E@uh;Z&n)zA;ujjWQx!floSMoP z=4OlK)Z9#t6zO}sF3sjI&z5sJ9be&V9oKMO!N_yCP>>FUL&l_hPGrnAf-W&iE&E+u&6pL=_UP4FHOdH8!DzQO)XbaFV$17PVX>?k1Te=a@r zJcMoIM&7mpcWuvDCfAHbGpvz*krlysCeu$J$OHI2)RNj`gO&$3?68)1yhgRuBxJh+ z7aDF=l6s+Se6QLevS=SsqkZu&`?L>JjYLpD-j))_}9F>Q5K z1!oS7WH9e_nJa^{!Z|klJCwW4&#!QdH#g%*@m+5T(8Q}; zb>cK$qY)}AzaYY!5V&&>9mz=KPekt_wuSfusL4dKa|;^Zw$SwedO?{VNp^4Jg$@)m z+vrj70KF5@f#^f@|AxMSXfnBtBOTbn(c9?aPO_h`BM(s=rNqcKjw!f}>EdW+3ny;l z{LYS1%*Tg${fKW`e{#UYt%l@a8KY@ z3^Z#vj3{M?sdI)_$7%Nsq`7w*KVXRa5`sGz!6@epp8~W;G#FEnRbi+YQ}L#Xv%o)4 tdCiR_E^(OQ^N7ylkEK93#-MP}Vvi)!{6cGQ@rm)4;H2<>j^w~Q{{ienVx#~7 diff --git a/target/classes/application.properties b/target/classes/application.properties index 94980e58a..0de30be77 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -3,4 +3,4 @@ spring.datasource.username=root spring.datasource.password=zipcode0 spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=true -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect \ No newline at end of file +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect diff --git a/target/classes/com/example/demo/WebsocketApplication$1.class b/target/classes/com/example/demo/WebsocketApplication$1.class index 912837e3b534487a9835f3b3d9f935fcbcd9831a..b450d1d5873f12c0b6b7c56cf67ee56b0ec0d1f2 100644 GIT binary patch delta 485 zcmYk2+fEZv6o$XundwZ2O({buhbkvQrHEB*K~bmz1BOFvG8oeNvKYMp>{{FrON^GU*;6EL93@=jqD3&OObS*6l0 zCI-vaR=BUQtDhoqR`s*k|6Pl0ngr%4Ccb*)SnL%b@sNd)vu>9}=9D9;7-f zHWzpJjF1-uemtjmAhDweei*`sj2Qw+wQ%Br%3NS|u-z-1niV9YnjN@N%?Z4ymJCu+ z2jA|{V|UA1aBnw03JgepITx-3MvNcx<>X95{|Tzx3#u?Ki`@$vml2D}czlXS;%%mx MVKk;va)J2W0qbHr@c;k- delta 415 zcmYk1NlF7j6o$V_ciXY8m^Nx0;+$wS4(&Wd4adup* zC{#|fMP9Q_UXgwH&OSdzK2`n8ysY1uMX%GZR!^_XrQNb$DxaM*Ci8Wm&?wgp0%h!o z>^QFUuKJyox=F~rO*qgk3z8wjp+`_qPN-A#3APlmTUW^a3Yx15PeRQEQGX43oW#KNN}O0rM@5}C_<_#aY`T}RW6*I-D%?1Yp=Xcq5ld_ zNF4Y9{3yiirVSJ!(X6!N`Fb<+?D_HY+jjuZ@SuSO+>LNA!hM1ID{XanEwHe;H4vyC zxP$~+9c}6DBps4JR71m_m5z&*87Qv{``lR#W1S1^c4C)G`lQm#kW46bGIln2XAF7S zcku~@gPCKGyX0gOf!=1v`H{>sukGl_tCT)EeAew@C;Kx_S zw7V3>F6pUaf&?Tr=H$Yh6%5JIk^C{}di8n-sj&40OSxtFnw~@deaQ zm6`C6O__Ojqzye)#t6KazjU8(^3ZX~B^g|%dZKmaLY#D zO?*smcz%J^zu$THSe+_??SFR2`JTyzvy9{)o6$rSHG!RZ)=8jUG?GT~!n_+EQylOR z72fgUtAMu+HI{X@B%gxM+LNykU&?UAvR*nHxW;;OntRi5#HaD@G?~`Bv+Rx& z@~;3PDuKig;71|O*jw9477`>r?9R^Yz4zR6U-Rc*zx@H=4mN72;=?NDacdsU8YDid z;C2-sea$4X)+opRmOHvc>JxNuh4{iEPMmo#X9*<;ZqC|H1 z+In%co9ng&UfUVO&P2LvGSlnp%{aDBIb-8Y;9jBOo>p-tpQymu^hm0)g4`T9duUP} z((K&2iH+M3m}xY-0<({7NKY@eO{~8jL_MAEDxwK2wQZpKU6mTY&ktwaz9IbWc3>l^ ze^4Z4_WL@O-{@Y)2G6v6G(IElg-plch$pS@Gzu9^LX%6jnuT)v&Lwh3 zX9=UBKWCWS5g{rgb(+6fsCC-9z~Yv6`!?KGK0QvSWLNE&y;!+HN<-oQ?&o^@sX9=y zubBU?HDPOmp05@9d#HP|XX0==mD@IRTPjIdKGZ88sQ!R%mZgub!1D2$8M8W8Jm&}7 z(ccer<{sM6hj$^>fi?#^PmRFJxr4((+bpCwNy)y7Lti~pWt#&{=+=ic$M|QpSAofG zb=0@Y_rYQ>ZE zFG3wM{*sfX!?`=)U?@HQO5jFea8JlGdyV2^Iw{!f;$2=TRbDZI5A(pa&aXMHFL9ma z$`tXv$erZs<;pA1A%5aV2`}^Qg+YNOzUw0ayn)B7G@|9Tw3`BrKOqG zUorbT%HRHsx#y_-$R8tPwV}`z`f_z>@bXA0H%N6{;U8X5)F=yXfY*o0Zwwt@;IB9N zT>B0p!&`Wp|0>?=claU5cA1>KJ8OKrJEwSDn}QW%SdVl9*2l@iT_3}}H-Wq1P2+vs p%;D~G=iy4L6RM-QEl=T<#(1TF#%ql6n#b`