From 8ad5f28e99bbbcdcd14347eaadbbf9096a22c741 Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Thu, 14 Dec 2023 23:29:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=8E=BB=E9=99=A4=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=AE=88=E5=8D=AB=E4=BB=A5=E5=8F=8A=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/.env.development              |   4 +-
 Yi.Bbs.Vue3/src/components/AvatarInfo.vue | 179 ++++++++++++----------
 Yi.Bbs.Vue3/src/permission.js             |   3 +-
 Yi.Bbs.Vue3/src/stores/user.js            |   2 +-
 Yi.Bbs.Vue3/src/views/Login.vue           |   5 +-
 5 files changed, 103 insertions(+), 90 deletions(-)

diff --git a/Yi.Bbs.Vue3/.env.development b/Yi.Bbs.Vue3/.env.development
index 414dc2c2..b78611ef 100644
--- a/Yi.Bbs.Vue3/.env.development
+++ b/Yi.Bbs.Vue3/.env.development
@@ -1,5 +1,5 @@
 # 接口前缀
 VITE_APP_BASEAPI="/api-dev"
-# VITE_APP_URL="http://123.207.63.87:19001/api/app"
-VITE_APP_URL="http://localhost:19001/api/app"
+VITE_APP_URL="http://123.207.63.87:19001/api/app"
+# VITE_APP_URL="http://localhost:19001/api/app"
 VITE_APP_ENV_NAME = "dev"
\ No newline at end of file
diff --git a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
index 81bd78a0..f340a801 100644
--- a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
+++ b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
@@ -1,131 +1,146 @@
-<template >
-    <div class="avatar">
-        <div class="avatar-left">
-            <el-avatar :size="props.size" :src="iconUrl" />
+<template>
+  <div class="avatar">
+    <div class="avatar-left">
+      <el-avatar :size="props.size" :src="iconUrl" />
 
-            <div v-if="props.isSelf">
-                <div class="nick"> {{ userInfo.nick }}</div>
-            </div>
+      <div v-if="props.isSelf">
+        <div class="nick">{{ userInfo.nick }}</div>
+      </div>
 
-            <div v-if="!props.isSelf">
-
-                <div class="nick" :class="{ mt_1: props.time != 'undefined' }"> {{ userInfo.nick }}</div>
-                <div class="remarks" v-if="props.time"> {{ props.time }}</div>
-                <div class="remarks">
-                    <slot name="bottom" />
-                </div>
-            </div>
-            <div class="info" v-if="!props.isSelf">
-                <el-tag class="ml-2" type="warning">V8</el-tag>
-                <el-tag class="ml-2" type="danger">会员</el-tag>
-            </div>
+      <div v-if="!props.isSelf">
+        <div class="nick" :class="{ mt_1: props.time != 'undefined' }">
+          {{ userInfo.nick }}
         </div>
-
-
-        <el-button v-if="props.showWatching" type="primary" size="default" icon="Plus">关注</el-button>
-
+        <div class="remarks" v-if="props.time">{{ props.time }}</div>
+        <div class="remarks">
+          <slot name="bottom" />
+        </div>
+      </div>
+      <div class="info" v-if="!props.isSelf">
+        <el-tag class="ml-2" type="warning">V8</el-tag>
+        <el-tag class="ml-2" type="danger">会员</el-tag>
+      </div>
     </div>
+
+    <el-button
+      v-if="props.showWatching"
+      type="primary"
+      size="default"
+      icon="Plus"
+      >关注</el-button
+    >
+  </div>
 </template>
 <script setup>
-import useUserStore from '@/stores/user'
-import { reactive, watch, onMounted, computed, ref } from 'vue';
+import useUserStore from "@/stores/user";
+import { reactive, watch, onMounted, computed, ref } from "vue";
 //userInfo
 //{icon,name,role,id},根据判断userInfo是否等于未定义，来觉得是当前登录用户信息，还是其他人信息
-const props = defineProps(['size', 'showWatching', 'time', 'userInfo', 'isSelf'])
+const props = defineProps([
+  "size",
+  "showWatching",
+  "time",
+  "userInfo",
+  "isSelf",
+]);
 const userStore = useUserStore();
 const userInfo = reactive({
-    icon: "",
-    nick: "",
-    role: [],
-    id: ""
+  icon: "",
+  nick: "",
+  role: [],
+  id: "",
 });
