From d2f617ee68cb7d3051f1999f0915bdd094a0b6d6 Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Fri, 3 Feb 2023 05:59:50 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEapi=E6=9C=8D=E5=8A=A1=E5=99=A8ip=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Dong Xia <dev12301@linx-info.com>
---
 src/pages/login/index.vue | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 6d6fe86..affa2ce 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="login-wrapper">
+    <span v-if="isDevelopment || useEnvironment === 'dev'" class="server-ip" @click="setServerIpVisible = true"><a-icon type="desktop" />服务器IP: {{ serverIp }}</span>
     <a-card class="login-card" hoverable>
       <a-card-meta title="欢迎登录" style="text-align: center" description="" />
       <br>
@@ -13,6 +14,9 @@
         <a-button :loading="loading" icon="login" type="primary" html-type="submit" class="btn-login">登 录</a-button>
       </a-form>
     </a-card>
+    <a-modal v-model="setServerIpVisible" title="IP设置" @ok="handleIpSet" @keyup.native.enter="handleIpSet">
+      <server-ip-set ref="serverIpSet" />
+    </a-modal>
   </div>
 </template>
 
@@ -20,17 +24,25 @@
 import { login } from '../../api/user'
 import { checkSystem } from '../../api/install'
 import sha1 from 'sha1'
+import ServerIpSet from '@/components/serverIp/index.vue'
+import { useEnvironment } from '../../../settings'
 export default {
+  components: {
+    ServerIpSet
+  },
   data() {
     return {
       loading: false,
       loginForm: this.$form.createForm(this, { name: 'login-form' }),
       setServerIpVisible: false,
       isDevelopment: process.env.NODE_ENV === 'development',
+      serverIp: '',
+      useEnvironment
     }
   },
   created() {
     this.checkSystem()
+    this.serverIp = localStorage.getItem('mini_serverIp')
   },
   methods: {
     // 检查是否需要初始化
@@ -74,6 +86,15 @@ export default {
           })
         }
       })
+    }，
+    handleIpSet() {
+      this.$refs.serverIpSet.handleSubmit().then(() => {
+        this.$notification.success({ message: '修改服务器IP成功' })
+        this.setServerIpVisible = false
+        location.reload()
+      }).catch(() => {
+        this.$notification.error({ message: '请输入正确的IP' })
+      })
     }
   }
 }
-- 
Gitee


From 6f6177a0c68982c9415896a026318946977de78d Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Fri, 3 Feb 2023 06:00:23 +0000
Subject: [PATCH 2/2] update src/pages/login/index.vue.

Signed-off-by: Dong Xia <dev12301@linx-info.com>
---
 src/pages/login/index.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index affa2ce..06ff318 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -45,7 +45,6 @@ export default {
     this.serverIp = localStorage.getItem('mini_serverIp')
   },
   methods: {
-    // 检查是否需要初始化
     checkSystem() {
       checkSystem().then(res => {
         if (res.code === 900) {
@@ -59,7 +58,6 @@ export default {
         }
       })
     },
-    // 登录
     handleLogin(e) {
       e.preventDefault()
       this.loginForm.validateFields((err, values) => {
@@ -75,9 +73,7 @@ export default {
                 message: res.msg,
                 duration: 2
               })
-              // 调用 store action 存储当前登录的用户名和 token
               this.$store.dispatch('login', { token: res.data.token, longTermToken: res.data.longTermToken }).then(() => {
-                // 跳转主页面
                 this.$router.push({ path: '/' })
               })
             }
@@ -86,7 +82,7 @@ export default {
           })
         }
       })
-    }，
+    },
     handleIpSet() {
       this.$refs.serverIpSet.handleSubmit().then(() => {
         this.$notification.success({ message: '修改服务器IP成功' })
-- 
Gitee