dev

src/main/java/com/its/op/entity/its/oper/TbWwwMember.java

@@ -77,15 +77,14 @@ public class TbWwwMember implements Serializable {
     @Column(name = "DEL_YN", columnDefinition = "CHAR", length = 1)
     private String delYn;
 
-    public String getPassword() {
-        return this.pwd;
-    }
-
     public void setPassword(String password) {
         if (!this.pwd.equals(password)) {
             this.pwd = SHA256Util.encrypt(password);
         }
     }
+    public void encryptPwd(String password) {
+        this.pwd = SHA256Util.encrypt(password);
+    }
     public void setAccountLockFree() {
         this.loginFailCount = 0;
         this.isAccountLock = "N";
@@ -112,19 +111,19 @@ public class TbWwwMember implements Serializable {
         this.email = email;
     }
 
-    public void updateInfo(TbWwwMemberDto.TbWwwMemberUpdReq req) {
-        this.name = req.getName();
-        this.pwd = req.getPwd();
-        setPassword(req.getPwd());
-        this.contactNum = req.getContactNum();
-        this.userAuth = req.getUserAuth();
-        this.hintQues = req.getHintQues();
-        this.hintAns = req.getHintAns();
-        this.loginFailCount = req.getLoginFailCount();
-        this.isAccountLock = req.getIsAccountLock();
-        this.ipAddress = req.getIpAddress();
-        this.regDt = req.getRegDt();
-        this.delYn = req.getDelYn();
-    }
+//    public void updateInfo(TbWwwMemberDto.TbWwwMemberUpdReq req) {
+//        this.name = req.getName();
+//        this.pwd = req.getPwd();
+//        setPassword(req.getPwd());
+//        this.contactNum = req.getContactNum();
+//        this.userAuth = req.getUserAuth();
+//        this.hintQues = req.getHintQues();
+//        this.hintAns = req.getHintAns();
+//        this.loginFailCount = req.getLoginFailCount();
+//        this.isAccountLock = req.getIsAccountLock();
+//        this.ipAddress = req.getIpAddress();
+//        this.regDt = req.getRegDt();
+//        this.delYn = req.getDelYn();
+//    }
 
 }

src/main/java/com/its/op/service/its/oper/TbWwwMemberService.java

@@ -61,13 +61,13 @@ public class TbWwwMemberService {
     }
 
     // 데이터 변경
-    @Transactional
-    public TbWwwMemberDto updateById(String email, TbWwwMemberDto.TbWwwMemberUpdReq req) {
-        TbWwwMember entity = requireOne(email);
-        entity.updateInfo(req);
-        this.repo.save(entity);
-        return entity.toDto();
-    }
+//    @Transactional
+//    public TbWwwMemberDto updateById(String email, TbWwwMemberDto.TbWwwMemberUpdReq req) {
+//        TbWwwMember entity = requireOne(email);
+//        entity.updateInfo(req);
+//        this.repo.save(entity);
+//        return entity.toDto();
+//    }
 
     // 데이터 변경 또는 생성-목록(데이터가 존재하면 업데이트 없으면 신규로 생성)
     @Transactional
@@ -83,12 +83,17 @@ public class TbWwwMemberService {
     @Transactional
     public TbWwwMemberDto mergeInfo(TbWwwMemberDto.TbWwwMemberUpdReq req) {
         TbWwwMember obj = req.toEntity();
+        String reqPwd = obj.getPwd();
+
         try {
             TbWwwMember entity = requireOne(req.getEmail());
-            obj.setPassword(entity.getPassword());
+            if (!reqPwd.equals(entity.getPwd())) {
+                obj.encryptPwd(reqPwd);
+            }
         }
         catch(NoSuchElementException e_notfound) {
-            obj.setPassword("");
+            // 데이터가 없는경우 비밀번호 무조건 암호화
+            obj.encryptPwd(reqPwd);
         }
 
         this.repo.save(obj);

src/test/java/com/its/op/ItsOpServerApplicationTests.java

@@ -18,7 +18,7 @@ public class ItsOpServerApplicationTests {
 
     @Test
     void encrypt() {
-        log.error("{}", SHA256Util.encrypt("admin12#$!"));
+        log.error("{}", SHA256Util.encrypt("1"));
         log.error("{}", SHA256Util.encrypt2("admin12#$!"));
     }
     void reference1() {