From 31639a6e98da2abbb33b87e409e007045a15f865 Mon Sep 17 00:00:00 2001 From: kaon Date: Wed, 14 May 2025 14:17:03 +0900 Subject: [PATCH] =?UTF-8?q?CONTROLLER=E8=AE=8A=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/jp/app/common/ApiResponse.java | 1 - .../app/config/security/SecurityConfig.java | 6 ++---- .../filter/JwtAuthenticationFilter.java | 13 +++++++------ .../jp/app/controller/DownloadController.java | 12 +++++++----- .../co/jp/app/controller/PetController.java | 13 ++++++++----- .../jp/app/controller/UploadController.java | 7 ++++--- .../app/exception/GlobalExceptionHandler.java | 8 +++----- .../maven/co.jp.app/dog-2/pom.properties | 4 ++-- .../co/jp/app/common/ApiResponse.class | Bin 2788 -> 3334 bytes .../app/config/security/SecurityConfig.class | Bin 5328 -> 5328 bytes .../filter/JwtAuthenticationFilter.class | Bin 3615 -> 3615 bytes .../app/controller/DownloadController.class | Bin 1215 -> 1465 bytes .../co/jp/app/controller/PetController.class | Bin 1195 -> 1450 bytes .../co/jp/app/controller/UserController.class | Bin 5069 -> 5068 bytes 14 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/main/java/co/jp/app/common/ApiResponse.java b/src/main/java/co/jp/app/common/ApiResponse.java index 3bea82a..e31a684 100644 --- a/src/main/java/co/jp/app/common/ApiResponse.java +++ b/src/main/java/co/jp/app/common/ApiResponse.java @@ -1,6 +1,5 @@ package co.jp.app.common; -import co.jp.app.common.ResultCode; public class ApiResponse { private boolean success; diff --git a/src/main/java/co/jp/app/config/security/SecurityConfig.java b/src/main/java/co/jp/app/config/security/SecurityConfig.java index a912e8c..17bb6a1 100644 --- a/src/main/java/co/jp/app/config/security/SecurityConfig.java +++ b/src/main/java/co/jp/app/config/security/SecurityConfig.java @@ -1,7 +1,5 @@ package co.jp.app.config.security; -import co.jp.app.config.security.filter.JwtAuthenticationFilter; -import co.jp.app.service.UserService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; @@ -11,12 +9,12 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import co.jp.app.config.security.filter.JwtAuthenticationFilter; @Configuration public class SecurityConfig { diff --git a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java index 7102e75..c29dded 100644 --- a/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/co/jp/app/config/security/filter/JwtAuthenticationFilter.java @@ -1,12 +1,7 @@ package co.jp.app.config.security.filter; -import co.jp.app.service.JwtService; import java.io.IOException; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.context.annotation.Lazy; + import org.springframework.lang.NonNull; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -16,6 +11,12 @@ import org.springframework.security.web.authentication.WebAuthenticationDetailsS import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import co.jp.app.service.JwtService; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Component public class JwtAuthenticationFilter extends OncePerRequestFilter { diff --git a/src/main/java/co/jp/app/controller/DownloadController.java b/src/main/java/co/jp/app/controller/DownloadController.java index 6f1bdbf..a831ea5 100644 --- a/src/main/java/co/jp/app/controller/DownloadController.java +++ b/src/main/java/co/jp/app/controller/DownloadController.java @@ -3,21 +3,23 @@ package co.jp.app.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import co.jp.app.entity.PetEntity; import co.jp.app.service.PetService; -@Controller +@RestController public class DownloadController { @Autowired private PetService service; @GetMapping("/api/dogs/download") - public String downloadById(@RequestParam List id) { - service.getPetByID(id); - return "download"; + public ResponseEntity downloadById(@RequestParam List id) { + List list = service.getPetByID(id); + return ResponseEntity.ok(list); } } diff --git a/src/main/java/co/jp/app/controller/PetController.java b/src/main/java/co/jp/app/controller/PetController.java index 8be5908..486c625 100644 --- a/src/main/java/co/jp/app/controller/PetController.java +++ b/src/main/java/co/jp/app/controller/PetController.java @@ -3,13 +3,15 @@ package co.jp.app.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import co.jp.app.entity.PetEntity; import co.jp.app.service.PetService; -@Controller +@RestController public class PetController { @@ -17,8 +19,9 @@ public class PetController { private PetService service; @GetMapping("/api/dogs/pet") - public String getListByEntities(@RequestParam List id) { - service.getPetByID(id); - return "pet"; + public ResponseEntity getListByEntities(@RequestParam List id) { + + List list = service.getPetByID(id); + return ResponseEntity.ok(list); } } diff --git a/src/main/java/co/jp/app/controller/UploadController.java b/src/main/java/co/jp/app/controller/UploadController.java index 85c45e9..fda2f8e 100644 --- a/src/main/java/co/jp/app/controller/UploadController.java +++ b/src/main/java/co/jp/app/controller/UploadController.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; @@ -19,12 +20,12 @@ public class UploadController { private UploadService service; @PostMapping("/api/dogs/upload") - public String upload() { + public ResponseEntity upload() { List list = new ArrayList(); - service.saveAllPets(list); + List pets = service.saveAllPets(list); - return "upload"; + return ResponseEntity.ok(pets); } diff --git a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java index 0482aaf..4b34f1f 100644 --- a/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java +++ b/src/main/java/co/jp/app/exception/GlobalExceptionHandler.java @@ -1,14 +1,11 @@ package co.jp.app.exception; -import co.jp.app.common.ApiResponse; -import co.jp.app.common.ResultCode; -import co.jp.app.exception.BusinessException; +import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.userdetails.UsernameNotFoundException; @@ -18,7 +15,8 @@ import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import java.util.stream.Collectors; +import co.jp.app.common.ApiResponse; +import co.jp.app.common.ResultCode; @RestControllerAdvice public class GlobalExceptionHandler { diff --git a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties index f3135a6..8d2b1c9 100644 --- a/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties +++ b/target/classes/META-INF/maven/co.jp.app/dog-2/pom.properties @@ -1,6 +1,6 @@ #Generated by Maven Integration for Eclipse -#Mon May 12 15:57:02 JST 2025 -m2e.projectLocation=C\:\\Users\\Administrator\\git\\Dog-1 +#Wed May 14 11:48:45 JST 2025 +m2e.projectLocation=C\:\\Users\\ichbi\\OneDrive\\\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\\dog-1 m2e.projectName=dog-1 groupId=co.jp.app artifactId=dog-2 diff --git a/target/classes/co/jp/app/common/ApiResponse.class b/target/classes/co/jp/app/common/ApiResponse.class index 064e11b57a1f8d50ee01ff25816f78d542935b7f..9958624623938e32d8cde59247fde9180d61824f 100644 GIT binary patch literal 3334 zcmbVOTT|Os5dMxa2waB{nvfD`>Ocs#LvSulFWeg9Bn>TuG$!QMn-IbXY{?_ZnPxiu zAARgo`_hNDQ<_XN)4q46f2rxWlCVWgJWOHabF}B|e!Ji9*`vSzef}qaS!`=aC=44; zVXIcqYqf&mRI83%n6FuPOt0qHo~a?J(6^;O)(aKgE*F;9woJoU(7d`~n4YJg9x5aa zXWis0-U&7l}L_LyD~BRux9uD-l6aSUpBOJS%DZW<>r z#E{Eo;6|Xj&;y0H)6mc@M&3yygHsAA?pfMp=4dt-^El#0^hVR@L8^y(V`-ehIBl2i z7K_(QCE9GufN1B^=tP&y&ZhAO(h7$cE!(_RudbQyioR9}lHwS8WmR`Ad5?rif74$i1RubRH; z(jO+hSwXvbZEKu%=Vn%>TGi&VlI^y-p<^ks_kk2bpF)OdYRUdyMy6kb)?Tp*H6tmz z%p%;-t%|~I`-*LEmBHVCjXSMj#12n;tD&zN<`qVo*;uGl%(7mYcgyvvY5Ui|G0d88 zId(US3JXQuwjDoH_smRGzL_RoX2Wqa5^jchX2vHocezi`cs0|oHY_7!x-NG}N106F z3a(2wZYUg!S3`7W$cA$IhB355MwmbZI$fP-`GA%PTe)k8N-e9Efs^j>c@9MR%ZFnhsiLW($rEt0#nq@zBw#`E5Wf;#5-S8dvi3Cc-@8jG= zyF-IFb$h*HdZ!m1XS-gDUofpP?@?S~Biv{Eqt+wBO2G zIV1(A*eg3&Hc2Gp;^8bI*IqF48Vg2VL)>*JnD zvk`2V_Yii3u%m<>3t+=6?!wYgz@3V5Cz4(gBYADO6w4TIFnq#wsm*zgl7Y_r@5uff zC`iGDDays-?2L*_3MovHNTiUId?oH@IOH?TXM|7w8J3^pF3^M+;8tLoH88_QGD{}s*e<4Gkb^Be ki$r)%;sJjXco?04NBErY-GpA_W5DE_eBNzf6I&Sk4^p1wf&c&j literal 2788 zcma)8T~8ZF6upCu7dxBaf*~a&sUZ&72I7V`9|UllI3Y=ELK<6CrRu|ACT79jwY+Pj zsOo!vLVrXbTB)d2D)k5CM^!zuv$n_BxIC<9=FXjS&pmVRz=wa||3gHZR5ECU(e;Xx zJ8I;3qmipP^}1u{9yhEv!fiOVD+~%ViXZV4o~v=Yn%mhw5*3e;;kGIj;ku029#(Zs zc~vl)D0Y2IUemIx>x{w&+~d7_3I}`9l2x_2*J|Q$s9c6+HLYO;ewpGhk~oy#C_m~y zmQMq5_}LA3`o3tE z`F_pU!>RDvE^k_L9T=yJJ;ry9_C|bLc!$oxYu@B_;fW^X4Zr19?Tjb^hvA7Kr|ok@ z(a2v2s;yBdo!O01h;B%UX2H!nv_SFZ|6R_lp$={InL#?s``eA;T5g#%N)b7`ZIVG_ za<*tvlwznM%PqCb5gbvFF;{pUQ#ies!R5rN!rN}wX(FBJS3#ZY_)O`A*cJ*v27sRW z72S){sp-*l#;;@pERgVuVwPHmaAP8$e+!fP$D^On(q zPOy#IpVkDLJ#W$%^d+OKb$%=gj$Ps2x0ZK^nd@=e!!522lD{8puxur#)vSmuOO||G zdp_>S*8nXvxDYk;j&|`Uj^nvrlQ&c^xG~zI7Y03NlMYgz{ln>`7`-zeH(zZpjP~)yET!VJd27PJ_%Fm#0 z(4fOz@zyCZXbw#kLbZfwM0OiyBeK{05uJwJOa9!%7=_1Wcq+>k8pqCa*cir3e-ryI z%(8z{{5LE^l)!Jq--^)`=B9F!?TgiPkHy65D!x%PHijsDOf#K0*Zes5^f;j`3*wAu zamIV%s3ZbZ1E~0GM6>vnte;_&tVhB3`tO)1zA+?Ea0}CWbR=RJdCPRKAmK^6=10w{^FdS~!B;7n z@UKR4O!zv6d`{Co>qNjw?U`UDbH5z&1IhfQvgk|7;8$w!7^BkQ51RiK2K~-%TrmGE zEg`yudyP>ti}*QrGgX?-fyTU#sn|w3*+qivy6VckB#?r;lR`0Crj-G_Q)g@K_62$0 zp|RHI zsBKTlk9}yvIM9 z)Xhxx6VU_wK7?XxK)kPIITchw_x`0Ni4$RzsCJ@75 H4bA)q-lQ3& diff --git a/target/classes/co/jp/app/config/security/SecurityConfig.class b/target/classes/co/jp/app/config/security/SecurityConfig.class index d5567d79a3384ed2d3878a563eb9067253cae66c..6c5a43c36a2648ae58bf75fd9afbd0d083f52021 100644 GIT binary patch delta 75 zcmcbhc|mi7l@O;S0}F#R11E#bWM`o~Muo|ngkpJB88{f!7z7y986+4qCd&xNFzQaO e6t3ZP0;+Rn5Mpqj{7*QX)tP~j!DVukNErY^f)6bK delta 75 zcmcbhc|mi7l@O;i0}F#J11E#rWM`o~My1J{gkpKs88{d;7z7wJ86+6ACd&xNFzQdP e6t3ZP0jhIl5MuD0{7*QX)s=yf!EJJsNErY|b`MDa diff --git a/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class b/target/classes/co/jp/app/config/security/filter/JwtAuthenticationFilter.class index 4d41360f1c573df2772e96eb42c2f4ce2697b60a..1227cc1212f16fa840be4134cc4795a2d692cee9 100644 GIT binary patch delta 88 zcmbO)Ghb$d0uQe=0}F!;11Ezl10RFjW?ddJMoSe2E(Q$-Nd`>@MFuSfB?esvZ3aCC qGX?_&HwHt7UPVgEhl62Ajz>yo&(`DGd(* delta 88 zcmbO)Ghb$d0uQeg0}F#R11EzF10RFzW?ddJMoVP|E(Uc5Nd^rDMFvd+4c-V)xV*P zHl(+tZ9II?G<71F!$Ju2oM}kwDALFf6sJKb|E6#1wkZxy>PGE<`ISlQl#m##fDmYM z6@FCR$`=O2Ql;jIx+`?o6-KWIacIbXBmSvH`A2`nT#a#r-dJr_+Q2l^+n( z9x;)7!qk5L8L2yFRK$2jSO>-tMiOyGGyQ8MFvc7Ekc9>=96{t5DabRM?74ol#XqgU XoM0_TOoNvto^b`s2r(GpyA|LY3z$9H!?du zck*KvkBTq`CLm;B;L+N`Ag#TPK{i}Sc>|Eo%)kdExxjM544e!i4E#X87(^|D0D~Zq s2h_!&%Am#o^fZ{w2o=!)if97atc*Zu2A~!#FsaSJ4y4(Dk~$0w0FTl@p8x;= diff --git a/target/classes/co/jp/app/controller/PetController.class b/target/classes/co/jp/app/controller/PetController.class index 3e8803fff82f716700291a50559db36681aa781c..d16f15b815380bbdf9410c1a49dfe6e0cc6c5c9b 100644 GIT binary patch delta 521 zcmb7=%Syvg6h-&Fv6e<@>!kPu!AEOadwtCMa3X@x`oQ7`#2RDTn1tk3an!NH68s6B zD2j*!!KuIEFNk<-#X(1Pa@c3@v*ECAV>ct}``61WfHKza)e5T=Gu4KEu8WqmY*DoW zSzM~Rz9|CFw;c1t*UyX#*KdkbDLrvu1fJ^z#+D;3d0AwL)hyG|Wy?1hYT*^jXajaj z+Q!2hn`CVj^H_{xfgwF$brfl27`WSHDF1$M>y9b*jv7Y&fB*Ao>zE$>@3Cbdj TY|yeoGr_TnD2ZXZTLZoUC=-br delta 296 zcmZ3*y_%Ej)W2Q(7#J9A8FV*tc{7@*X!v9$mL=+!mSpDW`(zfESZhKAauV~>^@B@_ zGV{`{85uZ(Gt=`DOG=AU85t}mFJROV0qa6lWHLFBMRT$|(_2Lj1{FpI=7Q7`Mh2$L z6h;OCbW0{LXLg<}&0@-^4b&sbU0jk{l$u{sS&*tfxsD~2k#F)97LSTB1|}e6VBpc( z!XT}^jX^eCNO=R0&&T^trOv1jc!HxkQEq91fq#VV91)Bw59@PEIBigYO{u823?qniqJJU zJG|_o*PxGnh3jB6KB0)zU9%!IX8-CAI5qBD*r279>!4KFzv~tDF}=Y4F|W2|lsh!y ziqf@nhf`J{WR1k9+EbR7QN|4>xKrU9iKV)u$>d>cde}>hDFYvt-JsWd9wMnRZ6DA( zoGE7PIsJ%!m`5}oRy50T)ppo>v-1d#+6iw&KT2BTF~#jyGi7drV?1tqd|~}KPiZ`< zXp~%|;7{|6ecD&&I`JRv%OAFpvn<8{TlHLmas-r!C9CnK1C+u$AURyeG2od(`Bc%NGo zMqjw4uXlIE?A#k{&-(dcHeqHdXAM5iQc60*y+JeF5*q9Yn*Bj@Fld?)VMO@U;Ipi? z#o0t>TX0aC^|y3}T3SOvjn5Tr*7QgqnV61G*?;QS=bYJEP`04w&pQgMa8Zp;4f$-K zm|FYFbw~9xIORiBG7D?c^MqA~o@Ig#&Z7h`=O*?DqfFu==>VIh#}+{wsGyM>1lg3s z8}W0a?4%b1?3HR=PT9wP9KtN-ejbo$Q1TwseoeX_kXT2R%2F$%oO*C8DMpH;JSfCU zi5(2FUeFUfA2&C2&YLvPqE37=l9$GZIO78w>&EqM-z>0V_gauqs)$>@H;# zmU0548(t7KECm#HrE&VDUz+?MnmJvDzo6fmo^zU^pPJeCd7tMw-{#mwr&dI;`NMh3e3!g_@(M>Q|DyCTZ*hN6Bvy-2rv^3pn~ zaM7g~d$MyoIj+&o4uvn=895Ld96ZxM(Bb76JsLiQw?Oy%^R+`h`Z(#LUr}Y!w5cqo z##;>Nzj@AjBAj+{N>Ql~2XgdZz3cTWUbp=WL;9SzKJ6^;x_D>Yx5Ivp_w*`XooAT1 ziMf8ge$>_{@7QjJ{b4q>DgK^?L$6tF{+nqo9rJmrnhMwJ3momSeHB%>FzD5 z4hT56P?odf>#u_{vHp-e5LU< zr3$UNuBy4Iy1rrGkv+TJOe?C5#8uOd#GDboW+X<9#2q7^vW%EEVt0+iC9_OOBA8Jl zHnuvcuf`^f*mWZ|Ys5w@}E!>!H7SwW-ppCe#=PQHj`md zXI8OmJbl-qEwEtA$i=~CJme7|pLOENPfwilOk%?>Ur@1LlaU+EtV?nr#U2~?P}0rj zX`1BuddV|o9<~ZYiFCKIky18DXN%P@CdgA#2@{7nEYlu2<5gOOeJrx1B=?}6lr2wIwydaA$uKh9M!Nu?k=(}XJS%%Zx|?L>97PQhlBL(wJBik?TL$*hOf_BXBTS8@aRYAiR%;p$ag$pjMvxb| z&9`!B5rxcgN4zQ%*}mg@IjE8>?uwI6;WHhW7hHJFiv?lSgyUb-qM%w$do*l+(d6RB n!T&KyJh~}3JNG5pcwo7cDcO?L%WDoLNlERMdM_{VFwOH1i;5sk