From 812a7b4595787f55f476f34f8f22bea6d3e519a2 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 1 Sep 2022 23:30:04 +0800
Subject: [PATCH] =?UTF-8?q?cas=20sso=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5ok,=E4=BD=86=E5=90=8E=E7=AB=AF=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=A0=B9=E8=B7=AF=E5=BE=84=E6=89=8D=E8=83=BD=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ebts-ui/.env.development                      |  2 +-
 ebts-ui/.env.production                       |  2 +-
 ebts-ui/.env.staging                          |  2 +-
 ebts-ui/src/layout/components/Navbar.vue      | 27 +++++++++++++++----
 ebts-ui/src/permission.js                     | 13 ++++++++-
 ebts-ui/src/router/index.js                   |  1 +
 ebts-ui/src/settings.js                       | 16 +++++++++++
 ebts-ui/src/store/modules/user.js             |  3 ++-
 ebts-ui/src/utils/request.js                  |  8 +++++-
 .../views/sist/article/components/article.vue |  7 ++---
 ebts-ui/vue.config.js                         |  5 ++--
 11 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/ebts-ui/.env.development b/ebts-ui/.env.development
index 767fc82..e27f265 100644
--- a/ebts-ui/.env.development
+++ b/ebts-ui/.env.development
@@ -3,7 +3,7 @@ ENV = 'development'
 
 # EBTS/开发环境
 #VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://localhost:8096/dev-api'
+VUE_APP_BASE_API = 'http://192.168.190.67'
 #VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api'
 
 # 路由懒加载
diff --git a/ebts-ui/.env.production b/ebts-ui/.env.production
index a992137..48d69d5 100644
--- a/ebts-ui/.env.production
+++ b/ebts-ui/.env.production
@@ -3,4 +3,4 @@ ENV = 'production'
 
 # EBTS/生产环境
 #VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://192.168.190.67:8096/dev-api'
+VUE_APP_BASE_API = 'http://192.168.190.67/dev-api'
diff --git a/ebts-ui/.env.staging b/ebts-ui/.env.staging
index 4364cfe..4280611 100644
--- a/ebts-ui/.env.staging
+++ b/ebts-ui/.env.staging
@@ -5,4 +5,4 @@ ENV = 'staging'
 
 # EBTS/测试环境
 #VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://sistapi.hchyun.cn:88/dev-api'
+VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api'
diff --git a/ebts-ui/src/layout/components/Navbar.vue b/ebts-ui/src/layout/components/Navbar.vue
index ac84be6..39d38ff 100644
--- a/ebts-ui/src/layout/components/Navbar.vue
+++ b/ebts-ui/src/layout/components/Navbar.vue
@@ -2,7 +2,14 @@
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+<!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />-->
+    <breadcrumb
+      id="breadcrumb-container"
+      class="breadcrumb-container"
+      v-if="!topNav"
+    />
+
+<!--    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />-->
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
@@ -69,7 +76,12 @@ export default {
           value: val
         })
       }
-    }
+    },
+    topNav: {
+      get() {
+        return this.$store.state.settings.topNav;
+      },
+    },
   },
   methods: {
     toggleSideBar() {
@@ -81,9 +93,14 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
-        })
+        // this.$store.dispatch('LogOut').then(() => {
+        //   location.href = '/index';
+        // }
+        this.$store.dispatch("LogOut").then(() => {
+          if (!settings.casEnable) {
+            location.href = this.$router.options.base + "/index";
+          }
+        });
       })
     }
   }
diff --git a/ebts-ui/src/permission.js b/ebts-ui/src/permission.js
index 00c2f3e..9f4f390 100644
--- a/ebts-ui/src/permission.js
+++ b/ebts-ui/src/permission.js
@@ -7,7 +7,9 @@ import { getToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
+
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
+const defaultSettings = require('@/settings.js')
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -48,12 +50,21 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
+    debugger
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
       next()
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      // NProgress.done()
+      if (!defaultSettings.casEnable) {
+        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      }
+      //开启cas
+      if (defaultSettings.casEnable) {
+        window.location.href = defaultSettings.casloginUrl // 否则全部重定向到登录页
+      }
       NProgress.done()
     }
   }
