From 8203a3a8ebda0e798a84c36530155581061e15d6 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 11 Nov 2019 20:05:24 +0800
Subject: [PATCH] v1.8.0 init

---
 application/index/view/default/config.json | 6 +++---
 application/lang/zh-cn.php                 | 1 +
 public/core.php                            | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/index/view/default/config.json b/application/index/view/default/config.json
index 4c837b872..3540572a4 100755
--- a/application/index/view/default/config.json
+++ b/application/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
-	"name":"默认模板",
-	"ver":"1.7.0",
+	"name":"默认主题",
+	"ver":"1.8.0",
 	"author":"Devil",
-	"home":"http://shopxo.net/"
+	"home":"https://shopxo.net/"
 }
\ No newline at end of file
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php
index 122fb63e1..b695d1362 100755
--- a/application/lang/zh-cn.php
+++ b/application/lang/zh-cn.php
@@ -26,6 +26,7 @@ return array(
             '1.5.0' => array('value' => '1.5.0', 'name' => 'v1.5.0'),
             '1.6.0' => array('value' => '1.6.0', 'name' => 'v1.6.0'),
             '1.7.0' => array('value' => '1.7.0', 'name' => 'v1.7.0'),
+            '1.8.0' => array('value' => '1.8.0', 'name' => 'v1.8.0'),
         ),
 
     // 用户注册类型列表
diff --git a/public/core.php b/public/core.php
index c0bfb3aee..e88007240 100755
--- a/public/core.php
+++ b/public/core.php
@@ -13,7 +13,7 @@
 if(version_compare(PHP_VERSION,'5.6.0','<'))  die('PHP版本最低 5.6.0');
 
 // 系统版本
-define('APPLICATION_VERSION', 'v1.7.0');
+define('APPLICATION_VERSION', 'v1.8.0');
 
 // 定义系统目录分隔符
 define('DS', '/');
-- 
GitLab