-const iconUrl=ref('/src/assets/logo.ico');
+const iconUrl = ref("/src/assets/logo.ico");
 const iconUrlHandler = () => {
-    if (userInfo.icon == null || userInfo.icon == undefined || userInfo.icon == '') {
-
-        return '/src/assets/logo.ico';
-    }
-    return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
-}
+  if (
+    userInfo.icon == null ||
+    userInfo.icon == undefined ||
+    userInfo.icon == ""
+  ) {
+    return "/src/assets/logo.ico";
+  }
+  return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
+};
 
 watch(userStore, (n) => {
-    if (props.userInfo == undefined) {
-        userInfo.nick = n.name;
-    }
+  if (props.userInfo == undefined) {
+    userInfo.nick = n.name;
+  }
+});
 
-})
-
-watch(() => props, (n) => {
+watch(
+  () => props,
+  (n) => {
     Init();
-}, { deep: true })
+  },
+  { deep: true }
+);
 
 onMounted(() => {
-    Init();
-})
+  Init();
+});
 
 const Init = () => {
-    //使用传入值
-    if (props.userInfo != undefined) {
-        userInfo.icon = props.userInfo.icon;
-        userInfo.nick = props.userInfo.nick;
-        userInfo.role = props.userInfo.role;
-        userInfo.id = props.userInfo.id;
-           iconUrl.value=iconUrlHandler(userInfo.icon)
-    }
-
-    //使用当前登录用户
-    else {
-     
-        userInfo.icon = userStore.icon;
-        userInfo.nick = userStore.name;
-        userInfo.role = userStore.role;
-        userInfo.id = userStore.id;
-        iconUrl.value=userInfo.icon;
-        
-    }
-}
+  //使用传入值
+  if (props.userInfo != undefined) {
+    userInfo.icon = props.userInfo.icon;
+    userInfo.nick = props.userInfo.nick;
+    userInfo.role = props.userInfo.role;
+    userInfo.id = props.userInfo.id;
+    iconUrl.value = iconUrlHandler(userInfo.icon);
+    console.log("使用传入值:", iconUrl.value);
+  }
 
