提交 74c8bd58 编写于 作者: ModStart's avatar ModStart

develop

上级 a2072b88
......@@ -3,6 +3,8 @@
namespace App\Web\Controller;
use Illuminate\Support\Facades\Input;
use ModStart\Core\Input\Response;
use Module\Cms\Provider\CmsHomePageProvider;
use Module\Vendor\Installer\Util\InstallerUtil;
use Module\Vendor\Provider\HomePage\HomePageProvider;
......
......@@ -48,12 +48,12 @@ class BannerController extends Controller
->gridFilter(function (GridFilter $filter) {
$filter->eq('position', '位置')->select(BannerPosition::class);
})
->hookChanged(function (Form $form) {
BannerUtil::clearCache();
})
->enablePagination(false)
->defaultOrder(['sort', 'asc'])
->canSort(true)
->title('轮播图片')
->hookSaved(function (Form $form) {
BannerUtil::clearCache();
});
->title('轮播图片');
}
}
- 新增:SSO登录时增加是否强制SSO退出参数
\ No newline at end of file
......@@ -83,7 +83,7 @@ class AuthController extends ModuleBaseController
{
$input = InputPackage::buildFromInput();
$redirect = $input->getTrimString('redirect', modstart_web_url(''));
if (modstart_config('ssoClientEnable', false)) {
if (modstart_config('ssoClientEnable', false) && modstart_config('ssoClientLogoutSyncEnable', false)) {
Input::merge(['domainUrl' => Request::domainUrl()]);
$ret = $this->api->ssoClientLogoutPrepare();
if ($ret['code']) {
......
此差异已折叠。
body{font-family:Helvetica,"STHeiti STXihei","Microsoft JhengHei","Microsoft YaHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.8em;padding:1em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file
body{font-family:"Microsoft YaHei",Helvetica,"STHeiti STXihei","Microsoft JhengHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.8em;padding:1em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file
......@@ -17,7 +17,9 @@
<a href="javascript:;" data-confirm="确认退出?" data-href="/logout">退出</a>
@else
<a href="{{modstart_web_url('login')}}">登录</a>
<a href="{{modstart_web_url('register')}}">注册</a>
@if(!modstart_config('registerDisable',false))
<a href="{{modstart_web_url('register')}}">注册</a>
@endif
@endif
</div>
<div class="logo">
......
body{font-family:Helvetica,"STHeiti STXihei","Microsoft JhengHei","Microsoft YaHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.8em;padding:1em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file
body{font-family:"Microsoft YaHei",Helvetica,"STHeiti STXihei","Microsoft JhengHei",Tohoma,Arial;font-size:12px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}a{color:#09f;text-decoration:none}a:focus,a:hover{color:#09f;text-decoration:none}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}img+br{display:block;padding:4px 0;content:' '}body p{margin-bottom:1em}iframe{border:none}.edui-faked-video{border:1px solid gray;width:300px;height:225px}img{max-width:100%}.ub-html{line-height:2em;color:#636b6f;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;overflow:hidden;word-wrap:break-word;font-size:inherit}.ub-html>:first-child{margin-top:0}.ub-html>p:first-child{margin-top:0}.ub-html>p:last-child{margin-bottom:0}.ub-html p{padding:0;line-height:1.8em;word-spacing:.05rem;margin:.5em 0}.ub-html img{max-width:100%}.ub-html img.ub-emotion{height:2em;border:none}.ub-html iframe{max-width:100%}.ub-html video{max-width:100%}.ub-html a{background:0 0}.ub-html hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}.ub-html code,.ub-html kbd,.ub-html pre{font-family:"Meiryo UI","YaHei Consolas Hybrid",Consolas,"Malgun Gothic","Segoe UI","Trebuchet MS",Helvetica,monospace,monospace;font-size:1em;background:#384548;color:#f8f8f2;white-space:pre;word-spacing:normal;word-wrap:normal;tab-size:4;hyphens:none;text-align:left;line-height:1.8em;padding:1em}.ub-html table{border-spacing:0;max-width:98%;margin:1em 0;box-shadow:0 0 .1rem #ccc;display:table;text-align:left;border:.05rem solid #ddd;border-collapse:collapse;overflow:auto;word-break:keep-all}.ub-html table tr{background-color:#fff;border-top:.05rem solid #ccc}.ub-html table tr tbody{border:0}.ub-html table tr th{font-weight:700;background-color:#f0f0f0;padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html table tr td{padding:.15rem .3rem;border:.05rem solid #ddd}.ub-html>p pre,.ub-html>p svg,.ub-html>p table{-webkit-box-shadow:0 0 .5rem #ccc;-moz-box-shadow:0 0 .5rem #ccc;box-shadow:0 0 .5rem #ccc;margin:1em auto;display:block}.ub-html td,.ub-html th{padding:0}.ub-html *{-moz-box-sizing:border-box;box-sizing:border-box}.ub-html input{font:.65rem/1.4 Helvetica,arial,freesans,clean,sans-serif,"Segoe UI Emoji","Segoe UI Symbol"}.ub-html a{color:#4183c4;text-decoration:none}.ub-html a:active,.ub-html a:hover{text-decoration:underline}.ub-html hr{height:0;margin:.75rem 0;overflow:hidden;background:0 0;border:0;border-bottom:.05rem solid #ddd}.ub-html hr:before{display:table;content:""}.ub-html hr:after{display:table;clear:both;content:""}.ub-html h1,.ub-html h2,.ub-html h3,.ub-html h4,.ub-html h5,.ub-html h6{font-weight:700;margin:1.2em 0 .6em 0;text-align:start}.ub-html h1{font-size:2em;margin:1em 0}.ub-html h2{font-size:1.7em;border-bottom:1px solid #eee;line-height:2em}.ub-html h3{font-size:1.5em}.ub-html h4{font-size:1.25em}.ub-html h5{font-size:1em}.ub-html h6{font-size:.85em}.ub-html blockquote{display:block;font-size:1em;overflow:auto;overflow-scrolling:touch;border-left:3px solid rgba(0,0,0,.4);background:rgba(0,0,0,.05);color:#6a737d;padding-top:.5em;padding-bottom:.5em;padding-left:1em;padding-right:.5em;margin-bottom:1em;margin-top:1em}.ub-html blockquote p{margin:.5em 0}.ub-html ol,.ub-html ul{padding:.5em 0;margin-top:0;margin-bottom:0;padding-left:1.4em}.ub-html ol li{list-style:decimal}.ub-html ul li{list-style:disc}.ub-html ol ol,.ub-html ul ol{list-style-type:lower-roman}.ub-html ol ol ol,.ub-html ol ul ol,.ub-html ul ol ol,.ub-html ul ul ol{list-style-type:lower-alpha}.ub-html dd{margin-left:0}.ub-html code{color:#c7254e;background-color:#f9f2f4;border-radius:.2em;white-space:pre;font-family:"Source Code Pro",monospace;font-size:.9em;padding:.1em .2em}.ub-html code.formula{color:inherit;background-color:inherit;border:inherit;font-size:inherit}.ub-html pre{margin-top:0;margin-bottom:0;font-family:Consolas,"Liberation Mono",Menlo,Courier,monospace;font-size:.9em;border-left:none}.ub-html pre code{color:inherit;background:0 0;border:none}.ub-html{font-size:14px}.ub-html iframe.edui-faked-video{width:auto;height:auto}
\ No newline at end of file
body {
font-family: Helvetica, "STHeiti STXihei", "Microsoft JhengHei", "Microsoft YaHei", Tohoma, Arial;
font-family: "Microsoft YaHei", Helvetica, "STHeiti STXihei", "Microsoft JhengHei", Tohoma, Arial;
font-size: 12px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
......
......@@ -8307,7 +8307,7 @@
initialContent: '',
initialStyle: '',
autoClearinitialContent: false,
iframeCssUrl: _url + 'themes/iframe.css?20211111',
iframeCssUrl: _url + 'themes/iframe.css?20211216',
textarea: 'editorValue',
focus: false,
focusInEnd: true,
......@@ -35,6 +35,7 @@ class ModuleUninstallCommand extends Command
unset($installeds[$module]);
$this->unPublishAsset($module);
$this->unPublishRoot($module);
ModuleManager::saveUserInstalledModules($installeds);
......@@ -46,6 +47,21 @@ class ModuleUninstallCommand extends Command
Event::fire($event);
}
private function unPublishAsset($module)
{
$fs = $this->laravel['files'];
$from = ModuleManager::path($module, 'Asset') . '/';
if (!file_exists($from)) {
return;
}
$to = public_path("vendor/$module/");
if (!file_exists($to)) {
return;
}
$fs->deleteDirectory($to);
$this->info("Module Asset UnPublish : $to");
}
private function unPublishRoot($module)
{
$root = ModuleManager::path($module, 'ROOT');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册