From dcf5e6f3ecf7cee9a28d2d1c1b2746e54ef9ad45 Mon Sep 17 00:00:00 2001
From: librena <yangyuanqi02@meituan.com>
Date: Sat, 17 Oct 2020 01:20:52 +0800
Subject: [PATCH] feat: upgrade pom

---
 0                                    |  0
 pom.xml                              |  2 +-
 windchat-boot/openzaly-server.config | 82 ----------------------------
 3 files changed, 1 insertion(+), 83 deletions(-)
 create mode 100644 0
 delete mode 100755 windchat-boot/openzaly-server.config

diff --git a/0 b/0
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index a26fe27..b8d769f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <gson_version>2.8.2</gson_version>
         <fastjson_version>1.2.31</fastjson_version>
         <slf4j_version>1.7.25</slf4j_version>
-        <guava_version>24.1.1-jre</guava_version>
+        <guava_version>29.0-jre</guava_version>
         <sqlite.version>3.21.0.1</sqlite.version>
         <mysql.version>8.0.16</mysql.version>
     </properties>
diff --git a/windchat-boot/openzaly-server.config b/windchat-boot/openzaly-server.config
deleted file mode 100755
index f11bfcf..0000000
--- a/windchat-boot/openzaly-server.config
+++ /dev/null
@@ -1,82 +0,0 @@
-# 
-# Copyright 2018-2028 Akaxin Group
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License. 
-#
-
-########################################################
-###  ***************Akaxin ***************
-###             openzaly-server
-########################################################
-
-
-
-## personal/PERSONAL edition      : use sqlite database
-## team/TEAM edition              : use mysql database,support one master with several slaves
-## enterprise/ENTERPRISE edition  : use mysql + redis database ,support im server distribution
-## ultimate edition               : team or enterprise customization
-openzaly.edition=PERSONAL
-
-
-# openzaly version
-openzaly.version=1.0.7
-
-##### site tcp address,clients connect to site.address 
-site.address=0.0.0.0
-# site tcp port default 2021
-site.port=2021
-
-# pluginapi server address
-pluginapi.address=0.0.0.0
-# pluginapi server port
-pluginapi.port=8280
-
-# default back-stage management address
-site.admin.address=127.0.0.1
-# default back-stage management port
-site.admin.port=8288
-
-# first user login site,use this user invite code(UIC)
-site.uic=000000
-
-# deposit pictures,audio,db default current path
-# site.baseDir=${pwd}
-# goup max members count = 100
-# group.members.count=100
-
-## if openzaly.edition = personal/PERSONAL
-openzaly.sqlite.url=openzalyDB.sqlite3
-
-
-## if openzaly.edition = team/TEAM
-openzaly.mysql.host=localhost
-openzaly.mysql.port=3306
-openzaly.mysql.database=openzaly
-
-openzaly.mysql.username=root
-openzaly.mysql.password=1234567890
-openzaly.mysql.initial-size=10
-openzaly.mysql.max-size=100
-openzaly.mysql.max-idle=60
-
-openzaly.mysql.useUnicode=true
-openzaly.mysql.characterEncoding=utf-8
-openzaly.mysql.verifyServerCertificate=false
-openzaly.mysql.useSSL=true
-
-
-## if openzaly.edition = enterprise/ENTERPRISE
-#### support support im server distribution
-
-## if openzaly.edition = ultimate edition
-#### openzaly support customed for team or enterprise
\ No newline at end of file