vue2-client 1.22.39 → 1.22.46

package/src/pages/login/Login.vue

@@ -25,6 +25,7 @@
                     autocomplete="autocomplete"
                     placeholder="请输入账户名"
                     size="large"
+                    :disabled="smsStep"
                   >
                     <a-icon slot="prefix" type="user" />
                   </a-input>
@@ -36,10 +37,29 @@
                     placeholder="请输入密码"
                     size="large"
                     type="password"
+                    :disabled="smsStep"
                   >
                     <a-icon slot="prefix" type="lock" />
                   </a-input>
                 </a-form-item>
+                <a-form-item v-if="smsStep">
+                  <a-input
+                    v-decorator="['smsCode', {rules: [{ required: true, message: '请输入验证码', whitespace: true}]}]"
+                    autocomplete="autocomplete"
+                    placeholder="请输入短信验证码"
+                    size="large"
+                    :maxLength="8"
+                  >
+                    <a-icon slot="prefix" type="safety" />
+                    <a-button
+                      slot="suffix"
+                      type="link"
+                      :disabled="countdown > 0"
+                      @click="resendSms"
+                      style="padding: 0 4px;"
+                    >{{ countdown > 0 ? `${countdown}s 后重发` : '重新发送' }}</a-button>
+                  </a-input>
+                </a-form-item>
                 <a-form-item>
                   <a-button :loading="loading" htmlType="submit" size="large" class="btn" type="primary">登录</a-button>
                 </a-form-item>
@@ -74,14 +94,68 @@ export default {
     return {
       loading: false,
       error: '',
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      // V4 短信两阶段：smsStep=false 是 Step1 输入用户名+密码，true 是 Step2 输入短信验证码
+      smsStep: false,
+      maskedPhone: '',
+      countdown: 0,
+      countdownTimer: null,
+      // Step1 进入 Step2 后字段被 disabled 不可改，仍需提交 Step1 时的原始凭据
+      stage1Name: '',
+      stage1Password: ''
     }
   },
   computed: {
     ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible', 'routeName', 'defaultAvatarUrl'])
   },
