4.0.0 GA

ReleaseNotes.txt

@@ -1,4 +1,4 @@
-MaxKey v 4.0.0 RC1 2023/09/--
+MaxKey v 4.0.0 GA 2023/09/01
     *(MAXKEY-230801) JDK 17 支持
     *(MAXKEY-230802) SpringBoot 3.0+ 支持
     *(MAXKEY-230803) Spring 6.0+ 支持
@@ -12,7 +12,9 @@
     *(MAXKEY-230811) 新增身份管理一级菜单包含组织、用户、用户组、用户组成员
     *(MAXKEY-230812) 角色调整为用户组，后续为应用级权限控制
     *(MAXKEY-230813) Mybatis JPA Etra优化，类似JPA实体定义，开发更加简洁
-    *(MAXKEY-230814) 依赖项引用、更新和升级
+    *(MAXKEY-230814) 增加前端打包镜像的dockerfile暴露8527、8526端口 @iwc_2011911
+    *(MAXKEY-230815) jar 打包baseName -> archiveBaseName
+    *(MAXKEY-230816) 依赖项引用、更新和升级
         JDK                 17
         spring              6.0.11
         springBoot          3.1.2
@@ -24,6 +26,7 @@
         httpcomponentscore5 5.2.1
         tomcat              10.1.11
         mybatisjpaextra     3.2.1
+        jibGradlePlugin     3.3.2
 
 
 MaxKey v 3.5.19 GA 2023/08/15

docker/docker-mysql/docker-entrypoint-initdb.d/latest/current.version.txt

@@ -1 +1 @@
-v 3.5.17 GA
+v 4.0.0 GA

docker/docker-mysql/docker-entrypoint-initdb.d/latest/maxkey.sql

