nsgm-cli 2.0.11 → 2.0.14

package/client/utils/cookie.ts

@@ -1,52 +1,52 @@
-import _ from 'lodash'
-
-export const setCookie = (name: string, value:string, cookieExpire:any) => { 
-  const currentDate = new Date()
-  const currentTime = currentDate.getTime()
-  let expiresTime = currentDate
-  expiresTime.setTime(currentTime + 60 * 1000 * 60 * 24 * 30)
-
-  if (typeof document !== 'undefined') {
-    let cookie = name + '=' + window.btoa(encodeURIComponent(value))
-    // let cookie = name + '=' + encodeURIComponent(value)
-    if (cookieExpire) {
-      cookie += ";expires=" + cookieExpire
-    } else { 
-      cookie += ";expires=" + expiresTime.toUTCString()
-    }
-
-    cookie += ";path=/"
-    document.cookie = cookie
-  }
-}
-
-export const getCookie = (name: string) => { 
-  let result = ''
-  if (typeof document !== 'undefined') { 
-    const cookie = document.cookie
-    // console.log('cookie', cookie)
-
-    const cookieArr = cookie.split("; ")
-  
-    _.each(cookieArr, (item, index) => { 
-      const itemArr = item.split("=")
-      if (name === itemArr[0]) {
-        result = decodeURIComponent(window.atob(itemArr[1]))
-        // result = decodeURIComponent(itemArr[1])
-        return false
-      }
-    })
-  }
-  return result
-}
-
-export const delCookie = (name: string) => { 
-  const currentDate = new Date()
-  const currentTime = currentDate.getTime()
-  let expiresTime = currentDate
-  expiresTime.setTime(currentTime - 1)
-
-  if (typeof document !== 'undefined') {
-    document.cookie = name + "=;expires=" + expiresTime.toUTCString() + ";path=/"
-  }
+import _ from 'lodash'
+
+export const setCookie = (name: string, value:string, cookieExpire:any) => { 
+  const currentDate = new Date()
+  const currentTime = currentDate.getTime()
+  let expiresTime = currentDate
+  expiresTime.setTime(currentTime + 60 * 1000 * 60 * 24 * 30)
+
+  if (typeof document !== 'undefined') {
+    let cookie = name + '=' + window.btoa(encodeURIComponent(value))
+    // let cookie = name + '=' + encodeURIComponent(value)
+    if (cookieExpire) {
+      cookie += ";expires=" + cookieExpire
+    } else { 
+      cookie += ";expires=" + expiresTime.toUTCString()
+    }
+
+    cookie += ";path=/"
+    document.cookie = cookie
+  }
+}
+
+export const getCookie = (name: string) => { 
+  let result = ''
+  if (typeof document !== 'undefined') { 
+    const cookie = document.cookie
+    // console.log('cookie', cookie)
+
+    const cookieArr = cookie.split("; ")
+  
+    _.each(cookieArr, (item, index) => { 
+      const itemArr = item.split("=")
+      if (name === itemArr[0]) {
+        result = decodeURIComponent(window.atob(itemArr[1]))
+        // result = decodeURIComponent(itemArr[1])
+        return false
+      }
+    })
+  }
+  return result
+}
+
+export const delCookie = (name: string) => { 
+  const currentDate = new Date()
+  const currentTime = currentDate.getTime()
+  let expiresTime = currentDate
+  expiresTime.setTime(currentTime - 1)
+
+  if (typeof document !== 'undefined') {
+    document.cookie = name + "=;expires=" + expiresTime.toUTCString() + ";path=/"
+  }
 }

package/client/utils/fetch.ts

@@ -1,25 +1,25 @@
-import axios from 'axios'
-import { getLocalApiPrefix } from './common'
-
-export const getLocalGraphql = (query: string, variables: any = {}) => {
-  return new Promise((resolve, reject) => {
-    axios
-      .post(getLocalApiPrefix() + '/graphql', {
-        query,
-        variables
-      })
-      .then((res) => {
-        // console.log('axios_res', res)
-        if (res) {
-          const { data } = res
-          resolve(data)
-        } else {
-          reject()
-        }
-      })
-      .catch((_e) => {
-        // console.error('axios_e', _e)
-        reject(_e)
-      })
-  })
-}
+import axios from 'axios'
+import { getLocalApiPrefix } from './common'
+
+export const getLocalGraphql = (query: string, variables: any = {}) => {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(getLocalApiPrefix() + '/graphql', {
+        query,
+        variables
+      })
+      .then((res) => {
+        // console.log('axios_res', res)
+        if (res) {
+          const { data } = res
+          resolve(data)
+        } else {
+          reject()
+        }
+      })
+      .catch((_e) => {
+        // console.error('axios_e', _e)
+        reject(_e)
+      })
+  })
+}

