@liujitcn/kratos-uni-app-core 0.0.54 → 0.0.55

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.54",
+  "version": "0.0.55",
   "type": "module",
   "files": [
     "dist",

package/src/api/base/v1/file.ts

@@ -1,8 +1,9 @@
 import { http } from '../../../utils/http'
-import type {
-  DownloadFileRequest,
-  MultiUploadFileResponse,
-  FileInfo,
+import {
+  BaseFileAccessMode,
+  type DownloadFileRequest,
+  type MultiUploadFileResponse,
+  type FileInfo,
 } from '../../../rpc/base/v1/file'
 
 const FILE_URL = '/v1/base/file'
@@ -10,12 +11,17 @@ const FILE_URL = '/v1/base/file'
 /** 文件服务 */
 export class FileServiceImpl {
   /** 多个文件上传 */
-  MultiUploadFile(files: File[], fileType: string): Promise<MultiUploadFileResponse> {
+  MultiUploadFile(
+    files: File[],
+    fileType: string,
+    accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
+  ): Promise<MultiUploadFileResponse> {
     const formData = new FormData()
     files.map((file) => {
       formData.append(file.name, file)
     })
     formData.append('fileType', fileType)
+    formData.append('accessMode', String(accessMode))
     return http<MultiUploadFileResponse>({
       url: `${FILE_URL}/multi`,
       method: 'POST',
@@ -27,10 +33,15 @@ export class FileServiceImpl {
     })
   }
   /** 单个文件上传 */
-  UploadFile(file: File, fileType: string): Promise<FileInfo> {
+  UploadFile(
+    file: File,
+    fileType: string,
+    accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
+  ): Promise<FileInfo> {
     const formData = new FormData()
     formData.append('file', file)
     formData.append('fileType', fileType)
+    formData.append('accessMode', String(accessMode))
     return http<FileInfo>({
       url: `${FILE_URL}`,
       method: 'POST',

package/src/rpc/base/v1/file.ts

@@ -1,12 +1,22 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.11.8
+//   protoc-gen-ts_proto  v2.12.1
 //   protoc               unknown
 // source: base/v1/file.proto
 
 /* eslint-disable */
 import type { BytesValue } from "../../google/protobuf/wrappers";
 
+/** 文件访问方式。 */
+export enum BaseFileAccessMode {
+  /** BASE_FILE_ACCESS_MODE_UNSPECIFIED - 未指定文件访问方式，服务端按授权访问处理。 */
+  BASE_FILE_ACCESS_MODE_UNSPECIFIED = 0,
+  /** BASE_FILE_ACCESS_MODE_PUBLIC - 允许匿名公开访问。 */
+  BASE_FILE_ACCESS_MODE_PUBLIC = 1,
+  /** BASE_FILE_ACCESS_MODE_AUTHORIZED - 必须携带有效访问令牌。 */
+  BASE_FILE_ACCESS_MODE_AUTHORIZED = 2,
+}
+
 /** 批量上传文件请求参数 */
 export interface MultiUploadFileRequest {
   /** 文件名 */
@@ -35,6 +45,8 @@ export interface UploadFileInfo {
   path: string;
   /** 二进制内容将通过 base64 编码传输 */
   content: Uint8Array;
+  /** 文件访问方式，未指定时默认需要访问令牌 */
+  access_mode: BaseFileAccessMode;
 }
 
 /** 下载文件请求参数 */

package/src/utils/file.ts

@@ -1,10 +1,18 @@
-import type { FileInfo, MultiUploadFileResponse } from '../rpc/base/v1/file'
+import {
+  BaseFileAccessMode,
+  type FileInfo,
+  type MultiUploadFileResponse,
+} from '../rpc/base/v1/file'
 import { formatSrc } from './index'
 import { getLocaleRequestHeaders, t } from '../locales'
 import { getRequestAccessToken } from './http'
 
 // 文件上传-兼容小程序端、H5端、App端
-export const uploadFile = async (fileType: string, filePath: string): Promise<FileInfo> => {
+export const uploadFile = async (
+  fileType: string,
+  filePath: string,
+  accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
+): Promise<FileInfo> => {
   const token = await getRequestAccessToken()
   const res = await uni.uploadFile({
     url: '/v1/base/file',
@@ -12,6 +20,7 @@ export const uploadFile = async (fileType: string, filePath: string): Promise<Fi
     filePath: filePath,
     formData: {
       fileType: fileType,
+      accessMode: String(accessMode),
     },
     header: {
       ...getLocaleRequestHeaders(),
@@ -30,15 +39,20 @@ export const uploadFile = async (fileType: string, filePath: string): Promise<Fi
 export const uploadFileList = async (
   fileType: string,
   filePaths: string[],
+  accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
 ): Promise<FileInfo[]> => {
   const results = await Promise.allSettled(
-    filePaths.map((filePath) => uploadFile(fileType, filePath)),
+    filePaths.map((filePath) => uploadFile(fileType, filePath, accessMode)),
   )
   return results.flatMap((result) => (result.status === 'fulfilled' ? [result.value] : []))
 }
 
 // 多文件上传-兼容小程序端、H5端、App端
-export const multiUploadFile = async (fileType: string, files: any): Promise<FileInfo[]> => {
+export const multiUploadFile = async (
+  fileType: string,
+  files: any,
+  accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
+): Promise<FileInfo[]> => {
   const token = await getRequestAccessToken()
   const res = await uni.uploadFile({
     url: '/v1/base/file/multi',
@@ -47,6 +61,7 @@ export const multiUploadFile = async (fileType: string, files: any): Promise<Fil
     files: files,
     formData: {
       fileType: fileType,
+      accessMode: String(accessMode),
     },
     header: {
       ...getLocaleRequestHeaders(),

package/src/utils/http.ts

@@ -72,8 +72,8 @@ type HttpRequestOptions = UniApp.RequestOptions & {
 // 添加拦截器
 const httpInterceptor = {
   // 拦截前触发
-  invoke(options: UniApp.RequestOptions) {
-    const authMode = resolveAuthMode(options as HttpRequestOptions, options.url)
+  invoke(options: HttpRequestOptions) {
+    const authMode = resolveAuthMode(options, options.url)
     // 1. 相对接口地址只拼接一次基础路径，兼容 HMR 等场景下拦截器重复注册。
     if (
       !options.url.startsWith('http') &&

package/src/utils/index.ts

@@ -1,4 +1,11 @@
-const baseURL = import.meta.env.VITE_APP_STATIC_URL
+const baseURL = import.meta.env.VITE_APP_STATIC_URL || import.meta.env.VITE_APP_API_URL
+
+/** 将后端数据文件地址切换到当前构建配置的静态资源域名。 */
+const rewriteDataFileOrigin = (src: string, staticOrigin: string) => {
+  if (!staticOrigin) return src
+  const match = src.match(/^https?:\/\/[^/]+(\/data(?:\/|$).*)$/)
+  return match ? `${staticOrigin.replace(/\/$/, '')}${match[1]}` : src
+}
 
 /**
  * 解析静态资源访问前缀
@@ -60,12 +67,11 @@ export const formatSrc = (src: string) => {
   if (!src) {
     return src
   }
-  // 已经是绝对地址时直接返回，避免重复拼接。
+  const staticOrigin = resolveStaticOrigin()
+  // 后端数据文件即使保存了旧的绝对域名，也统一使用当前静态资源域名。
   if (/^https?:\/\//.test(src)) {
-    return src
+    return rewriteDataFileOrigin(src, staticOrigin)
   }
-
-  const staticOrigin = resolveStaticOrigin()
   if (!staticOrigin) {
     return src
   }

package/src/views/pages/index/index.vue

@@ -1,15 +1,35 @@
 <script setup lang="ts">
 import { onLoad } from '@dcloudio/uni-app'
-import { computed } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useSettingStore } from '../../../stores'
 import defaultLogo from '../../../static/images/logo_icon.png'
+import { formatSrc } from '../../../utils'
 import { useI18n } from '../../../locales'
 
 const settingStore = useSettingStore()
 const { t } = useI18n()
 const mainTitle = computed(() => settingStore.getData('mainTitle') || t('core.home.main_title'))
 const subTitle = computed(() => settingStore.getData('subTitle') || t('core.home.sub_title'))
-const appLogo = computed(() => settingStore.getData('appLogo') || defaultLogo)
+const configuredAppLogo = computed(() => {
+  const configuredLogo = settingStore.getData('appLogo')
+  return configuredLogo ? formatSrc(configuredLogo) : defaultLogo
+})
+const appLogo = ref(defaultLogo)
+
+watch(
+  configuredAppLogo,
+  (value) => {
+    appLogo.value = value
+  },
+  { immediate: true },
+)
+
+/** Logo 加载失败时回退到本地默认图片。 */
+const handleLogoError = () => {
+  if (appLogo.value !== defaultLogo) {
+    appLogo.value = defaultLogo
+  }
+}
 
 onLoad(() => {
   void settingStore.loadData().catch(() => undefined)
@@ -19,7 +39,7 @@ onLoad(() => {
 <template>
   <view class="page">
     <view class="hero">
-      <image class="logo" :src="appLogo" mode="aspectFit" />
+      <image class="logo" :src="appLogo" mode="aspectFit" @error="handleLogoError" />
       <view class="hero-copy">
         <text class="title">{{ mainTitle }}</text>
         <text class="subtitle">{{ subTitle }}</text>

package/src/views/pages/login/login.vue

@@ -7,6 +7,7 @@ import { computed, defineAsyncComponent, nextTick, reactive, ref, watch } from '
 import { defLoginService } from '../../../api/base/v1/login'
 import { defMfaService } from '../../../api/base/v1/mfa'
 import defaultLogo from '../../../static/images/logo_icon.png'
+import { formatSrc } from '../../../utils'
 import { homeTabPage } from '../../../utils/navigation'
 import { PASSWORD_CRYPTO_SCENE, encryptPassword } from '../../../utils/passwordCrypto'
 import { createWebAuthnCredential, getWebAuthnAssertion } from '../../../utils/webauthn'
@@ -41,9 +42,28 @@ const configuredMainTitle = computed(
 const configuredSubTitle = computed(
   () => settingStore.getData('subTitle') || t('core.login.default_sub_title'),
 )
-const configuredAppLogo = computed(() => settingStore.getData('appLogo') || defaultLogo)
+const configuredAppLogo = computed(() => {
+  const configuredLogo = settingStore.getData('appLogo')
+  return configuredLogo ? formatSrc(configuredLogo) : defaultLogo
+})
+const appLogo = ref(defaultLogo)
 const showTenantCode = computed(() => settingStore.getData('showTenantCode') !== 'false')
 
+watch(
+  configuredAppLogo,
+  (value) => {
+    appLogo.value = value
+  },
+  { immediate: true },
+)
+
+/** Logo 加载失败时回退到本地默认图片。 */
+const handleLogoError = () => {
+  if (appLogo.value !== defaultLogo) {
+    appLogo.value = defaultLogo
+  }
+}
+
 // 是否同意协议
 const isAgreePrivacy = ref(false)
 const isAgreePrivacyShakeY = ref(false)
@@ -867,7 +887,7 @@ onLoad(() => {
     </picker>
     <view class="login-hero">
       <view class="login-logo-shell">
-        <image :src="configuredAppLogo" />
+        <image :src="appLogo" @error="handleLogoError" />
       </view>
       <view class="login-hero-copy">
         <text class="login-title">{{ configuredMainTitle }}</text>