@@ -1,4 +1,4 @@
--- MySQL dump 10.13  Distrib 8.0.31, for Win64 (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.34, for Win64 (x86_64)
 --
 -- Host: 127.0.0.1    Database: maxkey
 -- ------------------------------------------------------
@@ -341,6 +341,85 @@ CREATE TABLE `mxk_file_upload` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `mxk_group_member`
+--
+
+DROP TABLE IF EXISTS `mxk_group_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `mxk_group_member` (
+  `ID` varchar(100) NOT NULL DEFAULT '' COMMENT 'ID',
+  `GROUPID` varchar(100) NOT NULL COMMENT 'GROUPID',
+  `MEMBERID` varchar(100) NOT NULL COMMENT 'MEMBERID USERID OR GROUP ID',
+  `TYPE` varchar(45) NOT NULL COMMENT 'TYPE  USER OR GROUP',
+  `CREATEDDATE` datetime DEFAULT CURRENT_TIMESTAMP,
+  `INSTID` varchar(45) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mxk_group_permissions`
+--
+
+DROP TABLE IF EXISTS `mxk_group_permissions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `mxk_group_permissions` (
+  `ID` varchar(45) NOT NULL COMMENT 'ID',
+  `GROUPID` varchar(45) NOT NULL COMMENT 'GROUPID',
+  `APPID` varchar(45) NOT NULL COMMENT 'APPID',
+  `CREATEDDATE` datetime DEFAULT CURRENT_TIMESTAMP,
+  `INSTID` varchar(45) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mxk_group_privileges`
+--
+
+DROP TABLE IF EXISTS `mxk_group_privileges`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `mxk_group_privileges` (
+  `id` varchar(50) NOT NULL,
+  `appid` varchar(50) DEFAULT NULL,
+  `groupid` varchar(50) DEFAULT NULL,
+  `resourceid` varchar(50) DEFAULT NULL,
+  `CREATEDBY` varchar(45) DEFAULT NULL,
+  `CREATEDDATE` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `status` int DEFAULT '1',
+  `INSTID` varchar(45) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mxk_groups`
+--
+
+DROP TABLE IF EXISTS `mxk_groups`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `mxk_groups` (
+  `ID` varchar(45) NOT NULL COMMENT 'ID',
+  `GROUPCODE` varchar(45) DEFAULT NULL,
+  `GROUPNAME` varchar(100) DEFAULT NULL COMMENT 'GROUP NAME',
+  `category` varchar(20) DEFAULT NULL COMMENT '动态用户组，dynamic动态组 static静态组app应用账号组',
+  `FILTERS` text COMMENT '过滤条件SQL',
+  `ORGIDSLIST` text COMMENT '机构列表',
+  `RESUMETIME` varchar(45) DEFAULT NULL COMMENT 'RESUMETIME',
+  `SUSPENDTIME` varchar(45) DEFAULT NULL COMMENT 'SUSPENDTIME',
+  `STATUS` tinyint unsigned DEFAULT NULL COMMENT 'STATUS',
+  `CREATEDBY` varchar(45) DEFAULT NULL COMMENT 'CREATEDBY',
+  `ISDEFAULT` tinyint unsigned DEFAULT NULL COMMENT 'ISDEFAULT',
+  `CREATEDDATE` datetime DEFAULT NULL COMMENT 'CREATEDDATE',
+  `MODIFIEDBY` varchar(45) DEFAULT NULL COMMENT 'MODIFIEDBY',
+  `MODIFIEDDATE` datetime DEFAULT NULL COMMENT 'MODIFIEDDATE',
+  `DESCRIPTION` varchar(500) DEFAULT NULL COMMENT 'DESCRIPTION',
+  `INSTID` varchar(45) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `mxk_history_connector`
 --
@@ -397,7 +476,7 @@ CREATE TABLE `mxk_history_login` (
   `USERNAME` varchar(200) NOT NULL COMMENT 'USERNAME',
   `DISPLAYNAME` varchar(45) DEFAULT NULL COMMENT 'DISPLAYNAME',
   `MESSAGE` varchar(200) DEFAULT NULL COMMENT 'MESSAGE',
-  `SOURCEIP` varchar(45) DEFAULT NULL COMMENT 'LOGIN SOURCEIP ',
+  `SOURCEIP` varchar(300) DEFAULT NULL COMMENT 'LOGIN SOURCEIP ',
   `IpRegion` varchar(500) DEFAULT NULL,
   `ipLocation` varchar(500) DEFAULT NULL,
   `LOGINTYPE` varchar(45) DEFAULT NULL COMMENT 'LOGINTYPE',
@@ -1026,7 +1105,7 @@ CREATE TABLE `mxk_userinfo` (
   `STATUS` tinyint unsigned DEFAULT '1' COMMENT '用户状态',
   `ISLOCKED` tinyint unsigned DEFAULT '1' COMMENT '锁定状态',
   `UNLOCKTIME` datetime DEFAULT '2020-01-01 01:01:01' COMMENT '解锁时间',
-  `LASTLOGINIP` varchar(45) DEFAULT NULL COMMENT '最近登录IP地址',
+  `LASTLOGINIP` varchar(300) DEFAULT NULL COMMENT '最近登录IP地址',
   `LASTLOGINTIME` datetime DEFAULT '2020-01-01 01:01:01' COMMENT '最近登录时间',
   `LASTLOGOFFTIME` datetime DEFAULT '2020-01-01 01:01:01' COMMENT '最近注销时间',
   `BADPASSWORDTIME` datetime DEFAULT '2020-01-01 01:01:01' COMMENT '最近密码错误时间',
@@ -1161,4 +1240,4 @@ CREATE TABLE `mxk_userinfo_adjunct` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-04-22 10:43:51
+-- Dump completed on 2023-09-01  6:46:42

maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts

@@ -26,5 +26,5 @@ export const CONSTS = {
   REDIRECT_URI: 'redirect_uri',
   REMEMBER: 'remember_me',
   TOKEN: '_token',
-  VERSION: 'v3.5.19 GA'
+  VERSION: 'v4.0.0 GA'
 };

maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts

@@ -19,5 +19,5 @@ export const CONSTS = {
   INST: 'inst',
   REDIRECT_URI: 'redirect_uri',
   REMEMBER: 'remember',
-  VERSION: 'v4.0.0 RC1'
+  VERSION: 'v4.0.0 GA'
 };