diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4892ae4f..c49a877e 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -21,7 +21,8 @@ *(MAXKEY-220120) 修复钉钉同步器bug *(MAXKEY-220121) 修复LDAP同步器bug *(MAXKEY-220122) 修复企业微信同步器bug - *(MAXKEY-220123) 依赖jar引用、更新和升级 + *(MAXKEY-220123) 增加在线集成指南 + *(MAXKEY-220124) 依赖jar引用、更新和升级 log4j 2.17.1 spring 5.3.15 springBoot 2.6.1 diff --git a/images/maxkey_login.png b/images/maxkey_login.png index 9fd83d6a..bd163544 100644 Binary files a/images/maxkey_login.png and b/images/maxkey_login.png differ diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Register.java b/maxkey-core/src/main/java/org/maxkey/entity/Register.java index 3ba72de9..cc1751ba 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Register.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Register.java @@ -17,22 +17,39 @@ package org.maxkey.entity; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +@Entity +@Table(name = "MXK_REGISTER") public class Register extends JpaBaseEntity{ /** * */ private static final long serialVersionUID = -4021412077583763378L; + @Id + @Column + @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") private String id; + @Column private String displayName; + @Column private String workEmail; + @Column private String workPhone; + @Column private Integer employees; //机构 private String instId; + @Column private String instName; /** diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl index 7dfcd1a1..350485a3 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl @@ -27,7 +27,9 @@
-
+
+ +