From 35d342047019f0512bf441134c9f4c8c2e8008d4 Mon Sep 17 00:00:00 2001
From: fanxb <fanxb.tl@gmail.com>
Date: Sat, 1 Apr 2023 17:29:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=94=BE=E5=BC=80github=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ConfigServiceImpl.java       |  1 -
 .../src/views/public/login/index.vue          | 23 +++++++++++--------
 bookmark_front/vue.config.js                  |  3 +--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java
index 7384f46..ca2e562 100644
--- a/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java
+++ b/bookMarkService/common/src/main/java/com/fanxb/bookmark/common/service/impl/ConfigServiceImpl.java
@@ -49,7 +49,6 @@ public class ConfigServiceImpl implements ConfigService {
         List<GlobalConfigPo> pos = globalConfigDao.selectByMap(Collections.emptyMap());
         Map<String, String> map = pos.stream().collect(Collectors.toMap(GlobalConfigPo::getCode, GlobalConfigPo::getValue));
         GlobalConfigVo vo = new GlobalConfigVo();
-        vo.setProxyExist(HttpUtil.getProxyExist());
         vo.setBingImgSrc(getCacheBingImg());
         vo.setMap(map);
         return vo;
diff --git a/bookmark_front/src/views/public/login/index.vue b/bookmark_front/src/views/public/login/index.vue
index 2dce028..9f6ff58 100644
--- a/bookmark_front/src/views/public/login/index.vue
+++ b/bookmark_front/src/views/public/login/index.vue
@@ -24,7 +24,7 @@
           </div>
           <div class="thirdPart">
             <span>第三方登陆</span>
-            <a-tooltip v-if="serverConfig.proxyExist" title="github登陆" class="oneIcon" placement="bottom">
+            <a-tooltip title="github登陆" class="oneIcon" placement="bottom">
               <a-icon type="github" @click="toGithub" style="font-size: 1.4em" />
             </a-tooltip>
           </div>
@@ -39,35 +39,36 @@ import Header from "@/components/public/Switch.vue";
 import httpUtil from "../../../util/HttpUtil.js";
 import { mapMutations, mapState } from "vuex";
 import HttpUtil from "../../../util/HttpUtil.js";
+
 export default {
   name: "Login",
   components: {
-    Header,
+    Header
   },
   computed: {
-    ...mapState("globalConfig", ["serverConfig"]),
+    ...mapState("globalConfig", ["serverConfig"])
   },
   data() {
     return {
       form: {
         str: "",
         password: "",
-        rememberMe: false,
+        rememberMe: false
       },
       rules: {
         str: [
           { required: true, message: "请输入用户名", trigger: "blur" },
-          { min: 1, max: 50, message: "最短1，最长50", trigger: "change" },
+          { min: 1, max: 50, message: "最短1，最长50", trigger: "change" }
         ],
         password: [
           { required: true, message: "请输入密码", trigger: "blur" },
-          { pattern: "^\\w{6,18}$", message: "密码为6-18位数字,字母,下划线组合", trigger: "change" },
-        ],
+          { pattern: "^\\w{6,18}$", message: "密码为6-18位数字,字母,下划线组合", trigger: "change" }
+        ]
       },
       loading: false, //是否加载中
       oauthLogining: false, //true:正在进行oauth后台操作
       page: null, //oauth打开的页面实例
-      redirect: null,
+      redirect: null
     };
   },
   async created() {
@@ -130,8 +131,8 @@ export default {
       } finally {
         this.loading = false;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -139,11 +140,13 @@ export default {
 .form {
   margin: 0.3rem;
   margin-bottom: 0.1rem;
+
   .reset {
     display: flex;
     justify-content: space-between;
   }
 }
+
 .thirdPart {
   display: flex;
   justify-content: space-between;
diff --git a/bookmark_front/vue.config.js b/bookmark_front/vue.config.js
index 89f47a7..c99fcfd 100644
--- a/bookmark_front/vue.config.js
+++ b/bookmark_front/vue.config.js
@@ -7,8 +7,7 @@ module.exports = {
 		proxy: {
 			"/bookmark/api": {
 				//这里最好有一个 /
-				// target: "http://localhost:8088", // 服务器端接口地址
-				target: "https://bm.fleyx.com", // 服务器端接口地址
+				target: "http://localhost:8088", // 服务器端接口地址
 				ws: true, //如果要代理 websockets，配置这个参数
 				// 如果是https接口，需要配置这个参数
 				changeOrigin: true, //是否跨域