Browse Source

v 3.3.0 ReleaseNotes

MaxKey 3 years ago
parent
commit
39a6eaa61d

+ 2 - 1
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

BIN
images/maxkey_login.png


+ 17 - 0
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;
 	
 	/**

+ 3 - 1
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl

@@ -27,7 +27,9 @@
 </div>
 <div class="container">	
 	<div class="row">
-		<div class="col-sm-6"></div>
+		<div class="d-none d-sm-block   col-sm-6 col-md-6">
+
+        </div>
         <div class="col-md-4 col-md-offset-4 col-lg-offset-4col-xl-offset-4">
             <div class="panel panel-default">
 				<table border="0">