shjung 3 gadi atpakaļ
vecāks
revīzija
4fb0819294

+ 0 - 1
src/main/java/com/its/op/controller/its/database/TbMsWebMemberController.java

@@ -38,7 +38,6 @@ public class TbMsWebMemberController {
         return this.service.accountLockFree(id);
     }
 
-
 //    @ApiOperation(value = " 정보변경(TB_MS_WEB_MEMBER)", response = TbMsWebMemberDto.class)
 //    @PutMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
 //    public TbMsWebMemberDto updateById(@PathVariable final String id, @RequestBody @Valid final TbMsWebMemberDto.TbMsWebMemberUpdReq req) {

+ 5 - 4
src/main/java/com/its/op/dto/its/oper/TbMsWebMemberDto.java

@@ -3,6 +3,7 @@ package com.its.op.dto.its.oper;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.its.op.entity.its.oper.TbMsWebMember;
 import com.its.utils.AES256Util;
+import com.its.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -50,7 +51,7 @@ public class TbMsWebMemberDto implements Serializable {
     @JsonProperty("answer")
     private String answer;
 
-    @ApiModelProperty("등록시각")  // Y DATE(0)
+    @ApiModelProperty("등록시각")  // Y VARCHAR(14)
     @JsonProperty("regdate")
     private String regdate;
 
@@ -82,8 +83,8 @@ public class TbMsWebMemberDto implements Serializable {
     @NoArgsConstructor(access = AccessLevel.PROTECTED)
     public static class TbMsWebMemberUpdReq {
 
-        @ApiModelProperty("메일주소, Nullable = N, VARCHAR(50)")  // N VARCHAR(50)
-        @JsonProperty("아이디")
+        @ApiModelProperty("아이디, Nullable = N, VARCHAR(50)")  // N VARCHAR(50)
+        @JsonProperty("email")
         @Size(min=1, max=50)
         private String email;
 
@@ -152,7 +153,7 @@ public class TbMsWebMemberDto implements Serializable {
             this.userauth = userauth;
             this.question = question;
             this.answer = answer;
-            this.regdate = regdate;
+            this.regdate = ItsUtils.getSysTime();
             this.loginFailCount = login_fail_count;
             this.isAccountLock = is_account_lock;
             this.ipAddress = ip_address;

+ 2 - 2
src/main/java/com/its/op/entity/its/oper/TbMsWebMember.java

@@ -55,8 +55,8 @@ public class TbMsWebMember implements Serializable {
     @Column(name = "ANSWER", length = 100)
     private String answer;
 
-    @ApiModelProperty("등록시각")  // Y DATE(0)
-    @Column(name = "REGDATE", length = 0)
+    @ApiModelProperty("등록시각")  // Y VARCHAR(14)
+    @Column(name = "REGDATE", length = 14)
     private String regdate;
 
     @ApiModelProperty("로그인 실패 횟수")  // Y NUMBER(3)

+ 2 - 17
src/main/java/com/its/op/xnettcp/client/NettyTcpClientVds.java

@@ -36,23 +36,7 @@ public class NettyTcpClientVds implements Callable<Object> {
         if (this.clientBootstrap == null) {
             this.clientBootstrap = this.bootstrapFactory.createBootstrap();
         }
-//            if (this.connectListener == null) {
-//                this.connectListener = new NettyTcpClientConnectListener(this);
-//            }
-//            if (this.closeListener == null) {
-//                this.closeListener = new NettyTcpClientCloseListener(this);
-//            }
-//            this.channel = this.channelFuture
-//                    .addListener(this.connectListener)
-//                    .channel()
-//                    .closeFuture()
-//                    .addListener(this.closeListener)
-//                    .channel();
-        connect();
-        return null;
-    }
 
-    public void connect() {
         log.info("VDS Server try connect: {}, {}", this.ipAddress, this.port);
         if (this.channelFuture != null && this.channelFuture.channel() != null) {
             this.channelFuture.channel().close();
@@ -60,7 +44,7 @@ public class NettyTcpClientVds implements Callable<Object> {
         }
         this.channelFuture = this.clientBootstrap.connect(new InetSocketAddress(this.ipAddress, this.port));
         this.channelFuture.addListener(new ChannelFutureListener() {
-            // 연결에 대한 리스 추가
+            // 연결에 대한 리스 추가
             @Override
             public void operationComplete(ChannelFuture future) {
                 if (future.isSuccess()) {
@@ -79,6 +63,7 @@ public class NettyTcpClientVds implements Callable<Object> {
                 channelClosed(future.channel());
             }
         });
+        return null;
     }
 
     public Channel getChannel() {