优化某些细节问题

amujie · Jul 1, 2020 · c7019c0 · c7019c0
1 parent d59dbcc
commit c7019c0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@
 - 作者首页：[https://amujie.com](https://amujie.com)
 - 加群链接：[https://jq.qq.com/?_wv=1027&k=5Cpumac](https://jq.qq.com/?_wv=1027&k=5Cpumac)
 - 扣群号码：137183109
+- 静态文件：[https://cdn.jsdelivr.net/gh/amujie/mojia@latest/](https://cdn.jsdelivr.net/gh/amujie/mojia@latest/)
 
 #### 主题简介
 - 主题定价：¥198(一个站点丨售后永久免费更新)

diff --git a/about/changelog.json b/about/changelog.json
@@ -1,7 +1,4 @@
 {
-	"1.0.7": [
-		"优化主题升级功能"
-	],
 	"1.0.7": [
 		"使用1.0.6之前版本的请先恢复默认设置再使用",
 		"修复防红页面点击浏览器图标跳转支付宝的问题",
@@ -11,7 +8,8 @@
 		"修复断点采集增加采集收藏",
 		"优化首页周更剧场显示问题",
 		"右上角图标增加设置选项",
-		"将暂无备注改为更新时间"
+		"将暂无备注改为更新时间",
+		"优化主题升级功能"
 	],
 	"1.0.6": [
 		"此版改动较大,极其不稳定,请使用测试站安装使用",

diff --git a/asset/exc/create.php b/asset/exc/create.php
@@ -25,7 +25,7 @@ function moJiaOptions() {
 			preg_match_all('/<option\s+value="amujie\/mojia@(.*)">/i', $versnew, $match);
 			echo json_encode(array('ver' => $match[1][0], 'key' => md5('mojia-' . $match[1][0])));
 		} elseif (@$_POST['ver'] == 'log') {
-			echo moJiaCurlGet(str_replace('latest',$_POST['new'],moJiaPath('vers')).'about/changelog.json');
+			echo moJiaCurlGet(str_replace('latest', $_POST['new'], moJiaPath('vers')) . 'about/changelog.json');
 		}
 	} elseif (isset($_POST['key'])) {
 		if (file_put_contents(moJiaPath('path') . 'application/extra/mojiakey.php', '<?php return ' . var_export($_POST, true) . ';?>')) {
@@ -129,7 +129,7 @@ function moJiaCollect() {
 			$array[$value]['collect_code'] = mac_get_mid_code($array[$value]['collect_mid']);
 			$array[$value]['collect_param'] = base64_encode($array[$value]['collect_param']);
 		}
-		die(json_encode($array));
+		die(json_encode($array ? $array : array()));
 	} elseif (isset($_POST['code'])) {
 		$data = moJiaCurlGet($_POST['url']);
 		if (@$_POST['type'] == 1) {
@@ -252,4 +252,4 @@ function moJiaCommon() {
 		echo $output;
 		exit ;
 	}
-}
+}
diff --git a/html/tinier/config.html b/html/tinier/config.html
@@ -1,8 +1,8 @@
 <?php $install = $GLOBALS['config']['site']['install_dir']; if($maccms['aid']==1) $maccms['mid']='0'; ?>
 <?php $template = $GLOBALS['config']['site']['install_dir'] . 'template/' . $GLOBALS['config']['site']['template_dir'] . '/'; ?>
-<?php $verify = file_exists("application/extra/mojiakey.php") ? require("application/extra/mojiakey.php"):""; $verify['tid'] = md5($_SERVER['SERVER_SOFTWARE'].PHP_OS.$_SERVER['DOCUMENT_ROOT']); ?>
+<?php $verify = file_exists("application/extra/mojiakey.php") ? require("application/extra/mojiakey.php"):null; $verify['tid'] = md5($_SERVER['SERVER_SOFTWARE'].PHP_OS.$_SERVER['DOCUMENT_ROOT']); ?>
 <?php $mojia = file_exists('application/extra/mojiaopt.php') ? require('application/extra/mojiaopt.php') : require(substr($template, strlen($install)).'asset/exc/config.php'); ?>
 <?php $config = parse_ini_file(substr($template, strlen($install)).'info.ini'); require(substr($template, strlen($install)).'asset/exc/obtain.php'); ?>
-<?php $cdnpath = $mojia['other']['cdns']['state'] ? $mojia['other']['cdns']['link'].(strpos($mojia['other']['cdns']['link'],'cdn.jsdelivr.net/gh/amujie')!==false?'@'.$config['version']:'').'/' : $template; ?>
+<?php $cdnpath = $mojia['other']['cdns']['state'] ? $mojia['other']['cdns']['link'].(strpos($mojia['other']['cdns']['link'],'cdn.jsdelivr.net/gh/amujie')!==false?'@'.$config['version']:null).'/' : $template; ?>
 <?php $mobile = false; foreach($mojia['nav'] as $value) if($value['mobile']) { $mobile=true; break; } ?>
 <?php $version = $mojia['other']['cdns']['debug'] ? $config['version'] : time(); ?>
diff --git a/info.ini b/info.ini
@@ -5,6 +5,6 @@ webtest	= https://mojia.amujie.com
 qqcode	= 1570457334
 qqgroup	= 137183109
 addgroup= 51Zakp5
-lastdate= 2020-06-30
-version	= 1.0.5
+lastdate= 2020-07-01
+version	= 1.0.7
 adsdir	= about