muzi
/
apeblog
mirror of https://github.com/1099438829/apeblog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正一大波错误

This commit is contained in:
1099438829 2021-04-05 23:35:46 +08:00
parent 78fd6bb6ae
commit 0506bb97fc
8 changed files with 2514 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/view/system_config/base.html
View File

@ -118,7 +118,7 @@
formData.append("storage",1);
$.ajax({
type:'POST',
url:'/admin/files/file',
url:'/admin/files/upload',
data: formData,
cache: false,
processData: false,

2
app/common/taglib/Zz.php
View File

@ -39,7 +39,7 @@ class Zz extends TagLib{
$row=isset($tag['row'])?$tag['row']:100;
$void=isset($tag['void'])?$tag['void']:'field';
$where=isset($tag['where'])?$tag['where']:'';
$orderby=isset($tag['orderby'])?$tag['orderby']:'sort asc';
$orderby=isset($tag['orderby'])?$tag['orderby']:'sort desc';
$display=isset($tag['display'])?$tag['display']:1;
$display=$display==1?1:0;

28
app/index/common.php
View File

@ -49,7 +49,7 @@ function get_document_category_list(){
//缓存文章菜单
$docuemtCategory=cache('DATA_DOCUMENT_CATEGORY_LIST');
if($docuemtCategory===null){
$docuemtCategoryList=Db::name('document_category')->where('status',1)->order('sort asc')->select();
$docuemtCategoryList=Db::name('document_category')->order('sort desc')->select();
//转换，让id作为数组的键
$docuemtCategory=[];
foreach ($docuemtCategoryList as $key=>$item){
@ -148,7 +148,7 @@ function tpl_get_channel($type,$typeid,$row,$where='',$orderby='',$display=1){
if(!$dc){
throw new Exception('分类不存在或已删除！');
}
$tempArr=Db::name('document_category')->where('id','in',$dc['child'])->where('status',1)->select();
$tempArr=Db::name('document_category')->where('id','in',$dc['child'])->select();
if($display){
$tempArr=$tempArr->where('display',1);
}
@ -179,8 +179,8 @@ function tpl_get_channel($type,$typeid,$row,$where='',$orderby='',$display=1){
$dc=get_document_category($typeid);
if($dc['pid']!=0){
//获取根分类，此操作读取数据库，非缓存！
$dc=Db::name('document_category')->where('pid',0)->where('status',1)
-> where("CONCAT(',',child,',') like '%,$typeid,%'");
$dc=Db::name('document_category')->where('pid',0)
->where("CONCAT(',',child,',') like '%,$typeid,%'");
if($display){
$dc=$dc->where('display',1);
}
@ -196,7 +196,7 @@ function tpl_get_channel($type,$typeid,$row,$where='',$orderby='',$display=1){
break;
case 'where':
//根据自定义条件获取分类（where语句），此操作读取数据库，非缓存！
$tempArr=Db::name('document_category')->where('status',1)-> where($where)->order($orderby);
$tempArr=Db::name('document_category')-> where($where)->order($orderby);
if($display){
$tempArr=$tempArr->where('display',1);
}
@ -210,7 +210,7 @@ function tpl_get_channel($type,$typeid,$row,$where='',$orderby='',$display=1){
break;
case 'ids':
//根据多个栏目id，逗号隔开的那种，获得栏目列表
$tempArr=Db::name('document_category')->where('status',1)-> where('id','in',$typeid)->order($orderby);
$tempArr=Db::name('document_category')-> where('id','in',$typeid)->order($orderby);
if($display){
$tempArr=$tempArr->where('display',1);
}
@ -243,7 +243,11 @@ function get_document_category_by_parent($pid,$row,$display=1){
}
if($item['pid']==$pid&&($display?$item['display']==1:true)){
$x=$x+1;
array_push($tempArr,$item);
$tempArr[$item['id']] = $item;
}
//判断是否有子元素,子元素则为其父元素的child字段设置为1
if ($item['pid'] > 0 && !empty($tempArr[$item['pid']])){
$tempArr[$item['pid']]['child'] = 1;
}
}
return $tempArr;
@ -297,7 +301,7 @@ function tpl_get_list($orderby,$pagesize,$cid,$type,$table='article',$where=fals
->join(config('database.prefix').'document_category b','a.category_id=b.id','LEFT')
->join(config('database.prefix')."document_$table c",'a.id=c.id','RIGHT')
->where("a.type='$table'")
->where('a.status',1)->where('b.status',1)
->where('a.status',1)
->field('a.*,b.title as category_title,c.*');
if($display){
@ -439,7 +443,7 @@ function tpl_get_article_list($cid,$row,$orderby,$table='article',$type='son',$w
->join(config('database.prefix').'document_category b','a.category_id=b.id','LEFT')
->join(config('database.prefix')."document_$table c",'a.id=c.id','RIGHT')
->where("a.type='$table'")
->where('a.status',1)->where('b.status',1)
->where('a.status',1)
->limit($row)
->field('a.*,b.title as category_title,c.*');
@ -535,10 +539,10 @@ if (!function_exists('web_config'))
*/
function web_config(string $formName): string
{
$webConfig = cache('webConfig');
$webConfig = cache('systemConfig');
if (empty($webConfig)){
$webConfig = Db::name('system_config')->where("status",1)->fetchSql(true)->column('value', 'form_name');
cache('webConfig',$webConfig);
$webConfig = Db::name('system_config')->where("status",1)->column('value', 'form_name');
cache('systemConfig',$webConfig);
}
return $webConfig[$formName]??'';
}

1194
public/template/blog/1.html Normal file
View File

File diff suppressed because it is too large Load Diff

1267
public/template/blog/index.html Normal file
View File

File diff suppressed because it is too large Load Diff

4
public/template/default/index/index.html
View File

@ -1,11 +1,9 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<title>行业字典管理 - {:web_config("title")}</title>
<title>轻烟随风的博客blog</title>
<title>-{:web_config("title")}</title>
<meta name="keywords" content="轻烟随风,blog,博客,oracle,pl/sql,erp,数据库,sql server,EBS,ERP系统,甲骨文,R12">
<meta name="description" content="oracle EBS等ERP系统上线，实施，维护过程中的心得，常见的开发工具的使用">
{include file="public/head" /}
<link rel="stylesheet" href="/template/default/lib/swiper/swiper.min.css">
<script src="/template/default/lib/swiper/swiper.min.js"></script>

84
public/template/default/public/head.html
View File

@ -1,35 +1,31 @@
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta name="Referrer" content="origin">
<style>.icon {
width: 18px;
height: 18px;
vertical-align: -3px;
fill: currentColor;
overflow: hidden;
}</style>
<style>html, body, #app {
background-image: url('/uploads/article/2021/03/beige-tiles.png') !important;
background-position: center center;
background-attachment: fixed;
background-size: cover;
}</style>
<link rel="icon" href="http://www.zyxpp.com//uploads/article/2020/12/LOGO1-1.png" type="image/x-icon">
<style>
.icon {
width: 18px;
height: 18px;
vertical-align: -3px;
fill: currentColor;
overflow: hidden;
}
html, body, #app {
background-image: url('/uploads/article/2021/03/beige-tiles.png') !important;
background-position: center center;
background-attachment: fixed;
background-size: cover;
}
:root {
--Maincolor: #FF8040 !important;
--MaincolorHover: #409EFF !important;
--fontSelectedColor: #3390ff !important;
}
#nprogress .bar {
background: var(--Maincolor) !important;
}
</style>
<link rel="icon" href="{:file_cdn(web_config('favicon'))}" type="image/x-icon">
<link rel="stylesheet" href="/template/default/css/main-mobile.css">
<link rel="stylesheet" href="/template/default/lib/fontawesome5/css/all.min.css">
<link rel="stylesheet" href="/template/default/css/main.css">
@ -43,52 +39,4 @@
}</style>
<link rel="stylesheet" href="/template/default/lib/nprogress/nprogress.min.css">
<script src="/template/default/lib/nprogress/nprogress.min.js"></script>
<script src="/template/default/js/tools.js"></script>
<header class="header_area">
<div class="main_menu">
<nav class="navbar navbar-expand-lg navbar-light">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<a class="navbar-brand logo_h" href="/"><img src="/template/default/img/logo.png" alt=""></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse offset" id="navbarSupportedContent">
<ul class="nav navbar-nav menu_nav justify-content-center">
<li class="nav-item {:IsActiveNav($cid)?'active':''}"><a class="nav-link" href="/">首页</a></li>
{zz:channel type="top"}
<li class="nav-item {if $field['child']} submenu dropdown{/if} {:IsActiveNav($cid,$field['id'])?'active':''}">
{if $field['child']}
<a href="{$field['url']}" class="nav-link">
{else /}
<a class="nav-link" href="{$field['url']}">
{/if}
{$field['title']}
</a>
{if $field['child']}
<ul class="dropdown-menu">
{zz:channel type="son" typeid="$field['id']" void="vo"}
<li class="nav-item {:IsActiveNav($cid,$vo['id'])?'active':''}">
<a class="nav-link" href="{$vo['url']}" {if $vo['link_str']} target="_blank"{/if}>
{$vo['title']}</a></li>
{/zz:channel}
</ul>
{/if}
</li>
{/zz:channel}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="nav-item"><a href="http://www.hulaxz.com/" target="_blank" class="primary_btn text-uppercase">更多模板</a></li>
</ul>
</div>
</div>
</nav>
</div>
</header>
<script src="/template/default/js/tools.js"></script>

145
public/template/default/public/header.html
View File

@ -1,53 +1,3 @@
<header class="header_area">
<div class="main_menu">
<nav class="navbar navbar-expand-lg navbar-light">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<a class="navbar-brand logo_h" href="/"><img src="/template/default/img/logo.png" alt=""></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse offset" id="navbarSupportedContent">
<ul class="nav navbar-nav menu_nav justify-content-center">
<li class="nav-item {:IsActiveNav($cid)?'active':''}"><a class="nav-link" href="/">首页</a></li>
{zz:channel type="top"}
<li class="nav-item {if $field['child']} submenu dropdown{/if} {:IsActiveNav($cid,$field['id'])?'active':''}">
{if $field['child']}
<a href="{$field['url']}" class="nav-link">
{else /}
<a class="nav-link" href="{$field['url']}">
{/if}
{$field['title']}
</a>
{if $field['child']}
<ul class="dropdown-menu">
{zz:channel type="son" typeid="$field['id']" void="vo"}
<li class="nav-item {:IsActiveNav($cid,$vo['id'])?'active':''}">
<a class="nav-link" href="{$vo['url']}" {if $vo['link_str']} target="_blank"{/if}>
{$vo['title']}</a></li>
{/zz:channel}
</ul>
{/if}
</li>
{/zz:channel}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="nav-item"><a href="http://www.hulaxz.com/" target="_blank" class="primary_btn text-uppercase">更多模板</a></li>
</ul>
</div>
</div>
</nav>
</div>
</header>
<header>
<div class="header-main-plane">
<div class="header-main container">
@ -59,9 +9,7 @@
$(".user-menu-plane").appendTo($(".drawer-menu-list"));
$(".menu-item-has-children").append('<div class="m-dropdown" onclick="mobile_menuclick(event)" ><i class="fa fa-angle-down"></i></div>')
$(".user-menu-main").append('<div class="m-dropdown" onclick="mobile_menuclick(event)"><i class="fa fa-angle-down"></i></div>')
}
function closeMenu() {
$('body').css('overflow', 'auto');
$(".drawer-menu-plane").removeClass("drawer-menu-plane-show");
@ -69,11 +17,9 @@
$(".menu-plane").prependTo($(".header-menu"));
$(".m-dropdown").remove();
}
function openSearch() {
$(".dialog-search-plane").addClass("dialog-search-plane-show");
}
function closeSearch() {
//$('body').css('overflow', 'auto');
$(".dialog-search-plane").removeClass("dialog-search-plane-show");
@ -90,7 +36,7 @@
</div>
<div class="header-logo-plane">
<div class="header-logo">
<a href=""><img src="/uploads/article/2020/12/logo11.png" alt=""></a></div>
<a href=""><img src="{:file_cdn(web_config('logo'))}" alt=""></a></div>
</div>
<div class="mobile-search-btn" onclick="openSearch()">
<i class="fa fa-search"></i>
@ -99,9 +45,9 @@
<div class="dialog-mask" onclick="closeSearch()"></div>
<div class="dialog-plane">
<h2>搜索内容</h2>
<form class="search-form" action="https://www.zyxpp.com" method="get" role="search">
<form class="search-form" action="{:url('/article/search')}" method="get" role="search">
<div class="search-form-input-plane">
<input type="text" class="search-keyword" name="s" placeholder="搜索内容" value="">
<input type="text" class="search-keyword" name="kw" placeholder="搜索内容" value="">
</div>
<div>
<button type="submit" class="search-submit" value="&#xf002;">搜索</button>
@ -109,83 +55,28 @@
</form>
</div>
</div>
<div class="header-menu">
<div class="menu-plane">
<nav class="menu-header-plane">
<ul id="menu-%e4%b8%8a%e6%96%b9%e5%af%bc%e8%88%aa%e6%a0%8f" class="menu-header-list">
<li id="menu-item-27"
class="menu-item current-menu-item current_page_item menu-item-27"><a href=""
aria-current="page">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-shouye_huaban1"></use>
</svg>
首页</a></li>
<li id="menu-item-411" class="menu-item menu-item-411"><a
href="category/talk/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-business-management"></use>
</svg>
学习笔记</a></li>
<li id="menu-item-388" class="menu-item menu-item-has-children menu-item-388"><a
title="oracle甲骨文" href="#">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-Management_system"></use>
</svg>
oracle EBS</a>
{zz:channel type="top"}
<li id="menu-item-{$field.id}" class="menu-item {notempty name="field['child']"}menu-item-has-children{/notempty} {:IsActiveNav($cid,$field['id'])?'current-menu-item':''} menu-item-{$field['id']}">
{notempty name="field['child']"}
<a href="#" aria-current="page">{$field['title']}</a>
{else /}
<a href="{$field['url']}" aria-current="page">{$field['title']}</a>
{/notempty}
{notempty name="field['child']"}
<ul class="sub-menu">
<li id="menu-item-32" class="menu-item menu-item-32"><a title="Oracle-OM-销售物流"
href="category/oracle-om/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-wuliuxiaocheche"></use>
</svg>
Oracle-OM-销售物流</a></li>
<li id="menu-item-194" class="menu-item menu-item-194"><a
title="Oracle-PROD-采购生产" href="category/oracle-pur-prod/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-shengchan"></use>
</svg>
Oracle-PROD-采购生产</a></li>
<li id="menu-item-50" class="menu-item menu-item-50"><a
title="Oracle-Finance-财务" href="category/oracle-finance/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-caiwu"></use>
</svg>
Oracle-Finance-财务</a></li>
<li id="menu-item-61" class="menu-item menu-item-61"><a title="Oracle-PL/SQL"
href="category/oracle-pl-sql/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-SQLxinjian"></use>
</svg>
Oracle-PL/SQL</a></li>
<li id="menu-item-82" class="menu-item menu-item-82"><a
title="Oracle-BI-Discoverer"
href="category/oracle-bi-discoverer/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-baobiao"></use>
</svg>
Oracle-BI-Discoverer</a></li>
<li id="menu-item-117" class="menu-item menu-item-117"><a title="Oracle-其他文档软件"
href="category/oracle-download/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-ruanjianfuwu"></use>
</svg>
Oracle-其他文档软件</a></li>
{zz:channel type="son" typeid="$field['id']" void="vo"}
<li id="menu-item-{$vo.id}" class="menu-item menu-item-{$vo.id} {:IsActiveNav($cid,$vo['id'])?'current-menu-item':''}">
<a title="{$vo['title']}" href="{$vo['url']}" aria-current="page" {if $vo['link_str']} target="_blank"{/if}>{$vo['title']}</a>
</li>
{/zz:channel}
</ul>
{/notempty}
</li>
<li id="menu-item-138" class="menu-item menu-item-138"><a title="Asp.Net"
href="category/dotnet/index.html">
<svg class="icon" aria-hidden="true">
<use xlink:href="#icon-weiruan"></use>
</svg>
Asp.Net</a></li>
<li id="menu-item-62" class="menu-item menu-item-62"><a title="sql-server"
href="category/sql-server/index.html">
<svg class="icon" aria-hidden="true" style="color:#00868B">
<use xlink:href="#icon-SQLserver"></use>
</svg>
sql-server</a></li>
{/zz:channel}
</ul>
</nav>
</div>