From 981223d9bc3d94c24a090a8a566e7c5b147e8097 Mon Sep 17 00:00:00 2001
From: ssongliu <songlius11@163.com>
Date: Tue, 3 Jan 2023 18:32:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20mysql=20utf8=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9B=E5=BB=BA=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/api/v1/setting.go                 |  3 ++-
 backend/app/dto/database.go                   |  2 +-
 backend/app/service/database_mysql.go         | 10 +++++++-
 frontend/index.html                           |  4 ++--
 .../components/app-layout/footer/index.vue    |  2 +-
 .../src/views/database/mysql/create/index.vue |  2 +-
 .../src/views/host/terminal/host/index.vue    |  5 +++-
 .../views/host/terminal/terminal/index.vue    | 10 +++++++-
 frontend/src/views/login/index.vue            | 21 ----------------
 frontend/src/views/setting/panel/index.vue    | 24 ++++++++++++++++++-
 10 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/backend/app/api/v1/setting.go b/backend/app/api/v1/setting.go
index 4a941594d..d322d0132 100644
--- a/backend/app/api/v1/setting.go
+++ b/backend/app/api/v1/setting.go
@@ -2,6 +2,7 @@ package v1
 
 import (
 	"errors"
+	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -87,7 +88,7 @@ func (b *BaseApi) HandlePasswordExpired(c *gin.Context) {
 func (b *BaseApi) SyncTime(c *gin.Context) {
 	ntime, err := ntp.Getremotetime()
 	if err != nil {
-		helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
+		helper.SuccessWithData(c, time.Now().Format("2006-01-02 15:04:05 MST -0700"))
 		return
 	}
 
diff --git a/backend/app/dto/database.go b/backend/app/dto/database.go
index e6b18938b..254020aea 100644
--- a/backend/app/dto/database.go
+++ b/backend/app/dto/database.go
@@ -21,7 +21,7 @@ type MysqlDBInfo struct {
 
 type MysqlDBCreate struct {
 	Name        string `json:"name" validate:"required"`
-	Format      string `json:"format" validate:"required,oneof=utf8mb4 utf-8 gbk big5"`
+	Format      string `json:"format" validate:"required,oneof=utf8mb4 utf8 gbk big5"`
 	Username    string `json:"username" validate:"required"`
 	Password    string `json:"password" validate:"required"`
 	Permission  string `json:"permission" validate:"required"`
diff --git a/backend/app/service/database_mysql.go b/backend/app/service/database_mysql.go
index 79e3a10bf..6f59782dc 100644
--- a/backend/app/service/database_mysql.go
+++ b/backend/app/service/database_mysql.go
@@ -154,6 +154,13 @@ func (u *MysqlService) ListDBName() ([]string, error) {
 	return dbNames, err
 }
 
+var formatMap = map[string]string{
+	"utf8":    "utf8_general_ci",
+	"utf8mb4": "utf8mb4_general_ci",
+	"gbk":     "gbk_chinese_ci",
+	"big5":    "big5_chinese_ci",
+}
+
 func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*model.DatabaseMysql, error) {
 	if req.Username == "root" {
 		return nil, errors.New("Cannot set root as user name")
@@ -170,7 +177,8 @@ func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*mode
 		return nil, errors.WithMessage(constant.ErrStructTransform, err.Error())
 	}
 
-	if err := excuteSql(app.ContainerName, app.Password, fmt.Sprintf("create database if not exists `%s` character set=%s", req.Name, req.Format)); err != nil {
+	createSql := fmt.Sprintf("create database if not exists `%s` default character set %s collate %s", req.Name, req.Format, formatMap[req.Format])
+	if err := excuteSql(app.ContainerName, app.Password, createSql); err != nil {
 		return nil, err
 	}
 	tmpPermission := req.Permission
diff --git a/frontend/index.html b/frontend/index.html
index 63e019d81..fa89b6e6c 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <link rel="icon" href="/favicon.ico" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>-</title>
+        <title>loading...</title>
     </head>
     <body>
         <div id="app">
@@ -94,4 +94,4 @@
         </div>
         <script type="module" src="/src/main.ts"></script>
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/frontend/src/components/app-layout/footer/index.vue b/frontend/src/components/app-layout/footer/index.vue
index d8c80ea59..f67fe13e4 100644
--- a/frontend/src/components/app-layout/footer/index.vue
+++ b/frontend/src/components/app-layout/footer/index.vue
@@ -3,7 +3,7 @@
         <slot></slot>
     </div>
     <div class="footer flx-center">
-        <a href="http://www.spicyboy.cn/" target="_blank">2022 © 1Panel By 飞致云.</a>
+        <a href="http://www.spicyboy.cn/" target="_blank">2023 © 1Panel By 飞致云.</a>
     </div>
 </template>
 
diff --git a/frontend/src/views/database/mysql/create/index.vue b/frontend/src/views/database/mysql/create/index.vue
index e453a79e9..ecbfbe737 100644
--- a/frontend/src/views/database/mysql/create/index.vue
+++ b/frontend/src/views/database/mysql/create/index.vue
@@ -11,7 +11,7 @@
                     <template #append>
                         <el-select v-model="form.format" style="width: 125px">
                             <el-option label="utf8mb4" value="utf8mb4" />
-                            <el-option label="utf-8" value="utf-8" />
+                            <el-option label="utf-8" value="utf8" />
                             <el-option label="gbk" value="gbk" />
                             <el-option label="big5" value="big5" />
                         </el-select>
diff --git a/frontend/src/views/host/terminal/host/index.vue b/frontend/src/views/host/terminal/host/index.vue
index 99fb72c0a..04b5e7697 100644
--- a/frontend/src/views/host/terminal/host/index.vue
+++ b/frontend/src/views/host/terminal/host/index.vue
@@ -76,7 +76,10 @@
                 <el-card class="el-card">
                     <el-form ref="hostInfoRef" label-width="100px" :model="hostInfo" :rules="rules">
                         <el-form-item :label="$t('terminal.ip')" prop="addr">
-                            <el-input clearable v-model="hostInfo.addr" />
+                            <span v-if="hostInfo.addr === '127.0.0.1' && hostOperation === 'edit'">
+                                {{ hostInfo.addr }}
+                            </span>
+                            <el-input v-else clearable v-model="hostInfo.addr" />
                         </el-form-item>
                         <el-form-item :label="$t('terminal.user')" prop="user">
                             <el-input clearable v-model="hostInfo.user" />
diff --git a/frontend/src/views/host/terminal/terminal/index.vue b/frontend/src/views/host/terminal/terminal/index.vue
index c8d8a3c1c..3054507bc 100644
--- a/frontend/src/views/host/terminal/terminal/index.vue
+++ b/frontend/src/views/host/terminal/terminal/index.vue
@@ -307,6 +307,14 @@ const onReconnect = async (item: any) => {
 
 const onConnTerminal = async (title: string, wsID: number, isLocal?: boolean) => {
     const res = await testByID(wsID);
+    if (isLocal) {
+        for (const tab of terminalTabs.value) {
+            if (tab.title.indexOf('@127.0.0.1:') !== -1 || tab.title === i18n.global.t('terminal.localhost')) {
+                onReconnect(tab);
+                return;
+            }
+        }
+    }
     terminalTabs.value.push({
         index: tabIndex,
         title: title,
@@ -322,7 +330,7 @@ const onConnTerminal = async (title: string, wsID: number, isLocal?: boolean) =>
             ctx.refs[`t-${terminalValue.value}`][0].acceptParams({
                 wsID: wsID,
                 terminalID: terminalValue.value,
-                error: res.data ? '' : 'Failed to set up the connection. Please check the host information !',
+                error: res.data ? '' : 'Authentication failed.  Please check the host information !',
             });
     });
     tabIndex++;
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index a4d336191..6478be475 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -38,32 +38,11 @@
 <script setup lang="ts" name="login">
 import LoginForm from './components/login-form.vue';
 import { ref, onMounted } from 'vue';
-// import { loginStatus, entrance } from '@/api/modules/auth';
-
-// interface Props {
-//     code: string;
-// }
-// const mySafetyCode = withDefaults(defineProps<Props>(), {
-//     code: '',
-// });
 
 const statusCode = ref<number>(0);
 
 const getStatus = async () => {
     statusCode.value = 1;
-    // const res = await loginStatus();
-    // if (res.code === 402) {
-    //     statusCode.value = -1;
-    // } else {
-    //     statusCode.value = 1;
-    //     return;
-    // }
-    // if (mySafetyCode.code) {
-    //     const res = await entrance(mySafetyCode.code);
-    //     if (res.code === 200) {
-    //         statusCode.value = 1;
-    //     }
-    // }
 };
 
 onMounted(() => {
diff --git a/frontend/src/views/setting/panel/index.vue b/frontend/src/views/setting/panel/index.vue
index 5c9e7a8a2..8055ad8b1 100644
--- a/frontend/src/views/setting/panel/index.vue
+++ b/frontend/src/views/setting/panel/index.vue
@@ -105,9 +105,10 @@
                         <el-form-item :label="$t('setting.syncTime')">
                             <el-input disabled v-model="form.localTime">
                                 <template #append>
-                                    <el-button @click="onSyncTime" icon="Refresh">
+                                    <el-button v-show="!show" @click="onSyncTime" icon="Refresh">
                                         {{ $t('commons.button.sync') }}
                                     </el-button>
+                                    <span v-show="show">{{ count }} S</span>
                                 </template>
                             </el-input>
                         </el-form-item>
@@ -210,6 +211,11 @@ const form = reactive({
     complexityVerification: '',
 });
 
+const timer = ref();
+const TIME_COUNT = ref(10);
+const count = ref();
+const show = ref();
+
 const search = async () => {
     const res = await getSettingInfo();
     form.userName = res.data.userName;
@@ -271,6 +277,21 @@ const onSave = async (formEl: FormInstance | undefined, key: string, val: any) =
             loading.value = false;
         });
 };
+
+function countdown() {
+    count.value = TIME_COUNT.value;
+    show.value = true;
+    timer.value = setInterval(() => {
+        if (count.value > 0 && count.value <= TIME_COUNT.value) {
+            count.value--;
+        } else {
+            show.value = false;
+            clearInterval(timer.value);
+            timer.value = null;
+        }
+    }, 1000);
+}
+
 function callback(error: any) {
     if (error) {
         return error.message;
@@ -326,6 +347,7 @@ const onSyncTime = async () => {
         .then((res) => {
             loading.value = false;
             form.localTime = res.data;
+            countdown();
             ElMessage.success(i18n.t('commons.msg.operationSuccess'));
         })
         .catch(() => {