From 7e9231a5273a598403700e6173fc5becaccefd19 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Tue, 20 Dec 2022 15:23:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mysql=20=E6=85=A2=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/dto/database.go                   |  4 +-
 backend/app/service/database_mysql.go         |  6 +-
 .../src/components/confirm-dialog/index.vue   |  9 +-
 .../src/components/container-log/index.vue    |  2 +
 .../views/database/mysql/setting/index.vue    | 16 +++-
 .../database/mysql/setting/slow-log/index.vue | 82 +++++++++++++++----
 6 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/backend/app/dto/database.go b/backend/app/dto/database.go
index 1d590aa0e..4cf540e46 100644
--- a/backend/app/dto/database.go
+++ b/backend/app/dto/database.go
@@ -84,8 +84,8 @@ type MysqlVariables struct {
 }
 
 type MysqlVariablesUpdate struct {
-	Param string `json:"param"`
-	Value int64  `json:"value"`
+	Param string      `json:"param"`
+	Value interface{} `json:"value"`
 }
 type MysqlConfUpdateByFile struct {
 	MysqlName string `json:"mysqlName" validate:"required"`
diff --git a/backend/app/service/database_mysql.go b/backend/app/service/database_mysql.go
index cd48f87dd..5ec038c25 100644
--- a/backend/app/service/database_mysql.go
+++ b/backend/app/service/database_mysql.go
@@ -433,7 +433,11 @@ func (u *MysqlService) UpdateVariables(updatas []dto.MysqlVariablesUpdate) error
 			}
 		}
 
