From 40391f4611959c149532f8fe37431b64982bbc0a Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Tue, 18 Jan 2022 14:55:21 +0800
Subject: [PATCH] v 3.3.0 GA

---
 ReleaseNotes.txt                              | 36 ++++++++++++++++++-
 gradle.properties                             |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.properties |  2 +-
 .../src/main/resources/application.properties |  2 +-
 .../src/main/resources/application.properties |  2 +-
 6 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 450b5d78..4892ae4f 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,4 +1,38 @@
-MaxKey v 3.2.0 GA 2021/12/21
+MaxKey v 3.3.0 GA 2022/01/**
+    *(MAXKEY-220101) 机构管理配置管理
+	*(MAXKEY-220102) 应用系统名称后台配置及国际化支持
+	*(MAXKEY-220103) 初步实现国际化存储在数据库
+	*(MAXKEY-220104) 租户管理邮箱地址
+	*(MAXKEY-220105) 租户管理短信网关
+	*(MAXKEY-220106) 租户管理LDAP配置
+	*(MAXKEY-220107) 官方网站增加Dromara标识
+	*(MAXKEY-220108) LDAP认证从租户读取配置
+	*(MAXKEY-220109) 租户管理社交账号
+	*(MAXKEY-220110) 社交账号自动识别http,https
+	*(MAXKEY-220111) 增加prometheus支持
+	*(MAXKEY-220112) log4j日志pattern调整 
+	*(MAXKEY-220113) 数据库方法统一命名
+	*(MAXKEY-220114) 修复新增应用oauth2协议 多租户新增bug
+	*(MAXKEY-220115) Logger统一使用slf4j
+	*(MAXKEY-220116) readme完善
+	*(MAXKEY-220117) org.maxkey.persistence.db调整为org.maxkey.persistence.repository
+	*(MAXKEY-220118) org.maxkey.constants下的类统一以Consts开头
+	*(MAXKEY-220119) 认证协议返回的数据统一增加机构institution
+	*(MAXKEY-220120) 修复钉钉同步器bug
+	*(MAXKEY-220121) 修复LDAP同步器bug
+	*(MAXKEY-220122) 修复企业微信同步器bug
+	*(MAXKEY-220123) 依赖jar引用、更新和升级
+		log4j           2.17.1
+		spring          5.3.15
+		springBoot      2.6.1
+		springbootadmin 2.6.0
+		xmlbeans        5.0.2
+		poi             5.1.0
+		jedis           3.8.0
+		mybatis         3.5.9
+		mybatis-jpa-extra 2.7
+		
+MaxKey v 3.2.0 GA 2021/12/21
     *(MAXKEY-211001) 实现多租户基本功能
     *(MAXKEY-211002) Apache log4j漏洞升级到2.17.0
     *(MAXKEY-211004) 修改对称加密算法，
diff --git a/gradle.properties b/gradle.properties
index d22baa7b..a0f7cf04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 #maxkey properties 
 group                           =maxkey.top
-version                         =3.2.1
+version                         =3.3.0
 vendor                          =https://www.maxkey.top
 author                          =MaxKeyTop
 
diff --git a/maxkey-gataway/src/main/resources/application.yml b/maxkey-gataway/src/main/resources/application.yml
index 69a09030..afb9dce0 100644
--- a/maxkey-gataway/src/main/resources/application.yml
+++ b/maxkey-gataway/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 #端口号
 application:
   name: maxkey-gateway-server
-  formatted-version: v3.2.1 GA
+  formatted-version: v3.3.0 GA
 server:
   port: 9000
 spring:
diff --git a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties
index 8beaa058..56afb671 100644
--- a/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties
+++ b/maxkey-webs/maxkey-boot-monitor/src/main/resources/application.properties
@@ -18,7 +18,7 @@
 application.title                               =MaxKey
 #for dynamic service discovery
 spring.application.name                         =maxkey-monitor
-application.formatted-version                   =v3.2.1 GA
+application.formatted-version                   =v3.3.0 GA
 #nacos discovery
 spring.cloud.nacos.discovery.enabled            =${NACOS_DISCOVERY_ENABLED:false}
 spring.cloud.nacos.discovery.instance-enabled   =false
diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
index 6a1f7878..89f9864b 100644
--- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
+++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title                           =MaxKey
-application.formatted-version               =v3.2.1 GA
+application.formatted-version               =v3.3.0 GA
 #for dynamic service discovery
 spring.application.name                     =maxkey
 ############################################################################
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties
index d808f370..d9afc320 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title                               =MaxKey-Mgt
-application.formatted-version                   =v3.2.1 GA
+application.formatted-version                   =v3.3.0 GA
 #for dynamic service discovery
 spring.application.name                         =maxkey-mgt
 ############################################################################
-- 
GitLab