mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化系统配置，系统左上角的logo读取系统配置上传的logo。

Browse Source
This commit is contained in:
HDM58\hdm58 2023-08-10 14:31:12 +08:00
parent 639d8b0ad2
commit 128a059fa7
10 changed files with 67 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/home/view/conf/add.html
View File

@ -9,9 +9,7 @@
</td>
<td>
<input type="hidden" name="id" value="{$id}" />
<input type="text" name="title" lay-verify="required" autocomplete="off" placeholder="请输入配置名称"
lay-reqText="请输入配置名称" class="layui-input" {notempty name="$config.title" } value="{$config.title}"
{/notempty}>
<input type="text" name="title" lay-verify="required" autocomplete="off" placeholder="请输入配置名称" lay-reqText="请输入配置名称" class="layui-input" value="{$config.title|default=''}">
</td>
<td class="layui-td-gray">状态<font>*</font>
</td>
@ -30,8 +28,7 @@
</td>
<td colspan="3">
<input type="text" name="name" lay-verify="required" placeholder="请输入配置标识" lay-reqText="请输入配置标识"
autocomplete="off" class="layui-input" {notempty name="$config.name" } value="{$config.name}"
{/notempty}>
autocomplete="off" class="layui-input" value="{$config.name|default=''}">
</td>
</tr>
<tr>

48
app/home/view/conf/email.html
View File

