update

Author: hoangtien2k3

Dockerfile

@@ -0,0 +1,6 @@
+FROM maven:latest
+RUN mkdir /obo
+WORKDIR /obo
+COPY . .
+EXPOSE 8080
+CMD [ "mvn", "spring-boot:run" ]

src/main/java/com/hoangtien2k3/ticketbookingapi/TicketBookingApiApplication.java

@@ -20,7 +20,7 @@ public static void main(String[] args) {
 
 	@Override
 	public void run(String... args) throws Exception {
-		System.out.println(passwordEncoder.encode("123456"));
+		// System.out.println(passwordEncoder.encode("12042003"));
 	}
 
 }

src/main/java/com/hoangtien2k3/ticketbookingapi/config/JwtRequestFilter.java

@@ -33,51 +33,35 @@ protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServl
         final String requestTokenHeader = httpServletRequest.getHeader("Authorization");
 
         String username = null;
-
         String jwtToken = null;
 
-
         if (requestTokenHeader != null && requestTokenHeader.startsWith("Bearer ")) {
 
             jwtToken = requestTokenHeader.substring(7);
 
             try {
-
                 username = jwtTokenUtil.getUsernameFromToken(jwtToken);
-
             } catch (IllegalArgumentException e) {
-
                 System.out.println("Unable to get JWT Token");
-
             } catch (ExpiredJwtException e) {
-
                 System.out.println("JWT Token has expired");
-
             }
-
         } else {
-
             logger.warn("JWT Token does not begin with Bearer String");
-
         }
 
-
         if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
 
             UserDetails userDetails = this.jwtUserDetailsService.loadUserByUsername(username);
 
-
             if (jwtTokenUtil.validateToken(jwtToken, userDetails)) {
 
                 UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(
-
                         userDetails, null, userDetails.getAuthorities());
 
                 usernamePasswordAuthenticationToken
-
                         .setDetails(new WebAuthenticationDetailsSource().buildDetails(httpServletRequest));
 
-
                 SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken);
             }
         }

src/main/java/com/hoangtien2k3/ticketbookingapi/config/WebSecurityConfig.java

@@ -75,9 +75,7 @@ protected void configure(HttpSecurity httpSecurity) throws Exception {
                         "/configuration/security",
                         "/swagger-ui.html",
                         "/webjars/**"
-                ).permitAll().
-
-                anyRequest().authenticated()
+                ).permitAll().anyRequest().authenticated()
                 .and()
                 .exceptionHandling().authenticationEntryPoint(jwtAuthenticationEntryPoint)
                 .and()

src/main/java/com/hoangtien2k3/ticketbookingapi/controller/UserController.java

@@ -1,7 +1,7 @@
 package com.hoangtien2k3.ticketbookingapi.controller;
 
 import com.hoangtien2k3.ticketbookingapi.entity.User;
-import com.hoangtien2k3.ticketbookingapi.model.UserNameProfile;
+import com.hoangtien2k3.ticketbookingapi.dao.UserNameProfile;
 import com.hoangtien2k3.ticketbookingapi.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -14,37 +14,33 @@
 import java.text.ParseException;
 import java.util.HashMap;
 
-@Api(value = "API User")
 @RestController
-@RequestMapping("/users")
+@Api(value = "API User")
+@RequestMapping("/user")
 public class UserController {
     @Autowired
-    private UserService userService;
+    UserService userService;
 
-    @ApiOperation(value = "User Register") // annotation mô tả của swagger
+    @ApiOperation(value = "User Register")
     @PostMapping("/register")
-    public ResponseEntity<?> registerUser(@Valid @RequestBody User user) {
+    public ResponseEntity<?> registerUser(@Valid @RequestBody User user){
         return ResponseEntity.ok(userService.registerUser(user));
     }
 
-
-    @ApiOperation(value = "update later")
+    @ApiOperation(value = "Update later")
     @PostMapping("/update")
-    public ResponseEntity<?> loginUser(Authentication authentication, @Valid @RequestBody UserNameProfile user) throws ParseException {
+    public ResponseEntity<?> updateUser(Authentication authentication, @Valid @RequestBody UserNameProfile user) throws ParseException {
         return ResponseEntity.ok(userService.updateUser(authentication, user));
     }
 
-
     @ApiOperation(value = "Login - Get Token Login")
     @PostMapping("/login")
-    public ResponseEntity<?> loginUser(@Valid @RequestBody HashMap<String, String> request) {
+    public ResponseEntity<?> loginUser(@Valid @RequestBody HashMap<String, String> request){
         return ResponseEntity.ok(userService.loginUser(request.get("username"), request.get("password")));
     }
 
-
     @GetMapping("/info")
-    public ResponseEntity<?> getInfo(Authentication authentication) {
+    public ResponseEntity<?> getInfo(Authentication authentication){
         return ResponseEntity.ok(userService.getInfo(authentication));
     }
-
 }

src/main/java/com/hoangtien2k3/ticketbookingapi/model/ResponseCinema.java renamed to src/main/java/com/hoangtien2k3/ticketbookingapi/dao/ResponseCinema.java

@@ -1,4 +1,4 @@
-package com.hoangtien2k3.ticketbookingapi.model;
+package com.hoangtien2k3.ticketbookingapi.dao;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/hoangtien2k3/ticketbookingapi/model/ResponseData.java renamed to src/main/java/com/hoangtien2k3/ticketbookingapi/dao/ResponseData.java

@@ -1,4 +1,4 @@
-package com.hoangtien2k3.ticketbookingapi.model;
+package com.hoangtien2k3.ticketbookingapi.dao;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/hoangtien2k3/ticketbookingapi/model/ResponseFormat.java renamed to src/main/java/com/hoangtien2k3/ticketbookingapi/dao/ResponseFormat.java

@@ -1,4 +1,4 @@
-package com.hoangtien2k3.ticketbookingapi.model;
+package com.hoangtien2k3.ticketbookingapi.dao;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/hoangtien2k3/ticketbookingapi/model/ResponseFormatFilm.java renamed to src/main/java/com/hoangtien2k3/ticketbookingapi/dao/ResponseFormatFilm.java

@@ -1,4 +1,4 @@
-package com.hoangtien2k3.ticketbookingapi.model;
+package com.hoangtien2k3.ticketbookingapi.dao;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/hoangtien2k3/ticketbookingapi/model/ResponseScheduleCinema.java renamed to src/main/java/com/hoangtien2k3/ticketbookingapi/dao/ResponseScheduleCinema.java

@@ -1,4 +1,4 @@
-package com.hoangtien2k3.ticketbookingapi.model;
+package com.hoangtien2k3.ticketbookingapi.dao;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;