Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

drew 5 лет назад
Родитель
Сommit
71b1f98392
2 измененных файлов с 3 добавлено и 1 удалено
  1. 2 0
      db.sql
  2. 1 1
      src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java

+ 2 - 0
db.sql

@@ -14,3 +14,5 @@ INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_ADMIN
 INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_USER');
 INSERT INTO `user_authority`(`user_id`, `authority_name`) VALUES (1, 'ROLE_USER');
 
 
 INSERT INTO `user`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `avatar`, `city`, `country`, `email`, `enabled`, `language`, `nickname`, `open_id`, `password`, `phone`, `province`, `sex`, `username`) VALUES (1, '2020-03-07 18:34:36', 'system', '2020-03-07 18:34:36', 'system', 'https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg', NULL, NULL, NULL, b'1', NULL, '管理员', NULL, '$2a$10$F1djCtmdF3T0qsviWw50/utajZSe4EJMMUD.Ey5BhEIpoDhanBMuC', NULL, NULL, NULL, 'root');
 INSERT INTO `user`(`id`, `created_at`, `created_by`, `modified_at`, `modified_by`, `avatar`, `city`, `country`, `email`, `enabled`, `language`, `nickname`, `open_id`, `password`, `phone`, `province`, `sex`, `username`) VALUES (1, '2020-03-07 18:34:36', 'system', '2020-03-07 18:34:36', 'system', 'https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg', NULL, NULL, NULL, b'1', NULL, '管理员', NULL, '$2a$10$F1djCtmdF3T0qsviWw50/utajZSe4EJMMUD.Ey5BhEIpoDhanBMuC', NULL, NULL, NULL, 'root');
+
+update hibernate_sequence set next_val = 1000

+ 1 - 1
src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Audited
 @Audited
 @EntityListeners(AuditingEntityListener.class)
 @EntityListeners(AuditingEntityListener.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
 public abstract class BaseEntity {
 public abstract class BaseEntity {
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @GeneratedValue(strategy = GenerationType.AUTO)