@ -9,69 +9,45 @@
</td>
<td>
<input type="hidden" name="id" value="{$id}">
<input type="text" name="smtp" lay-verify="required" autocomplete="off" placeholder="请输入SMTP服务器地址"
lay-reqText="请输入SMTP服务器地址" class="layui-input" {notempty name="$config.smtp" }
value="{$config.smtp}" {/notempty} style="width:240px;display: inline-block;">
<span
style="color:#999; font-size:12px;">如：QQ邮箱的SMTP服务器地址是smtp.qq.com，163邮箱的SMTP服务器地址是smtp.163.com</span>
<input type="text" name="smtp" lay-verify="required" autocomplete="off" placeholder="请输入SMTP服务器地址" lay-reqText="请输入SMTP服务器地址" class="layui-input" value="{$config.smtp|default=''}" style="width:240px;display: inline-block;">
<span style="color:#999; font-size:12px;">如：QQ邮箱的SMTP服务器地址是smtp.qq.com，163邮箱的SMTP服务器地址是smtp.163.com</span>
</td>
</tr>
<tr>
<td class="layui-td-gray-2">协议端口号<font>*</font>
</td>
<td>
<input type="text" name="smtp_port" lay-verify="required" autocomplete="off" placeholder="请输入端口"
lay-reqText="请输入端口" class="layui-input" {notempty name="$config.smtp_port" }
value="{$config.smtp_port}" {/notempty} style="width:240px;display: inline-block;">
<span style="color:#999; font-size:12px;">如：QQ邮箱的ssl协议方式端口号是465/587，163邮箱的ssl协议方式端口号是465/994</span>
<input type="text" name="smtp_port" lay-verify="required" autocomplete="off" placeholder="请输入端口" lay-reqText="请输入端口" class="layui-input" value="{$config.smtp_port|default=''}" style="width:240px;display: inline-block;"><span style="color:#999; font-size:12px;">如：QQ邮箱的ssl协议方式端口号是465/587，163邮箱的ssl协议方式端口号是465/994</span>
</td>
</tr>
<tr>
<td class="layui-td-gray">邮箱账户<font>*</font>
</td>
<td>
<input type="text" name="smtp_user" autocomplete="off" lay-verify="required" placeholder="请输入邮箱用户名"
lay-reqText="请输入邮箱用户名" class="layui-input" {notempty name="$config.smtp_user" }
value="{$config.smtp_user}" {/notempty} style="width:240px;display: inline-block;">
<span style="color:#999; font-size:12px;">如：gougucms@qq.com</span>
<td class="layui-td-gray">邮箱账户<font>*</font></td>
<td><input type="text" name="smtp_user" autocomplete="off" lay-verify="required" placeholder="请输入邮箱用户名" lay-reqText="请输入邮箱用户名" class="layui-input" value="{$config.smtp_user|default=''}"style="width:240px;display: inline-block;"><span style="color:#999; font-size:12px;">如：gougucms@qq.com</span>
</td>
</tr>
<tr>
<td class="layui-td-gray">邮箱密码<font>*</font>
</td>
<td>
<input type="password" name="smtp_pwd" lay-verify="required" autocomplete="off" placeholder="请输入邮箱密码"
class="layui-input" {notempty name="$config.smtp_pwd" } value="{$config.smtp_pwd}" {/notempty}
style="width:240px;display: inline-block;">
<span style="color:#999; font-size:12px;">
不一定是登录密码，如QQ邮箱的是第三方授权登录码，要自己去开启，在邮箱的设置->账户->POP3/IMAP/SMTP/Exchange/CardDAV/CalDAV服务</span>
<td class="layui-td-gray">邮箱密码<font>*</font></td>
<td><input type="password" name="smtp_pwd" lay-verify="required" autocomplete="off" placeholder="请输入邮箱密码" class="layui-input" value="{$config.smtp_pwd|default=''}" style="width:240px;display: inline-block;"><span style="color:#999; font-size:12px;">不一定是登录密码，如QQ邮箱的是第三方授权登录码，要自己去开启，在邮箱的设置->账户->POP3/IMAP/SMTP/Exchange/CardDAV/CalDAV服务</span>
</td>
</tr>
<tr>
<td class="layui-td-gray">发送人<font>*</font>
</td>
<td class="layui-td-gray">发送人<font>*</font></td>
<td>
<input type="text" name="from" autocomplete="off" lay-verify="required" placeholder="请输入要显示的发送者"
lay-reqText="请输入要显示的发送者" class="layui-input" {notempty name="$config.from" } value="{$config.from}"
{/notempty} style="width:240px; display: inline-block;">
<input type="text" name="from" autocomplete="off" lay-verify="required" placeholder="请输入要显示的发送者" lay-reqText="请输入要显示的发送者" class="layui-input" value="{$config.from|default=''}" style="width:240px; display: inline-block;">
<span style="color:#999; font-size:12px;">用于展示给发送方，如：勾股CMS系统管理员</span>
</td>
</tr>
<tr>
<td class="layui-td-gray">显示的邮箱<font>*</font>
</td>
<td class="layui-td-gray">显示的邮箱<font>*</font></td>
<td>
<input type="text" name="email" lay-verify="required" autocomplete="off" placeholder="请输入要显示的发送者邮箱"
lay-reqText="请输入要显示的发送者邮箱" class="layui-input" {notempty name="$config.email" }
value="{$config.email}" {/notempty} style="width:240px;display: inline-block;">
<input type="text" name="email" lay-verify="required" autocomplete="off" placeholder="请输入要显示的发送者邮箱" lay-reqText="请输入要显示的发送者邮箱" class="layui-input" value="{$config.email|default=''}" style="width:240px;display: inline-block;">
<span style="color:#999;font-size:12px;">可以不同于上面的账户，用于展示给发送方的邮箱，如：admin@gougucms.com</span>
</td>
</tr>
<tr>
<td class="layui-td-gray">邮件模板</td>
<td><textarea name="template" placeholder="" class="layui-textarea"
id="container">{notempty name="$config.template"}{$config.template}{/notempty}</textarea>
<td><textarea name="template" placeholder="" class="layui-textarea" id="container">{$config.template|default=''}</textarea>
</td>
</tr>
</table>

11
app/home/view/conf/other.html
View File