+  beforeDestroy () {
+    this.clearCountdown()
+  },
   methods: {
     ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
+    startCountdown (seconds) {
+      this.clearCountdown()
+      this.countdown = seconds
+      this.countdownTimer = setInterval(() => {
+        this.countdown -= 1
+        if (this.countdown <= 0) {
+          this.clearCountdown()
+        }
+      }, 1000)
+    },
+    clearCountdown () {
+      if (this.countdownTimer) {
+        clearInterval(this.countdownTimer)
+        this.countdownTimer = null
+      }
+      this.countdown = 0
+    },
+    exitSmsStep () {
+      this.smsStep = false
+      this.maskedPhone = ''
+      this.clearCountdown()
+    },
+    enterSmsStep (resp) {
+      this.$message.info(resp.states)
+      this.smsStep = true
+      this.maskedPhone = resp.maskedPhone || ''
+      this.startCountdown(resp.expireSeconds || 60)
+    },
+    resendSms () {
+      // 重新触发 Step1：不带 smsCode，后端会复用 userId 下发新的验证码并返回 smsPending
+      this.loading = true
+      V4Login(this.stage1Name, this.stage1Password, this.routeName).then(res => {
+        if (res && res.needsSmsCode) {
+          this.enterSmsStep(res)
+        } else {
+          this.$message.info('重发失败，请稍后重试')
+        }
+      }).catch(msg => {
+        this.$message.info(msg || '重发失败')
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     onSubmit (e) {
       e.preventDefault()
       this.form.validateFields((err) => {
@@ -106,7 +180,14 @@ export default {
               break
             }
             case 'V4' : {
-              V4Login(name, password, this.routeName).then(this.afterLoginV4).catch(msg => {
+              // V4 短信两阶段：Step1 不带 smsCode（密码正确→下发短信）；Step2 带 smsCode（验证通过→转发上游拿 token）
+              const smsCode = this.smsStep ? this.form.getFieldValue('smsCode') : undefined
+              // 把 Step1 凭据缓存到 data.Step1，确保 Step2 时字段 disabled 也能取出原值
+              if (!this.smsStep) {
+                this.stage1Name = name
+                this.stage1Password = password
+              }
+              V4Login(name, password, this.routeName, smsCode).then(res => this.afterLoginV4(res)).catch(msg => {
                 this.error = msg
                 this.loading = false
               })
@@ -132,12 +213,35 @@ export default {
       }
     },
     afterLoginV4 (res) {
+      // V4 短信两阶段 Step1：密码正确 -> 后端下发短信并返回 smsPending
+      // 响应字段：{ states, needsSmsCode: true, maskedPhone, expireSeconds }
+      if (res && res.needsSmsCode) {
+        this.enterSmsStep(res)
+        this.loading = false
+        return
+      }
+      // 仅当 states 含"登录成功"或响应含 access_token 时才视为成功。
+      const isSuccess = res && res.access_token
+      if (!isSuccess) {
+        this.loading = false
+        const errMsg = (res && res.states) || '登录失败'
+        this.$message.info(errMsg)
+        return
+      }
       setV4AccessToken(res)
       let data = res.resources
-      if (data.data) {
+      if (data && data.data) {
         data = data.data
       }
+      // 若上游 Step2 返回的是 token 而不是 resources，说明上游不是 V4 业务服务器：
+      // 此时前端没有 routes/permissions 信息，提示用户业务侧需要实现 V4 风格返回。
+      if (!data) {
+        this.loading = false
+        this.$message.info('登录成功但上游未返回路由信息，请联系管理员')
+        return
+      }
       this.$login.login(data).then(() => {
+        this.exitSmsStep()
         this.afterGeneral(data)
         if (data.deps === '用户工单登记') {
           this.$router.push(this.ticketPage).catch(() => {

package/src/router/async/router.map.js

@@ -57,7 +57,7 @@ routerResource.example = {
   path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/pages/LayoutTest/index.vue')
-  component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue')
+  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue')
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
@@ -94,6 +94,11 @@ routerResource.example = {
   // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
   // component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
   // component: () => import('@vue2-client/components/MarkdownEditor/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XHisEditor/ImageReportDemo.vue')
+  // component: () => import('@vue2-client/components/MarkdownEditor/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/HIS/HButtons/HButtonsSuffixDemo.vue')
+
+
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')

package/src/services/user.js

@@ -38,16 +38,20 @@ export async function modifyPassword (name, password, newPassword) {
   })
 }
 
-export async function V4Login (name, password, routeName) {
+export async function V4Login (name, password, routeName, smsCode) {
   // 适配未接入基座的单应用项目登录请求加密，如af-iot-web
   if (process.env.VUE_APP_SINGLE_PAPER === 'FALSE') {
     password = bcrypt.hashSync(password, 10)
   }
-  return request(V4_LOGIN, METHOD.POST, {
+  const payload = {
     username: name,
     password: password,
     resourceName: routeName
-  })
+  }
+  if (smsCode) {
+    payload.smsCode = smsCode
+  }
+  return request(V4_LOGIN, METHOD.POST, payload)
 }
 
 export async function V4RefreshToken () {

package/src/utils/EncryptUtil.js

@@ -68,14 +68,19 @@ export default {
       return null
     }
   },
-
+  normalizeEncryptData (data) {
+    if (typeof data === 'string') {
+      return data
+    }
+    return JSON.stringify(data)
+  },
   AESEncryptCBC(data, CRYPTO_KEY) {
     // 生成随机IV（每次加密不同）
     const iv = CryptoJS.lib.WordArray.random(16)
 
     // 使用 AES CBC 模式进行加密
     const encrypted = CryptoJS.AES.encrypt(
-      JSON.stringify(data),
+      this.normalizeEncryptData(data),
       CryptoJS.enc.Hex.parse(CRYPTO_KEY),
       {
         iv: iv, // IV

package/src/utils/login.js

@@ -13,7 +13,7 @@ import {
 } from '@vue2-client/store/mutation-types'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loginGen } from '@vue2-client/base-client/plugins/GetLoginInfoService'
-import { RSA_PRIVATE_KEY } from '@vue2-client/constants/crypto'
+import { RSA_PRIVATE_KEY, V3_RSA_PRIVATE_KEY } from '@vue2-client/constants/crypto'
 import EncryptUtil from '@vue2-client/utils/EncryptUtil'
 // 认证类型
 const AUTH_TYPE = {
@@ -44,14 +44,13 @@ export function checkSingleAuthorization(authType = AUTH_TYPE.BEARER, token) {
 
 function setAccessToken(data, jwt) {
   const token = jwt || data
-  if (token) {
-    localStorage.setItem(ACCESS_TOKEN, token)
-    let timestamp = new Date().getTime() // 当前的时间戳
-    timestamp = timestamp + 12 * 60 * 60 * 1000
-    // 格式化时间获取年月日, 登陆过期时间
-    const dateAfter = new Date(timestamp)
-    setAuthorization({ token: token, expireAt: dateAfter })
-  }
+  if (!token) return
+  localStorage.setItem(ACCESS_TOKEN, token)
+  let timestamp = new Date().getTime() // 当前的时间戳
+  timestamp = timestamp + 12 * 60 * 60 * 1000
+  // 格式化时间获取年月日, 登陆过期时间
+  const dateAfter = new Date(timestamp)
+  setAuthorization({ token, expireAt: dateAfter })
 }
 
 function afterGeneral(result, options) {
@@ -97,10 +96,12 @@ function afterLogin(res, options) {
       JSON.stringify({ username: name, password: password })
     )
     const jwt = res.jwtNew
-    // 如果返回字段有s说明是走的V3XuanJian网关
-    if(res.s || res.session) {
-      setV4SessionKey({session: res.s || res.session})
+    const isV3Gateway = !!(res.s || res.session)
+    // V3 网关：响应含 s/session 表示启用请求体 AES 加密，需先解密会话密钥
+    if (isV3Gateway) {
+      setSessionKey({ session: res.s || res.session })
     }
+    setAccessToken(data, jwt)
     // 获取路由配置
     getRoutesConfig(data, setting.routeName)
       .then((result) => {
@@ -116,7 +117,6 @@ function afterLogin(res, options) {
             }
             result.functions.unshift(resourceManageMain)
             afterGeneral(result, options)
-            setAccessToken(data, jwt)
             if (result.deps === '用户工单登记') {
               router.push(setting.ticketPage).catch(() => {
               })
@@ -173,7 +173,11 @@ function getWebConfigFromStorage() {
   }
 }
 
-/** 解析登录接口返回的 session 并写入 v4-session-key（受 webConfig.requestEncrypt 控制） */
+/**
+ * V4 登录：解析 session 并写入 v4-session-key。
+ * 受 webConfig.setting.requestEncrypt 开关控制，仅当配置开启且响应含 session 时才解密。
+ * 使用 RSA_PRIVATE_KEY（V4 产品密钥）。
+ */
 export function setV4SessionKey(res) {
   const webConfig = getWebConfigFromStorage()
   if (!res?.session || !webConfig?.setting?.requestEncrypt) return
@@ -181,6 +185,17 @@ export function setV4SessionKey(res) {
   if (sessionKey) localStorage.setItem(V4_SESSION_KEY, sessionKey)
 }
 
+/**
+ * V3 玄简网关：解析 session 并写入 v4-session-key。
+ * 登录响应含 s/session 时无条件解密（不读 requestEncrypt 开关），表示后续请求走 AES 加密。
+ * 使用 V3_RSA_PRIVATE_KEY（玄简网关密钥），与 V4 的 setV4SessionKey 密钥和触发条件均不同。
+ */
+export function setSessionKey(res) {
+  if (!res?.session) return
+  const sessionKey = EncryptUtil.RSADecryptRaw(res.session, V3_RSA_PRIVATE_KEY)
+  if (sessionKey) localStorage.setItem(V4_SESSION_KEY, sessionKey)
+}
+
 export function setV4AccessToken(res) {
   const payload = unwrapV4LoginPayload(res)
   if (!payload?.access_token) return

package/src/utils/request.js

@@ -100,6 +100,16 @@ async function request(url, method, params, config) {
   }
 }
 
+/**
+ * 规范 Authorization 头的 Bearer 前缀，避免重复拼接
+ * @param {string} token
+ * @returns {string}
+ */
+export function formatBearerToken(token) {
+  if (!token) return token
+  return token.startsWith('Bearer ') ? token : `Bearer ${token}`
+}
+
 /**
  * 设置认证信息
  * @param auth {Object}
@@ -232,8 +242,9 @@ function loadInterceptors() {
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
       if (config.url !== V4_LOGIN) {
-        // V4 环境则添加 V4请求头
-        config.headers[V4_ACCESS_TOKEN] = token
+        const isV3 = ['V2', 'V3'].includes(getSystemVersion())
+        // V3 网关：Authorization 需 Bearer 前缀；Access-Token 始终传原始 token
+        config.headers[V4_ACCESS_TOKEN] = isV3 ? formatBearerToken(token) : token
         config.headers[ACCESS_TOKEN] = token
       }
     }
@@ -249,7 +260,7 @@ function loadInterceptors() {
       !config.url.includes('/logic/openapi/') &&
       !config.url.includes('devApi') &&
       !config.url.includes('auth/login') &&
-      config.url.includes('api/af-')
+      (config.url.includes('api/af-') || config.url.includes('rs/user/userLogin'))
     ) {
       if (config.data && !(config.data instanceof FormData)) {
         if (v4SessionKey) {

package/src/utils/util.js

@@ -336,10 +336,33 @@ export function _moment(...args) {
   return moment(...args)
 }
 
-export function base64ToFile(base64Data, filename = 'image.png') {
-  // 将 base64 转换为 blob
+function getBase64Mime(base64Data) {
   const arr = base64Data.split(',')
-  const mime = arr[0].match(/:(.*?);/)?.[1] || 'image/png'
+  return arr[0].match(/:(.*?);/)?.[1] || 'image/png'
+}
+
+function getImageExtensionFromMime(mime) {
+  const extMap = {
+    'image/jpeg': 'jpg',
+    'image/jpg': 'jpg',
+    'image/png': 'png',
+    'image/gif': 'gif',
+    'image/bmp': 'bmp',
+    'image/webp': 'webp'
+  }
+  return extMap[mime] || mime.replace('image/', '') || 'png'
+}
+
+function resolveBase64FileName(filename, mime) {
+  const ext = getImageExtensionFromMime(mime)
+  const baseName = filename.replace(/\.[^.]+$/, '')
+  return `${baseName}.${ext}`
+}
+
+export function base64ToFile(base64Data, filename = 'image') {
+  const arr = base64Data.split(',')
+  const mime = getBase64Mime(base64Data)
+  const finalName = resolveBase64FileName(filename, mime)
   const bstr = atob(arr[1])
   let n = bstr.length
   const u8arr = new Uint8Array(n)
@@ -352,5 +375,5 @@ export function base64ToFile(base64Data, filename = 'image.png') {
   const blob = new Blob([u8arr], { type: mime })
 
   // 创建 File 对象
-  return new File([blob], filename, { type: mime })
+  return new File([blob], finalName, { type: mime })
 }

package/vue.config.js

@@ -12,6 +12,7 @@ const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
 const liuli = 'http://192.168.50.67:31567'
+// const v3Server = 'http://127.0.0.1:8077'
 const v3Server = 'http://192.168.50.67:31567'
 const geoserver = 'http://192.168.50.67:31567'
 // const gateway = 'http://192.168.50.67:31467'
@@ -36,6 +37,15 @@ module.exports = {
     port: 8020,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
+      '/api/af-auth/login': {
+        target: v3Server,
+      },
+      '/rs/logic/getLogin': {
+        pathRewrite: {
+          '^/rs/logic/getLogin': '/getLogin'
+        },
+        target: v3Server,
+      },
       // '/apply-image': {
       //   target: revenue,
       // },

package/.idea/MarsCodeWorkspaceAppSettings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.codeverse.userSettings.MarscodeWorkspaceAppSettingsState">
-    <option name="ckgOperationStatus" value="SUCCESS" />
-    <option name="progress" value="1.0" />
-  </component>
-</project>

package/.idea/deployment.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
-    <serverData>
-      <paths name="50.4">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>

package/.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

package/.idea/gradle.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="parallelModelFetch" value="true" />
-  </component>
-</project>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>