From 08b813cd9f7016ad879aae1b10da54d53495cab1 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Sat, 18 Nov 2023 20:28:35 +0800
Subject: [PATCH] version 1.2.0 and release note

---
 broker/pom.xml       |  2 +-
 common/pom.xml       |  2 +-
 distribution/pom.xml |  2 +-
 pom.xml              |  2 +-
 release_note.md      | 10 ++++++++++
 sdk/pom.xml          |  2 +-
 sdk/sdk_readme.txt   |  4 ++--
 7 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/broker/pom.xml b/broker/pom.xml
index 7ba455bc6..cd926a1e7 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.9</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index 24a2e1d12..0f9bc6d69 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.9</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/distribution/pom.xml b/distribution/pom.xml
index dfed577b1..0a3cb2caa 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.9</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>distribution</artifactId>
diff --git a/pom.xml b/pom.xml
index 816db7243..af45ff1b6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>1.1.9</version>
+    <version>1.2.0</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>
diff --git a/release_note.md b/release_note.md
index f41bfc169..1fb7c5580 100644
--- a/release_note.md
+++ b/release_note.md
@@ -12,6 +12,16 @@
 
 # 更新记录
 
+--------------
+Release note 1.2.0:
+1. 添加配置开关，可以关掉api/version检查接口。
+2. Server SDK会议事件中添加时间戳。
+3. 禁止私聊时，如果一方在允许私聊列表中，允许私聊。
+4. 解决某些特殊情况下获取网卡信息失败导致启动失败的问题。
+5. 支持按照用户ID来搜索用户。
+6. 添加获取某个用户是否在聊天室的接口。
+7. 优化多端加入聊天室的处理。
+
 --------------
 Release note 1.1.9:
 1. 解决服务器时间误差太大引起的问题。
diff --git a/sdk/pom.xml b/sdk/pom.xml
index a1d421eeb..3cde54c41 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.9</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sdk/sdk_readme.txt b/sdk/sdk_readme.txt
index a22c4af32..1c2db3450 100644
--- a/sdk/sdk_readme.txt
+++ b/sdk/sdk_readme.txt
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>cn.wildfirechat</groupId>
 			<artifactId>sdk</artifactId>
-			<version>1.1.9</version>
+			<version>1.2.0</version>
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/lib/sdk-1.1.9.jar</systemPath>
 		</dependency>
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>cn.wildfirechat</groupId>
 			<artifactId>common</artifactId>
-			<version>1.1.9</version>
+			<version>1.2.0</version>
 			<scope>system</scope>
 			<systemPath>${project.basedir}/src/lib/common-1.1.9.jar</systemPath>
 		</dependency>