@ -18,15 +18,10 @@
<td class="layui-td-gray">开发者</td>
<td>
<input type="hidden" value="{$id}" name="id">
<input type="text" name="author" autocomplete="off" placeholder="请输入开发者" lay-reqText="请输入开发者"
class="layui-input" {notempty name="$config.author" } value="{$config.author}" {/notempty}>
</td>
<td class="layui-td-gray-2">开发版本号
</td>
<td>
<input type="text" name="version" autocomplete="off" placeholder="请输入版本号" lay-reqText="请输入版本号"
class="layui-input" {notempty name="$config.version" } value="{$config.version}" {/notempty}>
<input type="text" name="author" autocomplete="off" placeholder="请输入开发者" lay-reqText="请输入开发者" class="layui-input" value="{$config.author|default=''}">
</td>
<td class="layui-td-gray-2">开发版本号</td>
<td><input type="text" name="version" autocomplete="off" placeholder="请输入版本号" lay-reqText="请输入版本号" class="layui-input" value="{$config.version|default=''}"></td>
</tr>
</table>

18
app/home/view/conf/token.html
View File

@ -8,27 +8,21 @@
<td class="layui-td-gray-2">Token签发组织</td>
<td>
<input type="hidden" value="{$id}" name="id">
<input type="text" name="iss" autocomplete="off" placeholder="请输入签发组织" lay-reqText="请输入签发组织"
class="layui-input" {notempty name="$config.iss" } value="{$config.iss}" {/notempty}>
</td>
<td class="layui-td-gray-2">Token签发作者
<input type="text" name="iss" autocomplete="off" placeholder="请输入签发组织" lay-reqText="请输入签发组织" class="layui-input" value="{$config.iss|default=''}">
</td>
<td class="layui-td-gray-2">Token签发作者</td>
<td>
<input type="text" name="aud" autocomplete="off" placeholder="请输入签发作者" lay-reqText="请输入签发作者"
class="layui-input" {notempty name="$config.aud" } value="{$config.aud}" {/notempty}>
<input type="text" name="aud" autocomplete="off" placeholder="请输入签发作者" lay-reqText="请输入签发作者" class="layui-input" value="{$config.aud|default=''}">
</td>
</tr>
<tr>
<td class="layui-td-gray">Token Secrect</td>
<td>
<input type="text" name="secrect" autocomplete="off" placeholder="请输入secrect" lay-reqText="请输入secrect"
class="layui-input" {notempty name="$config.secrect" } value="{$config.secrect}" {/notempty}>
</td>
<td class="layui-td-gray">Token过期时间
<input type="text" name="secrect" autocomplete="off" placeholder="请输入secrect" lay-reqText="请输入secrect" class="layui-input" value="{$config.secrect|default=''}">
</td>
<td class="layui-td-gray">Token过期时间</td>
<td>
<input type="text" name="exptime" autocomplete="off" placeholder="请输入过期时间" lay-reqText="请输入过期时间"
class="layui-input" {notempty name="$config.exptime" } value="{$config.exptime}" {/notempty}>
<input type="text" name="exptime" autocomplete="off" placeholder="请输入过期时间" lay-reqText="请输入过期时间" class="layui-input" value="{$config.exptime|default=''}">
</td>
</tr>
</table>

70
app/home/view/conf/web.html
View File