+  //使用当前登录用户
+  else {
+    userInfo.icon = userStore.icon;
+    userInfo.nick = userStore.name;
+    userInfo.role = userStore.role;
+    userInfo.id = userStore.id;
+    iconUrl.value = userInfo.icon;
+    console.log("当前登陆:", iconUrl.value);
+  }
+};
 </script>
 <style scoped>
 .mt_1 {
-    margin-top: 0.5rem;
+  margin-top: 0.5rem;
 }
 
 .nick {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 .info {
-    margin-top: 0.6rem;
-    margin-left: 1rem;
+  margin-top: 0.6rem;
+  margin-left: 1rem;
 }
 
 .info .el-tag {
-    margin-right: 1rem;
+  margin-right: 1rem;
 }
 
 .el-icon {
-    color: white;
-
+  color: white;
 }
 
 .avatar {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 
 .avatar-left {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
 }
 
 .el-avatar {
-    margin-right: 1.2rem;
+  margin-right: 1.2rem;
 }
 
 .remarks {
-    padding-top: 0.5rem;
-    color: #8C8C8C;
+  padding-top: 0.5rem;
+  color: #8c8c8c;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/Yi.Bbs.Vue3/src/permission.js b/Yi.Bbs.Vue3/src/permission.js
index 01e51f38..7abc3acc 100644
--- a/Yi.Bbs.Vue3/src/permission.js
+++ b/Yi.Bbs.Vue3/src/permission.js
@@ -41,7 +41,8 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next();
     } else {
-      next(`/login?redirect=${to.path}&unTourist=true`); // 否则全部重定向到登录页
+      next();
+      // next(`/login?redirect=${to.path}&unTourist=true`); // 否则全部重定向到登录页
       NProgress.done();
     }
   }
diff --git a/Yi.Bbs.Vue3/src/stores/user.js b/Yi.Bbs.Vue3/src/stores/user.js
index 744a944b..d23a5929 100644
--- a/Yi.Bbs.Vue3/src/stores/user.js
+++ b/Yi.Bbs.Vue3/src/stores/user.js
@@ -47,7 +47,7 @@ const useUserStore = defineStore("user", {
               user.icon == "" || user.icon == null
                 ? "/src/assets/logo.ico"
                 : import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon;
-
+            console.log(avatar, "store的avatar");
             if (res.roleCodes && res.roleCodes.length > 0) {
               // 验证返回的roles是否是一个非空数组
               this.roles = res.roleCodes;
diff --git a/Yi.Bbs.Vue3/src/views/Login.vue b/Yi.Bbs.Vue3/src/views/Login.vue
index 438bdfce..78382c90 100644
--- a/Yi.Bbs.Vue3/src/views/Login.vue
+++ b/Yi.Bbs.Vue3/src/views/Login.vue
@@ -26,7 +26,7 @@
       </el-form>
       <RouterLink to="/register"> 没有账号？前往注册</RouterLink>
       <button class="login-btn" @click="login(loginFormRef)">登 录</button>
-      <button class="login-btn" @click="guestlogin">游客临时登录</button>
+      <button class="login-btn" @click="guestlogin">访客</button>
     </div>
 
     <div class="divider">
@@ -76,9 +76,6 @@ const loginForm = reactive({
   code: "",
 });
 const guestlogin = async () => {
-  loginForm.userName = "guest";
-  loginForm.password = "123456";
-  await userStore.login(loginForm);
   const redirect = route.query?.redirect ?? "/index";
   router.push(redirect);
 };

From 7d9e6f3a23bfcd23866e66f99db06c85c5d2de15 Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Thu, 14 Dec 2023 23:47:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E5=80=BC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/src/assets/{ => common/icons}/logo.ico | Bin
 Yi.Bbs.Vue3/src/components/AvatarInfo.vue          |   8 +++-----
 Yi.Bbs.Vue3/src/stores/user.js                     |   3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename Yi.Bbs.Vue3/src/assets/{ => common/icons}/logo.ico (100%)

diff --git a/Yi.Bbs.Vue3/src/assets/logo.ico b/Yi.Bbs.Vue3/src/assets/common/icons/logo.ico
similarity index 100%
rename from Yi.Bbs.Vue3/src/assets/logo.ico
rename to Yi.Bbs.Vue3/src/assets/common/icons/logo.ico
diff --git a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
index f340a801..9306df7e 100644
--- a/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
+++ b/Yi.Bbs.Vue3/src/components/AvatarInfo.vue
@@ -50,14 +50,14 @@ const userInfo = reactive({
   role: [],
   id: "",
 });
-const iconUrl = ref("/src/assets/logo.ico");
+const iconUrl = ref("../../src/assets/common/icons/logo.ico");
 const iconUrlHandler = () => {
   if (
     userInfo.icon == null ||
     userInfo.icon == undefined ||
     userInfo.icon == ""
   ) {
-    return "/src/assets/logo.ico";
+    return "../../src/assets/common/icons/logo.ico";
   }
   return `${import.meta.env.VITE_APP_BASEAPI}/file/${userInfo.icon}`;
 };
@@ -88,7 +88,6 @@ const Init = () => {
     userInfo.role = props.userInfo.role;
     userInfo.id = props.userInfo.id;
     iconUrl.value = iconUrlHandler(userInfo.icon);
-    console.log("使用传入值:", iconUrl.value);
   }
 
   //使用当前登录用户
@@ -97,8 +96,7 @@ const Init = () => {
     userInfo.nick = userStore.name;
     userInfo.role = userStore.role;
     userInfo.id = userStore.id;
-    iconUrl.value = userInfo.icon;
-    console.log("当前登陆:", iconUrl.value);
+    iconUrl.value = iconUrlHandler(userInfo.icon);
   }
 };
 </script>
diff --git a/Yi.Bbs.Vue3/src/stores/user.js b/Yi.Bbs.Vue3/src/stores/user.js
index d23a5929..1a8ff224 100644
--- a/Yi.Bbs.Vue3/src/stores/user.js
+++ b/Yi.Bbs.Vue3/src/stores/user.js
@@ -45,9 +45,8 @@ const useUserStore = defineStore("user", {
             const user = res.user;
             const avatar =
               user.icon == "" || user.icon == null
-                ? "/src/assets/logo.ico"
+                ? "../../src/assets/common/icons/logo.ico"
                 : import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon;
-            console.log(avatar, "store的avatar");
             if (res.roleCodes && res.roleCodes.length > 0) {
               // 验证返回的roles是否是一个非空数组
               this.roles = res.roleCodes;