From 69f8f61e5b08f1b15f69c98a01a0a09b8f1600fe Mon Sep 17 00:00:00 2001
From: tensent <ycgpp@126.com>
Date: Wed, 15 Apr 2020 18:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8Fbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .example.env       | 2 +-
 app/common.php     | 2 +-
 public/install.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.example.env b/.example.env
index 80d67f4e..e7218c6b 100755
--- a/.example.env
+++ b/.example.env
@@ -1 +1 @@
-APP_DEBUG = true

rootuid = 1

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = {type}
HOSTNAME = {hostname}
DATABASE = {database}
USERNAME = {username}
PASSWORD = {password}
HOSTPORT = {hostport}
CHARSET = utf8
PREFIX = {prefix}
DEBUG = true

[LANG]
default_lang = zh-cn

[JWT]
SECRET={secret}
\ No newline at end of file
+APP_DEBUG = false
VERSION = 4.0.0

rootuid = 1

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = {type}
HOSTNAME = {hostname}
DATABASE = {database}
USERNAME = {username}
PASSWORD = {password}
HOSTPORT = {hostport}
CHARSET = utf8
PREFIX = {prefix}
DEBUG = true

[LANG]
default_lang = zh-cn

[JWT]
SECRET={secret}
\ No newline at end of file
diff --git a/app/common.php b/app/common.php
index bccfea21..52a8633d 100755
--- a/app/common.php
+++ b/app/common.php
@@ -99,7 +99,7 @@ function get_username($uid = 0) {
 }
 
 function avatar($uid, $size = 'middle') {
-	return request()->root(true) . '/static/common/images/default_avatar_' . $size . '.jpg';
+	return request()->domain() . '/static/common/images/default_avatar_' . $size . '.jpg';
 }
 
 // 分析枚举类型配置值 格式 a:名称1,b:名称2
diff --git a/public/install.php b/public/install.php
index b961e7cd..8347e3fb 100644
--- a/public/install.php
+++ b/public/install.php
@@ -256,7 +256,7 @@ function showmsg(msg, classname){
 											<?php } ?>
 										</tbody>
 									</table>
-									<?php if(session('error')){ ?>
+									<?php if(!session('error')){ ?>
 									<div class="margin-top" style="text-align: center;">
 										<div class="btn-group">
 											<a class="btn btn-default" href="?action=index">上一步</a>