@ -9,25 +9,19 @@
</td>
<td>
<input type="hidden" name="id" value="{$id}">
<input type="text" name="admin_title" lay-verify="required" autocomplete="off" placeholder="请输入系统名称"
lay-reqText="请输入系统名称" class="layui-input" {notempty name="$config.admin_title" }
value="{$config.admin_title}" {/notempty}>
<input type="text" name="admin_title" lay-verify="required" autocomplete="off" placeholder="请输入系统名称" lay-reqText="请输入系统名称" class="layui-input" value="{$config.admin_title|default=''}">
</td>
<td class="layui-td-gray">网站名称<font>*</font>
</td>
<td>
<input type="text" name="title" lay-verify="required" autocomplete="off" placeholder="请输入网站平台名称"
lay-reqText="请输入网站名称" class="layui-input" {notempty name="$config.title" } value="{$config.title}"
{/notempty}>
<input type="text" name="title" lay-verify="required" autocomplete="off" placeholder="请输入网站平台名称" lay-reqText="请输入网站名称" class="layui-input" value="{$config.title|default=''}">
</td>
<td rowspan="3" class="layui-td-gray">系统LOGO</td>
<td rowspan="3" class="layui-td-gray">系统大LOGO</td>
<td rowspan="3" style="width: 240px;">
<div class="layui-upload" style="width: 240px;">
<div class="layui-upload-list" id="logo" style="width: 100%; height:100px; overflow: hidden;">
<img src='{notempty name="$config.logo"}{$config.logo}{/notempty}'
style="max-width: 100%; width: 100%;" />
<input type="hidden" name="logo" {notempty name="$config.logo" } value="{$config.logo}"
{/notempty}>
<img src="{$config.logo|default='/static/home/images/syslogo.png'}" style="max-width: 100%; width: 100%;" />
<input type="hidden" name="logo" value="{$config.logo|default='/static/home/images/syslogo.png'}">
</div>
<button type="button" class="layui-btn" style="width: 100%;" id="uploadBtn">上传LOGO</button>
</div>
@ -37,57 +31,56 @@
<td class="layui-td-gray">网站域名<font>*</font>
</td>
<td>
<input type="text" name="domain" lay-verify="required" autocomplete="off" placeholder="请输入网站域名"
lay-reqText="请输入网站域名" class="layui-input" {notempty name="$config.domain" } value="{$config.domain}"
{/notempty}>
<input type="text" name="domain" lay-verify="required" autocomplete="off" class="layui-input" placeholder="请输入网站域名" lay-reqText="请输入网站域名" value="{$config.domain|default=''}">
</td>
<td class="layui-td-gray">ICP备案号</td>
<td>
<input type="text" name="icp" autocomplete="off" placeholder="请输入ICP备案号" class="layui-input" {notempty
name="$config.icp" } value="{$config.icp}" {/notempty}>
<input type="text" name="icp" autocomplete="off" placeholder="请输入ICP备案号" class="layui-input" value="{$config.icp|default=''}">
</td>
</tr>
<tr>
<td class="layui-td-gray-2">SEO关键词<font>*</font>
</td>
<td>
<input type="text" name="keywords" lay-verify="required" autocomplete="off" placeholder="多个关键词用“,”隔开"
lay-reqText="请输入SEO关键字" class="layui-input" {notempty name="$config.keywords" }
value="{$config.keywords}" {/notempty}>
<input type="text" name="keywords" lay-verify="required" autocomplete="off" placeholder="多个关键词用“,”隔开" lay-reqText="请输入SEO关键字" class="layui-input" value="{$config.keywords|default=''}">
</td>
<td class="layui-td-gray-2">公安备案号</td>
<td>
<input type="text" name="beian" autocomplete="off" placeholder="请输入公安备案号" class="layui-input" {notempty
name="$config.beian" } value="{$config.beian}" {/notempty}>
<input type="text" name="beian" autocomplete="off" placeholder="请输入公安备案号" class="layui-input" value="{$config.beian|default=''}">
</td>
</tr>
<tr>
<td class="layui-td-gray">SEO描述<font>*</font>
</td>
<td colspan="5">
<textarea name="desc" lay-verify="required" placeholder="请输入网站描述" lay-reqText="请输入网站描述"
class="layui-textarea">{notempty name="$config.desc"}{$config.desc} {/notempty}</textarea>
<td colspan="3">
<textarea name="desc" lay-verify="required" placeholder="请输入网站描述" lay-reqText="请输入网站描述" class="layui-textarea">{$config.desc|default=''}</textarea>
</td>
<td rowspan="2" class="layui-td-gray">系统小LOGO</td>
<td rowspan="2" style="width: 240px;">
<div class="layui-upload" style="width: 240px;">
<div class="layui-upload-list" id="smalllogo" style="width: 100%; height:100px; overflow: hidden; text-align:center;">
<img src="{$config.small_logo|default='/static/home/images/syslogo_small.png'}" style="max-width: 100%; width: 48%;" />
<input type="hidden" name="small_logo" value="{$config.small_logo|default='/static/home/images/syslogo_small.png'}">
</div>
<button type="button" class="layui-btn" style="width: 100%;" id="uploadBtn2">上传LOGO</button>
</div>
</td>
</tr>
<tr>
<td class="layui-td-gray">统计代码</td>
<td colspan="5">
<textarea name="code" placeholder="请输入完整的统计代码"
class="layui-textarea">{notempty name="$config.code"} value={$config.code}{/notempty}</textarea>
<td colspan="3">
<textarea name="code" placeholder="请输入完整的统计代码" class="layui-textarea">{$config.code|default=''}</textarea>
</td>
</tr>
<tr>
<td class="layui-td-gray">版权信息</td>
<td colspan="3">
<input type="text" name="copyright" autocomplete="off" placeholder="请输入版权信息" lay-reqText="请输入版权信息"
class="layui-input" {notempty name="$config.copyright" } value="{$config.copyright}" {/notempty}>
<input type="text" name="copyright" autocomplete="off" placeholder="请输入版权信息" lay-reqText="请输入版权信息" class="layui-input" value="{$config.copyright|default='勾股OA'}">
</td>
<td class="layui-td-gray-2">代码版本号<font>*</font>
</td>
<td>
<input type="text" lay-verify="required" name="version" autocomplete="off" placeholder="请输入版本号"
lay-reqText="请输入版本号" class="layui-input" {notempty name="$config.version" }
value="{$config.version}" {/notempty}>
<input type="text" lay-verify="required" name="version" autocomplete="off" placeholder="请输入版本号" lay-reqText="请输入版本号" class="layui-input" value="{$config.version|default='1.0.0'}">
</td>
</tr>
</table>
@ -131,6 +124,19 @@
}
}
});
var uploadInst2 = upload.render({
elem: '#uploadBtn2',
url: "/api/index/upload",
done: function (res) {
layer.msg(res.msg);
if (res.code == 0) {
//上传成功
$('#smalllogo input').attr('value', res.data.filepath);
$('#smalllogo img').attr('src', res.data.filepath);
}
}
});
}
</script>
{/block}

