From a52f9029f23d9d2ed3134eae787f9592f08efe6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 1 Dec 2022 02:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=88=E7=BD=91=E7=AB=99?= =?UTF-8?q?=EF=BC=89=EF=BC=9A=E6=96=B0=E5=A2=9EPostgreSQL=E6=94=AF?= =?UTF-8?q?=E6=8C=81=EF=BC=8C=E8=B0=83=E6=95=B4=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?CSS=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/InfosController.php | 6 +++--- .../Controllers/Api/WebsitesController.php | 8 +++++++ plugins/Openresty/views/index.blade.php | 2 +- resources/views/website/add.blade.php | 21 ++++++++++++------- .../views/website/default_settings.blade.php | 4 ++-- resources/views/website/edit.blade.php | 4 ++-- 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Api/InfosController.php b/app/Http/Controllers/Api/InfosController.php index 7d616120..948b03b4 100644 --- a/app/Http/Controllers/Api/InfosController.php +++ b/app/Http/Controllers/Api/InfosController.php @@ -307,10 +307,10 @@ class InfosController extends Controller $dbVersions['mysql'] = false; } // 判断postgresql插件是否安装 - if (isset(PLUGINS['postgresql15'])) { - $dbVersions['postgresql15'] = PLUGINS['postgresql15']['version']; + if (isset(PLUGINS['postgresql'])) { + $dbVersions['postgresql'] = PLUGINS['postgresql']['version']; } else { - $dbVersions['postgresql15'] = false; + $dbVersions['postgresql'] = false; } // 循环获取已安装的PHP版本 $php_versions = Plugin::query()->where('slug', 'like', 'php%')->get(); diff --git a/app/Http/Controllers/Api/WebsitesController.php b/app/Http/Controllers/Api/WebsitesController.php index 8fc61592..fbfed8a5 100644 --- a/app/Http/Controllers/Api/WebsitesController.php +++ b/app/Http/Controllers/Api/WebsitesController.php @@ -207,6 +207,14 @@ EOF; shell_exec("mysql -u root -p".$password." -e \"CREATE USER '".$credentials['db_username']."'@'localhost' IDENTIFIED BY '".$credentials['db_password']."';\""); shell_exec("mysql -u root -p".$password." -e \"GRANT ALL PRIVILEGES ON ".$credentials['db_name'].".* TO '".$credentials['db_username']."'@'localhost';\""); shell_exec("mysql -u root -p".$password." -e \"flush privileges;\""); + } elseif ($credentials['db_type'] == 'postgresql') { + shell_exec('echo "CREATE DATABASE '.$credentials['db_name'].';"|su - postgres -c "psql"'); + shell_exec('echo "CREATE USER '.$credentials['db_username'].' WITH PASSWORD \''.$credentials['db_password'].'\';"|su - postgres -c "psql"'); + shell_exec('echo "GRANT ALL PRIVILEGES ON DATABASE '.$credentials['db_name'].' TO '.$credentials['db_username'].';"|su - postgres -c "psql"'); + // 写入用户配置 + shell_exec('echo "host '.$credentials['db_name'].' '.$credentials['db_username'].' 127.0.0.1/32 scram-sha-256" >> /www/server/postgresql/15/pg_hba.conf'); + // 重载 + shell_exec('systemctl reload postgresql-15'); } } $res['code'] = 0; diff --git a/plugins/Openresty/views/index.blade.php b/plugins/Openresty/views/index.blade.php index 04d1c922..5e6b1483 100755 --- a/plugins/Openresty/views/index.blade.php +++ b/plugins/Openresty/views/index.blade.php @@ -33,7 +33,7 @@ Date: 2022-11-30 提示：Ctrl+F 搜索关键字，Ctrl+S 保存，Ctrl+H 查找替换！
+ style="height: 600px;">
diff --git a/resources/views/website/add.blade.php b/resources/views/website/add.blade.php index a782899f..6d673e28 100644 --- a/resources/views/website/add.blade.php +++ b/resources/views/website/add.blade.php @@ -53,19 +53,19 @@ Date: 2022-11-21
- +
- +
- +
@@ -99,15 +99,22 @@ Date: 2022-11-21 layui.use(['admin', 'form', 'laydate'], function () { var $ = layui.$ , admin = layui.admin - , element = layui.element , layer = layui.layer - , laydate = layui.laydate , table = layui.table , form = layui.form; $("#add-website-db-info").hide(); form.render(); + $('#add-website-db-password').hover(function () { + layer.tips('必须8位以上大小写数字特殊符号混合', '#add-website-db-password', { + tips: 1, + time: 0 + }); + }, function () { + layer.closeAll('tips'); + }); + form.on('select(add-website-db)', function (data) { console.log(data.value); //得到被选中的值 if (data.value === "") { @@ -118,12 +125,10 @@ Date: 2022-11-21 $("#add-website-db-info").show(); $('input[name="db_name"]').val($('input[name="name"]').val() + '_mysql'); $('input[name="db_username"]').val($('input[name="name"]').val() + '_mysql'); - $('input[name="db_password"]').val($('input[name="name"]').val() + '_password'); - }else if(data.value === 'postgresql15') { + }else if(data.value === 'postgresql') { $("#add-website-db-info").show(); $('input[name="db_name"]').val($('input[name="name"]').val() + '_postgresql'); $('input[name="db_username"]').val($('input[name="name"]').val() + '_postgresql'); - $('input[name="db_password"]').val($('input[name="name"]').val() + '_password'); } }); // 提交 diff --git a/resources/views/website/default_settings.blade.php b/resources/views/website/default_settings.blade.php index 1a965c9c..0d86cedb 100644 --- a/resources/views/website/default_settings.blade.php +++ b/resources/views/website/default_settings.blade.php @@ -15,14 +15,14 @@ Date: 2022-11-30
设置站点未找到时的提示页面。
-
@{{ d.data.index }}
+
@{{ d.data.index }}
设置站点停止时的提示页面。
-
@{{ d.data.stop }}
+
@{{ d.data.stop }}
diff --git a/resources/views/website/edit.blade.php b/resources/views/website/edit.blade.php index 90b045de..11067230 100644 --- a/resources/views/website/edit.blade.php +++ b/resources/views/website/edit.blade.php @@ -167,7 +167,7 @@ Date: 2022-11-28
设置伪静态规则，填入 location 部分即可
-
@{{ d.params.config.rewrite }}
+
@{{ d.params.config.rewrite }}
@@ -177,7 +177,7 @@ Date: 2022-11-28
如果你修改了原文，那么点击保存后，其余的修改将不会生效！ -
@{{ d.params.config.config_raw }}
+
@{{ d.params.config.config_raw }}