Skip to content

Commit

Permalink
feat: readme update
Browse files Browse the repository at this point in the history
  • Loading branch information
modstart committed Feb 3, 2023
1 parent acec02f commit c5b3328
Show file tree
Hide file tree
Showing 26 changed files with 187 additions and 66 deletions.
85 changes: 46 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<p align="center">
<a href="https://modstart.com">
<img src="https://ms-assets.modstart.com/data/image/2021/09/08/23652_1f1j_9825.png" alt="ModStart" width="360" />
Expand All @@ -7,7 +8,6 @@
基于 Laravel 的企业内容建站系统
</p>


<p align="center">
<a href="https://github.com/modstart/ModStartCMS" target="_blank">
<img alt="License Apache2.0" src="https://img.shields.io/badge/License-Apache2.0-blue">
Expand Down Expand Up @@ -44,7 +44,6 @@
最新版本 <img alt="GitHub last release" style="vertical-align:middle;height:18px;" src="https://img.shields.io/github/v/release/modstart/ModStartCMS?style=flat-square">

功能完善,模块市场丰富,欢迎交流。
QQ群: [467107293](https://qm.qq.com/cgi-bin/qm/qr?k=JP5GySRSCM8BUVoIGwfXF_bCe6gPajEb&jump_from=webapi)

- 会员模块通用且完整,支持完整的API调用
- 大文件分片上传,进度条显示,已上传文件管理
Expand All @@ -57,34 +56,35 @@ QQ群: [467107293](https://qm.qq.com/cgi-bin/qm/qr?k=JP5GySRSCM8BUVoIGwfXF_bCe
- 第三方云存储支持,支持云储存分片上传(阿里云、百度云、华为云、腾讯云、FTP、七牛云、UCloud、又拍云)
- 第三方短信支持(阿里云、腾讯云、华为云、百度云、253云通讯、聚合、七牛云、融云、赛邮、UCloud、云片、网易云)
- 丰富优秀的模块支持:
- [视频点播课](https://modstart.com/m/CourseVideo)
- [一物一码防伪溯源](https://modstart.com/m/Tracking)
- [文章投稿系统](https://modstart.com/m/CmsWriter)
- [Markdown文档管理](https://modstart.com/m/Markdown)
- [视频管理系统](https://modstart.com/m/Video)
- [邮件营销系统](https://modstart.com/m/Edm)
- [视频直播系统](https://modstart.com/m/CourseLive)
- [文库系统](https://modstart.com/m/Wenku)
- [相册系统](https://modstart.com/m/Photo)
- [文库系统](https://modstart.com/m/Wenku)
- [问答系统](https://modstart.com/m/Wenda)
- [IT工具箱](https://modstart.com/m/Tools)
- [帮助中心系统](https://modstart.com/m/CmsHelp)
- [短连接系统](https://modstart.com/m/ShortLink)
- [论坛系统](https://modstart.com/m/Forum)
- [个人博客系统](https://modstart.com/m/Blog)
- [发卡系统](https://modstart.com/m/Faka)
- [积分商城](https://modstart.com/m/CreditShop)
- [兼职招聘系统](https://modstart.com/m/Hire)
- [课程报名系统](https://modstart.com/m/Course)
- [活动报名系统](https://modstart.com/m/Event)
- [简单商城系统](https://modstart.com/m/Shop)
- [网盘系统](https://modstart.com/m/Pan)
- [微信公众号管理系统](https://modstart.com/m/WechatMP)
- [在线客服系统](https://modstart.com/m/LiveChat)
- [图床系统](https://modstart.com/m/PicUploader)
- [通用CMS系统](https://modstart.com/m/Cms)
- ...
- [视频点播课](https://modstart.com/m/CourseVideo)
- [一物一码防伪溯源](https://modstart.com/m/Tracking)
- [文章投稿系统](https://modstart.com/m/CmsWriter)
- [Markdown文档管理](https://modstart.com/m/Markdown)
- [视频管理系统](https://modstart.com/m/Video)
- [邮件营销系统](https://modstart.com/m/Edm)
- [视频直播系统](https://modstart.com/m/CourseLive)
- [文库系统](https://modstart.com/m/Wenku)
- [相册系统](https://modstart.com/m/Photo)
- [文库系统](https://modstart.com/m/Wenku)
- [问答系统](https://modstart.com/m/Wenda)
- [IT工具箱](https://modstart.com/m/Tools)
- [帮助中心系统](https://modstart.com/m/CmsHelp)
- [短连接系统](https://modstart.com/m/ShortLink)
- [论坛系统](https://modstart.com/m/Forum)
- [个人博客系统](https://modstart.com/m/Blog)
- [发卡系统](https://modstart.com/m/Faka)
- [积分商城](https://modstart.com/m/CreditShop)
- [兼职招聘系统](https://modstart.com/m/Hire)
- [课程报名系统](https://modstart.com/m/Course)
- [活动报名系统](https://modstart.com/m/Event)
- [简单商城系统](https://modstart.com/m/Shop)
- [网盘系统](https://modstart.com/m/Pan)
- [微信公众号管理系统](https://modstart.com/m/WechatMP)
- [在线客服系统](https://modstart.com/m/LiveChat)
- [图床系统](https://modstart.com/m/PicUploader)
- [通用CMS系统](https://modstart.com/m/Cms)
- ...



## 💡 系统简介
Expand All @@ -93,6 +93,7 @@ QQ群: [467107293](https://qm.qq.com/cgi-bin/qm/qr?k=JP5GySRSCM8BUVoIGwfXF_bCe

系统完全开源,基于 **Apache 2.0** 开源协议,**免费且不限制商业使用**


<img src="https://ms-assets.modstart.com/data/image/2021/11/07/46017_dv5r_7358.jpg" alt="功能架构" />

- [ModStart官方网站](https://modstart.com)
Expand Down Expand Up @@ -155,17 +156,17 @@ QQ群: [467107293](https://qm.qq.com/cgi-bin/qm/qr?k=JP5GySRSCM8BUVoIGwfXF_bCe


- **Laravel 5.1 版本**
- `PHP 5.6` `PHP 7.0`
- `MySQL` `>=5.0`
- `PHP Extension``Fileinfo`
- `Apache/Nginx`
- `PHP 5.6` `PHP 7.0`
- `MySQL` `>=5.0`
- `PHP Extension``Fileinfo`
- `Apache/Nginx`


- **Laravel 9.0 版本**
- `PHP 8.0` `PHP 8.1`
- `MySQL` `>=5.0`
- `PHP Extension``Fileinfo`
- `Apache/Nginx`
- `PHP 8.1`
- `MySQL` `>=5.0`
- `PHP Extension``Fileinfo`
- `Apache/Nginx`

> 我们的测试基于 PHP 的 5.6 / 7.0 / 8.0 / 8.1 版本,系统稳定性最好
Expand Down Expand Up @@ -286,4 +287,10 @@ AdminMenu::register(function () {

## ✉️ 使用交流

QQ交流群: [467107293](https://qm.qq.com/cgi-bin/qm/qr?k=JP5GySRSCM8BUVoIGwfXF_bCe6gPajEb&jump_from=webapi)
### QQ交流群

<img width="400" src="https://modstart.com/contact/ContactQQGroup" />

### 微信交流群

<img width="400" src="https://modstart.com/contact/ContactWechatGroup" />
2 changes: 1 addition & 1 deletion module/AdminManager/Docs/release.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 1.8.0
## 1.8.0 调用命令升级,日志优化显示

- 新增:系统升级调用命令容错处理
- 优化:系统升级界面日志颜色优化
Expand Down
1 change: 1 addition & 0 deletions module/Banner/Docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- 新增:快速渲染方式
- 新增:手机自适应宽高比
- 优化:浏览器自适应或尺寸变更时自动更新
- 修复:导航轮播适配最新版本方法调用

---

Expand Down
2 changes: 1 addition & 1 deletion module/Banner/View/pc/public/bannerNav.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
@endforeach
@endif
</div>
<a class="menu-toggle" href="javascript:;" onclick="$('body').toggleClass('ub-header-show')">
<a class="menu-toggle" href="javascript:;" onclick="MS.header.trigger()">
<i class="show iconfont icon-list"></i>
<i class="close iconfont icon-close"></i>
</a>
Expand Down
2 changes: 1 addition & 1 deletion module/Cms/Docs/release.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 3.2.0
## 3.2.0 内容访问优化,模型字段编辑修复

- 优化:内容访问无权限时基础字段保留
- 修复:模型字段不能编辑问题修复
Expand Down
6 changes: 6 additions & 0 deletions module/Vendor/Docs/release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 3.8.0

- 优化:导入页面兼容后台多标签方式展示

---

## 3.7.0 任务调度升级,订单处理优化

- 新增:任务调度执行器ScheduleRunner
Expand Down
10 changes: 7 additions & 3 deletions module/Vendor/Installer/function.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@
file_put_contents(ENV_FILE, "APP_ENV=beta\nAPP_DEBUG=true\nAPP_KEY=" . \ModStart\Core\Util\RandomUtil::string(32));
}

function php_is_laravel9()
{
return in_array(INSTALL_APP, ['CMS9', 'BLOG9']);
}

function php_version_requires()
{
if (INSTALL_APP == 'CMS9') {
if (php_is_laravel9()) {
return join('', [
'8.0.x',
'8.1.x',
]);
}
Expand All @@ -66,7 +70,7 @@ function php_version_requires()

function php_version_ok()
{
if (INSTALL_APP == 'CMS9') {
if (php_is_laravel9()) {
if (version_compare(PHP_VERSION, '8.1.0', '<')) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion module/Vendor/View/quickRun/import/excel.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</style>
@endsection

@section('bodyContent')
@section($_tabSectionName)
<div id="app" v-cloak>
<div class="tw-p-2 tw-rounded tw-mx-auto tw-bg-white">
<div class="ub-panel">
Expand Down
2 changes: 1 addition & 1 deletion module/Vendor/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Vendor",
"title": "通用功能包",
"version": "3.7.0",
"version": "3.8.0",
"author": "官方",
"description": "提供基础功能",
"modstartVersion": ">=3.3.0",
Expand Down
2 changes: 1 addition & 1 deletion public/asset/common/base.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion storage/cache/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*
!.gitignore
!.gitignore
2 changes: 1 addition & 1 deletion vendor/modstart/modstart/asset/common/base.js

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions vendor/modstart/modstart/resources/asset/src/common/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ jquery.fn.isInViewport = function () {
};

const Header = {
trigger: function (selector, showClass) {
trigger: function (ele, selector, showClass) {
selector = selector || 'header'
showClass = showClass || 'show'
var $header = $(selector)
if ((typeof ele === 'undefined') && window.event) {
ele = window.event.target
}
var $header = ele ? ($(ele).closest(selector)) : ($(selector))
if ($header.hasClass(showClass)) {
$header.removeClass(showClass)
$('html').removeClass('body-scroll-lock')
Expand All @@ -31,10 +34,13 @@ const Header = {
$('html').addClass('body-scroll-lock')
}
},
hide: function (selector, showClass) {
hide: function (ele, selector, showClass) {
if ((typeof ele === 'undefined') && window.event) {
ele = window.event.target
}
selector = selector || 'header'
showClass = showClass || 'show'
var $header = $(selector)
var $header = ele ? ($(ele).closest(selector)) : ($(selector))
$header.removeClass(showClass)
$('html').removeClass('body-scroll-lock')
}
Expand Down
9 changes: 8 additions & 1 deletion vendor/modstart/modstart/resources/asset/src/lib/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ var Form = {
winReload(Util.getRootWindow())
} else if ('[back]' === redirect) {
window.history.back();
} else if ('[tab-close]' === redirect) {
if (window == parent.window) {
console.error('tab-close must be in iframe')
return
}
var tabPageId = window.frameElement.getAttribute("data-tab-page")
window.parent._pageTabmanager.close(tabPageId)
} else if (redirect.indexOf('[js]') === 0) {
eval(redirect.substr(4));
} else {
Expand Down Expand Up @@ -254,4 +261,4 @@ var Form = {
};


module.exports = Form;
module.exports = Form;
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<img data-src="placeholder/400x100"/>
</a>
</div>
<div class="menu-mask" onclick="$('body').removeClass('ub-header-show')"></div>
<div class="menu-mask" onclick="MS.header.hide()"></div>
<div class="menu">
<a href="#">首页</a>
<a href="#" class="active">导航A</a>
<a href="#">导航B</a>
<a href="#">导航C</a>
</div>
<a class="menu-toggle" href="javascript:;" onclick="$('body').toggleClass('ub-header-show')">
<a class="menu-toggle" href="javascript:;" onclick="MS.header.trigger()">
<i class="show iconfont icon-list"></i>
<i class="close iconfont icon-close"></i>
</a>
Expand All @@ -38,4 +38,4 @@
<p>话说天下大势,合久必分,分久必合。</p>
<p>话说天下大势,合久必分,分久必合。</p>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,17 @@
line-height: 2rem;
padding: 0 0.5rem;

&.page{
background-color: var(--color-content-bg);
height:2.5rem;
padding:0.25rem 0;
.center{
.box{
background-color: var(--color-body-bg);
}
}
}

.left, .center, .right {
.item {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion vendor/modstart/modstart/src/Admin/Auth/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public static function addInfoLog($adminUserId, $summary, $content = [])
}
$adminLog = ModelUtil::insert('admin_log', ['adminUserId' => $adminUserId, 'type' => AdminLogType::INFO, 'summary' => $summary]);
if (!empty($content)) {
ModelUtil::insert('admin_log_data', ['id' => $adminLog['id'], 'content' => json_encode($content)]);
ModelUtil::insert('admin_log_data', ['id' => $adminLog['id'], 'content' => json_encode($content, JSON_UNESCAPED_UNICODE)]);
}
}

Expand Down
14 changes: 14 additions & 0 deletions vendor/modstart/modstart/src/Core/Input/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,25 @@ public static function headers()

public static function ip()
{
$keys = [
'HTTP_X_REAL_IP',
'HTTP_X_FORWARDED_FOR',
];
foreach ($keys as $key) {
if ($v = self::server($key)) {
return $v;
}
}
return self::instance()->ip();
}

public static function server($name)
{
return self::instance()->server($name);
}

public static function servers()
{
return self::instance()->server->all();
}
}
42 changes: 42 additions & 0 deletions vendor/modstart/modstart/src/Core/Util/MetaUtil.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php


namespace ModStart\Core\Util;


use ModStart\Core\Exception\BizException;

class MetaUtil
{
private static $supportKeys = [
'APP_NAME',
];

public static function get($key)
{
static $meta = null;
BizException::throwsIf('Meta信息不包含' . $key, !in_array($key, self::$supportKeys));
if (null === $meta) {
$file = base_path('meta.json');
if (file_exists($file)) {
$meta = @json_decode(file_get_contents($file), true);
}
if (empty($meta)) {
$meta = [];
}
}
if (isset($meta[$key])) {
return $meta[$key];
}
switch ($key) {
case 'APP_NAME':
if (defined('\App\Constant\AppConstant::APP_NAME')) {
return \App\Constant\AppConstant::APP_NAME;
} else if (defined('\App\Constant\AppConstant::APP')) {
return \App\Constant\AppConstant::APP;
}
return 'UnknownAppName';
}
return '-';
}
}
Loading

0 comments on commit c5b3328

Please sign in to comment.