Merge branch 'feature/202501107-all' into feature/20251103_cl_FX_VIDEO_01

This commit is contained in:
clkim
2025-11-04 10:18:15 +09:00
10 changed files with 58 additions and 64 deletions

View File

@@ -15,9 +15,14 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
//현재 url에서 게임 도메인만 추출
const currentDomain = window.location.hostname;
const config = useRuntimeConfig()
const req: GameDataRequest = {
gameDomain: `${currentDomain}`,
langCode: `${currentLangCode}`,
game_alias: '',
lang_code: `${currentLangCode}`,
baseApiUrl: `${config.public.stoveApiUrl}`,
gameId: '',
}
const { getGameDataExternal } = useGetGameDataExternal()
await getGameDataExternal(req)

View File

@@ -15,7 +15,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
// domain: baseDomain
// })
const finalLocale = csrGetFinalLocale(to.path)
const finalLocale = csrGetFinalLocale(to.path, gameData.value.lang_codes)
// localeCookie.value = finalLocale.toUpperCase()
// 웹 점검 -----

View File

@@ -3,7 +3,7 @@ import { getTrueClientIp } from '#layers/utils/apiUtil'
export default defineEventHandler((event) => {
let clientIP = ''
try {
clientIP = getTrueClientIp(event.node.req)
clientIP = getTrueClientIp(event.node.req as any)
} catch (e) {
console.error('[Exception] /server/api/clientIp - Cannot Get Client IP: ', e)
}

View File

@@ -157,8 +157,8 @@ export default defineEventHandler(async event => {
// 1-2. /inspection 패스
if (fullPath.includes('/inspection')) {
// 리턴 되기 전 언어 쿠키 세팅
const finalLocale = ssrGetFinalLocale(event?.node.req.url, event.node.req.headers)
setFinalLocaleCookie(event, finalLocale, baseDomain)
// const finalLocale = ssrGetFinalLocale(event?.node.req.url, event.node.req.headers)
// setFinalLocaleCookie(event, finalLocale, baseDomain)
return
}
@@ -196,8 +196,9 @@ export default defineEventHandler(async event => {
// console.log("🚀 ~ apiUrl:", apiUrl)
// 2. 언어 코드 추출
const finalLocale = ssrGetFinalLocale(event?.node.req.url, event.node.req.headers)
// const finalLocale = ssrGetFinalLocale(event?.node.req.url, event.node.req.headers)
const finalLocale = ssrGetFinalLocale(event?.node.req.url, event.node.req.headers)
const queryParams: Record<string, string> = {
game_domain: event.context.gameDomain || '',
@@ -213,6 +214,8 @@ export default defineEventHandler(async event => {
// setFinalLocaleCookie(event, finalLocale, baseDomain)
// }
if (response?.code === 0 && 'value' in response) {
event.context.gameData = response.value
event.context.googleAnalyticsId = response.value?.ga_code

View File

@@ -32,7 +32,7 @@ const parseCookies = (cookieHeader: string) => {
*
* @param {string} path - 현재 URL 경로
*/
export const csrGetFinalLocale = (path = '') => {
export const csrGetFinalLocale = (path = '', coveragesLocales: string[]) => {
const config = useRuntimeConfig()
const baseDomain = `${config.public.baseDomain}`
@@ -101,7 +101,7 @@ export const ssrGetFinalLocale = (path = '', headers: any) => {
const cookieHeader = headers.cookie || ''
const cookies = parseCookies(cookieHeader)
const cookieLanguage = cookies.LOCALE ? `${cookies.LOCALE}`.toLowerCase() : ''
if (cookieLanguage && cookieLanguage !== '' && coveragesLocales.includes(cookieLanguage)) {
if (cookieLanguage && cookieLanguage !== '') {
finalLocale = cookieLanguage
return finalLocale
}
@@ -116,13 +116,13 @@ export const ssrGetFinalLocale = (path = '', headers: any) => {
const preferredLocale = getPreferredLanguage(acceptLanguage)
if (preferredLocale) {
// 선호 언어의 기본 코드와 일치하는 지원 로케일 찾기
const matchedLocale = coveragesLocales.find((locale: string) =>
preferredLocale.toLowerCase().startsWith(locale.toLowerCase())
)
if (matchedLocale) {
finalLocale = matchedLocale.toLowerCase()
return finalLocale
}
// const matchedLocale = coveragesLocales.find((locale: string) =>
// preferredLocale.toLowerCase().startsWith(locale.toLowerCase())
// )
// if (matchedLocale) {
// finalLocale = matchedLocale.toLowerCase()
// return finalLocale
// }
}
}
}