-		files = updateMyCnf(files, group, info.Param, loadSizeUnit(info.Value))
+		if _, ok := info.Value.(int64); ok {
+			files = updateMyCnf(files, group, info.Param, loadSizeUnit(info.Value.(int64)))
+		} else {
+			files = updateMyCnf(files, group, info.Param, info.Value)
+		}
 	}
 	file, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC, 0666)
 	if err != nil {
diff --git a/frontend/src/components/confirm-dialog/index.vue b/frontend/src/components/confirm-dialog/index.vue
index 3e646573f..3dcdbe568 100644
--- a/frontend/src/components/confirm-dialog/index.vue
+++ b/frontend/src/components/confirm-dialog/index.vue
@@ -15,7 +15,7 @@
         </div>
         <template #footer>
             <span class="dialog-footer">
-                <el-button @click="submitVisiable = false">
+                <el-button @click="onCancle">
                     {{ $t('commons.button.cancel') }}
                 </el-button>
                 <el-button :disabled="submitInput !== submitInputInfo" @click="onConfirm">
@@ -49,13 +49,18 @@ const acceptParams = (props: DialogProps): void => {
     submitInputInfo.value = props.submitInputInfo;
     submitInput.value = '';
 };
-const emit = defineEmits<{ (e: 'confirm'): void }>();
+const emit = defineEmits(['confirm', 'cancle']);
 
 const onConfirm = async () => {
     emit('confirm');
     submitVisiable.value = false;
 };
 
+const onCancle = async () => {
+    emit('cancle');
+    submitVisiable.value = false;
+};
+
 defineExpose({
     acceptParams,
 });
diff --git a/frontend/src/components/container-log/index.vue b/frontend/src/components/container-log/index.vue
index 01a1f0b37..581512a5d 100644
--- a/frontend/src/components/container-log/index.vue
+++ b/frontend/src/components/container-log/index.vue
@@ -70,7 +70,9 @@ const timeOptions = ref([
 ]);
 
 const onCloseLog = async () => {
+    logSearch.isWatch = false;
     clearInterval(Number(timer));
+    timer = null;
 };
 
 const searchLogs = async () => {
diff --git a/frontend/src/views/database/mysql/setting/index.vue b/frontend/src/views/database/mysql/setting/index.vue
index 5b08bc44b..8a26442f6 100644
--- a/frontend/src/views/database/mysql/setting/index.vue
+++ b/frontend/src/views/database/mysql/setting/index.vue
@@ -2,7 +2,7 @@
     <div class="demo-collapse" v-show="onSetting">
         <el-card style="margin-top: 5px" v-loading="loading">
             <LayoutContent :header="'Mysql ' + $t('database.setting')" :back-name="'Mysql'" :reload="true">
-                <el-collapse v-model="activeName" accordion>
+                <el-collapse v-model="activeName" @change="handleCollapse" accordion>
                     <el-collapse-item :title="$t('database.confChange')" name="1">
                         <codemirror
                             :autofocus="true"
@@ -78,7 +78,7 @@ import Status from '@/views/database/mysql/setting/status/index.vue';
 import Variables from '@/views/database/mysql/setting/variables/index.vue';
 import SlowLog from '@/views/database/mysql/setting/slow-log/index.vue';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
-import { reactive, ref } from 'vue';
+import { onUnmounted, reactive, ref } from 'vue';
 import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
 import { oneDark } from '@codemirror/theme-one-dark';
@@ -132,6 +132,14 @@ const onClose = (): void => {
     onSetting.value = false;
 };
 
+const handleCollapse = async (val: string) => {
+    if (val !== '5') {
+        dialogContainerLogRef.value!.onCloseLog();
+    }
+    if (val !== '6') {
+        slowLogRef.value!.onCloseLog();
+    }
+};
 const onSubmitChangePort = async () => {
     let params = {
         key: 'mysql',
@@ -231,6 +239,10 @@ const loadMysqlConf = async (path: string) => {
     mysqlConf.value = res.data;
 };
 
+onUnmounted(() => {
+    console.log('adasd');
+});
+
 defineExpose({
     acceptParams,
     onClose,
diff --git a/frontend/src/views/database/mysql/setting/slow-log/index.vue b/frontend/src/views/database/mysql/setting/slow-log/index.vue
index 27d927ca4..139c6bd4b 100644
--- a/frontend/src/views/database/mysql/setting/slow-log/index.vue
+++ b/frontend/src/views/database/mysql/setting/slow-log/index.vue
@@ -1,19 +1,30 @@
 <template>
-    <div>
-        <span style="float: left">{{ $t('database.isOn') }}</span>
-        <el-switch
-            style="margin-left: 20px; float: left"
-            v-model="variables.slow_query_log"
-            active-value="ON"
-            inactive-value="OFF"
-        />
-        <span style="margin-left: 30px; float: left">{{ $t('database.longQueryTime') }}</span>
+    <div v-loading="loading">
+        <span style="float: left">{{ $t('database.longQueryTime') }}</span>
         <div style="margin-left: 5px; float: left">
             <el-input type="number" v-model.number="variables.long_query_time">
                 <template #append>{{ $t('database.second') }}</template>
             </el-input>
         </div>
-        <el-button style="margin-left: 20px" @click="onSaveStart">{{ $t('commons.button.confirm') }}</el-button>
+        <span style="float: left; margin-left: 20px">{{ $t('database.isOn') }}</span>
+        <el-switch
+            style="margin-left: 5px; float: left"
+            v-model="variables.slow_query_log"
+            active-value="ON"
+            inactive-value="OFF"
+            @change="handleSlowLogs"
+        />
+        <div v-if="variables.slow_query_log === 'ON'" style="margin-left: 20px; float: left">
+            <el-checkbox border v-model="isWatch">{{ $t('commons.button.watch') }}</el-checkbox>
+        </div>
+        <el-button
+            v-if="variables.slow_query_log === 'ON'"
+            style="margin-left: 20px"
+            @click="onDownload"
+            icon="Download"
+        >
+            {{ $t('file.download') }}
+        </el-button>
         <div v-if="variables.slow_query_log === 'ON'">
             <codemirror
                 :autofocus="true"
@@ -31,7 +42,8 @@
             />
         </div>
 
-        <ConfirmDialog ref="confirmDialogRef" @confirm="onSave"></ConfirmDialog>
+        <br />
+        <ConfirmDialog @cancle="onCancle" ref="confirmDialogRef" @confirm="onSave"></ConfirmDialog>
     </div>
 </template>
 <script lang="ts" setup>
@@ -44,13 +56,18 @@ import { LoadFile } from '@/api/modules/files';
 import ConfirmDialog from '@/components/confirm-dialog/index.vue';
 import { updateMysqlVariables } from '@/api/modules/database';
 import { ElMessage } from 'element-plus';
+import { dateFromatForName } from '@/utils/util';
 import i18n from '@/lang';
 
+const loading = ref();
 const extensions = [javascript(), oneDark];
 const slowLogs = ref();
 
 const confirmDialogRef = ref();
 
+const isWatch = ref();
+let timer: NodeJS.Timer | null = null;
+
 const mysqlName = ref();
 const variables = reactive({
     slow_query_log: 'OFF',
@@ -67,14 +84,19 @@ const acceptParams = (params: DialogProps): void => {
     variables.slow_query_log = params.variables.slow_query_log;
     variables.long_query_time = Number(params.variables.long_query_time);
 
+    let path = `/opt/1Panel/data/apps/mysql/${mysqlName.value}/data/1Panel-slow.log`;
     if (variables.slow_query_log === 'ON') {
-        let path = `/opt/1Panel/data/apps/mysql/${mysqlName.value}/data/1Panel-slow.log`;
         loadMysqlSlowlogs(path);
     }
+    timer = setInterval(() => {
+        if (variables.slow_query_log === 'ON' && isWatch.value) {
+            loadMysqlSlowlogs(path);
+        }
+    }, 1000 * 5);
     oldVariables.value = { ...variables };
 };
 
-const onSaveStart = async () => {
+const handleSlowLogs = async () => {
     let params = {
         header: i18n.global.t('database.confChange'),
         operationInfo: i18n.global.t('database.restartNowHelper'),
@@ -83,17 +105,38 @@ const onSaveStart = async () => {
     confirmDialogRef.value!.acceptParams(params);
 };
 
+const onCancle = async () => {
+    variables.slow_query_log = variables.slow_query_log === 'ON' ? 'OFF' : 'ON';
+};
+
 const onSave = async () => {
     let param = [] as Array<Database.VariablesUpdate>;
     if (variables.slow_query_log !== oldVariables.value.slow_query_log) {
         param.push({ param: 'slow_query_log', value: variables.slow_query_log });
     }
     if (variables.slow_query_log === 'ON') {
-        param.push({ param: 'long_query_time', value: variables.long_query_time });
+        param.push({ param: 'long_query_time', value: variables.long_query_time + '' });
         param.push({ param: 'slow_query_log_file', value: '/var/lib/mysql/1Panel-slow.log' });
     }
-    await updateMysqlVariables(param);
-    ElMessage.success(i18n.global.t('commons.msg.operationSuccess'));
+    loading.value = true;
+    await updateMysqlVariables(param)
+        .then(() => {
+            loading.value = false;
+            ElMessage.success(i18n.global.t('commons.msg.operationSuccess'));
+        })
+        .catch(() => {
+            loading.value = false;
+        });
+};
+
+const onDownload = async () => {
+    const downloadUrl = window.URL.createObjectURL(new Blob([slowLogs.value]));
+    const a = document.createElement('a');
+    a.style.display = 'none';
+    a.href = downloadUrl;
+    a.download = mysqlName.value + '-slowlogs-' + dateFromatForName(new Date()) + '.log';
+    const event = new MouseEvent('click');
+    a.dispatchEvent(event);
 };
 
 const loadMysqlSlowlogs = async (path: string) => {
@@ -101,7 +144,14 @@ const loadMysqlSlowlogs = async (path: string) => {
     slowLogs.value = res.data;
 };
 
+const onCloseLog = async () => {
+    isWatch.value = false;
+    clearInterval(Number(timer));
+    timer = null;
+};
+
 defineExpose({
     acceptParams,
+    onCloseLog,
 });
 </script>