diff --git a/ebts-ui/src/router/index.js b/ebts-ui/src/router/index.js
index 85dde8e..241a686 100644
--- a/ebts-ui/src/router/index.js
+++ b/ebts-ui/src/router/index.js
@@ -200,6 +200,7 @@ export const constantRoutes = [
 
 export default new Router({
   mode: 'history', // 去掉url中的#
+  base:"/admin",
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })
diff --git a/ebts-ui/src/settings.js b/ebts-ui/src/settings.js
index b9b1929..928efe6 100644
--- a/ebts-ui/src/settings.js
+++ b/ebts-ui/src/settings.js
@@ -1,5 +1,21 @@
 module.exports = {
   title: 'EBTS',
+  /**
+   * 开启cas
+   */
+  casEnable: true,
+
+  /**
+   * 单点登录url
+   */
+  casloginUrl: 'https://cas.swjtu.edu.cn/authserver/login?service=http://192.168.190.67/dev-api/dev',
+
+  /**
+   * 单点登出url
+   */
+  // caslogoutUrl: 'http://localhost:8888/cas/logout?service=http://localhost:8080',
+  caslogoutUrl: 'https://cas.swjtu.edu.cn/authserver/logout?service=http://192.168.190.67',
+
 
   /**
    * 是否系统布局配置
diff --git a/ebts-ui/src/store/modules/user.js b/ebts-ui/src/store/modules/user.js
index 4242da8..01106cb 100644
--- a/ebts-ui/src/store/modules/user.js
+++ b/ebts-ui/src/store/modules/user.js
@@ -1,6 +1,6 @@
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-
+const defaultSettings = require('@/settings')
 const user = {
   state: {
     token: getToken(),
@@ -82,6 +82,7 @@ const user = {
           commit('SET_PERMISSIONS', [])
           removeToken()
           resolve()
+          window.location.href = defaultSettings.caslogoutUrl
         }).catch(error => {
           reject(error)
         })
diff --git a/ebts-ui/src/utils/request.js b/ebts-ui/src/utils/request.js
index 77fe3d1..30c5ddd 100644
--- a/ebts-ui/src/utils/request.js
+++ b/ebts-ui/src/utils/request.js
@@ -5,6 +5,7 @@ import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+const defaultSettings = require('@/settings')
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
@@ -39,8 +40,13 @@ service.interceptors.response.use(res => {
         }
       ).then(() => {
         store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          if (!defaultSettings.casEnable) {
+            location.href = '/index';
+          }
         })
+        // store.dispatch('LogOut').then(() => {
+        //   location.href = '/index';
+        // })
       })
     } else if (code === 500) {
       Message({
diff --git a/ebts-ui/src/views/sist/article/components/article.vue b/ebts-ui/src/views/sist/article/components/article.vue
index 1cc747a..c17a0fc 100644
--- a/ebts-ui/src/views/sist/article/components/article.vue
+++ b/ebts-ui/src/views/sist/article/components/article.vue
@@ -248,12 +248,13 @@ export default {
     getArticleType().then(res => {
       let dictCodes = res.data
       let articleList = this.articleTypeOptions
+      console.log("dictCodes",dictCodes,"articleList",articleList)
       for (let i = 0; i < articleList.length; i++) {
         for (let j = 0; j < dictCodes.length; j++) {
-          if (articleList[i].dictCode === dictCodes[j]) {
-            if (articleList[i].attribute2 === 1) {
+          if (articleList[i].dictCode == dictCodes[j]) {
+            if (articleList[i].attribute2 == 1) {
               this.sistArticleTypeOption.push(articleList[i])
-            } else if (articleList[i].attribute2 === 2) {
+            } else if (articleList[i].attribute2 == 2) {
               this.labArticleTypeOption.push(articleList[i])
             }
           }
diff --git a/ebts-ui/vue.config.js b/ebts-ui/vue.config.js
index df2d4dd..69653f3 100644
--- a/ebts-ui/vue.config.js
+++ b/ebts-ui/vue.config.js
@@ -16,8 +16,9 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.hchyun.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.hchyun.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  // 例如 https://www.hchyun.com/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.hchyun.com/admin/，则设置 baseUrl 为 /admin/。
+  // publicPath: "/admin/",
+  publicPath: "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）