@liujitcn/kratos-taro-app-core 0.0.53 → 0.0.55

package/README.md

@@ -40,6 +40,6 @@ pnpm test
 pnpm check:exports
 ```
 
-构建产物按模式与平台隔离：开发使用 `dist/dev/h5`、`dist/dev/mp-weixin`，生产默认使用 `dist/build/h5`、`dist/build/mp-weixin`。`KRATOS_TARO_OUTPUT_ROOT` 可覆盖默认目录；仓库宿主及 Kratos 配套项目的 H5 生产构建输出到 `backend/data/taro-app`。微信开发者工具默认指向开发目录，发布时导入生产目录。
+构建产物按模式与平台隔离：开发使用 `dist/dev/h5`、`dist/dev/mp-weixin`，生产默认使用 `dist/build/h5`、`dist/build/mp-weixin`。`KRATOS_TARO_OUTPUT_ROOT` 可覆盖默认目录；仓库宿主及 Kratos 配套项目的 H5 生产构建输出到 `backend/web/taro-app`。微信开发者工具默认指向开发目录，发布时导入生产目录。
 
 应用配置加载成功后，core 会将 `i18n_customs` 按 `locale + key` 覆盖已注册的本地文案，并刷新页面翻译。仅覆盖已有 key 的非空文案；未配置或已删除的覆盖项恢复本地默认值，未知语言和未知 key 忽略。切换语言时沿用配置重载流程。

package/package.json

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

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

@@ -1,8 +1,9 @@
 import Taro from '@tarojs/taro'
-import type {
-  DownloadFileRequest,
-  FileInfo,
-  MultiUploadFileResponse,
+import {
+  BaseFileAccessMode,
+  type DownloadFileRequest,
+  type FileInfo,
+  type MultiUploadFileResponse,
 } from '../../../rpc/base/v1/file'
 import { uploadFile, uploadFileList } from '../../../utils/file'
 import { getLocaleRequestHeaders, t } from '../../../locales'
@@ -13,26 +14,26 @@ const FILE_URL = '/v1/base/file'
 /** 文件服务。 */
 export class FileServiceImpl {
   /** 上传多个浏览器文件。 */
-  async MultiUploadFile(files: File[], fileType: string): Promise<MultiUploadFileResponse> {
+  async MultiUploadFile(files: File[], fileType: string, accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED): Promise<MultiUploadFileResponse> {
     if (process.env.TARO_ENV !== 'h5') {
       throw new Error(t('core.file.temporary_path_required'))
     }
     const paths = files.map((file) => URL.createObjectURL(file))
     try {
-      return { files: await uploadFileList(fileType, paths) }
+      return { files: await uploadFileList(fileType, paths, accessMode) }
     } finally {
       paths.forEach((path) => URL.revokeObjectURL(path))
     }
   }
 
   /** 上传单个浏览器文件。 */
-  async UploadFile(file: File, fileType: string): Promise<FileInfo> {
+  async UploadFile(file: File, fileType: string, accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED): Promise<FileInfo> {
     if (process.env.TARO_ENV !== 'h5') {
       throw new Error(t('core.file.temporary_path_required'))
     }
     const path = URL.createObjectURL(file)
     try {
-      return await uploadFile(fileType, path)
+      return await uploadFile(fileType, path, accessMode)
     } finally {
       URL.revokeObjectURL(path)
     }

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,17 +1,21 @@
 import Taro from '@tarojs/taro'
-import type { FileInfo, MultiUploadFileResponse } from '../rpc/base/v1/file'
+import { BaseFileAccessMode, type FileInfo, type MultiUploadFileResponse } from '../rpc/base/v1/file'
 import { getLocaleRequestHeaders, t } from '../locales'
 import { formatSrc } from './index'
 import { getRequestAccessToken, requestBaseURL } from './http'
 
 /** 上传单个文件。 */
-export async function uploadFile(fileType: string, filePath: string): Promise<FileInfo> {
+export async function uploadFile(
+  fileType: string,
+  filePath: string,
+  accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
+): Promise<FileInfo> {
   const token = await getRequestAccessToken()
   const response = await Taro.uploadFile({
     url: `${requestBaseURL}/v1/base/file`,
     name: 'file',
     filePath,
-    formData: { fileType },
+    formData: { fileType, accessMode: String(accessMode) },
     header: {
       ...getLocaleRequestHeaders(),
       'source-client': 'miniapp',
@@ -23,8 +27,12 @@ export async function uploadFile(fileType: string, filePath: string): Promise<Fi
 }
 
 /** 并发上传文件列表。 */
-export async function uploadFileList(fileType: string, filePaths: string[]): Promise<FileInfo[]> {
-  const results = await Promise.allSettled(filePaths.map((filePath) => uploadFile(fileType, filePath)))
+export async function uploadFileList(
+  fileType: string,
+  filePaths: string[],
+  accessMode = BaseFileAccessMode.BASE_FILE_ACCESS_MODE_AUTHORIZED,
+): Promise<FileInfo[]> {
+  const results = await Promise.allSettled(filePaths.map((filePath) => uploadFile(fileType, filePath, accessMode)))
   return results.flatMap((result) => (result.status === 'fulfilled' ? [result.value] : []))
 }
 

package/src/utils/index.ts

@@ -1,4 +1,12 @@
-const configuredStaticUrl = process.env.VITE_APP_STATIC_URL || ''
+const configuredStaticUrl =
+  process.env.VITE_APP_STATIC_URL || process.env.VITE_APP_API_URL || ''
+
+/** 将后端数据文件地址切换到当前构建配置的静态资源域名。 */
+function rewriteDataFileOrigin(src: string, staticOrigin: string): string {
+  if (!staticOrigin) return src
+  const match = src.match(/^https?:\/\/[^/]+(\/data(?:\/|$).*)$/)
+  return match ? `${staticOrigin}${match[1]}` : src
+}
 
 /** 日期格式化函数。 */
 export function formatDate(date: Date, format = 'YYYY-MM-DD HH:mm:ss'): string {
@@ -24,10 +32,13 @@ export function formatPrice(price: number): string {
 
 /** 格式化后端静态资源地址。 */
 export function formatSrc(src: string): string {
-  if (!src || /^https?:\/\//.test(src)) return src
   const browserOrigin =
-    typeof window !== 'undefined' && window.location?.origin ? window.location.origin : ''
+    process.env.TARO_ENV === 'h5' && typeof window !== 'undefined' && window.location?.origin
+      ? window.location.origin
+      : ''
   const staticOrigin = browserOrigin || configuredStaticUrl.replace(/\/$/, '')
+  if (!src) return src
+  if (/^https?:\/\//.test(src)) return rewriteDataFileOrigin(src, staticOrigin)
   if (!staticOrigin) return src
   return src.startsWith('/')
     ? `${staticOrigin}${src}`

package/src/views/pages/index/index.tsx

@@ -1,7 +1,9 @@
 import { Image, Text, View } from '@tarojs/components'
 import { useLoad } from '@tarojs/taro'
+import { useEffect, useState } from 'react'
 import defaultLogo from '@liujitcn/kratos-taro-app-core/static/images/logo_icon.png'
 import { useSettingStore } from '../../../stores'
+import { formatSrc } from '../../../utils'
 import './index.scss'
 import { useI18n } from '../../../locales'
 
@@ -12,7 +14,14 @@ export default function HomePage() {
   const loadData = useSettingStore((state) => state.loadData)
   const mainTitle = settings?.get('mainTitle') || t('core.home.main_title')
   const subTitle = settings?.get('subTitle') || t('core.home.sub_title')
-  const appLogo = settings?.get('appLogo') || defaultLogo
+  const configuredAppLogo = settings?.get('appLogo')
+  const configuredLogoUrl = configuredAppLogo ? formatSrc(configuredAppLogo) : defaultLogo
+  const [appLogo, setAppLogo] = useState(configuredLogoUrl)
+
+  useEffect(() => {
+    setAppLogo(configuredLogoUrl)
+  }, [configuredLogoUrl])
+
   useLoad(() => {
     void loadData().catch(() => undefined)
   })
@@ -36,6 +45,7 @@ export default function HomePage() {
           className='home-logo'
           src={appLogo}
           mode='aspectFit'
+          onError={() => setAppLogo(defaultLogo)}
         />
         <View className='home-hero__copy'>
           <Text className='home-title'>{mainTitle}</Text>

package/src/views/pages/login/login.tsx

@@ -7,6 +7,7 @@ import { defMfaService } from '../../../api/base/v1/mfa'
 import { navigateAppRoute } from '../../../navigation'
 import { LoginStatus, type LoginRequest, type LoginResponse } from '../../../rpc/base/v1/login'
 import { useSettingStore, useUserStore } from '../../../stores'
+import { formatSrc } from '../../../utils'
 import { restoreLoginRedirect } from '../../../utils/navigation'
 import { encryptPassword, PASSWORD_CRYPTO_SCENE } from '../../../utils/passwordCrypto'
 import { createWebAuthnCredential, getWebAuthnAssertion } from '../../../utils/webauthn'
@@ -124,7 +125,9 @@ export default function LoginPage() {
     languageOptions.find((item) => item.language_code === locale)?.native_name || locale
   const mainTitle = settings?.get('mainTitle') || t('core.home.main_title')
   const subTitle = settings?.get('subTitle') || t('core.login.default_sub_title')
-  const appLogo = settings?.get('appLogo') || defaultLogo
+  const configuredAppLogo = settings?.get('appLogo')
+  const configuredLogoUrl = configuredAppLogo ? formatSrc(configuredAppLogo) : defaultLogo
+  const [appLogo, setAppLogo] = useState(configuredLogoUrl)
   const showTenantCode = settings?.get('showTenantCode') !== 'false'
   const configuredCaptchaType = settings?.get('captchaType') || ''
   const isBehaviorCaptcha = behaviorCaptchaTypes.has(captchaType)
@@ -169,6 +172,10 @@ export default function LoginPage() {
     t,
   ]) as unknown as Record<string, string | number | boolean>
 
+  useEffect(() => {
+    setAppLogo(configuredLogoUrl)
+  }, [configuredLogoUrl])
+
   useEffect(() => {
     void Taro.setNavigationBarTitle({ title: t('common.action.login') })
   }, [locale, t])
@@ -601,7 +608,7 @@ export default function LoginPage() {
       </Picker>
       <View className='login-hero'>
         <View className='login-logo-shell'>
-          <Image className='login-logo' src={appLogo} />
+          <Image className='login-logo' src={appLogo} onError={() => setAppLogo(defaultLogo)} />
         </View>
         <View className='login-hero-copy'>
           <Text className='login-title'>{mainTitle}</Text>
@@ -754,7 +761,9 @@ export default function LoginPage() {
                   <Checkbox
                     value='remember'
                     checked={rememberMfaDevice}
-                    onChange={(event) => setRememberMfaDevice(event.detail.value.includes('remember'))}
+                    onChange={(event) =>
+                      setRememberMfaDevice(event.detail.value.includes('remember'))
+                    }
                   />
                   <Text>{t('core.login.mfa_remember_device', { days: mfaRememberDays })}</Text>
                 </View>