package/client/utils/menu.tsx

@@ -1,27 +1,27 @@
-import { BookOutlined, SolutionOutlined } from '@ant-design/icons'
-import React from 'react'
-
-let key = 1
-
-export default [
-  {
-    key: key.toString(),
-    text: '介绍',
-    url: '/',
-    icon: <BookOutlined rev={undefined} />,
-    subMenus: null
-  },
-  {
-    key: (++key).toString(),
-    text: '模板',
-    url: '/template/manage',
-    icon: <SolutionOutlined rev={undefined} />,
-    subMenus: [
-      {
-        key: key + '_1',
-        text: '模板1',
-        url: '/template/manage'
-      }
-    ]
-  }
-]
+import { BookOutlined, SolutionOutlined } from '@ant-design/icons'
+import React from 'react'
+
+let key = 1
+
+export default [
+  {
+    key: key.toString(),
+    text: '介绍',
+    url: '/',
+    icon: <BookOutlined rev={undefined} />,
+    subMenus: null
+  },
+  {
+    key: (++key).toString(),
+    text: '模板',
+    url: '/template/manage',
+    icon: <SolutionOutlined rev={undefined} />,
+    subMenus: [
+      {
+        key: key + '_1',
+        text: '模板1',
+        url: '/template/manage'
+      }
+    ]
+  }
+]

package/client/utils/sso.ts

