shjung 3 năm trước cách đây
mục cha
commit
42d55715ab

+ 3 - 4
src/main/java/com/its/op/controller/its/LoginController.java

@@ -3,6 +3,7 @@ package com.its.op.controller.its;
 import com.its.op.config.AppUtils;
 import com.its.op.config.JasyptConfig;
 import com.its.op.dto.its.LoginDto;
+import com.its.op.dto.its.common.UserInfoDto;
 import com.its.op.dto.its.oper.UserMenuDto;
 import com.its.op.security.WebMvcConfig;
 import com.its.op.service.its.LoginService;
@@ -91,7 +92,7 @@ public class LoginController {
 //    }
 
     @PostMapping({"/userinfo.do"})
-    public String getUserInfo(HttpServletRequest request, HttpServletResponse response) {
+    public UserInfoDto getUserInfo(HttpServletRequest request, HttpServletResponse response) {
         Cookie[] cookies = request.getCookies();
         for (int ii = 0; ii < cookies.length; ii++) {
             log.error("getUserInfo: {}, {}", cookies[ii].getName(), cookies[ii].getValue());
@@ -102,8 +103,6 @@ public class LoginController {
             try {
                 encUserId = CookieUtils.getCookie(request, WebMvcConfig.USER_UUID);
                 loginHms = CookieUtils.getCookie(request, WebMvcConfig.USER_TIME);
-                expiredCookie(response, WebMvcConfig.USER_UUID);
-                expiredCookie(response, WebMvcConfig.USER_TIME);
             } catch (Exception e) {
                 log.error("{}", e.getMessage());
             }
@@ -117,7 +116,7 @@ public class LoginController {
             log.info("logout: {}", req.toString());
             encUserId = userId;
         }
-        return encUserId;
+        return UserInfoDto.builder().userId(encUserId).build();
     }
 
     /**

+ 24 - 0
src/main/java/com/its/op/dto/its/common/UserInfoDto.java

@@ -0,0 +1,24 @@
+package com.its.op.dto.its.common;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * String New ID DTO Class
+ */
+@Data
+@Builder
+@ApiModel("UserInfoDto(사용자 ID 정보)")
+public class UserInfoDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("userId")
+    @JsonProperty("user-id")
+    private String userId;
+
+}

+ 2 - 1
src/main/java/com/its/op/dto/its/vms/TbVmsFormDto.java

@@ -126,7 +126,8 @@ public class TbVmsFormDto implements Serializable {
 
         @ApiModelProperty("VMS FORM 설명, Nullable = Y, VARCHAR(200)")  // Y VARCHAR(200)
         @JsonProperty("vms_form_expl")
-        @Size(min=1, max=200)
+        //@Size(min=1, max=200)
+        @Size(max=200)
         private String vmsFormExpl;
 
         @ApiModelProperty("VMS 메시지 표출 방향 코드, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)