浏览代码

上线打包

shenji 1 年之前
父节点
当前提交
dc90d0cb98
共有 7 个文件被更改,包括 18 次插入15 次删除
  1. 6 1
      public/index.html
  2. 2 2
      src/components/tools/UserMenu.vue
  3. 1 1
      src/config/router.config.js
  4. 4 3
      src/store/modules/user.js
  5. 2 5
      src/views/Index.vue
  6. 1 1
      src/views/Redirect.vue
  7. 2 2
      url.config.js

+ 6 - 1
public/index.html

@@ -283,7 +283,12 @@
     // window._CONFIG['domianURL'] = 'http://127.0.0.1:8090/jeecg-boot'; // 本地测试
     // window._CONFIG['domianURL'] = 'http://106.15.206.14:8087/jeecg-boot';// 测试服务器
     // window._CONFIG['domianURL'] = 'http://www.myfitt.cn:18087/jeecg-boot';// 森语外网
-    window._CONFIG['domianURL'] = 'http://172.18.91.36:8081/jeecg-boot';// 博物馆oa
+    // window._CONFIG['domianURL'] = 'https://172.18.91.36:8083/jeecg-boot';// 博物馆oa
+    window._CONFIG['domianURL'] = 'https://oa.worldskillsmuseum.cn/jeecg-boot';// 博物馆oa域名
+
+    // window._CONFIG['ssoURL'] = 'http://127.0.0.1:8090/jeecg-boot';// 本地测试
+    // window._CONFIG['ssoURL'] = 'http://172.18.91.12:8888/sso';// 博物馆oa
+    window._CONFIG['ssoURL'] = 'https://sso.worldskillsmuseum.cn/sso';// 博物馆oa域名
     window._CONFIG['casPrefixUrl'] = 'http://www.myfitt.cn:18005/cas';
     window._CONFIG['onlinePreviewDomainURL'] = 'http://fileview.jeecg.com/onlinePreview'
     window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/static';

+ 2 - 2
src/components/tools/UserMenu.vue

@@ -181,10 +181,10 @@
           content: '真的要注销登录吗 ?',
           onOk() {
             return that.Logout({}).then(() => {
-              window.location.href="/";
+              // window.location.href="/";
               //window.location.reload()
                 //博物馆单点登录注销
-                // window.location.href="http://172.18.91.12:8888/sso";
+                window.location.href=window._CONFIG['ssoURL'];
             }).catch(err => {
               that.$message.error({
                 title: '错误',

+ 1 - 1
src/config/router.config.js

@@ -299,7 +299,7 @@ export const constantRouterMap = [
     component: UserLayout,
     redirect: '/user/login',
     // 博物馆单点登录
-    // component: () => import('@/views/Index'),
+    component: () => import('@/views/Index'),
     hidden: true,
     children: [
       {

+ 4 - 3
src/store/modules/user.js

@@ -234,11 +234,12 @@ const user = {
         Vue.ls.remove(USER_NAME)
        
         logout(logoutToken).then(() => {
-            let sevice = 'http://' + window.location.host + '/'
+            // let sevice = 'http://' + window.location.host + '/'
             let serviceUrl = encodeURIComponent(sevice)
-            window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
+            // window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
+            // window.location.href="/";
               //博物馆单点登录注销
-//             window.location.href="http://172.18.91.12:8888/sso";
+            window.location.href=window._CONFIG['ssoURL'];
             // resolve()
         }).catch(() => {
           console.log("111111111111111")

+ 2 - 5
src/views/Index.vue

@@ -27,9 +27,6 @@
     created(){
       this.getUUID();
     },
-    // created(){
-    //   window.location.href = 'http://172.18.91.12:8888/sso/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=http://172.18.91.36:8083/#/redirect/login'
-    // },
     methods: {
       ...mapActions(['uuidLogin']),
       getUUID(){
@@ -37,7 +34,7 @@
         // var dz_url = url.split('#')[0];                //获取#/之前的字符串
         var cs = url.split('?')[1];                //获取?之后的参数字符串
         if(cs==undefined){
-          window.location.href = 'http://172.18.91.12:8888/sso/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=http://172.18.91.36:8083/#/redirect/login'
+          window.location.href = window._CONFIG['ssoURL']+'/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=https://oa.worldskillsmuseum.cn/#/redirect/login'
         }
         var cs_arr = cs.split('&');                    //参数字符串分割为数组
         var cs={};
@@ -79,7 +76,7 @@
             })
           })
         }else{
-          window.location.href = 'http://172.18.91.12:8888/sso/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=http://172.18.91.36:8083/#/redirect/login'
+          window.location.href = window._CONFIG['ssoURL']+'/oauth/authorize?client_id=OAManager&response_type=code&redirect_url=https://oa.worldskillsmuseum.cn/#/redirect/login'
         }
       },
     }

+ 1 - 1
src/views/Redirect.vue

@@ -97,7 +97,7 @@
           } else {
               this.requestFailed(res)
               setTimeout(()=>{
-                window.location.href="http://172.18.91.12:8888/sso"
+                window.location.href=window._CONFIG['ssoURL']
               },3000)
           }
       },

+ 2 - 2
url.config.js

@@ -1,9 +1,9 @@
 export function getEditorJumpUrl () {
-    let url = 'http://localhost:8080'
+    // let url = 'http://localhost:8080'
     //let url ="http://106.15.206.14:8089";//测试服务器
     // let url ="http://192.168.1.158:8089";//森宇服务器
     // let url = "http://220.191.168.86:18089" // 森语外网
-    // let url = 'http://172.18.91.36:8082' // 博物馆OA
+    let url = 'https://172.18.91.36:8082' // 博物馆OA
     return url
   }