@@ -1,205 +1,205 @@
-import axios from 'axios'
-import { setCookie, getCookie, delCookie } from './cookie'
-import { getUrlParamByKey, getLocalApiPrefix, getLocalEnv } from './common'
-import _ from 'lodash'
-
-const env = getLocalEnv()
-
-const LOGIN_COOKIE_ID = env + '_cas_nsgm'
-const LOGIN_COOKIE_USER = env + '_nsgm_user'
-
-const getPrincipalUrl = () => { 
-  const url = getLocalApiPrefix() + '/rest/sso/sessionCheck'
-  return url
-}
-
-const getValidateUrl = () => { 
-  const url = getLocalApiPrefix() + '/rest/sso/ticketCheck'
-  return url
-}
-
-const handleLocationHref = () => { 
-  let newHref = ''
-  if (typeof window !== 'undefined') {
-    const locationHref = window.location.href
-    if (locationHref.indexOf('?') !== -1) {
-      const locationHrefArr = locationHref.split('?')
-      const locationHrefArrLen = locationHrefArr.length
-
-      let newParamStr = ''
-      
-      if (locationHrefArrLen > 1) {
-        const paramStr = locationHrefArr[1]
-        if (paramStr.indexOf('&') !== -1) {
-          const paramArr = paramStr.split('&')
-          
-          _.each(paramArr, (item, index) => {
-            if (item.indexOf('=') !== -1) {
-              const itemArr = item.split('=')
-              const itemArrLen = itemArr.length
-
-              const key = itemArr[0]
-              let value = ''
-              if (itemArrLen > 1)
-                value = itemArr[1]
-              
-              if ('ticket' !== key) {
-                newParamStr += key + '=' + value + '&'
-              }
-            }
-          })
-
-          newParamStr = newParamStr.substring(0, newParamStr.length - 1)
-        } else {
-          if (paramStr.indexOf('ticket') === -1) {
-            newParamStr = paramStr
-          }
-        }
-      }
-
-      const locationHrefArrFirst = locationHrefArr[0]
-      if(newParamStr !== '')
-        newHref = locationHrefArrFirst + '?' + newParamStr
-      else
-        newHref = locationHrefArrFirst
-    } else { 
-      newHref = locationHref
-    }
-  }
-
-  // console.log('newHref', newHref)
-  return encodeURIComponent(newHref)
-}
-
-const jumpToLogin = () => { 
-  delCookie(LOGIN_COOKIE_ID)
-  delCookie(LOGIN_COOKIE_USER)
-  
-  if (typeof window !== 'undefined') {
-    window.location.href = window.location.origin + '/login'
-  }
-}
-
-const jumpToLogout = () => { 
-  delCookie(LOGIN_COOKIE_ID)
-  delCookie(LOGIN_COOKIE_USER)
-  
-  if (typeof window !== 'undefined') {
-    window.location.href = window.location.origin
-  }
-}
-
-const principalLogin = (cookie:string, callback:any) => { 
-  let url = getPrincipalUrl()
-
-  if (typeof window !== 'undefined') {
-    url += '?cookieValue=' + cookie + '&redirectUrl=' + handleLocationHref()
-  }
-
-  console.log('principalLogin_url', url)
-  axios.get(url, { params: { credentials: 'include' } }).then((res:any) => {
-    console.log('principalLogin_res', res)
-    const { data } = res
-    if (data) {
-      const { returnCode, userAttr } = data
-      if (returnCode !== 0) {
-        jumpToLogin()
-      } else { 
-        storeLoginUser(userAttr, callback)
-      }
-    } else { 
-      jumpToLogin()
-    }
-  }).catch((e) => {
-    console.log('principalLogin_exception', e)
-    jumpToLogin()
-  })
-}
-
-const storeLoginUser = (userAttr:any, callback:any) => { 
-  console.log('storeLoginUser', userAttr)
-
-  if (userAttr) {
-    const user = JSON.stringify(userAttr, ['city', 'company', 'department', 'displayName', 'employee', 'mail', 'name', 'sn'])
-    setCookie(LOGIN_COOKIE_USER, user, null)
-    callback && callback(JSON.parse(user))
-  } else { 
-    callback && callback()
-  }
-}
-
-const storeLogin = (cookie:any, cookieExpire:any, userAttr:any, callback:any) => { 
-  console.log('storeLogin_cookie', cookie)
-
-  if (cookie) { 
-    setCookie(LOGIN_COOKIE_ID, cookie, cookieExpire)
-  }
-
-  storeLoginUser(userAttr, callback)
-}
-
-const validateLogin = (ticket:string, name:string = '', callback:any) => { 
-  let url = getValidateUrl()
-
-  if (typeof window !== 'undefined') {
-    url += '?ticket=' + ticket
-
-    if(name !== ''){
-      url += '&name=' + name
-    }
-  }
-  
-  console.log('validateLogin_url', url)
-  axios.get(url, { params: { credentials: 'include' } }).then((res:any) => {
-    console.log('validateLogin_res', res)
-
-    if (res) {
-      const { data } = res
-      if (data) {
-        const { cookieValue, cookieExpire, returnCode, userAttr } = data
-        if (returnCode === 0) {
-          storeLogin(cookieValue, cookieExpire, userAttr, callback)
-        } else { 
-          jumpToLogin()
-        }
-      } else { 
-        jumpToLogin()
-      }
-    } else { 
-      jumpToLogin()
-    }
-  }).catch((e) => {
-    console.log('validateLogin_exception', e)
-  })
-}
-
-export const login = (callback:any) => { 
-  const cookieLoginValue = getCookie(LOGIN_COOKIE_ID)
-  console.log('cookieLoginValue', cookieLoginValue)
-
-  if(typeof window !== 'undefined'){
-    const locationHref = window.location.href
-
-    if(locationHref.indexOf('/login') === -1){
-
-      if (cookieLoginValue !== '') {
-        principalLogin(cookieLoginValue, callback)
-      } else { 
-        const urlParamTicket = getUrlParamByKey('ticket')
-        const urlParamName = getUrlParamByKey('name')
-        console.log('urlParamTicket', urlParamTicket, urlParamName)
-
-        if (urlParamTicket !== '') {
-          validateLogin(urlParamTicket, urlParamName, callback)
-        } else { 
-          jumpToLogin()
-        }
-      }
-    }
-  }
-}
-
-export const logout = () => { 
-  jumpToLogout()
-}
-
+import axios from 'axios'
+import { setCookie, getCookie, delCookie } from './cookie'
+import { getUrlParamByKey, getLocalApiPrefix, getLocalEnv } from './common'
+import _ from 'lodash'
+
+const env = getLocalEnv()
+
+const LOGIN_COOKIE_ID = env + '_cas_nsgm'
+const LOGIN_COOKIE_USER = env + '_nsgm_user'
+
+const getPrincipalUrl = () => { 
+  const url = getLocalApiPrefix() + '/rest/sso/sessionCheck'
+  return url
+}
+
+const getValidateUrl = () => { 
+  const url = getLocalApiPrefix() + '/rest/sso/ticketCheck'
+  return url
+}
+
+const handleLocationHref = () => { 
+  let newHref = ''
+  if (typeof window !== 'undefined') {
+    const locationHref = window.location.href
+    if (locationHref.indexOf('?') !== -1) {
+      const locationHrefArr = locationHref.split('?')
+      const locationHrefArrLen = locationHrefArr.length
+
+      let newParamStr = ''
+      
+      if (locationHrefArrLen > 1) {
+        const paramStr = locationHrefArr[1]
+        if (paramStr.indexOf('&') !== -1) {
+          const paramArr = paramStr.split('&')
+          
+          _.each(paramArr, (item, index) => {
+            if (item.indexOf('=') !== -1) {
+              const itemArr = item.split('=')
+              const itemArrLen = itemArr.length
+
+              const key = itemArr[0]
+              let value = ''
+              if (itemArrLen > 1)
+                value = itemArr[1]
+              
+              if ('ticket' !== key) {
+                newParamStr += key + '=' + value + '&'
+              }
+            }
+          })
+
+          newParamStr = newParamStr.substring(0, newParamStr.length - 1)
+        } else {
+          if (paramStr.indexOf('ticket') === -1) {
+            newParamStr = paramStr
+          }
+        }
+      }
+
+      const locationHrefArrFirst = locationHrefArr[0]
+      if(newParamStr !== '')
+        newHref = locationHrefArrFirst + '?' + newParamStr
+      else
+        newHref = locationHrefArrFirst
+    } else { 
+      newHref = locationHref
+    }
+  }
+
+  // console.log('newHref', newHref)
+  return encodeURIComponent(newHref)
+}
+
+const jumpToLogin = () => { 
+  delCookie(LOGIN_COOKIE_ID)
+  delCookie(LOGIN_COOKIE_USER)
+  
+  if (typeof window !== 'undefined') {
+    window.location.href = window.location.origin + '/login'
+  }
+}
+
+const jumpToLogout = () => { 
+  delCookie(LOGIN_COOKIE_ID)
+  delCookie(LOGIN_COOKIE_USER)
+  
+  if (typeof window !== 'undefined') {
+    window.location.href = window.location.origin
+  }
+}
+
+const principalLogin = (cookie:string, callback:any) => { 
+  let url = getPrincipalUrl()
+
+  if (typeof window !== 'undefined') {
+    url += '?cookieValue=' + cookie + '&redirectUrl=' + handleLocationHref()
+  }
+
+  console.log('principalLogin_url', url)
+  axios.get(url, { params: { credentials: 'include' } }).then((res:any) => {
+    console.log('principalLogin_res', res)
+    const { data } = res
+    if (data) {
+      const { returnCode, userAttr } = data
+      if (returnCode !== 0) {
+        jumpToLogin()
+      } else { 
+        storeLoginUser(userAttr, callback)
+      }
+    } else { 
+      jumpToLogin()
+    }
+  }).catch((e) => {
+    console.log('principalLogin_exception', e)
+    jumpToLogin()
+  })
+}
+
+const storeLoginUser = (userAttr:any, callback:any) => { 
+  console.log('storeLoginUser', userAttr)
+
+  if (userAttr) {
+    const user = JSON.stringify(userAttr, ['city', 'company', 'department', 'displayName', 'employee', 'mail', 'name', 'sn'])
+    setCookie(LOGIN_COOKIE_USER, user, null)
+    callback && callback(JSON.parse(user))
+  } else { 
+    callback && callback()
+  }
+}
+
+const storeLogin = (cookie:any, cookieExpire:any, userAttr:any, callback:any) => { 
+  console.log('storeLogin_cookie', cookie)
+
+  if (cookie) { 
+    setCookie(LOGIN_COOKIE_ID, cookie, cookieExpire)
+  }
+
+  storeLoginUser(userAttr, callback)
+}
+
+const validateLogin = (ticket:string, name:string = '', callback:any) => { 
+  let url = getValidateUrl()
+
+  if (typeof window !== 'undefined') {
+    url += '?ticket=' + ticket
+
+    if(name !== ''){
+      url += '&name=' + name
+    }
+  }
+  
+  console.log('validateLogin_url', url)
+  axios.get(url, { params: { credentials: 'include' } }).then((res:any) => {
+    console.log('validateLogin_res', res)
+
+    if (res) {
+      const { data } = res
+      if (data) {
+        const { cookieValue, cookieExpire, returnCode, userAttr } = data
+        if (returnCode === 0) {
+          storeLogin(cookieValue, cookieExpire, userAttr, callback)
+        } else { 
+          jumpToLogin()
+        }
+      } else { 
+        jumpToLogin()
+      }
+    } else { 
+      jumpToLogin()
+    }
+  }).catch((e) => {
+    console.log('validateLogin_exception', e)
+  })
+}
+
+export const login = (callback:any) => { 
+  const cookieLoginValue = getCookie(LOGIN_COOKIE_ID)
+  console.log('cookieLoginValue', cookieLoginValue)
+
+  if(typeof window !== 'undefined'){
+    const locationHref = window.location.href
+
+    if(locationHref.indexOf('/login') === -1){
+
+      if (cookieLoginValue !== '') {
+        principalLogin(cookieLoginValue, callback)
+      } else { 
+        const urlParamTicket = getUrlParamByKey('ticket')
+        const urlParamName = getUrlParamByKey('name')
+        console.log('urlParamTicket', urlParamTicket, urlParamName)
+
+        if (urlParamTicket !== '') {
+          validateLogin(urlParamTicket, urlParamName, callback)
+        } else { 
+          jumpToLogin()
+        }
+      }
+    }
+  }
+}
+
+export const logout = () => { 
+  jumpToLogout()
+}
+

package/generation/.babelrc

@@ -1,11 +1,11 @@
-{
-  "presets": ["next/babel"],
-  "plugins": [
-    ["styled-components", { 
-      "ssr": true,
-      "displayName": true,
-      "preprocess": false
-    }]
-  ]
-}
+{
+  "presets": ["next/babel"],
+  "plugins": [
+    ["styled-components", { 
+      "ssr": true,
+      "displayName": true,
+      "preprocess": false
+    }]
+  ]
+}