Merge branch 'susu' into dev
This commit is contained in:
@@ -32,10 +32,8 @@ public class InitAdminData implements ApplicationRunner {
|
||||
null,
|
||||
"test-admin",
|
||||
"admin1@#$",
|
||||
"admin@framework.org",
|
||||
null,
|
||||
false,
|
||||
false,
|
||||
List.of("ROLE_ADMIN"));
|
||||
|
||||
// 지방실사
|
||||
@@ -43,10 +41,8 @@ public class InitAdminData implements ApplicationRunner {
|
||||
null,
|
||||
"test-local-inspection",
|
||||
"local1@#$",
|
||||
"local@framework.org",
|
||||
"code.region.main.1",
|
||||
false,
|
||||
false,
|
||||
List.of("ROLE_LOCAL_INSPECTION"));
|
||||
|
||||
// 조사원
|
||||
@@ -54,10 +50,8 @@ public class InitAdminData implements ApplicationRunner {
|
||||
null,
|
||||
"test-researcher",
|
||||
"researcher1@#$",
|
||||
"researcher@framework.org",
|
||||
"code.region.main.1",
|
||||
false,
|
||||
false,
|
||||
List.of("ROLE_RESEARCHER"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,9 +8,7 @@ public interface SaveAdminPortIn {
|
||||
Long seq,
|
||||
String id,
|
||||
String password,
|
||||
String email,
|
||||
String regionMainCode,
|
||||
Boolean accountDisabled,
|
||||
Boolean accountLocked,
|
||||
List<String> roleIds);
|
||||
}
|
||||
|
||||
@@ -25,10 +25,8 @@ public class SaveAdminService implements SaveAdminPortIn {
|
||||
Long seq,
|
||||
String id,
|
||||
String password,
|
||||
String email,
|
||||
String regionMainCode,
|
||||
Boolean accountDisabled,
|
||||
Boolean accountLocked,
|
||||
List<String> roleIds) {
|
||||
|
||||
LocalDateTime passwordUpdatedAt;
|
||||
@@ -58,11 +56,9 @@ public class SaveAdminService implements SaveAdminPortIn {
|
||||
id,
|
||||
password,
|
||||
passwordUpdatedAt,
|
||||
email,
|
||||
regionMainCode,
|
||||
accountDisabled,
|
||||
loginFailCnt,
|
||||
accountLocked,
|
||||
roleIds
|
||||
));
|
||||
}
|
||||
|
||||
@@ -15,10 +15,10 @@ public class SaveAdminCmd extends AuditCommand {
|
||||
private String id;
|
||||
private String encodedPassword;
|
||||
private LocalDateTime passwordUpdatedAt;
|
||||
private String email;
|
||||
/* private String email;*/
|
||||
private String regionMainCode;
|
||||
private Boolean accountDisabled;
|
||||
private Integer loginFailCnt;
|
||||
private Boolean accountLocked;
|
||||
/* private Boolean accountLocked;*/
|
||||
private List<String> roleIds;
|
||||
}
|
||||
|
||||
@@ -12,22 +12,18 @@
|
||||
INSERT INTO admin (seq,
|
||||
id,
|
||||
password,
|
||||
email,
|
||||
region_main_code,
|
||||
password_updated_at,
|
||||
account_disabled,
|
||||
login_fail_cnt,
|
||||
account_locked,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>)
|
||||
VALUES (#{seq},
|
||||
#{id},
|
||||
#{encodedPassword},
|
||||
#{email},
|
||||
#{regionMainCode},
|
||||
#{passwordUpdatedAt},
|
||||
#{accountDisabled},
|
||||
#{loginFailCnt},
|
||||
#{accountLocked},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>)
|
||||
</insert>
|
||||
|
||||
@@ -36,12 +32,10 @@
|
||||
UPDATE admin
|
||||
SET
|
||||
password = #{encodedPassword},
|
||||
email = #{email},
|
||||
region_main_code = #{regionMainCode},
|
||||
password_updated_at = #{passwordUpdatedAt},
|
||||
account_disabled = #{accountDisabled},
|
||||
login_fail_cnt = #{loginFailCnt},
|
||||
account_locked = #{accountLocked},
|
||||
<include refid="common.fields.UpdateBaseSet"/>
|
||||
WHERE seq = #{seq}
|
||||
</update>
|
||||
|
||||
Reference in New Issue
Block a user