2637309949 4 роки тому
батько
коміт
eee367902b
50 змінених файлів з 37 додано та 38 видалено
  1. 0 0
      .travis.yml
  2. 1 1
      public/domain.js
  3. 0 0
      src/api/modules/index.js
  4. 0 0
      src/api/modules/sys_app_fun.js
  5. 0 0
      src/api/modules/sys_area.js
  6. 0 0
      src/api/modules/sys_attachment.js
  7. 0 0
      src/api/modules/sys_cas.js
  8. 0 0
      src/api/modules/sys_client.js
  9. 0 0
      src/api/modules/sys_comment.js
  10. 0 0
      src/api/modules/sys_data_permission.js
  11. 0 0
      src/api/modules/sys_dingtalk.js
  12. 0 0
      src/api/modules/sys_domain.js
  13. 0 0
      src/api/modules/sys_menu.js
  14. 0 0
      src/api/modules/sys_notification.js
  15. 0 0
      src/api/modules/sys_optionset.js
  16. 0 0
      src/api/modules/sys_org.js
  17. 0 0
      src/api/modules/sys_permission.js
  18. 0 0
      src/api/modules/sys_role.js
  19. 0 0
      src/api/modules/sys_role_menu.js
  20. 0 0
      src/api/modules/sys_schedule.js
  21. 0 0
      src/api/modules/sys_schedule_history.js
  22. 0 0
      src/api/modules/sys_scheduling.js
  23. 0 0
      src/api/modules/sys_setting.js
  24. 0 0
      src/api/modules/sys_table.js
  25. 0 0
      src/api/modules/sys_table_column.js
  26. 0 0
      src/api/modules/sys_tag.js
  27. 0 0
      src/api/modules/sys_tag_group.js
  28. 0 0
      src/api/modules/sys_tracker.js
  29. 0 0
      src/api/modules/sys_user.js
  30. 0 0
      src/api/modules/sys_user_template.js
  31. 0 0
      src/api/modules/sys_user_template_detail.js
  32. 0 0
      src/api/modules/sys_wechat.js
  33. 0 0
      src/api/modules/sys_worker.js
  34. 0 0
      src/components/ImageCropper/utils/data2blob.js
  35. 0 0
      src/components/ImageCropper/utils/effectRipple.js
  36. 0 0
      src/components/ImageCropper/utils/language.js
  37. 0 0
      src/components/ImageCropper/utils/mimes.js
  38. 10 16
      src/store/modules/user.js
  39. 4 4
      src/utils/auth.js
  40. 1 1
      src/views/attachment/query.js
  41. 1 8
      src/views/login/index.vue
  42. 1 1
      src/views/menu/query.js
  43. 1 1
      src/views/optionset/query.js
  44. 1 1
      src/views/org/query.js
  45. 1 1
      src/views/role/query.js
  46. 1 1
      src/views/scheduling/query.js
  47. 1 1
      src/views/table/query.js
  48. 1 1
      src/views/tracker/query.js
  49. 1 1
      src/views/user/query.js
  50. 12 0
      wget-log

+ 0 - 0
.travis.yml


+ 1 - 1
public/domain.js

