Skip to content

Commit c979353

Browse files
modstartmodstart
committed
feat: upgrade
1 parent 5e885ab commit c979353

554 files changed

Lines changed: 25118 additions & 21291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎artisan‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
define('LARAVEL_START', microtime(true));
55

6+
require __DIR__.'/module/Vendor/Installer/artisanCheck.php';
7+
68
/*
79
|--------------------------------------------------------------------------
810
| Register The Auto Loader
@@ -19,16 +21,6 @@ require __DIR__.'/vendor/autoload.php';
1921

2022
$app = require_once __DIR__.'/bootstrap/app.php';
2123

22-
if (\ModStart\Core\Util\PlatformUtil::isLinux()) {
23-
if (function_exists('posix_getuid')) {
24-
$uid = posix_getuid();
25-
if ($uid == 0) {
26-
echo "You can't run this command as root ( uid = ${uid} ).\n";
27-
exit(-1);
28-
}
29-
}
30-
}
31-
3224
/*
3325
|--------------------------------------------------------------------------
3426
| Run The Artisan Application

‎config/module.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
'Cms' => [
4545
'enable' => true,
4646
],
47+
'SiteCounter' => [
48+
'enable' => true,
49+
],
4750
'AigcBase' => [
4851
'enable' => true,
4952
],

‎module/AdminManager/Asset/entry/upgrade.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎module/AdminManager/Core/ModuleServiceProvider.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,78 +19,78 @@ public function boot(Dispatcher $events)
1919
AdminMenu::register(function () {
2020
return [
2121
[
22-
'title' => L('Admin Manage'),
22+
'title' => L('AdminManage'),
2323
'icon' => 'user-o',
2424
'sort' => 500,
2525
'children' => [
2626
[
27-
'title' => L('Admin User'),
27+
'title' => L('AdminUser'),
2828
'url' => '\ModStart\Admin\Controller\AdminUserController@index',
2929
],
3030
[
31-
'title' => L('Admin User Manage'),
31+
'title' => L('AdminUserManage'),
3232
'rule' => 'AdminUserManage',
3333
'hide' => true,
3434
],
3535
[
36-
'title' => L('Admin Role'),
36+
'title' => L('AdminRole'),
3737
'url' => '\ModStart\Admin\Controller\AdminRoleController@index',
3838
],
3939
[
40-
'title' => L('Admin Role Manage'),
40+
'title' => L('AdminRoleManage'),
4141
'rule' => 'AdminRoleManage',
4242
'hide' => true,
4343
],
4444
[
45-
'title' => L('Admin Log'),
45+
'title' => L('AdminLog'),
4646
'url' => '\ModStart\Admin\Controller\AdminLogController@index',
4747
],
4848
[
49-
'title' => L('Admin Log Manage'),
49+
'title' => L('AdminLogManage'),
5050
'rule' => 'AdminLogManage',
5151
'hide' => true,
5252
],
5353
[
54-
'title' => L('Change password'),
54+
'title' => L('ChangePassword'),
5555
'url' => '\ModStart\Admin\Controller\ProfileController@changePassword',
5656
'hide' => true,
5757
],
5858
]
5959
],
6060
[
61-
'title' => L('System Manage'),
61+
'title' => L('SystemManage'),
6262
'icon' => 'code-alt',
6363
'sort' => 700,
6464
'children' => [
6565
[
66-
'title' => L('System Manage'),
66+
'title' => L('SystemManage'),
6767
'rule' => 'SystemManage',
6868
'url' => '\ModStart\Admin\Controller\SystemController@index',
6969
'hide' => true,
7070
],
7171
[
72-
'title' => L('Data File Manager View'),
72+
'title' => L('DataFileManagerView'),
7373
'rule' => 'DataFileManagerView',
7474
'url' => '\ModStart\Admin\Controller\DataController@index',
7575
'hide' => true,
7676
],
7777
[
78-
'title' => L('Data File Manager Upload'),
78+
'title' => L('DataFileManagerUpload'),
7979
'rule' => 'DataFileManagerUpload',
8080
'hide' => true,
8181
],
8282
[
83-
'title' => L('Data File Manager Delete'),
83+
'title' => L('DataFileManagerDelete'),
8484
'rule' => 'DataFileManagerDelete',
8585
'hide' => true,
8686
],
8787
[
88-
'title' => L('Data File Manager Add/Edit'),
88+
'title' => L('DataFileManagerAddEdit'),
8989
'rule' => 'DataFileManagerAdd/Edit',
9090
'hide' => true,
9191
],
9292
[
93-
'title' => L('System Upgrade'),
93+
'title' => L('SystemUpgrade'),
9494
'rule' => 'SystemUpgrade',
9595
'hide' => true,
9696
]

‎module/AdminManager/resources/asset/src/pages/Upgrade.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<div class="ub-panel">
1111
<div class="head">
1212
<div class="more" v-if="memberUser.id">
13-
<el-button round style="padding:0.25rem 0.5rem;" :loading="memberUserLoading"
13+
<el-button round style="padding:0.3125rem 0.625rem;" :loading="memberUserLoading"
1414
@click="doMemberLoginShow()">
1515
<span v-if="memberUserLoading">
1616
登录中
1717
</span>
1818
<span v-else-if="memberUser.id>0">
1919
<div v-if="memberUser.avatar" class="ub-cover-1-1 tw-rounded-full"
20-
style="width:0.8rem;display:inline-block;vertical-align:middle;"
20+
style="width:1rem;display:inline-block;vertical-align:middle;"
2121
:style="{backgroundImage:`url(${memberUser.avatar})`}"></div>
2222
<i v-else class="iconfont icon-user"></i>
2323
{{memberUser.username}}
@@ -107,7 +107,7 @@
107107
</a>
108108
</div>
109109
<div v-if="!memberUser.id">
110-
<div style="padding:0 1.5rem;">
110+
<div style="padding:0 1.875rem;">
111111
<div class="tw-py-2 tw-text-center tw-text-lg">
112112
请登录账号
113113
</div>
@@ -472,7 +472,7 @@ export default {
472472

473473
<style lang="less">
474474
.pb-member-info-dialog{
475-
max-width:18rem;
475+
max-width:22.5rem;
476476
}
477477
</style>
478478

‎module/AigcBase/Admin/Controller/AigcChatController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public function index($type)
2222
{
2323
Response::textEventStreamed(function ($sendCallback, $param = []) use ($type) {
2424
$input = InputPackage::buildFromInput();
25+
$systemPrompt = $input->getTrimString('systemPrompt');
2526
$prompt = $input->getTrimString('prompt');
2627
$driver = null;
2728
switch ($type) {
@@ -38,6 +39,7 @@ public function index($type)
3839
BizException::throws('机器人没有配置');
3940
} else {
4041
$option = [];
42+
$option['systemPrompt'] = $systemPrompt;
4143
$ret = $provider->chatStream(function ($payload, $param) use (&$sendCallback, &$send) {
4244
call_user_func($sendCallback, $payload['type'], isset($payload['data']) ? $payload['data'] : null);
4345
}, 'Admin_' . SessionUtil::id(), [

‎module/AigcBase/Admin/Controller/AigcKeyPoolController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected function crud(AdminCRUDBuilder $builder)
9595
if ($provider) {
9696
$html[] = "<table class='ub-table mini border tw-bg-white'>";
9797
foreach ($provider->paramDisplay($item->toArray()) as $v) {
98-
$html[] = "<tr><td>$v[name]</td><td><div style='max-width:8rem;overflow:hidden;text-overflow:ellipsis;'>$v[value]</div></td></tr>";
98+
$html[] = "<tr><td>$v[name]</td><td><div style='max-width:10rem;overflow:hidden;text-overflow:ellipsis;'>$v[value]</div></td></tr>";
9999
}
100100
$html[] = "</table>";
101101
}
@@ -105,8 +105,8 @@ protected function crud(AdminCRUDBuilder $builder)
105105
->listable(true)->showable(true)->addable(false)->editable(false);
106106
$builder->text('remark', '备注');
107107

108-
$builder->display('created_at', L('Created At'))->listable(false);
109-
$builder->display('updated_at', L('Updated At'))->listable(false);
108+
$builder->display('created_at', L('CreatedAt'))->listable(false);
109+
$builder->display('updated_at', L('UpdatedAt'))->listable(false);
110110
})
111111
->gridFilter(function (GridFilter $filter) {
112112
// $filter->eq('userId', '用户ID');

0 commit comments

Comments
 (0)