4
app/home/view/index/index.html
View File

@ -72,8 +72,8 @@
<div class="layui-side layui-side-menu layui-side-{$theme}">
<div class="layui-side-scroll no-scroll">
<div class="layui-logo" gg-event="closeAllTabs">
<img src="{__IMG__}/syslogo.png" style="height: 40px;" class="syslogo">
<img src="{__IMG__}/syslogo_small.png" style="height: 40px;" class="logo">
<img src="{:get_system_config('web','logo')}" onerror="javascript:this.src='{__IMG__}/syslogo.png';this.onerror=null;" style="height: 40px;" class="syslogo">
<img src="{:get_system_config('web','small_logo')}" onerror="javascript:this.src='{__IMG__}/syslogo_small.png';this.onerror=null;" style="height: 40px;" class="logo">
</div>
<ul id="menuList" class="layui-nav layui-nav-tree layui-inline" lay-shrink="all">

2
app/install/data/gouguoa.sql
View File

@ -457,7 +457,7 @@ CREATE TABLE `oa_config` (
-- ----------------------------
-- Records of oa_config
-- ----------------------------
INSERT INTO `oa_config` VALUES (1, '网站配置', 'web', 'a:13:{s:2:\"id\";s:1:\"1\";s:11:\"admin_title\";s:8:\"勾股OA\";s:5:\"title\";s:8:\"勾股OA\";s:4:\"logo\";s:52:\"/storage/202111/fc507cc8332d5ef49d9425185e4a9697.jpg\";s:4:\"file\";s:0:\"\";s:6:\"domain\";s:23:\"https://oa.gougucms.com\";s:3:\"icp\";s:23:\"粤ICP备1xxxxxx11号-1\";s:8:\"keywords\";s:8:\"勾股OA\";s:5:\"beian\";s:29:\"粤公网安备1xxxxxx11号-1\";s:4:\"desc\";s:479:\"勾股办公是一款基于ThinkPHP6 + Layui + MySql打造的，简单实用的开源免费的企业办公系统框架。系统集成了系统设置、人事管理模块、消息管理模块、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。 \";s:4:\"code\";s:0:\"\";s:9:\"copyright\";s:36:\"© 2022 gougucms.com GPL-3.0 license\";s:7:\"version\";s:6:\"1.0.22\";}', 1, 1612514630, 1638010154);
INSERT INTO `oa_config` VALUES (1, '网站配置', 'web', 'a:14:{s:2:"id";s:1:"1";s:11:"admin_title";s:8:"勾股OA";s:5:"title";s:8:"勾股OA";s:4:"logo";s:31:"/static/home/images/syslogo.png";s:4:"file";s:0:"";s:6:"domain";s:23:"https://oa.gougucms.com";s:3:"icp";s:23:"粤ICP备1xxxxxx11号-1";s:8:"keywords";s:8:"勾股OA";s:5:"beian";s:29:"粤公网安备1xxxxxx11号-1";s:4:"desc";s:481:"勾股办公是一款基于ThinkPHP6 + Layui + MySql打造的，简单实用的开源免费的企业办公系统框架。系统集成了系统设置、人事管理模块、消息管理模块、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。 ";s:10:"small_logo";s:37:"/static/home/images/syslogo_small.png";s:4:"code";s:0:"";s:9:"copyright";s:36:"© 2023 gougucms.com GPL-3.0 license";s:7:"version";s:6:"1.0.24";}', 1, 1612514630, 1638010154);
INSERT INTO `oa_config` VALUES (2, '邮箱配置', 'email', 'a:8:{s:2:\"id\";s:1:\"2\";s:4:\"smtp\";s:11:\"smtp.qq.com\";s:9:\"smtp_port\";s:3:\"465\";s:9:\"smtp_user\";s:15:\"gougucms@qq.com\";s:8:\"smtp_pwd\";s:6:\"123456\";s:4:\"from\";s:24:\"勾股CMS系统管理员\";s:5:\"email\";s:18:\"admin@gougucms.com\";s:8:\"template\";s:485:\"<p>勾股办公是一款基于ThinkPHP6 + Layui + MySql打造的，简单实用的开源免费的企业办公系统框架。系统集成了系统设置、人事管理模块、消息管理模块、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。</p>\";}', 1, 1612521657, 1637075205);
INSERT INTO `oa_config` VALUES (3, 'Api Token配置', 'token', 'a:5:{s:2:\"id\";s:1:\"3\";s:3:\"iss\";s:15:\"oa.gougucms.com\";s:3:\"aud\";s:7:\"gouguoa\";s:7:\"secrect\";s:7:\"GOUGUOA\";s:7:\"exptime\";s:4:\"3600\";}', 1, 1627313142, 1638010233);
INSERT INTO `oa_config` VALUES (4, '其他配置', 'other', 'a:3:{s:2:\"id\";s:1:\"5\";s:6:\"author\";s:15:\"勾股工作室\";s:7:\"version\";s:13:\"v1.2021.07.28\";}', 1, 1613725791, 1635953640);

2
public/index.php
View File

@ -18,7 +18,7 @@ require __DIR__ . '/../vendor/autoload.php';
define('CMS_VERSION','4.80.09');
// 定义Layui版本号
define('LAYUI_VERSION','2.8.12');
define('LAYUI_VERSION','2.8.13');
// 定义项目目录
define('CMS_ROOT', __DIR__ . '/../');

2
public/static/assets/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

2
public/static/assets/layui/layui.js
View File

File diff suppressed because one or more lines are too long