@@ -5,7 +5,7 @@ window.Domain = {
     "contact_email": null,
     "contact_mobile": null,
     "login_url": "localhost",
-    "api_url": "http://localhost:8082",
+    "api_url": "http://172.16.10.191:8082",
     "static_url": null,
     "theme": "default",
     "auth_mode": 1

+ 0 - 0
src/api/modules/index.js


+ 0 - 0
src/api/modules/sys_app_fun.js


+ 0 - 0
src/api/modules/sys_area.js


+ 0 - 0
src/api/modules/sys_attachment.js


+ 0 - 0
src/api/modules/sys_cas.js


+ 0 - 0
src/api/modules/sys_client.js


+ 0 - 0
src/api/modules/sys_comment.js


+ 0 - 0
src/api/modules/sys_data_permission.js


+ 0 - 0
src/api/modules/sys_dingtalk.js


+ 0 - 0
src/api/modules/sys_domain.js


+ 0 - 0
src/api/modules/sys_menu.js


+ 0 - 0
src/api/modules/sys_notification.js


+ 0 - 0
src/api/modules/sys_optionset.js


+ 0 - 0
src/api/modules/sys_org.js


+ 0 - 0
src/api/modules/sys_permission.js


+ 0 - 0
src/api/modules/sys_role.js


+ 0 - 0
src/api/modules/sys_role_menu.js


+ 0 - 0
src/api/modules/sys_schedule.js


+ 0 - 0
src/api/modules/sys_schedule_history.js


+ 0 - 0
src/api/modules/sys_scheduling.js


+ 0 - 0
src/api/modules/sys_setting.js


+ 0 - 0
src/api/modules/sys_table.js


+ 0 - 0
src/api/modules/sys_table_column.js


+ 0 - 0
src/api/modules/sys_tag.js


+ 0 - 0
src/api/modules/sys_tag_group.js


+ 0 - 0
src/api/modules/sys_tracker.js


+ 0 - 0
src/api/modules/sys_user.js


+ 0 - 0
src/api/modules/sys_user_template.js


+ 0 - 0
src/api/modules/sys_user_template_detail.js


+ 0 - 0
src/api/modules/sys_wechat.js


+ 0 - 0
src/api/modules/sys_worker.js


+ 0 - 0
src/components/ImageCropper/utils/data2blob.js


+ 0 - 0
src/components/ImageCropper/utils/effectRipple.js


+ 0 - 0
src/components/ImageCropper/utils/language.js


+ 0 - 0
src/components/ImageCropper/utils/mimes.js


+ 10 - 16
src/store/modules/user.js

@@ -13,6 +13,7 @@ const state = {
 const mutations = {
   SET_TOKEN: (state, token) => {
     state.token = token
+    setToken(token)
   },
   SET_INTRODUCTION: (state, introduction) => {
     state.introduction = introduction
@@ -35,7 +36,6 @@ const actions = {
       api.sysUser.login({ domain, username, password }).then(response => {
         const { data: { access_token }} = response
         commit('SET_TOKEN', access_token)
-        setToken(access_token)
         resolve()
       }).catch(error => {
         reject(error)
@@ -72,19 +72,15 @@ const actions = {
 
   // user logout
   logout({ commit, state, dispatch }) {
-    return new Promise((resolve, reject) => {
-      api.sysUser.logout(state.token).then(() => {
-        commit('SET_TOKEN', '')
-        commit('SET_ROLES', [])
-        removeToken()
-        resetRouter()
-        // reset visited views and cached views
-        // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
-        dispatch('tagsView/delAllViews', null, { root: true })
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
+    return new Promise(resolve => {
+      commit('SET_TOKEN', '')
+      commit('SET_ROLES', [])
+      removeToken()
+      resetRouter()
+      // reset visited views and cached views
+      // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
+      dispatch('tagsView/delAllViews', null, { root: true })
+      resolve()
     })
   },
 
@@ -104,8 +100,6 @@ const actions = {
       const token = role + '-token'
 
       commit('SET_TOKEN', token)
-      setToken(token)
-
       const { roles } = await dispatch('getInfo')
 
       resetRouter()

+ 4 - 4
src/utils/auth.js

@@ -15,8 +15,8 @@ export function removeToken() {
 }
 
 export function loginUrl(redirect, { state = '', $router, next } = {}) {
-  if (window.Domain.auth_mode === 1) {
-    window.location.href = location.href = `${window.Domain.api_url}/api/sys/cas/url?redirect_uri=${encodeURIComponent(`${window.location.origin}/#${redirect}`)}&state=${state}`
+  if (window.Domain && window.Domain.auth_mode === 1) {
+    window.location.href = location.href = `${window.Domain.api_url}/api/sys/cas/url?domain=${window.Domain.name}&redirect_uri=${encodeURIComponent(`${window.location.origin}/#${redirect}`)}&state=${encodeURIComponent(state)}`
   } else {
     if (next) {
       next(`/login?redirect=${redirect}&state=${state}`)
@@ -27,8 +27,8 @@ export function loginUrl(redirect, { state = '', $router, next } = {}) {
 }
 
 export function logoutUrl(redirect, { state = '', $router, next } = {}) {
-  if (window.Domain.auth_mode === 1) {
-    window.location.href = `${window.Domain.api_url}/api/sys/cas/logout?redirect_uri=${encodeURIComponent(`${window.location.origin}/#${redirect}`)}&state=${state}`
+  if (window.Domain && window.Domain.auth_mode === 1) {
+    window.location.href = `${window.Domain.api_url}/api/sys/cas/logout?domain=${encodeURIComponent(window.Domain.name)}&redirect_uri=${encodeURIComponent(`${window.location.origin}/#${redirect}`)}&state=${encodeURIComponent(state)}`
   } else {
     if (next) {
       next(`/logout?redirect=${redirect}&state=${state}`)

+ 1 - 1
src/views/attachment/query.js

@@ -3,7 +3,7 @@ export const attachment = {
     return {
       query: {
         export: {
-          name: 'attachments.xlsx',
+          name: 'attachments.zip',
           size: 1000
         },
         items: [

+ 1 - 8
src/views/login/index.vue

@@ -6,13 +6,6 @@
         <h3 class="title">Login</h3>
       </div>
 
-      <el-form-item prop="domain">
-        <span class="svg-container">
-          <svg-icon icon-class="domain" />
-        </span>
-        <el-input ref="domain" v-model="loginForm.domain" placeholder="Domain" name="domain" type="text" tabindex="1" autocomplete="on" />
-      </el-form-item>
-
       <el-form-item prop="username">
         <span class="svg-container">
           <svg-icon icon-class="user" />
@@ -77,7 +70,7 @@ export default {
     }
     return {
       loginForm: {
-        domain: 'localhost',
+        domain: window.Domain && window.Domain.name,
         username: 'admin',
         password: 'admin'
       },

+ 1 - 1
src/views/menu/query.js

@@ -3,7 +3,7 @@ export const menu = {
     return {
       query: {
         export: {
-          name: 'menus.xlsx',
+          name: 'menus.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/optionset/query.js

@@ -3,7 +3,7 @@ export const optionset = {
     return {
       query: {
         export: {
-          name: 'optionsets.xlsx',
+          name: 'optionsets.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/org/query.js

@@ -5,7 +5,7 @@ export const org = {
     return {
       query: {
         export: {
-          name: 'orgs.xlsx',
+          name: 'orgs.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/role/query.js

@@ -5,7 +5,7 @@ export const role = {
     return {
       query: {
         export: {
-          name: 'roles.xlsx',
+          name: 'roles.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/scheduling/query.js

@@ -5,7 +5,7 @@ export const scheduling = {
     return {
       query: {
         export: {
-          name: 'roles.xlsx',
+          name: 'roles.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/table/query.js

@@ -5,7 +5,7 @@ export const table = {
     return {
       query: {
         export: {
-          name: 'tables.xlsx',
+          name: 'tables.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/tracker/query.js

@@ -5,7 +5,7 @@ export const tracker = {
     return {
       query: {
         export: {
-          name: 'trackers.xlsx',
+          name: 'trackers.zip',
           size: 1000
         },
         items: [

+ 1 - 1
src/views/user/query.js

@@ -5,7 +5,7 @@ export const user = {
     return {
       query: {
         export: {
-          name: 'users.xlsx',
+          name: 'users.zip',
           size: 1000
         },
         items: [

+ 12 - 0
wget-log

@@ -0,0 +1,12 @@
+--2021-06-12 22:35:43--  http://140.82.121.3/
+Connecting to 140.82.121.3:80... connected.
+HTTP request sent, awaiting response... 301 Moved Permanently
+Location: https://140.82.121.3/ [following]
+--2021-06-12 22:35:43--  https://140.82.121.3/
+Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
+Connecting to 140.82.121.3:443... failed: Connection timed out.
+Retrying.
+
+--2021-06-12 22:37:54--  (try: 2)  https://140.82.121.3/
+Connecting to 140.82.121.3:443... connected.
+The certificate's owner does not match hostname ‘140.82.121.3’