Compare commits

20 Commits

Author SHA1 Message Date
68092759d3 玩家抽奖记录-新增平台盈利汇总 2026-03-21 10:35:00 +08:00
8702cb0571 优化彩金池杀分逻辑-根据彩金池玩家盈利判断而非玩家个人盈利判断 2026-03-20 15:25:45 +08:00
ca620eb536 优化记录菜单显示数据个数为每页100条,并且为id倒序 2026-03-20 15:25:03 +08:00
8684fdc9f0 优化当前彩金池累加逻辑 2026-03-20 15:03:18 +08:00
d72868eb76 优化彩金池配置页面编辑报错 2026-03-20 10:34:24 +08:00
6ff65afcb5 优化多语言翻译 2026-03-20 10:29:31 +08:00
b689a40595 优化杀分时不触发中大奖 2026-03-20 10:24:01 +08:00
f9f8a1e169 修复打包报错 2026-03-19 15:59:10 +08:00
3dbd68829a 优化代理逻辑agent_id 2026-03-19 15:52:06 +08:00
333e85f7d9 多语言优化 2026-03-19 15:40:06 +08:00
db0e420a8f 优化翻译 2026-03-19 14:43:08 +08:00
f63616e735 菜单按钮权限设置-后台可以设置新增的按钮权限 2026-03-17 20:30:37 +08:00
bdf50e61f5 修改原有框架中英文映射 2026-03-17 18:09:10 +08:00
e7b8f4cae9 修改DiceLotteryPoolConfig-type改为name映射 2026-03-17 17:09:10 +08:00
d4cf708bc1 对接文档 2026-03-17 16:41:19 +08:00
eb8123c7b3 配置后台接口中英文对照 2026-03-17 16:31:31 +08:00
683bd5d97a API对接文档 2026-03-17 16:11:56 +08:00
150d31eac5 优化杀分逻辑 2026-03-17 15:36:14 +08:00
1892c7bcb7 修复切换语言失败BUG 2026-03-17 15:04:05 +08:00
5b5e923a0b 优化当前彩金池-安全线 2026-03-17 14:40:28 +08:00
171 changed files with 4498 additions and 1419 deletions

272
API对接文档.md Normal file
View File

@@ -0,0 +1,272 @@
# 大富翁-摇色子 对接文档
本文覆盖**平台侧对接接口**`/api/v1/*`,使用 `auth-token` 鉴权)以及(可选)**玩家侧接口**`/api/*`,使用 `token` 鉴权)。
---
## 1. 基本约定
### 1.1 服务地址Base URL
由部署方提供:
- 测试环境:`https://dice-api.yuliao666.top`
下文所有路径均为相对路径,如:`/api/v1/getGameUrl`
### 1.2 请求方式与编码
- **请求方法**:项目路由多数使用 `Route::any`,对接建议统一使用 **POST**(便于 body 传参);个别接口文档中标注了 GET 参数。
- **编码**`UTF-8`
- **Content-Type**:建议 `application/x-www-form-urlencoded``application/json`(以平台实际实现为准)
### 1.3 统一返回结构
所有接口统一返回 JSON
```json
{
"code": 200,
"message": "success",
"data": {}
}
```
- `code`:业务状态码(见“返回 code 对照表”)
- `message`:提示信息(可根据请求头 `lang` 返回中英文)
- `data`:成功时返回数据;失败时通常不返回该字段
### 1.4 多语言lang
服务端会根据请求头 `lang` 翻译 `message`(以及部分接口字段):
- `lang: zh`(默认)
- `lang: en`
> 注意:平台 v1 接口的 `getGameUrl` 还支持 body 参数 `lang``zh/en`),用于拼接游戏地址语言参数。
---
## 2. 鉴权与对接流程(平台侧 /api/v1
平台侧接口分两步:
1. **获取 `auth-token`**
2. **携带 `auth-token` 调用 `/api/v1/*` 业务接口**
### 2.1 获取 auth-token
- **路径**`/api/v1/authToken`
- **方法**GET / POST 均可(建议 GET参数放 query
- **说明**:用于平台调用 v1 业务接口的授权 tokenJWT
#### 请求参数query/body
| 参数名 | 必填 | 类型 | 说明 |
| --- | --- | --- |---------------------------------------------------|
| agent_id | 是 | string | 平台/代理标识后台查看对应管理员agent_id |
| secret | 是 | string | 双方约定的密钥(服务端配置 `xF75oK91TQj13s0UmNIr1NBWMWGfflNO` |
| time | 是 | int/string | Unix 时间戳(秒),服务端会做时间容忍校验 |
| signature | 是 | string | 签名:`md5(agent_id + secret + time)` |
- **agent_id**:通过后台获取系统管理-用户管理-代理ID![http://dice-api.yuliao666.top/storage/20260317/20a0d49f016bcc89afa794ed217e762fe3ef6481.png](server/public/img.png)
- **secret**xF75oK91TQj13s0UmNIr1NBWMWGfflNO服务器配置
- **后台地址**https://dice.yuliao666.top 账号: zhuguan 密码123456
#### 签名规则
- **签名字符串**:直接拼接 `agent_id.secret.time`(无分隔符)
- **算法**MD532 位小写/大写均可,按实现一致即可)
示例(伪代码):
```text
signature = md5(agent_id + secret + time)
```
#### 响应示例
```json
{
"code": 200,
"message": "success",
"data": {
"authtoken": "xxxx.yyyy.zzzz"
}
}
```
#### 失败场景
- 缺少参数:`code=400`
- 密钥错误/签名错误/时间戳无效:`code=403`
- 服务端未配置密钥或生成失败:`code=500`
### 2.2 调用 v1 业务接口(携带 auth-token
`/api/v1/authToken` 外,其余 `/api/v1/*` 接口需要在请求头携带:
- `auth-token: <authtoken>`
`auth-token` 过期或失效,返回 `code=402`,需要重新调用 `/api/v1/authToken` 获取新 token。
---
## 3. 平台 v1 业务接口清单(/api/v1
### 3.1 获取游戏地址
- **路径**`/api/v1/getGameUrl`
- **方法**POST
- **请求头**`auth-token`
- **说明**:根据平台用户名创建/登录玩家并生成登录 JWT返回可直接打开的游戏地址。
#### 请求参数body
| 参数名 | 必填 | 类型 | 说明 |
| --- | --- | --- | --- |
| username | 是 | string | 玩家唯一账号(平台侧用户名) |
| password | 否 | string | 默认 `123456` |
| time | 否 | int/string | 默认当前时间戳 |
| lang | 否 | string | `zh` / `en`,默认 `zh` |
#### 响应示例
```json
{
"code": 200,
"message": "success",
"data": {
"url": "https://dice-game.yuliao666.top/?token=...&lang=zh"
}
}
```
### 3.2 获取用户信息
- **路径**`/api/v1/getPlayerInfo`
- **方法**POST
- **请求头**`auth-token`
#### 请求参数
| 参数名 | 必填 | 类型 | 说明 |
| --- | --- | --- | --- |
| username | 是 | string | 玩家账号 |
#### 响应说明
返回玩家基础信息(已隐藏敏感字段,如 `password` 等)。
### 3.3 获取游戏记录
- **路径**`/api/v1/getPlayerGameRecord`
- **方法**POST
- **请求头**`auth-token`
#### 请求参数
| 参数名 | 必填 | 类型 | 说明 |
| --- | --- | --- | --- |
| username | 否 | string | 不传则查询全量(按时间/分页) |
| start_create_time | 否 | string | 开始时间(与数据库存储格式一致) |
| end_create_time | 否 | string | 结束时间(与数据库存储格式一致) |
| page | 否 | int | 默认 1 |
| limit | 否 | int | 默认 20最大 100 |
#### 响应说明
返回游玩记录列表,并附带 `dice_player`(包含 `id/username/phone`)。
### 3.4 获取钱包流水
- **路径**`/api/v1/getPlayerWalletRecord`
- **方法**POST
- **请求头**`auth-token`
参数与分页规则同 3.3,返回钱包流水列表(附带 `dice_player`)。
### 3.5 获取中奖券获取记录
- **路径**`/api/v1/getPlayerTicketRecord`
- **方法**POST
- **请求头**`auth-token`
参数与分页规则同 3.3,返回中奖券记录列表(附带 `dice_player`)。
### 3.6 平台钱包转入/转出
- **路径**`/api/v1/setPlayerWallet`
- **方法**POST
- **请求头**`auth-token`
- **说明**:平台为玩家加币/扣币,生成钱包流水。
#### 请求参数
| 参数名 | 必填 | 类型 | 说明 |
| --- | --- | --- | --- |
| username | 是 | string | 玩家账号 |
| coin | 是 | number | 转入:`>0`;转出:`<0`;不允许为 0 |
#### 业务规则
-`coin < 0` 且余额不足时:`code=422``message=余额不足,无法转出`
---
## 4. 玩家侧接口(可选 /api
若甲方平台需要在**服务端**直接调用“购买抽奖券/开局”等接口,可按本节对接(此类接口需要 `token`,与 `auth-token` 不同)。
### 4.1 获取 token玩家登录
- **路径**`/api/user/Login`
- **方法**POST
- **说明**:创建/登录玩家并返回登录 token 以及游戏地址。
请求参数:`username``password`(必填),`lang/coin/time`(可选)。
响应 `data.token` 可用于后续 `/api/*` 请求头 `token``Authorization: Bearer <token>`
### 4.2 需要 token 的接口
请求头携带(任选一种):
- `token: <token>`
- `Authorization: Bearer <token>`
接口列表:
- `/api/user/logout`
- `/api/user/info`
- `/api/user/balance`
- `/api/user/walletRecord`
- `/api/user/playGameRecord`
- `/api/game/config`
- `/api/game/buyLotteryTickets`
- `/api/game/lotteryPool`
- `/api/game/playStart`
---
## 5. 返回 code 对照表
项目定义的统一状态码如下(与 HTTP 语义对齐):
| code | 含义 | 常见场景 |
| --- | --- | --- |
| 200 | 成功 | 请求成功 |
| 400 | 请求参数错误 | 缺参、参数格式不合法、范围错误 |
| 401 | 未授权 | 未携带 `auth-token``token` |
| 402 | token 无效或已过期 | `auth-token/token` 过期、签名错误、被挤下线等 |
| 403 | 鉴权失败 | `secret` 错误、签名验证失败、时间戳无效等 |
| 404 | 资源不存在 | 用户不存在等 |
| 422 | 业务逻辑错误 | 余额不足、业务校验失败等 |
| 500 | 服务器内部错误 | 服务端异常或配置缺失 |
---
## 6. 联调建议
- **时间戳校验**`/api/v1/authToken` 会校验 `time` 与服务器时间差(默认容忍 300 秒),请确保平台服务器时间同步。
- **token 失效处理**:当 `code=402` 时,按业务类型重新获取 `auth-token` 或重新登录获取 `token`
- **语言**:如需英文提示,请在请求头带 `lang: en`

View File

@@ -117,7 +117,8 @@
right: 0, right: 0,
left: 0, left: 0,
bottom: 0, // 增加底部间距 bottom: 0, // 增加底部间距
containLabel: true outerBoundsMode: 'same' as const,
outerBoundsContain: 'axisLabel' as const
} }
const options: EChartsOption = { const options: EChartsOption = {

View File

@@ -75,7 +75,8 @@
right: 20, right: 20,
bottom: props.showDataZoom ? 80 : 20, bottom: props.showDataZoom ? 80 : 20,
left: 20, left: 20,
containLabel: true outerBoundsMode: 'same',
outerBoundsContain: 'axisLabel'
}, },
tooltip: getTooltipStyle('axis', { tooltip: getTooltipStyle('axis', {
axisPointer: { axisPointer: {

View File

@@ -64,7 +64,8 @@
right: 20, right: 20,
bottom: 20, bottom: 20,
left: 20, left: 20,
containLabel: true outerBoundsMode: 'same',
outerBoundsContain: 'axisLabel'
}, },
tooltip: props.showTooltip tooltip: props.showTooltip
? getTooltipStyle('item', { ? getTooltipStyle('item', {

View File

@@ -178,7 +178,7 @@
import { useMenuStore } from '@/store/modules/menu' import { useMenuStore } from '@/store/modules/menu'
import AppConfig from '@/config' import AppConfig from '@/config'
import { languageOptions } from '@/locales' import { languageOptions } from '@/locales'
import { invalidatePageLocaleCache } from '@/locales/pageLocaleLoader' import { invalidatePageLocaleCache, loadPageLocale } from '@/locales/pageLocaleLoader'
import { mittBus } from '@/utils/sys' import { mittBus } from '@/utils/sys'
import { themeAnimation } from '@/utils/ui/animation' import { themeAnimation } from '@/utils/ui/animation'
import { useCommon } from '@/hooks/core/useCommon' import { useCommon } from '@/hooks/core/useCommon'
@@ -285,12 +285,12 @@
* 切换系统语言 * 切换系统语言
* @param {LanguageEnum} lang - 目标语言类型 * @param {LanguageEnum} lang - 目标语言类型
*/ */
const changeLanguage = (lang: LanguageEnum): void => { const changeLanguage = async (lang: LanguageEnum): Promise<void> => {
if (locale.value === lang) return if (locale.value === lang) return
locale.value = lang locale.value = lang
userStore.setLanguage(lang) userStore.setLanguage(lang)
invalidatePageLocaleCache() invalidatePageLocaleCache()
reload(50) await loadPageLocale(router.currentRoute.value.path)
} }
/** /**

View File

@@ -90,7 +90,7 @@
:disabled="item.disabled" :disabled="item.disabled"
class="flex-1 min-w-0 [&_.el-checkbox__label]:overflow-hidden [&_.el-checkbox__label]:text-ellipsis [&_.el-checkbox__label]:whitespace-nowrap" class="flex-1 min-w-0 [&_.el-checkbox__label]:overflow-hidden [&_.el-checkbox__label]:text-ellipsis [&_.el-checkbox__label]:whitespace-nowrap"
>{{ >{{
item.label || (item.type === 'selection' ? t('table.selection') : '') getColumnDisplayLabel(item.label, item.type)
}}</ElCheckbox }}</ElCheckbox
> >
</div> </div>
@@ -173,6 +173,15 @@
(e: 'update:showSearchBar', value: boolean): void (e: 'update:showSearchBar', value: boolean): void
}>() }>()
/** 列标题显示table./page. 开头的 key 用 t() 翻译,随语言切换更新 */
const getColumnDisplayLabel = (label: unknown, type?: string): string => {
if (type === 'selection') return t('table.selection')
if (label && typeof label === 'string' && (label.startsWith('table.') || label.startsWith('page.'))) {
return t(label)
}
return (label as string) || ''
}
/** /**
* 获取列的显示状态 * 获取列的显示状态
* 优先使用 visible 字段,如果不存在则使用 checked 字段 * 优先使用 visible 字段,如果不存在则使用 checked 字段

View File

@@ -311,9 +311,12 @@
/** 表头 label 为 table. 或 page. 开头的 i18n key 时自动翻译,切换语言后表头随动 */ /** 表头 label 为 table. 或 page. 开头的 i18n key 时自动翻译,切换语言后表头随动 */
const displayColumns = computed(() => { const displayColumns = computed(() => {
const list = props.columns || [] const list = props.columns || []
const localeRef = i18n.global.locale as { value?: string }
const currentLocale = localeRef && typeof localeRef === 'object' && 'value' in localeRef ? localeRef.value : (i18n.global.locale as string)
void currentLocale
return list.map((col) => { return list.map((col) => {
const label = col.label const label = col.label
if (label && typeof label === 'string' && (label.startsWith('table.') || label.startsWith('page.')) && i18n.global.te(label)) { if (label && typeof label === 'string' && (label.startsWith('table.') || label.startsWith('page.'))) {
return { ...col, label: $t(label) } return { ...col, label: $t(label) }
} }
return col return col

View File

@@ -39,6 +39,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from 'vue' import { computed } from 'vue'
import { useDictStore } from '@/store/modules/dict' import { useDictStore } from '@/store/modules/dict'
import { useI18n } from 'vue-i18n'
defineOptions({ name: 'SaCheckbox', inheritAttrs: false }) defineOptions({ name: 'SaCheckbox', inheritAttrs: false })
@@ -69,6 +70,7 @@
const modelValue = defineModel<(string | number)[]>() const modelValue = defineModel<(string | number)[]>()
const dictStore = useDictStore() const dictStore = useDictStore()
const { t, te, locale } = useI18n()
const canConvertToNumberStrict = (value: any) => { const canConvertToNumberStrict = (value: any) => {
if (value == null) return false if (value == null) return false
@@ -81,9 +83,20 @@
} }
const options = computed(() => { const options = computed(() => {
// 让字典选项在切换语言时可响应更新
locale.value
const list = dictStore.getByCode(props.dict) || [] const list = dictStore.getByCode(props.dict) || []
if (!props.valueType) return list if (!props.valueType) {
return list.map((item) => {
const key = `dict.${props.dict}.${item.value}`
return {
...item,
label: te(key) ? t(key) : item.label
}
})
}
return list.map((item) => { return list.map((item) => {
let newValue = item.value let newValue = item.value
@@ -101,7 +114,11 @@
return { return {
...item, ...item,
value: newValue value: newValue,
label: (() => {
const key = `dict.${props.dict}.${newValue}`
return te(key) ? t(key) : item.label
})()
} }
}) })
}) })

View File

@@ -14,12 +14,12 @@
:round="round" :round="round"
class="mr-1 last:mr-0" class="mr-1 last:mr-0"
> >
{{ getData(item)?.label || item }} {{ getDisplayLabel(item) }}
</ElTag> </ElTag>
</template> </template>
<template v-else> <template v-else>
<span v-for="(item, index) in normalizedValues" :key="index"> <span v-for="(item, index) in normalizedValues" :key="index">
{{ getData(item)?.label || item }}{{ index < normalizedValues.length - 1 ? '' : '' }} {{ getDisplayLabel(item) }}{{ index < normalizedValues.length - 1 ? '' : '' }}
</span> </span>
</template> </template>
</div> </div>
@@ -27,6 +27,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { useDictStore } from '@/store/modules/dict' import { useDictStore } from '@/store/modules/dict'
import { useI18n } from 'vue-i18n'
defineOptions({ name: 'SaDict' }) defineOptions({ name: 'SaDict' })
@@ -50,6 +51,7 @@
}) })
const dictStore = useDictStore() const dictStore = useDictStore()
const { t, te, locale } = useI18n()
// 统一处理 value转换为数组格式 // 统一处理 value转换为数组格式
const normalizedValues = computed(() => { const normalizedValues = computed(() => {
@@ -64,6 +66,16 @@
// 根据值获取字典数据 // 根据值获取字典数据
const getData = (value: string) => dictStore.getDataByValue(props.dict, value) const getData = (value: string) => dictStore.getDataByValue(props.dict, value)
const getDisplayLabel = (value: string) => {
// 让显示在切换语言时可响应更新
locale.value
const key = `dict.${props.dict}.${value}`
if (te(key)) return t(key)
return getData(value)?.label || value
}
const getColor = (color: string | undefined, type: 'bg' | 'border' | 'text') => { const getColor = (color: string | undefined, type: 'bg' | 'border' | 'text') => {
// 如果没有指定颜色,使用默认主色调 // 如果没有指定颜色,使用默认主色调
if (!color) { if (!color) {

View File

@@ -45,6 +45,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from 'vue' import { computed } from 'vue'
import { useDictStore } from '@/store/modules/dict' import { useDictStore } from '@/store/modules/dict'
import { useI18n } from 'vue-i18n'
defineOptions({ name: 'SaRadio', inheritAttrs: false }) defineOptions({ name: 'SaRadio', inheritAttrs: false })
@@ -82,6 +83,7 @@
const modelValue = defineModel<string | number | undefined>() const modelValue = defineModel<string | number | undefined>()
const dictStore = useDictStore() const dictStore = useDictStore()
const { t, te, locale } = useI18n()
// 判断能否转成数字 // 判断能否转成数字
const canConvertToNumberStrict = (value: any) => { const canConvertToNumberStrict = (value: any) => {
@@ -97,10 +99,21 @@
// 核心逻辑:在 computed 中处理数据类型转换 // 核心逻辑:在 computed 中处理数据类型转换
const options = computed(() => { const options = computed(() => {
// 让字典选项在切换语言时可响应更新
locale.value
const list = dictStore.getByCode(props.dict) || [] const list = dictStore.getByCode(props.dict) || []
// 如果没有指定 valueType直接返回原始字典 // 如果没有指定 valueType直接返回原始字典
if (!props.valueType) return list if (!props.valueType) {
return list.map((item) => {
const key = `dict.${props.dict}.${item.value}`
return {
...item,
label: te(key) ? t(key) : item.label
}
})
}
// 如果指定了类型,进行映射转换 // 如果指定了类型,进行映射转换
return list.map((item) => { return list.map((item) => {
@@ -119,7 +132,11 @@
return { return {
...item, ...item,
value: newValue value: newValue,
label: (() => {
const key = `dict.${props.dict}.${newValue}`
return te(key) ? t(key) : item.label
})()
} }
}) })
}) })

View File

@@ -37,6 +37,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed } from 'vue' import { computed } from 'vue'
import { useDictStore } from '@/store/modules/dict' import { useDictStore } from '@/store/modules/dict'
import { useI18n } from 'vue-i18n'
defineOptions({ name: 'SaSelect', inheritAttrs: false }) defineOptions({ name: 'SaSelect', inheritAttrs: false })
@@ -75,6 +76,7 @@
const modelValue = defineModel<string | number | Array<string | number>>() const modelValue = defineModel<string | number | Array<string | number>>()
const dictStore = useDictStore() const dictStore = useDictStore()
const { t, te, locale } = useI18n()
// 判断能否转成数字 // 判断能否转成数字
const canConvertToNumberStrict = (value: any) => { const canConvertToNumberStrict = (value: any) => {
@@ -90,10 +92,21 @@
// 计算属性:获取字典数据并处理类型转换 // 计算属性:获取字典数据并处理类型转换
const options = computed(() => { const options = computed(() => {
// 让字典选项在切换语言时可响应更新
locale.value
const list = dictStore.getByCode(props.dict) || [] const list = dictStore.getByCode(props.dict) || []
// 1. 如果没有指定 valueType直接返回 // 1. 如果没有指定 valueType直接返回
if (!props.valueType) return list if (!props.valueType) {
return list.map((item) => {
const key = `dict.${props.dict}.${item.value}`
return {
...item,
label: te(key) ? t(key) : item.label
}
})
}
// 2. 如果指定了类型,进行映射转换 // 2. 如果指定了类型,进行映射转换
return list.map((item) => { return list.map((item) => {
@@ -111,7 +124,11 @@
return { return {
...item, ...item,
value: newValue value: newValue,
label: (() => {
const key = `dict.${props.dict}.${newValue}`
return te(key) ? t(key) : item.label
})()
} }
}) })
}) })

View File

@@ -345,7 +345,9 @@ export function useChart(options: UseChartOptions = {}) {
right: 15, right: 15,
bottom: 8, bottom: 8,
left: 0, left: 0,
containLabel: true, // ECharts 6替代已弃用的 containLabel需配合 outerBounds 布局,避免控制台告警)
outerBoundsMode: 'same' as const,
outerBoundsContain: 'axisLabel' as const,
...baseGrid ...baseGrid
} }

View File

@@ -47,6 +47,17 @@
"labelName": "Name", "labelName": "Name",
"close": "Close" "close": "Close"
}, },
"dict": {
"data_status": {
"1": "Normal",
"2": "Disabled"
},
"gender": {
"1": "Male",
"2": "Female",
"3": "Unknown"
}
},
"search": { "search": {
"placeholder": "Search page", "placeholder": "Search page",
"historyTitle": "Search history", "historyTitle": "Search history",

View File

@@ -18,7 +18,6 @@
"t5Weight": "T5 Pool Weight (%)", "t5Weight": "T5 Pool Weight (%)",
"weightsSumHint": "Total pool weights: ", "weightsSumHint": "Total pool weights: ",
"weightsSumUnit": "% / 100% (must equal 100%)", "weightsSumUnit": "% / 100% (must equal 100%)",
"weightsSumUnitCurrent": "% / 100%",
"currentPoolTitle": "Current Lottery Pool", "currentPoolTitle": "Current Lottery Pool",
"loading": "Loading...", "loading": "Loading...",
"poolName": "Pool Name", "poolName": "Pool Name",
@@ -27,13 +26,13 @@
"profitCalcHint": "Sum of (win amount including BIGWIN minus 100 ticket cost) per round; refreshes every 2s while open.", "profitCalcHint": "Sum of (win amount including BIGWIN minus 100 ticket cost) per round; refreshes every 2s while open.",
"tierRuleTitle": "Tier Rule", "tierRuleTitle": "Tier Rule",
"tierRuleContent": "When player profit in this pool is below safety line, use player T*_weight; when above or equal, use pool T*_weight (kill).", "tierRuleContent": "When player profit in this pool is below safety line, use player T*_weight; when above or equal, use pool T*_weight (kill).",
"killScoreWeights": "Kill weights (type=1 read-only)", "killScoreWeights": "Kill weights",
"killWeightNote": "(Kill weights from pool config type=1; edit in list.)", "killWeightNote": "(Kill weights from pool config type=1; edit in list.)",
"btnResetProfit": "Reset Player Total Profit", "btnResetProfit": "Reset Player Total Profit",
"btnSaveSafetyLine": "Save Safety Line", "btnSaveSafetyLine": "Save Safety Line",
"ruleSafetyLineRequired": "Please enter safety line", "ruleSafetyLineRequired": "Please enter safety line",
"msgGetPoolFailed": "Failed to get lottery pool", "msgGetPoolFailed": "Failed to get lottery pool",
"msgSaveSuccess": "Saved", "msgSaveSuccess": "Save Success",
"msgResetProfitSuccess": "Player total profit reset to 0", "msgResetProfitSuccess": "Player total profit reset to 0",
"msgResetFailed": "Reset failed", "msgResetFailed": "Reset failed",
"ruleNameRequired": "Name is required", "ruleNameRequired": "Name is required",

View File

@@ -31,7 +31,13 @@
"rollNumber": "Roll Sum", "rollNumber": "Roll Sum",
"placeholderRollNumber": "Sum of 5 dice (530)", "placeholderRollNumber": "Sum of 5 dice (530)",
"rewardConfig": "Reward Config", "rewardConfig": "Reward Config",
"placeholderRewardConfig": "Select reward config (by UI text)" "placeholderRewardConfig": "Select reward config (by UI text)",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully",
"validateFailed": "Validation failed, please check required fields and format"
},
"toolbar": {
"platformTotalProfit": "Platform Total Profit"
}, },
"search": { "search": {
"player": "Player", "player": "Player",

View File

@@ -33,5 +33,34 @@
"rollNumber": "Roll Number", "rollNumber": "Roll Number",
"rewardConfig": "Reward Config", "rewardConfig": "Reward Config",
"createTime": "Create Time" "createTime": "Create Time"
},
"form": {
"titleAdd": "Add Player Draw Record (Test)",
"titleEdit": "Edit Player Draw Record (Test)",
"labelLotteryConfigId": "Lottery Config ID",
"placeholderLotteryConfigId": "Please enter lottery config id",
"placeholderWinCoin": "Win coin",
"placeholderRewardTier": "Please select tier (will auto fill reward config id)",
"rewardConfigId": "Reward Config ID",
"placeholderRewardConfigId": "Auto fill by tier or enter manually",
"placeholderStartIndex": "Please enter start index",
"labelTargetIndex": "Target Index",
"placeholderTargetIndex": "Please enter target index",
"placeholderRollNumber": "Please enter roll number",
"labelRollArray": "Roll Array [1,2,3,4,5,6]",
"placeholderRollArray": "Please enter roll array [1,2,3,4,5,6]",
"labelStatus": "Status (0=fail, 1=success)",
"placeholderSuperWinCoin": "Please enter super win coin",
"placeholderRewardWinCoin": "Please enter reward win coin",
"labelAdminId": "Admin ID",
"placeholderAdminId": "Please enter admin id",
"ruleLotteryConfigIdRequired": "Lottery config id is required",
"ruleDrawTypeRequired": "Draw type is required",
"ruleIsBigWinRequired": "Is big win is required",
"ruleDirectionRequired": "Direction is required",
"ruleRewardConfigIdRequired": "Reward config id is required",
"ruleStatusRequired": "Status is required",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -30,6 +30,7 @@
"t5Weight": "T5 Pool Weight (%)", "t5Weight": "T5 Pool Weight (%)",
"weightsSumHint": "Total pool weights: ", "weightsSumHint": "Total pool weights: ",
"weightsSumUnit": "% / 100% (must equal 100%)", "weightsSumUnit": "% / 100% (must equal 100%)",
"ruleWeightsSumMustBe100": "Total pool weights must equal 100%",
"walletTitle": "Player Wallet Operation", "walletTitle": "Player Wallet Operation",
"walletPlayer": "Player", "walletPlayer": "Player",
"walletBalance": "Balance", "walletBalance": "Balance",

View File

@@ -12,7 +12,9 @@
"placeholderFreeDrawCount": "Please enter free draw count", "placeholderFreeDrawCount": "Please enter free draw count",
"totalDrawCount": "Total Draw Count", "totalDrawCount": "Total Draw Count",
"placeholderTotalDrawCount": "Auto sum", "placeholderTotalDrawCount": "Auto sum",
"placeholderRemark": "Remark (required)" "placeholderRemark": "Remark (required)",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
}, },
"search": { "search": {
"player": "Player", "player": "Player",

View File

@@ -17,7 +17,9 @@
"placeholderWalletBefore": "Auto from selected user", "placeholderWalletBefore": "Auto from selected user",
"walletAfter": "After", "walletAfter": "After",
"placeholderWalletAfter": "Auto calculated", "placeholderWalletAfter": "Auto calculated",
"placeholderRemark": "Optional" "placeholderRemark": "Optional",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
}, },
"search": { "search": {
"type": "Type", "type": "Type",

View File

@@ -1,12 +1,13 @@
{ {
"toolbar": { "toolbar": {
"weightRatio": "Weight Ratio", "weightRatio": "Weight Ratio",
"weightTest": "Test Weight" "weightTest": "Test Weights"
}, },
"search": { "search": {
"tier": "Tier", "tier": "Tier",
"clockwise": "Clockwise", "clockwise": "Clockwise",
"anticlockwise": "Anticlockwise" "anticlockwise": "Counter-clockwise",
"optionBigwin": "BIGWIN"
}, },
"table": { "table": {
"startIndex": "Start Index", "startIndex": "Start Index",
@@ -17,5 +18,67 @@
"realEv": "Real EV", "realEv": "Real EV",
"remark": "Remark", "remark": "Remark",
"weight": "Weight" "weight": "Weight"
},
"weightShared": {
"xAxisEndIndex": "End Index",
"xAxisGridNumber": "Points",
"emptyTier": "No data for this tier",
"sumLineDual": "Tier weight sum (clockwise): {cw}; counter-clockwise: {ccw} (each row 110000, ratio draw within tier, sum not limited)",
"sumLineSingle": "Tier weight sum: {sum} (each row 110000, ratio draw within tier, sum not limited)",
"t4t5NoteSingle": "T4 and T5 have a single outcome; no weight configuration.",
"t4t5NoteDual": "T4 and T5 have a single outcome when hit; no weight configuration.",
"colEndIndexId": "End Index (id)",
"colGridNumber": "Points (grid_number)",
"colDicePoints": "Dice Points",
"colRealEv": "Real EV",
"colUiText": "Display Text",
"colRemark": "Remark",
"colWeightCwDir": "Clockwise weight (direction=0)",
"colWeightCcwDir": "Counter-clockwise weight (direction=1)",
"weightColSuffix": "Weight (1-10000)",
"fetchFail": "Failed to load weight data",
"nothingToSubmit": "Nothing to submit",
"submitFail": "Save failed",
"btnCancel": "Cancel",
"btnSubmit": "Submit",
"saveSuccess": "Saved successfully"
},
"weightEdit": {
"title": "Dice Reward (dice_reward) Weight Ratio",
"globalTip": "You are editing weights on dice_reward (DiceReward), split by end_index into clockwise and counter-clockwise; the draw uses the set for the current direction."
},
"weightRatio": {
"title": "Weight Ratio",
"globalTip": "Configure dice_reward weights: first by direction (clockwise / counter-clockwise), then by tier (T1T5); each row weight 110000, ratio draw within tier.",
"tabClockwise": "Clockwise",
"tabCounterclockwise": "Counter-clockwise"
},
"weightTest": {
"title": "One-Click Weight Test",
"alertTitle": "Bonus pool logic",
"alertBody": "Same as playStart draw: uses name=default safety line and kill switch; when profit is below the line, paid tickets use player tier weights (custom below), free tickets use killScore; when profit reaches the line and kill is on, both use killScore.",
"stepPaid": "Paid ticket",
"stepFree": "Free ticket",
"labelLotteryTypePaid": "Test pool type",
"labelLotteryTypeFree": "Test pool type",
"placeholderPaidPool": "Leave empty for custom tier odds below (default: default)",
"placeholderFreePool": "Leave empty for custom tier odds below (default: killScore)",
"tierProbHint": "Custom tier odds (T1T5), each 0100%, sum of five must not exceed 100%",
"tierFieldLabel": "Tier {tier} (%)",
"tierSumError": "Current sum of five tiers is {sum}%, cannot exceed 100%",
"labelCwCount": "Clockwise spins",
"labelCcwCount": "Counter-clockwise spins",
"placeholderSelect": "Please select",
"btnPrev": "Back",
"btnNext": "Next",
"btnStart": "Start test",
"btnCancel": "Cancel",
"warnTotalSpins": "At least one of paid/free direction spin counts must be greater than 0",
"warnPaidTierSumPositive": "When no paid pool is selected, T1T5 odds sum must be greater than 0",
"warnPaidTierSumMax": "Paid T1T5 odds sum cannot exceed 100%",
"warnFreeTierSumPositive": "When no free pool is selected, T1T5 odds sum must be greater than 0",
"warnFreeTierSumMax": "Free T1T5 odds sum cannot exceed 100%",
"successCreated": "Test job created and will run in background. Check player draw records (test data) for results.",
"failCreate": "Failed to create test job"
} }
} }

View File

@@ -1,7 +1,74 @@
{ {
"toolbar": { "toolbar": {
"gameRewardConfig": "Game Reward Config", "gameRewardConfig": "Game Reward Config",
"createRewardRef": "Create Reward Reference" "createRewardRef": "Create Reward Reference",
"createRewardRefTitle": "Rule: start_index=config(grid_number).id; clockwise end_index=(start_index+grid_number)%26; counter-clockwise end_index=start_index-grid_number>=0?start_index-grid_number:26+start_index-grid_number"
},
"configPage": {
"tabIndex": "Reward Index",
"tabBigwin": "Big Win Weights",
"tipIndex": "Dice points must be between 5 and 30 and unique in this table.",
"tipBigwin": "Left to right: big-win points (read-only), display text, real EV, remark, weight (0~10000). Points 5 and 30 are fixed at 100%. This tab saves big-win weights only.",
"colId": "Index (id)",
"colDicePoints": "Dice Points",
"colDisplayText": "Display Text",
"colDisplayTextEn": "Display Text (EN)",
"colRealEv": "Real Settlement",
"colTier": "Tier",
"colRemark": "Remark",
"placeholderTierSelect": "Tier",
"placeholderDisplayZh": "Display text (Chinese)",
"placeholderDisplayEn": "Display text (English)",
"placeholderRemark": "Remark",
"btnSave": "Save",
"btnReset": "Reset",
"colBigwinPoints": "Big-Win Points",
"colDisplayInfo": "Display Info",
"colDisplayInfoEn": "Display Info (EN)",
"colRealPrize": "Real Prize",
"colWeightRange": "Weight (0-10000)",
"placeholderDisplayInfoZh": "Display info (Chinese)",
"placeholderDisplayInfoEn": "Display info (English)",
"weightFixedTip": "Points 5 and 30 are fixed at 100%",
"emptyBigwin": "No BIGWIN tier rows. Set tier to BIGWIN in the Reward Index tab first.",
"confirmCreateRefTitle": "Create Reward Reference",
"confirmCreateRefMsg": "Create reward reference by rule: start_index is the id of the cell for grid_number in reward config; clockwise end_index=(start_index+roll)%26; counter-clockwise end_index=start_index-roll if >=0 else 26+start_index-roll. Existing data will be cleared, then 26 points (530) for both directions will be generated. Continue?",
"confirmCreateRefOk": "Create",
"confirmCreateRefCancel": "Cancel",
"createRefSuccess": "Created for 26 dice points (530), clockwise + counter-clockwise: clockwise added {cwNew}, counter-clockwise added {ccwNew}; clockwise updated {cwUp}, counter-clockwise updated {ccwUp}{skippedPart}",
"createRefSuccessSkipped": "; {n} point(s) used fallback start index",
"createRefSuccessSimple": "Created successfully",
"createRefFail": "Failed to create reward reference",
"loadIndexFail": "Failed to load reward index config",
"saveSuccess": "Saved successfully",
"saveFail": "Save failed",
"resetIndexReloaded": "Reward index reloaded from server",
"resetBigwinReloaded": "Big win weights reloaded from server",
"warnNoIndexToSave": "No reward index rows to save",
"warnGridRange": "Dice points must be between {min} and {max}",
"dupJoiner": ", ",
"warnDupGrid": "Duplicate dice points in this table: {list}",
"warnNoBigwinToSave": "No BIGWIN rows to save",
"warnBigwinDupGrid": "Duplicate big-win points in this table: {list}",
"infoNoBigwin": "No BIGWIN rows. Set tier to BIGWIN in the Reward Index tab first."
},
"weightRatio": {
"title": "T1T5 Weight Ratio (Clockwise / Counter-clockwise)",
"globalTip": "Weights come from dice_reward, split by end index (DiceRewardConfig.id) into clockwise and counter-clockwise; draw uses the weight set for the current direction.",
"xAxisEndIndex": "End Index",
"emptyTier": "No data for this tier",
"sumLine": "Tier weight sum (clockwise): {cw}; counter-clockwise: {ccw} (each row 110000, ratio draw within tier, sum not limited)",
"t4t5Note": "T4 and T5 have a single outcome; no weight configuration.",
"colEndIndexId": "End Index (id)",
"colDicePoints": "Dice Points",
"colRealEv": "Real EV",
"colUiText": "Display Text",
"colWeightCw": "Clockwise weight (1-10000)",
"colWeightCcw": "Counter-clockwise weight (1-10000)",
"fetchFail": "Failed to load weight ratio data",
"nothingToSubmit": "Nothing to submit",
"submitFail": "Save failed",
"saveSuccess": "Saved successfully"
}, },
"search": { "search": {
"dicePoints": "Dice Points", "dicePoints": "Dice Points",
@@ -19,5 +86,34 @@
"realEv": "Real EV", "realEv": "Real EV",
"remark": "Remark", "remark": "Remark",
"weight": "Weight" "weight": "Weight"
},
"form": {
"titleAdd": "Add Reward Config",
"titleEdit": "Edit Reward Config",
"labelDicePoints": "Dice Points",
"placeholderDicePoints": "Please enter dice points",
"labelUiText": "Display Text",
"placeholderUiText": "Please enter display text (Chinese)",
"labelUiTextEn": "Display Text (EN)",
"placeholderUiTextEn": "Please enter display text (English)",
"labelRealEv": "Real EV",
"placeholderRealEv": "Please enter real EV",
"labelTier": "Tier",
"placeholderTier": "Please select tier",
"tierBigWin": "BIGWIN (Super Prize)",
"labelBigWinWeight": "Big Win Weight",
"placeholderBigWinWeight": "0~10000, 10000=100% win",
"bigWinWeightDisabledTip": "For points 5 and 30, big win is guaranteed. Weight is fixed to 10000.",
"bigWinWeightTip": "10000=100% win, 0=0% win; only effective for points 10/15/20/25",
"labelRemark": "Remark",
"placeholderRemark": "Please enter remark",
"ruleDicePointsRequired": "Dice points is required",
"ruleUiTextRequired": "Display text is required",
"ruleUiTextEnMax": "Display text (EN) must be less than 255 characters",
"ruleRealEvRequired": "Real EV is required",
"ruleTierRequired": "Tier is required",
"ruleBigWinWeightRange": "Big win weight must be between 0 and 10000",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -4,6 +4,8 @@
}, },
"table": { "table": {
"id": "ID", "id": "ID",
"clockwiseAbbr": "CW",
"counterclockwiseAbbr": "CCW",
"status": "Status", "status": "Status",
"paidDraw": "Paid Draw", "paidDraw": "Paid Draw",
"freeDraw": "Free Draw", "freeDraw": "Free Draw",
@@ -14,5 +16,64 @@
"statusFail": "Failed", "statusFail": "Failed",
"statusDone": "Done", "statusDone": "Done",
"statusTesting": "Testing" "statusTesting": "Testing"
},
"form": {
"titleAdd": "Add Reward Config Weight Test Record",
"titleEdit": "Edit Reward Config Weight Test Record",
"labelTestCount": "Test Count: 100/500/1000",
"placeholderTestCount": "Please enter test count: 100/500/1000",
"labelWeightSnapshot": "Weight Snapshot: save id,grid_number,tier,weight by tier",
"placeholderWeightSnapshot": "Please enter weight snapshot: id,grid_number,tier,weight by tier",
"labelResultCounts": "Result Counts: grid_number => count",
"placeholderResultCounts": "Please enter result counts: grid_number => count",
"ruleTestCountRequired": "Test count is required",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
},
"detail": {
"title": "Test Record Detail",
"sectionBasic": "Basic Info",
"recordId": "Record ID",
"testCount": "Test count",
"testCountSuffix": " runs",
"createTime": "Created at",
"admin": "Operator",
"paidPoolId": "Paid lottery pool config ID",
"freePoolId": "Free lottery pool config ID",
"bigwinSnapshot": "BIGWIN weight snapshot",
"sectionPaidTier": "Paid draw tier odds (T1T5, used in test)",
"sectionFreeTier": "Free draw tier odds (T1T5, used in test)",
"colTier": "Tier",
"colWeight": "Weight",
"colPercent": "Share",
"emptyPaidTier": "No paid tier data (legacy records may only have tier_weights_snapshot)",
"emptyFreeTier": "No free tier data",
"sectionSnapshot": "Weight snapshot (T1T5 / BIGWIN used in test)",
"subCw": "Clockwise (non-BIGWIN)",
"subCcw": "Counter-clockwise (non-BIGWIN)",
"colGridNumber": "Dice points",
"emptyCw": "No clockwise data",
"emptyCcw": "No counter-clockwise data",
"subBigwin": "BIGWIN (DiceRewardConfig snapshot)",
"emptyBigwinTable": "No BIGWIN data",
"sectionResult": "Landing stats (count per grid_number)",
"chartXAxis": "Dice points (grid_number)",
"emptyResult": "No landing data",
"resultTotal": "Total landings: {n}",
"btnImport": "Import to current config",
"importTitle": "Import to production config",
"importDesc": "Import this test record into DiceReward (cell weights), DiceRewardConfig (BIGWIN weight), and DiceLotteryPoolConfig (paid/free T1T5 odds). Select target pools.",
"importPaidLabel": "Import paid tier odds to pool",
"importPaidPlaceholder": "Select a pool (paid pool recommended)",
"importPaidTip": "If empty, uses paid pool ID saved on this record",
"importFreeLabel": "Import free tier odds to pool",
"importFreePlaceholder": "Select a pool (free pool recommended)",
"importFreeTip": "If empty, uses free pool ID saved on this record",
"btnConfirmImport": "Confirm import",
"importSuccess": "Imported. DiceReward, DiceRewardConfig (BIGWIN), and pool config refreshed.",
"importFail": "Import failed",
"dash": "—",
"dirCw": "Clockwise",
"dirCcw": "Counter-clockwise"
} }
} }

View File

@@ -14,5 +14,13 @@
"fileType": "File Type", "fileType": "File Type",
"fileSize": "File Size", "fileSize": "File Size",
"uploadTime": "Upload Time" "uploadTime": "Upload Time"
},
"form": {
"titleAdd": "Add File",
"titleEdit": "Edit File",
"labelFileName": "File Name",
"placeholderFileName": "Please enter file name",
"ruleFileNameRequired": "Please enter file name",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"search": { "search": {
"deptName": "Dept Name", "deptName": "channel(Department) Name",
"deptCode": "Dept Code", "deptCode": "Dept Code",
"status": "Status", "status": "Status",
"placeholderDeptName": "Please enter dept name", "placeholderDeptName": "Please enter dept name",
@@ -8,11 +8,32 @@
"searchSelectPlaceholder": "Please select" "searchSelectPlaceholder": "Please select"
}, },
"table": { "table": {
"deptName": "Dept Name", "deptName": "channel(Department) Name",
"deptCode": "Dept Code", "deptCode": "Dept Code",
"leader": "Leader", "leader": "Leader",
"sort": "Sort", "sort": "Sort",
"status": "Status", "status": "Status",
"createTime": "Create Time" "createTime": "Create Time"
},
"form": {
"titleAdd": "Add Department",
"titleEdit": "Edit Department",
"labelParentDept": "Parent Department",
"labelDeptName": "Dept Name",
"labelDeptCode": "Dept Code",
"labelLeader": "Leader",
"labelRemark": "Description",
"labelSort": "Sort",
"labelStatus": "Enabled",
"placeholderDeptName": "Please enter dept name",
"placeholderDeptCode": "Please enter dept code",
"placeholderRemark": "Please enter description",
"placeholderSort": "Please enter sort",
"noParentDept": "No parent department",
"ruleParentDeptRequired": "Please select parent department",
"ruleDeptNameRequired": "Please enter dept name",
"ruleDeptCodeRequired": "Please enter dept code",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -17,5 +17,49 @@
"sort": "Sort", "sort": "Sort",
"status": "Status", "status": "Status",
"createTime": "Create Time" "createTime": "Create Time"
},
"form": {
"titleAdd": "Add Menu",
"titleEdit": "Edit Menu",
"labelMenuType": "Menu Type",
"labelParentMenu": "Parent Menu",
"labelMenuName": "Menu Name",
"labelRoutePath": "Route Path",
"labelRoutePathTip": "Top-level: absolute path starting with / (e.g. /dashboard). Sub-level: relative path (e.g. console, user).",
"placeholderRoutePath": "e.g. /dashboard or console",
"labelComponentName": "Component Name",
"placeholderComponentName": "e.g. User",
"labelComponentPath": "Component Path",
"labelComponentPathTip": "Fill component path under views. For directory menu, leave empty.",
"placeholderComponentPath": "e.g. /system/user or leave empty",
"labelMenuIcon": "Menu Icon",
"labelPermSlug": "Permission Slug",
"placeholderPermSlug": "Please enter permission slug",
"labelLinkUrl": "External Link",
"placeholderLinkUrl": "e.g. https://saithink.top",
"labelSort": "Sort",
"labelSortTip": "Larger number comes first",
"placeholderSort": "Please enter sort",
"labelStatus": "Status",
"labelStatusTip": "After disabled, this menu item will be unavailable",
"labelIsIframe": "Embedded",
"labelIsIframeTip": "Only effective in external link mode",
"labelIsKeepAlive": "Keep Alive",
"labelIsKeepAliveTip": "Switching tabs won't refresh",
"labelIsHidden": "Hidden",
"labelIsHiddenTip": "Hidden in menu but accessible via route",
"labelIsFixedTab": "Fixed Tab",
"labelIsFixedTabTip": "Fixed in tabs bar",
"labelIsFullPage": "Full Page",
"labelIsFullPageTip": "Do not inherit side menu and top bar",
"noParentMenu": "No parent menu",
"ruleParentMenuRequired": "Please select parent menu",
"ruleMenuNameRequired": "Please enter menu name",
"ruleRoutePathRequired": "Please enter route path",
"ruleComponentNameRequired": "Please enter component name",
"rulePermSlugRequired": "Please enter permission slug",
"ruleLinkUrlRequired": "Please enter external link",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -13,5 +13,22 @@
"sort": "Sort", "sort": "Sort",
"status": "Status", "status": "Status",
"createTime": "Create Time" "createTime": "Create Time"
},
"form": {
"titleAdd": "Add Post",
"titleEdit": "Edit Post",
"labelName": "Post Name",
"labelCode": "Post Code",
"labelRemark": "Description",
"labelSort": "Sort",
"labelStatus": "Enabled",
"placeholderName": "Please enter post name",
"placeholderCode": "Please enter post code",
"placeholderRemark": "Please enter description",
"placeholderSort": "Please enter sort",
"ruleNameRequired": "Please enter post name",
"ruleCodeRequired": "Please enter post code",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -14,5 +14,25 @@
"roleRemark": "Role Description", "roleRemark": "Role Description",
"status": "Status", "status": "Status",
"createTime": "Create Time" "createTime": "Create Time"
},
"form": {
"titleAdd": "Add Role",
"titleEdit": "Edit Role",
"labelName": "Role Name",
"labelCode": "Role Code",
"labelLevel": "Role Level",
"levelTip": "Controls role permission level, cannot operate roles with higher level than your own",
"labelRemark": "Description",
"labelSort": "Sort",
"labelStatus": "Enabled",
"placeholderName": "Please enter role name",
"placeholderCode": "Please enter role code",
"placeholderRemark": "Please enter role description",
"placeholderSort": "Please enter sort",
"ruleNameRequired": "Please enter role name",
"ruleCodeRequired": "Please enter role code",
"ruleLevelRequired": "Please enter role level",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -17,5 +17,35 @@
"status": "Status", "status": "Status",
"createTime": "Create Time", "createTime": "Create Time",
"updateTime": "Update Time" "updateTime": "Update Time"
},
"form": {
"titleAdd": "Add User",
"titleEdit": "Edit User",
"labelAvatar": "Avatar",
"labelUsername": "Username",
"labelRealname": "Real Name",
"labelPassword": "Password",
"labelPasswordConfirm": "Confirm Password",
"labelEmail": "Email",
"labelPhone": "Phone",
"labelDept": "Department",
"labelRole": "Role",
"labelPost": "Post",
"labelGender": "Gender",
"labelStatus": "Status",
"labelRemark": "Remark",
"placeholderEmail": "Please enter email",
"placeholderPhone": "Please enter phone",
"placeholderRemark": "Please enter remark",
"rulePasswordNotMatch": "Passwords do not match",
"ruleUsernameRequired": "Please enter username",
"ruleUsernameLength": "Length must be between 2 and 20 characters",
"rulePasswordRequired": "Please enter password",
"rulePasswordLength": "Length must be between 6 and 20 characters",
"rulePasswordConfirmRequired": "Please enter confirm password",
"ruleDeptRequired": "Please select department",
"ruleRoleRequired": "Please select role",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -17,5 +17,46 @@
"executeTime": "Execute Time", "executeTime": "Execute Time",
"parameter": "Parameter", "parameter": "Parameter",
"executeStatus": "Status" "executeStatus": "Status"
},
"form": {
"titleAdd": "Add Scheduled Task",
"titleEdit": "Edit Scheduled Task",
"labelName": "Task Name",
"labelType": "Task Type",
"labelTaskStyle": "Schedule Rule",
"labelTarget": "Target",
"labelParams": "Parameters",
"labelStatus": "Status",
"labelRemark": "Remark",
"placeholderName": "Please enter task name",
"placeholderTarget": "Please enter target",
"placeholderParams": "Please enter parameters",
"placeholderRemark": "Please enter remark",
"taskStyleEveryDay": "Every day",
"taskStyleEveryHour": "Every hour",
"taskStyleNHours": "N hours",
"taskStyleNMinutes": "N minutes",
"taskStyleNSeconds": "N seconds",
"taskStyleEveryWeek": "Every week",
"taskStyleEveryMonth": "Every month",
"taskStyleEveryYear": "Every year",
"weekMon": "Mon",
"weekTue": "Tue",
"weekWed": "Wed",
"weekThu": "Thu",
"weekFri": "Fri",
"weekSat": "Sat",
"weekSun": "Sun",
"unitMonth": "Month",
"unitDay": "Day",
"unitHour": "Hour",
"unitMinute": "Minute",
"unitSecond": "Second",
"ruleNameRequired": "Task name is required",
"ruleTypeRequired": "Task type is required",
"ruleTaskStyleRequired": "Schedule rule is required",
"ruleTargetRequired": "Target is required",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
} }
} }

View File

@@ -47,6 +47,17 @@
"labelName": "名称", "labelName": "名称",
"close": "关闭" "close": "关闭"
}, },
"dict": {
"data_status": {
"1": "正常",
"2": "停用"
},
"gender": {
"1": "男",
"2": "女",
"3": "未知"
}
},
"search": { "search": {
"placeholder": "搜索页面", "placeholder": "搜索页面",
"historyTitle": "搜索历史", "historyTitle": "搜索历史",
@@ -323,7 +334,7 @@
"role": "角色管理", "role": "角色管理",
"userCenter": "个人中心", "userCenter": "个人中心",
"menu": "菜单管理", "menu": "菜单管理",
"dept": "部门管理", "dept": "渠道(部门)管理",
"post": "岗位管理", "post": "岗位管理",
"config": "系统配置" "config": "系统配置"
}, },

View File

@@ -18,7 +18,6 @@
"t5Weight": "T5池权重(%)", "t5Weight": "T5池权重(%)",
"weightsSumHint": "五个池权重总和:", "weightsSumHint": "五个池权重总和:",
"weightsSumUnit": "% / 100%必须为100%", "weightsSumUnit": "% / 100%必须为100%",
"weightsSumUnitCurrent": "% / 100%须为100%",
"currentPoolTitle": "当前彩金池", "currentPoolTitle": "当前彩金池",
"loading": "加载中...", "loading": "加载中...",
"poolName": "池子名称", "poolName": "池子名称",
@@ -27,8 +26,8 @@
"profitCalcHint": "计算方式:每局按“当前中奖金额(含超级大奖 BIGWIN减去抽奖券费用 100”累加弹窗打开期间每 2 秒自动刷新", "profitCalcHint": "计算方式:每局按“当前中奖金额(含超级大奖 BIGWIN减去抽奖券费用 100”累加弹窗打开期间每 2 秒自动刷新",
"tierRuleTitle": "抽奖档位规则", "tierRuleTitle": "抽奖档位规则",
"tierRuleContent": "当玩家在当前彩金池的累计盈利 低于安全线 时,按 玩家 的 T*_weight 权重抽取档位;当累计盈利 高于或等于安全线 时,按 当前彩金池 的 T*_weight 权重抽取档位(杀分)。", "tierRuleContent": "当玩家在当前彩金池的累计盈利 低于安全线 时,按 玩家 的 T*_weight 权重抽取档位;当累计盈利 高于或等于安全线 时,按 当前彩金池 的 T*_weight 权重抽取档位(杀分)。",
"killScoreWeights": "杀分权重type=1 只读)", "killScoreWeights": "杀分权重",
"killWeightNote": "(杀分权重来自奖池配置 type=1,请在列表中编辑对应记录)", "killWeightNote": "(杀分权重来自奖池配置,请在列表中编辑对应记录)",
"btnResetProfit": "重置玩家累计盈利", "btnResetProfit": "重置玩家累计盈利",
"btnSaveSafetyLine": "保存安全线", "btnSaveSafetyLine": "保存安全线",
"ruleSafetyLineRequired": "请输入安全线", "ruleSafetyLineRequired": "请输入安全线",

View File

@@ -31,7 +31,13 @@
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"placeholderRollNumber": "5 个色子点数之和530", "placeholderRollNumber": "5 个色子点数之和530",
"rewardConfig": "奖励配置", "rewardConfig": "奖励配置",
"placeholderRewardConfig": "请选择奖励配置(显示前端文本)" "placeholderRewardConfig": "请选择奖励配置(显示前端文本)",
"addSuccess": "新增成功",
"editSuccess": "修改成功",
"validateFailed": "表单验证失败,请检查必填项与格式"
},
"toolbar": {
"platformTotalProfit": "平台总盈利"
}, },
"search": { "search": {
"player": "玩家", "player": "玩家",

View File

@@ -33,5 +33,34 @@
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"rewardConfig": "奖励配置", "rewardConfig": "奖励配置",
"createTime": "创建时间" "createTime": "创建时间"
},
"form": {
"titleAdd": "新增玩家抽奖记录(测试数据)",
"titleEdit": "编辑玩家抽奖记录(测试数据)",
"labelLotteryConfigId": "彩金池配置id",
"placeholderLotteryConfigId": "请输入彩金池配置id",
"placeholderWinCoin": "赢取平台币",
"placeholderRewardTier": "请选择档位(选后自动带出奖励配置ID)",
"rewardConfigId": "奖励配置id",
"placeholderRewardConfigId": "可选中奖档位自动带出或手动输入",
"placeholderStartIndex": "请输入起始索引",
"labelTargetIndex": "结束索引",
"placeholderTargetIndex": "请输入结束索引",
"placeholderRollNumber": "请输入摇取点数和",
"labelRollArray": "摇取点数:[1,2,3,4,5,6]",
"placeholderRollArray": "请输入摇取点数:[1,2,3,4,5,6]",
"labelStatus": "状态:0=失败,1=成功",
"placeholderSuperWinCoin": "请输入中大奖平台币",
"placeholderRewardWinCoin": "请输入摇色子中奖平台币",
"labelAdminId": "所属管理员",
"placeholderAdminId": "请输入所属管理员",
"ruleLotteryConfigIdRequired": "彩金池配置id必需填写",
"ruleDrawTypeRequired": "抽奖类型必需填写",
"ruleIsBigWinRequired": "是否中大奖必需填写",
"ruleDirectionRequired": "方向必需填写",
"ruleRewardConfigIdRequired": "奖励配置id必需填写",
"ruleStatusRequired": "状态必需填写",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -30,6 +30,7 @@
"t5Weight": "T5池权重(%)", "t5Weight": "T5池权重(%)",
"weightsSumHint": "五个池权重总和:", "weightsSumHint": "五个池权重总和:",
"weightsSumUnit": "% / 100%必须为100%", "weightsSumUnit": "% / 100%必须为100%",
"ruleWeightsSumMustBe100": "五个池权重总和必须为100%",
"walletTitle": "玩家钱包操作", "walletTitle": "玩家钱包操作",
"walletPlayer": "玩家", "walletPlayer": "玩家",
"walletBalance": "钱包余额", "walletBalance": "钱包余额",

View File

@@ -12,7 +12,9 @@
"placeholderFreeDrawCount": "请输入赠送抽奖次数", "placeholderFreeDrawCount": "请输入赠送抽奖次数",
"totalDrawCount": "总抽奖次数", "totalDrawCount": "总抽奖次数",
"placeholderTotalDrawCount": "自动求和", "placeholderTotalDrawCount": "自动求和",
"placeholderRemark": "请输入备注(必填)" "placeholderRemark": "请输入备注(必填)",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
}, },
"search": { "search": {
"player": "玩家", "player": "玩家",

View File

@@ -17,7 +17,9 @@
"placeholderWalletBefore": "选择用户后自动带出当前平台币", "placeholderWalletBefore": "选择用户后自动带出当前平台币",
"walletAfter": "钱包操作后", "walletAfter": "钱包操作后",
"placeholderWalletAfter": "根据平台币变化自动计算", "placeholderWalletAfter": "根据平台币变化自动计算",
"placeholderRemark": "选填" "placeholderRemark": "选填",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
}, },
"search": { "search": {
"type": "类型", "type": "类型",

View File

@@ -6,7 +6,8 @@
"search": { "search": {
"tier": "档位", "tier": "档位",
"clockwise": "顺时针", "clockwise": "顺时针",
"anticlockwise": "逆时针" "anticlockwise": "逆时针",
"optionBigwin": "BIGWIN"
}, },
"table": { "table": {
"startIndex": "起始索引", "startIndex": "起始索引",
@@ -17,5 +18,67 @@
"realEv": "实际中奖金额", "realEv": "实际中奖金额",
"remark": "备注", "remark": "备注",
"weight": "权重(1-10000)" "weight": "权重(1-10000)"
},
"weightShared": {
"xAxisEndIndex": "结束索引",
"xAxisGridNumber": "点数",
"emptyTier": "该档位暂无配置数据",
"sumLineDual": "当前档位权重合计(顺时针):{cw};逆时针:{ccw}(各条 1-10000档位内按权重比抽取和不限制",
"sumLineSingle": "当前档位权重合计:{sum}(各条 1-10000档位内按权重比抽取和不限制",
"t4t5NoteSingle": "T4、T5 仅单一结果,无需配置权重。",
"t4t5NoteDual": "T4、T5 档位抽中时仅有一个结果,无需配置权重。",
"colEndIndexId": "结束索引(id)",
"colGridNumber": "点数(grid_number)",
"colDicePoints": "色子点数",
"colRealEv": "实际中奖金额",
"colUiText": "显示文本",
"colRemark": "备注",
"colWeightCwDir": "顺时针权重(direction=0)",
"colWeightCcwDir": "逆时针权重(direction=1)",
"weightColSuffix": "权重(1-10000)",
"fetchFail": "获取权重数据失败",
"nothingToSubmit": "没有可提交的配置",
"submitFail": "保存失败",
"btnCancel": "取消",
"btnSubmit": "提交",
"saveSuccess": "保存成功"
},
"weightEdit": {
"title": "奖励对照表dice_reward权重配比",
"globalTip": "编辑的是奖励对照表dice_reward / DiceReward 模型的权重按结束索引end_index区分顺时针与逆时针两套权重抽奖时按当前方向取对应权重。"
},
"weightRatio": {
"title": "权重配比",
"globalTip": "配置奖励对照表dice_reward的权重一级按方向顺时针/逆时针二级按档位T1-T5各条权重 1-10000档位内按权重比抽取。",
"tabClockwise": "顺时针",
"tabCounterclockwise": "逆时针"
},
"weightTest": {
"title": "一键测试权重",
"alertTitle": "彩金池逻辑说明",
"alertBody": "与 playStart 抽奖逻辑一致:使用 name=default 的安全线、杀分开关;盈利未达安全线时,付费抽奖券使用玩家自身权重(下方自定义档位),免费抽奖券使用 killScore 配置;盈利达到安全线且杀分开启时,付费/免费均使用 killScore 配置。",
"stepPaid": "付费抽奖券",
"stepFree": "免费抽奖券",
"labelLotteryTypePaid": "测试数据档位类型",
"labelLotteryTypeFree": "测试数据档位类型",
"placeholderPaidPool": "不选则下方自定义档位概率(默认 default",
"placeholderFreePool": "不选则下方自定义档位概率(默认 killScore",
"tierProbHint": "自定义档位概率T1T5每档 0-100%,五档之和不能超过 100%",
"tierFieldLabel": "档位 {tier}%",
"tierSumError": "当前五档之和为 {sum}%,不能超过 100%",
"labelCwCount": "顺时针次数",
"labelCcwCount": "逆时针次数",
"placeholderSelect": "请选择",
"btnPrev": "上一步",
"btnNext": "下一步",
"btnStart": "开始测试",
"btnCancel": "取消",
"warnTotalSpins": "付费或免费至少一种方向次数之和大于 0",
"warnPaidTierSumPositive": "付费未选奖池时T1T5 档位概率之和需大于 0",
"warnPaidTierSumMax": "付费档位概率 T1T5 之和不能超过 100%",
"warnFreeTierSumPositive": "免费未选奖池时T1T5 档位概率之和需大于 0",
"warnFreeTierSumMax": "免费档位概率 T1T5 之和不能超过 100%",
"successCreated": "测试任务已创建,后台将自动执行。请在【玩家抽奖记录(测试数据)】中查看生成的测试数据",
"failCreate": "创建测试任务失败"
} }
} }

View File

@@ -1,7 +1,74 @@
{ {
"toolbar": { "toolbar": {
"gameRewardConfig": "游戏奖励配置", "gameRewardConfig": "游戏奖励配置",
"createRewardRef": "创建奖励对照" "createRewardRef": "创建奖励对照",
"createRewardRefTitle": "按规则start_index=config(grid_number).id顺时针 end_index=(start_index+grid_number)%26逆时针 end_index=start_index-grid_number≥0?start_index-grid_number:26+start_index-grid_number"
},
"configPage": {
"tabIndex": "奖励索引",
"tabBigwin": "大奖权重",
"tipIndex": "色子点数须在 530 之间且本表内不重复。",
"tipBigwin": "从左至右:中大奖点数(不可改)、显示信息、实际中奖、备注、权重(0~10000)。点数 5、30 权重固定 100%。本表单独立提交,仅提交大奖权重。",
"colId": "索引(id)",
"colDicePoints": "色子点数",
"colDisplayText": "显示文本",
"colDisplayTextEn": "显示文本(英文)",
"colRealEv": "真实结算",
"colTier": "所属档位",
"colRemark": "备注",
"placeholderTierSelect": "档位",
"placeholderDisplayZh": "显示文本(中文)",
"placeholderDisplayEn": "显示文本(英文)",
"placeholderRemark": "备注",
"btnSave": "保存",
"btnReset": "重置",
"colBigwinPoints": "中大奖点数",
"colDisplayInfo": "显示信息",
"colDisplayInfoEn": "显示信息(英文)",
"colRealPrize": "实际中奖",
"colWeightRange": "权重(0-10000)",
"placeholderDisplayInfoZh": "显示信息(中文)",
"placeholderDisplayInfoEn": "显示信息(英文)",
"weightFixedTip": "点数 5、30 固定 100%",
"emptyBigwin": "暂无 BIGWIN 档位配置,请在「奖励索引」中设置 tier 为 BIGWIN。",
"confirmCreateRefTitle": "创建奖励对照",
"confirmCreateRefMsg": "按规则创建奖励对照:起始索引 start_index=奖励配置中 grid_number 对应格位的 id顺时针 end_index=(start_index+摇取点数)%26逆时针 end_index=start_index-摇取点数≥0 则取该值,否则 26+start_index-摇取点数。先清空现有数据再为 5-30 共 26 个点数、顺/逆时针分别生成。是否继续?",
"confirmCreateRefOk": "确定创建",
"confirmCreateRefCancel": "取消",
"createRefSuccess": "已按 5-30 共 26 个点数、顺时针+逆时针创建:顺时针新增 {cwNew} 条、逆时针新增 {ccwNew} 条;顺时针更新 {cwUp} 条、逆时针更新 {ccwUp} 条{skippedPart}",
"createRefSuccessSkipped": "{n} 个点数使用兜底起始索引",
"createRefSuccessSimple": "创建成功",
"createRefFail": "创建奖励对照失败",
"loadIndexFail": "获取奖励索引配置失败",
"saveSuccess": "保存成功",
"saveFail": "保存失败",
"resetIndexReloaded": "已重新加载奖励索引,恢复为服务器最新数据",
"resetBigwinReloaded": "已重新加载,大奖权重恢复为服务器最新数据",
"warnNoIndexToSave": "暂无奖励索引数据可保存",
"warnGridRange": "色子点数必须在 {min}{max} 之间",
"dupJoiner": "、",
"warnDupGrid": "色子点数在本表内不能重复,重复的点数为:{list}",
"warnNoBigwinToSave": "暂无 BIGWIN 档位配置可保存",
"warnBigwinDupGrid": "大奖权重本表内点数不能重复,重复的点数为:{list}",
"infoNoBigwin": "暂无 BIGWIN 档位配置,请先在「奖励索引」中设置 tier 为 BIGWIN"
},
"weightRatio": {
"title": "T1-T5 权重配比(顺时针/逆时针)",
"globalTip": "权重来自奖励对照表dice_reward按结束索引DiceRewardConfig.id区分顺时针与逆时针两套权重抽奖时按当前方向取对应权重。",
"xAxisEndIndex": "结束索引",
"emptyTier": "该档位暂无配置数据",
"sumLine": "当前档位权重合计(顺时针):{cw};逆时针:{ccw}(各条 1-10000档位内按权重比抽取和不限制",
"t4t5Note": "T4、T5 档位抽中时仅有一个结果,无需配置权重。",
"colEndIndexId": "结束索引(id)",
"colDicePoints": "色子点数",
"colRealEv": "实际中奖金额",
"colUiText": "显示文本",
"colWeightCw": "顺时针权重(1-10000)",
"colWeightCcw": "逆时针权重(1-10000)",
"fetchFail": "获取权重配比数据失败",
"nothingToSubmit": "没有可提交的配置",
"submitFail": "保存失败",
"saveSuccess": "保存成功"
}, },
"search": { "search": {
"dicePoints": "色子点数(摇取5-30)", "dicePoints": "色子点数(摇取5-30)",
@@ -19,5 +86,34 @@
"realEv": "实际中奖金额", "realEv": "实际中奖金额",
"remark": "备注", "remark": "备注",
"weight": "权重(1-10000)" "weight": "权重(1-10000)"
},
"form": {
"titleAdd": "新增奖励配置",
"titleEdit": "编辑奖励配置",
"labelDicePoints": "色子点数",
"placeholderDicePoints": "请输入色子点数",
"labelUiText": "前端显示文本",
"placeholderUiText": "请输入前端显示文本(中文)",
"labelUiTextEn": "前端显示文本(英文)",
"placeholderUiTextEn": "请输入前端显示文本(英文)",
"labelRealEv": "真实资金结算",
"placeholderRealEv": "请输入真实资金结算",
"labelTier": "所属档位",
"placeholderTier": "请选择所属档位",
"tierBigWin": "BIGWIN超级大奖",
"labelBigWinWeight": "大奖权重",
"placeholderBigWinWeight": "0~1000010000=100%中奖",
"bigWinWeightDisabledTip": "点数 5、30 摇到必中大奖,权重固定 10000",
"bigWinWeightTip": "10000=100% 中奖0=0% 中奖;仅对点数 10/15/20/25 生效",
"labelRemark": "备注",
"placeholderRemark": "请输入备注",
"ruleDicePointsRequired": "色子点数必需填写",
"ruleUiTextRequired": "前端显示文本必需填写",
"ruleUiTextEnMax": "前端显示文本(英文)长度需小于 255 字符",
"ruleRealEvRequired": "真实资金结算必需填写",
"ruleTierRequired": "所属档位必需填写",
"ruleBigWinWeightRange": "大奖权重 0~10000",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -4,6 +4,8 @@
}, },
"table": { "table": {
"id": "ID", "id": "ID",
"clockwiseAbbr": "顺",
"counterclockwiseAbbr": "逆",
"status": "状态", "status": "状态",
"paidDraw": "付费抽取", "paidDraw": "付费抽取",
"freeDraw": "免费抽取", "freeDraw": "免费抽取",
@@ -14,5 +16,64 @@
"statusFail": "失败", "statusFail": "失败",
"statusDone": "完成", "statusDone": "完成",
"statusTesting": "测试中" "statusTesting": "测试中"
},
"form": {
"titleAdd": "新增奖励配置权重测试记录",
"titleEdit": "编辑奖励配置权重测试记录",
"labelTestCount": "测试次数100/500/1000",
"placeholderTestCount": "请输入测试次数100/500/1000",
"labelWeightSnapshot": "测试时权重配比快照:按档位保存 id,grid_number,tier,weight",
"placeholderWeightSnapshot": "请输入测试时权重配比快照:按档位保存 id,grid_number,tier,weight",
"labelResultCounts": "落点统计grid_number=>出现次数",
"placeholderResultCounts": "请输入落点统计grid_number=>出现次数",
"ruleTestCountRequired": "测试次数100/500/1000必需填写",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
},
"detail": {
"title": "测试记录详情",
"sectionBasic": "基本信息",
"recordId": "记录ID",
"testCount": "测试次数",
"testCountSuffix": "次",
"createTime": "创建时间",
"admin": "执行管理员",
"paidPoolId": "付费奖池配置ID",
"freePoolId": "免费奖池配置ID",
"bigwinSnapshot": "BIGWIN 权重快照",
"sectionPaidTier": "付费抽奖档位概率T1-T5测试时使用",
"sectionFreeTier": "免费抽奖档位概率T1-T5测试时使用",
"colTier": "档位",
"colWeight": "权重",
"colPercent": "占比",
"emptyPaidTier": "暂无付费档位数据(旧记录可能仅保存 tier_weights_snapshot",
"emptyFreeTier": "暂无免费档位数据",
"sectionSnapshot": "权重配比快照(测试时使用的 T1-T5/BIGWIN 配置)",
"subCw": "顺时针(非 BIGWIN",
"subCcw": "逆时针(非 BIGWIN",
"colGridNumber": "色子点数",
"emptyCw": "暂无顺时针数据",
"emptyCcw": "暂无逆时针数据",
"subBigwin": "BIGWIN按 DiceRewardConfig 配置快照)",
"emptyBigwinTable": "暂无 BIGWIN 数据",
"sectionResult": "落点统计(各 grid_number 出现次数)",
"chartXAxis": "色子点数 (grid_number)",
"emptyResult": "暂无落点数据",
"resultTotal": "总落点次数:{n}",
"btnImport": "导入到当前配置",
"importTitle": "导入到正式配置",
"importDesc": "将本测试记录导入DiceReward格子权重、DiceRewardConfigBIGWIN weight、DiceLotteryPoolConfig付费/免费 T1-T5 档位概率)。请选择要写入的奖池。",
"importPaidLabel": "导入付费档位概率到奖池",
"importPaidPlaceholder": "选择任意奖池(建议付费池)",
"importPaidTip": "不选则使用本记录保存时的付费奖池配置 ID",
"importFreeLabel": "导入免费档位概率到奖池",
"importFreePlaceholder": "选择任意奖池(建议免费池)",
"importFreeTip": "不选则使用本记录保存时的免费奖池配置 ID",
"btnConfirmImport": "确认导入",
"importSuccess": "导入成功,已刷新 DiceReward、DiceRewardConfig(BIGWIN)、奖池配置",
"importFail": "导入失败",
"dash": "—",
"dirCw": "顺时针",
"dirCcw": "逆时针"
} }
} }

View File

@@ -14,5 +14,13 @@
"fileType": "文件类型", "fileType": "文件类型",
"fileSize": "文件大小", "fileSize": "文件大小",
"uploadTime": "上传时间" "uploadTime": "上传时间"
},
"form": {
"titleAdd": "新增文件",
"titleEdit": "编辑文件",
"labelFileName": "文件名称",
"placeholderFileName": "请输入文件名称",
"ruleFileNameRequired": "请输入文件名称",
"editSuccess": "修改成功"
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"search": { "search": {
"deptName": "部门名称", "deptName": "渠道(部门)名称",
"deptCode": "部门编码", "deptCode": "部门编码",
"status": "状态", "status": "状态",
"placeholderDeptName": "请输入部门名称", "placeholderDeptName": "请输入部门名称",
@@ -8,11 +8,32 @@
"searchSelectPlaceholder": "请选择" "searchSelectPlaceholder": "请选择"
}, },
"table": { "table": {
"deptName": "部门名称", "deptName": "渠道(部门)名称",
"deptCode": "部门编码", "deptCode": "部门编码",
"leader": "部门领导", "leader": "部门领导",
"sort": "排序", "sort": "排序",
"status": "状态", "status": "状态",
"createTime": "创建时间" "createTime": "创建时间"
},
"form": {
"titleAdd": "新增部门",
"titleEdit": "编辑部门",
"labelParentDept": "上级部门",
"labelDeptName": "部门名称",
"labelDeptCode": "部门编码",
"labelLeader": "部门领导",
"labelRemark": "描述",
"labelSort": "排序",
"labelStatus": "启用",
"placeholderDeptName": "请输入部门名称",
"placeholderDeptCode": "请输入部门编码",
"placeholderRemark": "请输入部门描述",
"placeholderSort": "请输入排序",
"noParentDept": "无上级部门",
"ruleParentDeptRequired": "请选择上级部门",
"ruleDeptNameRequired": "请输入部门名称",
"ruleDeptCodeRequired": "请输入部门编码",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -17,5 +17,49 @@
"sort": "排序", "sort": "排序",
"status": "状态", "status": "状态",
"createTime": "创建时间" "createTime": "创建时间"
},
"form": {
"titleAdd": "新增菜单",
"titleEdit": "编辑菜单",
"labelMenuType": "菜单类型",
"labelParentMenu": "上级菜单",
"labelMenuName": "菜单名称",
"labelRoutePath": "路由地址",
"labelRoutePathTip": "一级菜单:以 / 开头的绝对路径(如 /dashboard 二级及以下:相对路径(如 console、user",
"placeholderRoutePath": "如:/dashboard 或 console",
"labelComponentName": "组件名称",
"placeholderComponentName": "如: User",
"labelComponentPath": "组件路径",
"labelComponentPathTip": "填写组件路径views目录下 目录菜单:留空",
"placeholderComponentPath": "如:/system/user 或留空",
"labelMenuIcon": "菜单图标",
"labelPermSlug": "权限标识",
"placeholderPermSlug": "请输入权限标识",
"labelLinkUrl": "外链地址",
"placeholderLinkUrl": "如https://saithink.top",
"labelSort": "排序",
"labelSortTip": "数字越大越靠前",
"placeholderSort": "请输入排序",
"labelStatus": "状态",
"labelStatusTip": "禁用后,该菜单项将不可用",
"labelIsIframe": "是否内嵌",
"labelIsIframeTip": "外链模式下有效",
"labelIsKeepAlive": "是否缓存",
"labelIsKeepAliveTip": "切换tabs不刷新",
"labelIsHidden": "是否隐藏",
"labelIsHiddenTip": "不在菜单栏显示,但是可以通过路由访问",
"labelIsFixedTab": "是否固定",
"labelIsFixedTabTip": "固定在tabs导航栏",
"labelIsFullPage": "是否全屏",
"labelIsFullPageTip": "不继承左侧菜单和顶部导航栏",
"noParentMenu": "无上级菜单",
"ruleParentMenuRequired": "请选择上级菜单",
"ruleMenuNameRequired": "请输入菜单名称",
"ruleRoutePathRequired": "请输入路由地址",
"ruleComponentNameRequired": "请输入组件名称",
"rulePermSlugRequired": "请输入权限标识",
"ruleLinkUrlRequired": "请输入外链地址",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -13,5 +13,22 @@
"sort": "排序", "sort": "排序",
"status": "状态", "status": "状态",
"createTime": "创建时间" "createTime": "创建时间"
},
"form": {
"titleAdd": "新增岗位",
"titleEdit": "编辑岗位",
"labelName": "岗位名称",
"labelCode": "岗位编码",
"labelRemark": "描述",
"labelSort": "排序",
"labelStatus": "启用",
"placeholderName": "请输入岗位名称",
"placeholderCode": "请输入岗位编码",
"placeholderRemark": "请输入岗位描述",
"placeholderSort": "请输入排序",
"ruleNameRequired": "请输入岗位名称",
"ruleCodeRequired": "请输入岗位编码",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -14,5 +14,25 @@
"roleRemark": "角色描述", "roleRemark": "角色描述",
"status": "状态", "status": "状态",
"createTime": "创建时间" "createTime": "创建时间"
},
"form": {
"titleAdd": "新增角色",
"titleEdit": "编辑角色",
"labelName": "角色名称",
"labelCode": "角色标识",
"labelLevel": "角色级别",
"levelTip": "控制角色的权限层级, 不能操作职级高于自己的角色",
"labelRemark": "描述",
"labelSort": "排序",
"labelStatus": "启用",
"placeholderName": "请输入角色名称",
"placeholderCode": "请输入角色编码",
"placeholderRemark": "请输入角色描述",
"placeholderSort": "请输入排序",
"ruleNameRequired": "请输入角色名称",
"ruleCodeRequired": "请输入角色编码",
"ruleLevelRequired": "请输入角色级别",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -17,5 +17,35 @@
"status": "状态", "status": "状态",
"createTime": "创建时间", "createTime": "创建时间",
"updateTime": "更新时间" "updateTime": "更新时间"
},
"form": {
"titleAdd": "新增用户",
"titleEdit": "编辑用户",
"labelAvatar": "头像",
"labelUsername": "用户名",
"labelRealname": "真实姓名",
"labelPassword": "密码",
"labelPasswordConfirm": "确认密码",
"labelEmail": "邮箱",
"labelPhone": "手机号",
"labelDept": "部门",
"labelRole": "角色",
"labelPost": "岗位",
"labelGender": "性别",
"labelStatus": "状态",
"labelRemark": "备注",
"placeholderEmail": "请输入邮箱",
"placeholderPhone": "请输入手机号",
"placeholderRemark": "请输入备注",
"rulePasswordNotMatch": "两次输入的密码不一致",
"ruleUsernameRequired": "请输入用户名",
"ruleUsernameLength": "长度在 2 到 20 个字符",
"rulePasswordRequired": "请输入密码",
"rulePasswordLength": "长度在 6 到 20 个字符",
"rulePasswordConfirmRequired": "请输入确认密码",
"ruleDeptRequired": "请选择部门",
"ruleRoleRequired": "请选择角色",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -17,5 +17,46 @@
"executeTime": "执行时间", "executeTime": "执行时间",
"parameter": "任务参数", "parameter": "任务参数",
"executeStatus": "执行状态" "executeStatus": "执行状态"
},
"form": {
"titleAdd": "新增定时任务",
"titleEdit": "编辑定时任务",
"labelName": "任务名称",
"labelType": "任务类型",
"labelTaskStyle": "定时规则",
"labelTarget": "调用目标",
"labelParams": "任务参数",
"labelStatus": "状态",
"labelRemark": "备注",
"placeholderName": "请输入任务名称",
"placeholderTarget": "请输入调用目标",
"placeholderParams": "请输入任务参数",
"placeholderRemark": "请输入备注",
"taskStyleEveryDay": "每天",
"taskStyleEveryHour": "每小时",
"taskStyleNHours": "N小时",
"taskStyleNMinutes": "N分钟",
"taskStyleNSeconds": "N秒",
"taskStyleEveryWeek": "每周",
"taskStyleEveryMonth": "每月",
"taskStyleEveryYear": "每年",
"weekMon": "周一",
"weekTue": "周二",
"weekWed": "周三",
"weekThu": "周四",
"weekFri": "周五",
"weekSat": "周六",
"weekSun": "周日",
"unitMonth": "月",
"unitDay": "日",
"unitHour": "时",
"unitMinute": "分",
"unitSecond": "秒",
"ruleNameRequired": "任务名称不能为空",
"ruleTypeRequired": "任务类型不能为空",
"ruleTaskStyleRequired": "定时规则不能为空",
"ruleTargetRequired": "调用目标不能为空",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
} }
} }

View File

@@ -27,6 +27,12 @@ function getModuleKey(locale: string, path: string): string {
let lastLoadedPath: string | null = null let lastLoadedPath: string | null = null
let lastLoadedLocale: string | null = null let lastLoadedLocale: string | null = null
/** 获取当前语言locale 可能是 string 或 Ref */
function getCurrentLocale(): string {
const loc = i18n.global.locale
return typeof loc === 'string' ? loc : (loc as { value: string }).value
}
/** /**
* 加载并合并页面翻译到 i18n 的 page 命名空间 * 加载并合并页面翻译到 i18n 的 page 命名空间
*/ */
@@ -36,15 +42,34 @@ export async function loadPageLocale(routePath: string): Promise<void> {
clearPageLocale() clearPageLocale()
return return
} }
const locale = i18n.global.locale.value const locale = getCurrentLocale()
const key = getModuleKey(locale, path)
const modules = locale === LanguageEnum.EN ? enModules : zhModules const modules = locale === LanguageEnum.EN ? enModules : zhModules
const loader = modules[key]
const tryPaths: string[] = [path]
// 兼容别名路由:例如 /user 实际页面为 /system/user
if (!path.includes('/')) {
tryPaths.push(`system/${path}`)
}
if (path === 'user') {
tryPaths.push('system/user')
}
let matchedPath: string | null = null
let loader: (() => Promise<PageLocaleModule>) | undefined
for (const p of tryPaths) {
const key = getModuleKey(locale, p)
const l = modules[key]
if (l) {
matchedPath = p
loader = l
break
}
}
if (!loader) { if (!loader) {
clearPageLocale() clearPageLocale()
return return
} }
if (lastLoadedPath === path && lastLoadedLocale === locale) { if (lastLoadedPath === matchedPath && lastLoadedLocale === locale) {
return return
} }
try { try {
@@ -52,7 +77,7 @@ export async function loadPageLocale(routePath: string): Promise<void> {
const message = mod?.default const message = mod?.default
if (message && typeof message === 'object') { if (message && typeof message === 'object') {
i18n.global.mergeLocaleMessage(locale, { page: message }) i18n.global.mergeLocaleMessage(locale, { page: message })
lastLoadedPath = path lastLoadedPath = matchedPath
lastLoadedLocale = locale lastLoadedLocale = locale
} }
} catch { } catch {
@@ -64,7 +89,7 @@ export async function loadPageLocale(routePath: string): Promise<void> {
* 清除 page 命名空间(进入无页面翻译的路由时调用) * 清除 page 命名空间(进入无页面翻译的路由时调用)
*/ */
export function clearPageLocale(): void { export function clearPageLocale(): void {
const locale = i18n.global.locale.value const locale = getCurrentLocale()
const messages = i18n.global.getLocaleMessage(locale) as Record<string, unknown> const messages = i18n.global.getLocaleMessage(locale) as Record<string, unknown>
if (messages && 'page' in messages) { if (messages && 'page' in messages) {
const next = { ...messages } const next = { ...messages }

View File

@@ -209,8 +209,23 @@ function handleLoginStatus(
userStore: ReturnType<typeof useUserStore>, userStore: ReturnType<typeof useUserStore>,
next: NavigationGuardNext next: NavigationGuardNext
): boolean { ): boolean {
// 已登录或访问登录页或静态路由,直接放行 // 已登录或访问登录页,直接放行
if (userStore.isLogin || to.path === RoutesAlias.Login || isStaticRoute(to.path)) { if (userStore.isLogin || to.path === RoutesAlias.Login) {
return true
}
// 未登录时访问根路径(首页),重定向到登录页
if (to.path === '/') {
userStore.logOut()
next({
name: 'Login',
query: { redirect: to.fullPath }
})
return false
}
// 其他静态路由(注册、忘记密码、错误页等)放行
if (isStaticRoute(to.path)) {
return true return true
} }

View File

@@ -16,11 +16,19 @@
import axios, { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios' import axios, { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import i18n from '@/locales'
import { ApiStatus } from './status' import { ApiStatus } from './status'
import { HttpError, handleError, showError, showSuccess } from './error' import { HttpError, handleError, showError, showSuccess } from './error'
import { $t } from '@/locales' import { $t } from '@/locales'
import { BaseResponse } from '@/types' import { BaseResponse } from '@/types'
/** 当前语言zh/en供请求头 lang 使用,无 header 时后端按后台语言回包 */
function getRequestLang(): string {
const locale = i18n.global.locale as string | { value: string }
const lang = typeof locale === 'string' ? locale : (locale && 'value' in locale ? locale.value : 'zh')
return lang === 'en' ? 'en' : 'zh'
}
/** 请求配置常量(超时时间 30s */ /** 请求配置常量(超时时间 30s */
const REQUEST_TIMEOUT = 30000 const REQUEST_TIMEOUT = 30000
const LOGOUT_DELAY = 500 const LOGOUT_DELAY = 500
@@ -66,6 +74,7 @@ axiosInstance.interceptors.request.use(
(request: InternalAxiosRequestConfig) => { (request: InternalAxiosRequestConfig) => {
const { accessToken } = useUserStore() const { accessToken } = useUserStore()
if (accessToken) request.headers.set('Authorization', `Bearer ` + accessToken) if (accessToken) request.headers.set('Authorization', `Bearer ` + accessToken)
request.headers.set('lang', getRequestLang())
if (request.data && !(request.data instanceof FormData) && !request.headers['Content-Type']) { if (request.data && !(request.data instanceof FormData) && !request.headers['Content-Type']) {
request.headers.set('Content-Type', 'application/json') request.headers.set('Content-Type', 'application/json')

View File

@@ -17,14 +17,13 @@ export default {
}, },
/** /**
* 获取 DiceLotteryPoolConfig 列表数据,含 id、name、type、t1_weightt5_weight用于一键测试权重档位类型下拉 * 获取 DiceLotteryPoolConfig 列表数据,含 id、name、t1_weightt5_weight用于一键测试权重档位类型下拉
* type0=付费抽奖券1=免费抽奖券;付费默认选 type=0免费默认选 type=1 * name 映射default=原 type=0killScore=原 type=1up=原 type=2
*/ */
async getOptions(): Promise< async getOptions(): Promise<
Array<{ Array<{
id: number id: number
name: string name: string
type: number
t1_weight: number t1_weight: number
t2_weight: number t2_weight: number
t3_weight: number t3_weight: number
@@ -40,7 +39,6 @@ export default {
return rows.map((r: any) => ({ return rows.map((r: any) => ({
id: Number(r.id), id: Number(r.id),
name: String(r.name ?? r.id ?? ''), name: String(r.name ?? r.id ?? ''),
type: Number(r.type ?? 0),
t1_weight: Number(r.t1_weight ?? 0), t1_weight: Number(r.t1_weight ?? 0),
t2_weight: Number(r.t2_weight ?? 0), t2_weight: Number(r.t2_weight ?? 0),
t3_weight: Number(r.t3_weight ?? 0), t3_weight: Number(r.t3_weight ?? 0),
@@ -104,6 +102,7 @@ export default {
id: number id: number
name: string name: string
safety_line: number safety_line: number
kill_enabled: number
t1_weight: number t1_weight: number
t2_weight: number t2_weight: number
t3_weight: number t3_weight: number
@@ -118,14 +117,7 @@ export default {
/** /**
* 更新当前彩金池:仅 safety_line、t1_weightt5_weight不可改 profit_amount * 更新当前彩金池:仅 safety_line、t1_weightt5_weight不可改 profit_amount
*/ */
updateCurrentPool(params: { updateCurrentPool(params: { safety_line?: number; kill_enabled?: number }) {
safety_line?: number
t1_weight?: number
t2_weight?: number
t3_weight?: number
t4_weight?: number
t5_weight?: number
}) {
return request.post<any>({ return request.post<any>({
url: '/core/dice/lottery_pool_config/DiceLotteryPoolConfig/updateCurrentPool', url: '/core/dice/lottery_pool_config/DiceLotteryPoolConfig/updateCurrentPool',
data: params data: params

View File

@@ -73,7 +73,7 @@
// 搜索表单 // 搜索表单
const searchForm = ref({ const searchForm = ref({
name: undefined, name: undefined,
type: undefined // type 字段已移除,改用 name 区分default/killScore/up
}) })
// 搜索处理 // 搜索处理
@@ -82,9 +82,14 @@
getData() getData()
} }
// 奖池类型展示:0=正常 1=强制杀猪 2=T1高倍率 // 奖池类型展示:按 name 映射
const typeFormatter = (row: Record<string, unknown>) => const typeFormatter = (row: Record<string, unknown>) => {
row.type === 0 ? t('page.search.poolTypeNormal') : row.type === 1 ? t('page.search.poolTypeKill') : row.type === 2 ? t('page.search.poolTypeT1') : '-' const n = String(row.name ?? '')
if (n === 'default') return t('page.search.poolTypeNormal')
if (n === 'killScore') return t('page.search.poolTypeKill')
if (n === 'up') return t('page.search.poolTypeT1')
return n || '-'
}
// 权重列带 % // 权重列带 %
const weightFormatter = (prop: string) => (row: Record<string, unknown>) => { const weightFormatter = (prop: string) => (row: Record<string, unknown>) => {
@@ -111,7 +116,7 @@
apiFn: api.list, apiFn: api.list,
columnsFactory: () => [ columnsFactory: () => [
{ prop: 'name', label: 'page.table.name', align: 'center' }, { prop: 'name', label: 'page.table.name', align: 'center' },
{ prop: 'type', label: 'page.table.poolType', width: 100, align: 'center', formatter: typeFormatter }, { prop: 'name', label: 'page.table.poolType', width: 100, align: 'center', formatter: typeFormatter },
{ prop: 'safety_line', label: 'page.table.safetyLine', align: 'center' }, { prop: 'safety_line', label: 'page.table.safetyLine', align: 'center' },
{ {
prop: 't1_weight', prop: 't1_weight',

View File

@@ -42,6 +42,9 @@
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item label="开启杀分">
<el-switch v-model="formData.kill_enabled" :active-value="1" :inactive-value="0" />
</el-form-item>
<el-form-item :label="$t('page.form.killScoreWeights')"> <el-form-item :label="$t('page.form.killScoreWeights')">
<div class="text-gray-500 text-sm"> <div class="text-gray-500 text-sm">
T1: {{ pool.t1_weight }}% / T2: {{ pool.t2_weight }}% / T3: {{ pool.t3_weight }}% / T4: {{ pool.t4_weight }}% / T5: {{ pool.t5_weight }}% T1: {{ pool.t1_weight }}% / T2: {{ pool.t2_weight }}% / T3: {{ pool.t3_weight }}% / T4: {{ pool.t4_weight }}% / T5: {{ pool.t5_weight }}%
@@ -49,20 +52,28 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="text-gray-500 text-sm"> <div class="text-gray-500 text-sm">
{{ $t('page.form.weightsSumHint') }}<span :class="weightsSum !== 100 ? 'text-red-500' : ''">{{ {{ $t('page.form.killWeightNote') }}
weightsSum
}}</span
>{{ $t('page.form.weightsSumUnitCurrent') }} {{ $t('page.form.killWeightNote') }}
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
<template #footer> <template #footer>
<el-button @click="handleClose">{{ $t('form.close') }}</el-button> <el-button @click="handleClose">{{ $t('form.close') }}</el-button>
<el-button :loading="resetting" :disabled="!pool" @click="handleResetProfit"> <el-button
v-permission="'dice:lottery_pool_config:index:resetProfitAmount'"
:loading="resetting"
:disabled="!pool"
@click="handleResetProfit"
>
{{ $t('page.form.btnResetProfit') }} {{ $t('page.form.btnResetProfit') }}
</el-button> </el-button>
<el-button type="primary" :loading="saving" :disabled="!pool" @click="handleSubmit"> <el-button
v-permission="'dice:lottery_pool_config:index:updateCurrentPool'"
type="primary"
:loading="saving"
:disabled="!pool"
@click="handleSubmit"
>
{{ $t('page.form.btnSaveSafetyLine') }} {{ $t('page.form.btnSaveSafetyLine') }}
</el-button> </el-button>
</template> </template>
@@ -81,6 +92,7 @@
id: number id: number
name: string name: string
safety_line: number safety_line: number
kill_enabled: number
t1_weight: number t1_weight: number
t2_weight: number t2_weight: number
t3_weight: number t3_weight: number
@@ -104,7 +116,8 @@
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
const formData = reactive({ const formData = reactive({
safety_line: 0 safety_line: 0,
kill_enabled: 1
}) })
const rules = computed<FormRules>(() => ({ const rules = computed<FormRules>(() => ({
@@ -143,6 +156,7 @@
if (data && typeof data === 'object') { if (data && typeof data === 'object') {
pool.value = data pool.value = data
formData.safety_line = data.safety_line ?? 0 formData.safety_line = data.safety_line ?? 0
formData.kill_enabled = (data.kill_enabled ?? 1) === 1 ? 1 : 0
} }
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message ?? t('page.form.msgGetPoolFailed')) ElMessage.error(e?.message ?? t('page.form.msgGetPoolFailed'))
@@ -180,7 +194,8 @@
await formRef.value?.validate?.() await formRef.value?.validate?.()
saving.value = true saving.value = true
await api.updateCurrentPool({ await api.updateCurrentPool({
safety_line: formData.safety_line safety_line: formData.safety_line,
kill_enabled: formData.kill_enabled
}) })
ElMessage.success(t('page.form.msgSaveSuccess')) ElMessage.success(t('page.form.msgSaveSuccess'))
await loadPool() await loadPool()

View File

@@ -25,19 +25,7 @@
show-word-limit show-word-limit
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.form.poolType')" prop="type"> <!-- dice_lottery_pool_config 已移除 type 字段 name 区分 default/killScore/upname -->
<el-select
v-model="formData.type"
:placeholder="$t('page.form.placeholderPoolType')"
clearable
style="width: 100%"
:disabled="dialogType === 'edit'"
>
<el-option :label="$t('page.form.poolTypeNormal')" :value="0" />
<el-option :label="$t('page.form.poolTypeKill')" :value="1" />
<el-option :label="$t('page.form.poolTypeT1')" :value="2" />
</el-select>
</el-form-item>
<el-form-item :label="$t('page.form.safetyLine')" prop="safety_line"> <el-form-item :label="$t('page.form.safetyLine')" prop="safety_line">
<el-input-number <el-input-number
v-model="formData.safety_line" v-model="formData.safety_line"
@@ -127,7 +115,6 @@
*/ */
const rules = computed<FormRules>(() => ({ const rules = computed<FormRules>(() => ({
name: [{ required: true, message: t('page.form.ruleNameRequired'), trigger: 'blur' }], name: [{ required: true, message: t('page.form.ruleNameRequired'), trigger: 'blur' }],
type: [{ required: true, message: t('page.form.rulePoolTypeRequired'), trigger: 'change' }],
t1_weight: [{ required: true, message: t('page.form.ruleT1Required'), trigger: 'blur' }], t1_weight: [{ required: true, message: t('page.form.ruleT1Required'), trigger: 'blur' }],
t2_weight: [{ required: true, message: t('page.form.ruleT2Required'), trigger: 'blur' }], t2_weight: [{ required: true, message: t('page.form.ruleT2Required'), trigger: 'blur' }],
t3_weight: [{ required: true, message: t('page.form.ruleT3Required'), trigger: 'blur' }], t3_weight: [{ required: true, message: t('page.form.ruleT3Required'), trigger: 'blur' }],
@@ -142,7 +129,6 @@
id: null as number | null, id: null as number | null,
name: '', name: '',
remark: '', remark: '',
type: null as number | null,
safety_line: 0 as number, safety_line: 0 as number,
t1_weight: 0 as number, t1_weight: 0 as number,
t2_weight: 0 as number, t2_weight: 0 as number,
@@ -188,7 +174,6 @@
if (!props.data) return if (!props.data) return
const numKeys = [ const numKeys = [
'id', 'id',
'type',
'safety_line', 'safety_line',
't1_weight', 't1_weight',
't2_weight', 't2_weight',

View File

@@ -13,16 +13,7 @@
<el-input v-model="formData.name" :placeholder="$t('page.search.placeholderName')" clearable /> <el-input v-model="formData.name" :placeholder="$t('page.search.placeholderName')" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-bind="setSpan(6)"> <!-- dice_lottery_pool_config 已移除 type 字段 name 区分 default/killScore/up -->
<el-form-item :label="$t('page.search.poolType')" prop="type">
<el-select
v-model="formData.type"
:options="typeOptions"
:placeholder="$t('page.search.placeholderPoolType')"
clearable
/>
</el-form-item>
</el-col>
</sa-search-bar> </sa-search-bar>
</template> </template>
@@ -42,11 +33,7 @@
const isExpanded = ref<boolean>(false) const isExpanded = ref<boolean>(false)
const { t } = useI18n() const { t } = useI18n()
const typeOptions = computed(() => [ // type 字段已移除
{ name: '0', value: t('page.search.poolTypeNormal') },
{ name: '1', value: t('page.search.poolTypeKill') },
{ name: '2', value: t('page.search.poolTypeT1') }
])
// 表单数据双向绑定 // 表单数据双向绑定
const searchBarRef = ref() const searchBarRef = ref()
const formData = computed({ const formData = computed({

View File

@@ -7,6 +7,9 @@
<!-- 表格头部 --> <!-- 表格头部 -->
<ArtTableHeader v-model:columns="columnChecks" :loading="loading" @refresh="refreshData"> <ArtTableHeader v-model:columns="columnChecks" :loading="loading" @refresh="refreshData">
<template #left> <template #left>
<span v-if="totalWinCoin !== null" class="table-summary-inline">
{{ $t('page.toolbar.platformTotalProfit') }}<strong>{{ totalWinCoin }}</strong>
</span>
<!-- <ElSpace wrap>--> <!-- <ElSpace wrap>-->
<!-- <ElButton--> <!-- <ElButton-->
<!-- v-permission="'dice:play_record:index:save'"--> <!-- v-permission="'dice:play_record:index:save'"-->
@@ -126,6 +129,15 @@
direction: undefined direction: undefined
}) })
/** 当前筛选下平台总盈利付费抽奖次数×100 - 玩家总收益) */
const totalWinCoin = ref<number | null>(null)
const listApi = async (params: Record<string, any>) => {
const res = await api.list(params)
totalWinCoin.value = (res as any)?.total_win_coin ?? null
return res
}
// 搜索处理 // 搜索处理
const handleSearch = (params: Record<string, any>) => { const handleSearch = (params: Record<string, any>) => {
Object.assign(searchParams, params) Object.assign(searchParams, params)
@@ -170,7 +182,8 @@
refreshData refreshData
} = useTable({ } = useTable({
core: { core: {
apiFn: api.list, apiFn: listApi,
apiParams: { limit: 100 },
columnsFactory: () => [ columnsFactory: () => [
// { type: 'selection' }, // { type: 'selection' },
{ prop: 'id', label: 'page.table.id', width: 80 }, { prop: 'id', label: 'page.table.id', width: 80 },
@@ -219,3 +232,15 @@
// selectedRows // selectedRows
} = useSaiAdmin() } = useSaiAdmin()
</script> </script>
<style scoped>
.table-summary-inline {
margin-right: 12px;
font-size: 14px;
color: var(--el-text-color-regular);
white-space: nowrap;
}
.table-summary-inline strong {
color: var(--el-color-danger);
}
</style>

View File

@@ -184,9 +184,12 @@
<script setup lang="ts"> <script setup lang="ts">
import api from '../../../api/play_record/index' import api from '../../../api/play_record/index'
import { useI18n } from 'vue-i18n'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
const { t } = useI18n()
interface Props { interface Props {
modelValue: boolean modelValue: boolean
dialogType: string dialogType: string
@@ -399,15 +402,15 @@
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
delete payload.id delete payload.id
await api.save(payload) await api.save(payload)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(payload) await api.update(payload)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()
} catch (error: any) { } catch (error: any) {
let msg = '表单验证失败,请检查必填项与格式' let msg = t('page.form.validateFailed')
if (error?.message) { if (error?.message) {
msg = error.message msg = error.message
} else if (typeof error === 'string') { } else if (typeof error === 'string') {

View File

@@ -23,7 +23,7 @@
{{ $t('table.actions.delete') }} {{ $t('table.actions.delete') }}
</ElButton> </ElButton>
<ElButton <ElButton
v-permission="'dice:play_record_test:index:destroy'" v-permission="'dice:play_record_test:index:clearAll'"
type="danger" type="danger"
plain plain
@click="handleClearAll" @click="handleClearAll"

View File

@@ -1,52 +1,52 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增玩家抽奖记录(测试数据)' : '编辑玩家抽奖记录(测试数据)'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="600px" width="600px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="彩金池配置id" prop="lottery_config_id"> <el-form-item :label="$t('page.form.labelLotteryConfigId')" prop="lottery_config_id">
<el-input v-model="formData.lottery_config_id" placeholder="请输入彩金池配置id" /> <el-input v-model="formData.lottery_config_id" :placeholder="$t('page.form.placeholderLotteryConfigId')" />
</el-form-item> </el-form-item>
<el-form-item label="抽奖类型" prop="lottery_type"> <el-form-item :label="$t('page.form.drawType')" prop="lottery_type">
<el-select <el-select
v-model="formData.lottery_type" v-model="formData.lottery_type"
placeholder="请选择" :placeholder="$t('form.placeholderSelect')"
clearable clearable
style="width: 100%" style="width: 100%"
> >
<el-option label="付费" :value="0" /> <el-option :label="$t('page.search.paid')" :value="0" />
<el-option label="赠送" :value="1" /> <el-option :label="$t('page.search.free')" :value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="方向" prop="direction"> <el-form-item :label="$t('page.search.direction')" prop="direction">
<el-select v-model="formData.direction" placeholder="请选择" clearable style="width: 100%"> <el-select v-model="formData.direction" :placeholder="$t('form.placeholderSelect')" clearable style="width: 100%">
<el-option label="顺时针" :value="0" /> <el-option :label="$t('page.search.clockwise')" :value="0" />
<el-option label="逆时针" :value="1" /> <el-option :label="$t('page.search.anticlockwise')" :value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否中大奖" prop="is_win"> <el-form-item :label="$t('page.search.isBigWin')" prop="is_win">
<el-select v-model="formData.is_win" placeholder="请选择" clearable style="width: 100%"> <el-select v-model="formData.is_win" :placeholder="$t('form.placeholderSelect')" clearable style="width: 100%">
<el-option label="" :value="0" /> <el-option :label="$t('page.search.noBigWin')" :value="0" />
<el-option label="中大奖" :value="1" /> <el-option :label="$t('page.search.bigWin')" :value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="赢取平台币" prop="win_coin"> <el-form-item :label="$t('page.search.winCoin')" prop="win_coin">
<el-input-number <el-input-number
v-model="formData.win_coin" v-model="formData.win_coin"
placeholder="赢取平台币" :placeholder="$t('page.form.placeholderWinCoin')"
:precision="2" :precision="2"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%"
/> />
</el-form-item> </el-form-item>
<el-form-item label="中奖档位" prop="reward_tier"> <el-form-item :label="$t('page.search.rewardTier')" prop="reward_tier">
<el-select <el-select
v-model="formData.reward_tier" v-model="formData.reward_tier"
placeholder="请选择档位(选后自动带出奖励配置ID)" :placeholder="$t('page.form.placeholderRewardTier')"
clearable clearable
style="width: 100%" style="width: 100%"
@change="onRewardTierChange" @change="onRewardTierChange"
@@ -58,40 +58,40 @@
<el-option label="T5" value="T5" /> <el-option label="T5" value="T5" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="奖励配置id" prop="reward_config_id"> <el-form-item :label="$t('page.form.rewardConfigId')" prop="reward_config_id">
<el-input <el-input
v-model="formData.reward_config_id" v-model="formData.reward_config_id"
placeholder="可选中奖档位自动带出或手动输入" :placeholder="$t('page.form.placeholderRewardConfigId')"
/> />
</el-form-item> </el-form-item>
<el-form-item label="起始索引" prop="start_index"> <el-form-item :label="$t('page.table.startIndex')" prop="start_index">
<el-input v-model="formData.start_index" placeholder="请输入起始索引" /> <el-input v-model="formData.start_index" :placeholder="$t('page.form.placeholderStartIndex')" />
</el-form-item> </el-form-item>
<el-form-item label="结束索引" prop="target_index"> <el-form-item :label="$t('page.form.labelTargetIndex')" prop="target_index">
<el-input v-model="formData.target_index" placeholder="请输入结束索引" /> <el-input v-model="formData.target_index" :placeholder="$t('page.form.placeholderTargetIndex')" />
</el-form-item> </el-form-item>
<el-form-item label="摇取点数和" prop="roll_number"> <el-form-item :label="$t('page.search.rollNumber')" prop="roll_number">
<el-input v-model="formData.roll_number" placeholder="请输入摇取点数和" /> <el-input v-model="formData.roll_number" :placeholder="$t('page.form.placeholderRollNumber')" />
</el-form-item> </el-form-item>
<el-form-item label="摇取点数:[1,2,3,4,5,6]" prop="roll_array"> <el-form-item :label="$t('page.form.labelRollArray')" prop="roll_array">
<el-input v-model="formData.roll_array" placeholder="请输入摇取点数:[1,2,3,4,5,6]" /> <el-input v-model="formData.roll_array" :placeholder="$t('page.form.placeholderRollArray')" />
</el-form-item> </el-form-item>
<el-form-item label="状态:0=失败,1=成功" prop="status"> <el-form-item :label="$t('page.form.labelStatus')" prop="status">
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
<el-form-item label="中大奖平台币" prop="super_win_coin"> <el-form-item :label="$t('page.table.superWinCoin')" prop="super_win_coin">
<el-input v-model="formData.super_win_coin" placeholder="请输入中大奖平台币" /> <el-input v-model="formData.super_win_coin" :placeholder="$t('page.form.placeholderSuperWinCoin')" />
</el-form-item> </el-form-item>
<el-form-item label="摇色子中奖平台币" prop="reward_win_coin"> <el-form-item :label="$t('page.table.rewardWinCoin')" prop="reward_win_coin">
<el-input v-model="formData.reward_win_coin" placeholder="请输入摇色子中奖平台币" /> <el-input v-model="formData.reward_win_coin" :placeholder="$t('page.form.placeholderRewardWinCoin')" />
</el-form-item> </el-form-item>
<el-form-item label="所属管理员" prop="admin_id"> <el-form-item :label="$t('page.form.labelAdminId')" prop="admin_id">
<el-input v-model="formData.admin_id" placeholder="请输入所属管理员" /> <el-input v-model="formData.admin_id" :placeholder="$t('page.form.placeholderAdminId')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -101,6 +101,7 @@
import rewardConfigApi from '../../../api/reward_config/index' import rewardConfigApi from '../../../api/reward_config/index'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -120,6 +121,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -134,14 +136,14 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
lottery_config_id: [{ required: true, message: '彩金池配置id必需填写', trigger: 'blur' }], lottery_config_id: [{ required: true, message: t('page.form.ruleLotteryConfigIdRequired'), trigger: 'blur' }],
lottery_type: [{ required: true, message: '抽奖类型:0=付费,1=赠送必需填写', trigger: 'blur' }], lottery_type: [{ required: true, message: t('page.form.ruleDrawTypeRequired'), trigger: 'blur' }],
is_win: [{ required: true, message: '中大奖:0=无,1=中奖必需填写', trigger: 'blur' }], is_win: [{ required: true, message: t('page.form.ruleIsBigWinRequired'), trigger: 'blur' }],
direction: [{ required: true, message: '方向:0=顺时针,1=逆时针必需填写', trigger: 'blur' }], direction: [{ required: true, message: t('page.form.ruleDirectionRequired'), trigger: 'blur' }],
reward_config_id: [{ required: true, message: '奖励配置id必需填写', trigger: 'blur' }], reward_config_id: [{ required: true, message: t('page.form.ruleRewardConfigIdRequired'), trigger: 'blur' }],
status: [{ required: true, message: '状态:0=失败,1=成功必需填写', trigger: 'blur' }] status: [{ required: true, message: t('page.form.ruleStatusRequired'), trigger: 'blur' }]
}) }))
/** /**
* 初始数据 * 初始数据
@@ -256,10 +258,10 @@
delete (payload as Record<string, unknown>).reward_tier delete (payload as Record<string, unknown>).reward_tier
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(payload) await api.save(payload)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(payload) await api.update(payload)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -89,7 +89,7 @@
</div> </div>
<div class="config-row"> <div class="config-row">
<span class="config-label">{{ $t('page.form.configLabelType') }}</span> <span class="config-label">{{ $t('page.form.configLabelType') }}</span>
<span>{{ lotteryConfigTypeText(currentLotteryConfig.type) }}</span> <span>{{ lotteryConfigTypeText(currentLotteryConfig.name) }}</span>
</div> </div>
<div class="config-row"> <div class="config-row">
<span class="config-label">{{ $t('page.form.configLabelWeights') }}</span> <span class="config-label">{{ $t('page.form.configLabelWeights') }}</span>
@@ -171,9 +171,11 @@
<script setup lang="ts"> <script setup lang="ts">
import api from '../../../api/player/index' import api from '../../../api/player/index'
import lotteryConfigApi from '../../../api/lottery_pool_config/index' import lotteryConfigApi from '../../../api/lottery_pool_config/index'
import { useI18n } from 'vue-i18n'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
const { t } = useI18n()
const WEIGHT_FIELDS = ['t1_weight', 't2_weight', 't3_weight', 't4_weight', 't5_weight'] as const const WEIGHT_FIELDS = ['t1_weight', 't2_weight', 't3_weight', 't4_weight', 't5_weight'] as const
interface Props { interface Props {
@@ -265,11 +267,12 @@
/** 当前选中的 DiceLotteryConfig 完整数据(用于展示) */ /** 当前选中的 DiceLotteryConfig 完整数据(用于展示) */
const currentLotteryConfig = ref<Record<string, any> | null>(null) const currentLotteryConfig = ref<Record<string, any> | null>(null)
function lotteryConfigTypeText(type: unknown): string { function lotteryConfigTypeText(name: unknown): string {
const t = Number(type) const n = String(name ?? '')
if (t === 0) return '付费' if (n === 'default') return '默认'
if (t === 1) return '赠送' if (n === 'killScore') return '杀分'
return t ? `类型${t}` : '-' if (n === 'up') return '上分'
return n || '-'
} }
/** 是否为空/自定义权重(未选彩金池或选 0 */ /** 是否为空/自定义权重(未选彩金池或选 0 */
@@ -415,7 +418,7 @@
await formRef.value.validate() await formRef.value.validate()
const useCustomWeights = isLotteryConfigEmpty() const useCustomWeights = isLotteryConfigEmpty()
if (useCustomWeights && Math.abs(weightsSum.value - 100) > 0.01) { if (useCustomWeights && Math.abs(weightsSum.value - 100) > 0.01) {
ElMessage.warning('五个池权重总和必须为100%') ElMessage.warning(t('page.form.ruleWeightsSumMustBe100'))
return return
} }
const payload = { ...formData } const payload = { ...formData }
@@ -427,10 +430,10 @@
} }
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(payload) await api.save(payload)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(payload) await api.update(payload)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -122,6 +122,7 @@
} = useTable({ } = useTable({
core: { core: {
apiFn: api.list, apiFn: api.list,
apiParams: { limit: 100 },
columnsFactory: () => { columnsFactory: () => {
const usernameFormatter = (row: Record<string, any>) => const usernameFormatter = (row: Record<string, any>) =>
row?.dicePlayer?.username ?? row?.player_id ?? '-' row?.dicePlayer?.username ?? row?.player_id ?? '-'

View File

@@ -81,9 +81,12 @@
<script setup lang="ts"> <script setup lang="ts">
import api from '../../../api/player_ticket_record/index' import api from '../../../api/player_ticket_record/index'
import { useI18n } from 'vue-i18n'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
const { t } = useI18n()
interface Props { interface Props {
modelValue: boolean modelValue: boolean
dialogType: string dialogType: string
@@ -230,10 +233,10 @@
const rest = { ...formData } as Record<string, unknown> const rest = { ...formData } as Record<string, unknown>
delete rest.id delete rest.id
await api.save(rest) await api.save(rest)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -163,6 +163,7 @@
} = useTable({ } = useTable({
core: { core: {
apiFn: api.list, apiFn: api.list,
apiParams: { limit: 100 },
columnsFactory: () => [ columnsFactory: () => [
{ type: 'selection', align: 'center' }, { type: 'selection', align: 'center' },
{ prop: 'id', label: 'page.table.id', width: 80, align: 'center' }, { prop: 'id', label: 'page.table.id', width: 80, align: 'center' },

View File

@@ -90,9 +90,12 @@
<script setup lang="ts"> <script setup lang="ts">
import api from '../../../api/player_wallet_record/index' import api from '../../../api/player_wallet_record/index'
import { useI18n } from 'vue-i18n'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
const { t } = useI18n()
interface Props { interface Props {
modelValue: boolean modelValue: boolean
dialogType: string dialogType: string
@@ -225,10 +228,10 @@
const payload = { ...formData } const payload = { ...formData }
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(payload) await api.save(payload)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(payload) await api.update(payload)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -14,7 +14,7 @@
<template #left> <template #left>
<ElSpace wrap> <ElSpace wrap>
<ElButton <ElButton
v-permission="'dice:reward:index:update'" v-permission="'dice:reward:index:batchUpdateWeights'"
type="primary" type="primary"
@click="weightRatioVisible = true" @click="weightRatioVisible = true"
v-ripple v-ripple
@@ -22,7 +22,7 @@
{{ $t('page.toolbar.weightRatio') }} {{ $t('page.toolbar.weightRatio') }}
</ElButton> </ElButton>
<ElButton <ElButton
v-permission="'dice:reward:index:index'" v-permission="'dice:reward:index:startWeightTest'"
@click="weightTestVisible = true" @click="weightTestVisible = true"
v-ripple v-ripple
> >

View File

@@ -15,7 +15,7 @@
<el-option label="T3" value="T3" /> <el-option label="T3" value="T3" />
<el-option label="T4" value="T4" /> <el-option label="T4" value="T4" />
<el-option label="T5" value="T5" /> <el-option label="T5" value="T5" />
<el-option label="BIGWIN" value="BIGWIN" /> <el-option :label="$t('page.search.optionBigwin')" value="BIGWIN" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

View File

@@ -1,32 +1,30 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
title="奖励对照表dice_reward权重配比" :title="$t('page.weightEdit.title')"
width="900px" width="900px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<div class="global-tip"> <div class="global-tip">
编辑的是<strong>奖励对照表dice_reward / DiceReward 模型</strong {{ $t('page.weightEdit.globalTip') }}
>的权重<strong>结束索引end_index</strong>区分
<strong>顺时针</strong><strong>逆时针</strong>两套权重抽奖时按当前方向取对应权重
</div> </div>
<div v-loading="loading" class="dialog-body"> <div v-loading="loading" class="dialog-body">
<el-tabs v-model="activeTier" type="card"> <el-tabs v-model="activeTier" type="card">
<el-tab-pane v-for="t in tierKeys" :key="t" :label="t" :name="t"> <el-tab-pane v-for="t in tierKeys" :key="t" :label="t" :name="t">
<div v-if="getTierItems(t).length === 0" class="empty-tip">该档位暂无配置数据</div> <div v-if="getTierItems(t).length === 0" class="empty-tip">{{ $t('page.weightShared.emptyTier') }}</div>
<template v-else> <template v-else>
<div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'"> <div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'">
<div class="chart-row"> <div class="chart-row">
<ArtBarChart <ArtBarChart
x-axis-name="结束索引" :x-axis-name="$t('page.weightShared.xAxisEndIndex')"
:x-axis-data="getTierChartLabels(t)" :x-axis-data="getTierChartLabels(t)"
:data="getTierChartData(t, 'clockwise')" :data="getTierChartData(t, 'clockwise')"
height="180px" height="180px"
/> />
<ArtBarChart <ArtBarChart
x-axis-name="结束索引" :x-axis-name="$t('page.weightShared.xAxisEndIndex')"
:x-axis-data="getTierChartLabels(t)" :x-axis-data="getTierChartLabels(t)"
:data="getTierChartData(t, 'counterclockwise')" :data="getTierChartData(t, 'counterclockwise')"
height="180px" height="180px"
@@ -34,42 +32,50 @@
</div> </div>
</div> </div>
<div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'"> <div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'">
当前档位权重合计顺时针<strong>{{ getTierSum(t, 'clockwise') }}</strong> {{
逆时针<strong>{{ getTierSum(t, 'counterclockwise') }}</strong> $t('page.weightShared.sumLineDual', {
各条 1-10000和不限制 cw: getTierSum(t, 'clockwise'),
ccw: getTierSum(t, 'counterclockwise')
})
}}
</div> </div>
<div class="weight-sum weight-sum-t4t5" v-else>T4T5 仅单一结果无需配置权重</div> <div class="weight-sum weight-sum-t4t5" v-else>{{ $t('page.weightShared.t4t5NoteSingle') }}</div>
<el-table :data="getTierItems(t)" border size="small" class="weight-table"> <el-table :data="getTierItems(t)" border size="small" class="weight-table">
<el-table-column <el-table-column
label="结束索引(id)" :label="$t('page.weightShared.colEndIndexId')"
prop="id" prop="id"
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="色子点数" prop="grid_number" width="80" align="center" />
<el-table-column <el-table-column
label="实际中奖金额" :label="$t('page.weightShared.colDicePoints')"
prop="grid_number"
width="80"
align="center"
/>
<el-table-column
:label="$t('page.weightShared.colRealEv')"
prop="real_ev" prop="real_ev"
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="显示文本" :label="$t('page.weightShared.colUiText')"
prop="ui_text" prop="ui_text"
min-width="70" min-width="70"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="备注" :label="$t('page.weightShared.colRemark')"
prop="remark" prop="remark"
min-width="70" min-width="70"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="顺时针权重(direction=0)" min-width="160" align="center"> <el-table-column :label="$t('page.weightShared.colWeightCwDir')" min-width="160" align="center">
<template #default="{ row }"> <template #default="{ row }">
<div class="weight-cell-vertical"> <div class="weight-cell-vertical">
<div class="weight-slider-wrap"> <div class="weight-slider-wrap">
@@ -146,7 +152,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="逆时针权重(direction=1)" min-width="160" align="center"> <el-table-column :label="$t('page.weightShared.colWeightCcwDir')" min-width="160" align="center">
<template #default="{ row }"> <template #default="{ row }">
<div class="weight-cell-vertical"> <div class="weight-cell-vertical">
<div class="weight-slider-wrap"> <div class="weight-slider-wrap">
@@ -232,8 +238,10 @@
</el-tabs> </el-tabs>
</div> </div>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('page.weightShared.btnCancel') }}</el-button>
<el-button type="primary" :loading="submitting" @click="handleSubmit">提交</el-button> <el-button type="primary" :loading="submitting" @click="handleSubmit">{{
$t('page.weightShared.btnSubmit')
}}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -242,6 +250,9 @@
import api from '../../../api/reward/index' import api from '../../../api/reward/index'
import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue' import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const TIER_KEYS = ['T1', 'T2', 'T3', 'T4', 'T5'] as const const TIER_KEYS = ['T1', 'T2', 'T3', 'T4', 'T5'] as const
/** 供模板 v-for 使用 */ /** 供模板 v-for 使用 */
@@ -430,7 +441,7 @@
grouped.value = parsePayload(res) grouped.value = parsePayload(res)
}) })
.catch(() => { .catch(() => {
ElMessage.error('获取权重数据失败') ElMessage.error(t('page.weightShared.fetchFail'))
}) })
.finally(() => { .finally(() => {
loading.value = false loading.value = false
@@ -456,19 +467,19 @@
function handleSubmit() { function handleSubmit() {
const items = collectItems() const items = collectItems()
if (items.length === 0) { if (items.length === 0) {
ElMessage.info('没有可提交的配置') ElMessage.info(t('page.weightShared.nothingToSubmit'))
return return
} }
submitting.value = true submitting.value = true
api api
.batchUpdateWeights(items) .batchUpdateWeights(items)
.then(() => { .then(() => {
ElMessage.success('保存成功') ElMessage.success(t('page.weightShared.saveSuccess'))
emit('success') emit('success')
handleClose() handleClose()
}) })
.catch((e: { message?: string }) => { .catch((e: { message?: string }) => {
ElMessage.error(e?.message ?? '保存失败') ElMessage.error(e?.message ?? t('page.weightShared.submitFail'))
}) })
.finally(() => { .finally(() => {
submitting.value = false submitting.value = false

View File

@@ -1,78 +1,76 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
title="权重配比" :title="$t('page.weightRatio.title')"
width="900px" width="900px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<div class="global-tip"> <div class="global-tip">
配置<strong>奖励对照表dice_reward</strong>的权重一级按<strong>方向</strong>顺时针/逆时针二级按<strong>档位</strong>T1-T5各条权重 {{ $t('page.weightRatio.globalTip') }}
1-10000档位内按权重比抽取
</div> </div>
<div v-loading="loading" class="dialog-body"> <div v-loading="loading" class="dialog-body">
<!-- 一级方向懒加载避免逆时针柱状图在隐藏容器内初始化导致不显示二级档位 --> <!-- 一级方向懒加载避免逆时针柱状图在隐藏容器内初始化导致不显示二级档位 -->
<el-tabs v-model="activeDirection" type="card" class="direction-tabs" :lazy="true"> <el-tabs v-model="activeDirection" type="card" class="direction-tabs" :lazy="true">
<el-tab-pane label="顺时针" name="0"> <el-tab-pane :label="$t('page.weightRatio.tabClockwise')" name="0">
<el-tabs v-model="activeTier" type="card" class="tier-tabs"> <el-tabs v-model="activeTier" type="card" class="tier-tabs">
<el-tab-pane v-for="t in tierKeys" :key="'cw-' + t" :label="t" :name="t"> <el-tab-pane v-for="t in tierKeys" :key="'cw-' + t" :label="t" :name="t">
<div v-if="getTierItems(t).length === 0" class="empty-tip">该档位暂无配置数据</div> <div v-if="getTierItems(t).length === 0" class="empty-tip">{{ $t('page.weightShared.emptyTier') }}</div>
<template v-else> <template v-else>
<div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'"> <div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'">
<ArtBarChart <ArtBarChart
:key="'cw-' + activeDirection + '-' + t" :key="'cw-' + activeDirection + '-' + t"
x-axis-name="点数" :x-axis-name="$t('page.weightShared.xAxisGridNumber')"
:x-axis-data="getTierChartLabels(t)" :x-axis-data="getTierChartLabels(t)"
:data="getTierChartDataForCurrentDirection(t)" :data="getTierChartDataForCurrentDirection(t)"
height="180px" height="180px"
/> />
</div> </div>
<div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'"> <div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'">
当前档位权重合计<strong>{{ getTierSumForCurrentDirection(t) }}</strong> {{
各条 1-10000档位内按权重比抽取和不限制 $t('page.weightShared.sumLineSingle', { sum: getTierSumForCurrentDirection(t) })
}}
</div> </div>
<div class="weight-sum weight-sum-t4t5" v-else <div class="weight-sum weight-sum-t4t5" v-else>{{ $t('page.weightShared.t4t5NoteSingle') }}</div>
>T4T5 仅单一结果无需配置权重</div
>
<el-table :data="getTierItems(t)" border size="small" class="weight-table"> <el-table :data="getTierItems(t)" border size="small" class="weight-table">
<el-table-column <el-table-column
label="点数(grid_number)" :label="$t('page.weightShared.colGridNumber')"
prop="grid_number" prop="grid_number"
width="110" width="110"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="结束索引(id)" :label="$t('page.weightShared.colEndIndexId')"
prop="id" prop="id"
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="实际中奖金额" :label="$t('page.weightShared.colRealEv')"
prop="real_ev" prop="real_ev"
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="显示文本" :label="$t('page.weightShared.colUiText')"
prop="ui_text" prop="ui_text"
min-width="70" min-width="70"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="备注" :label="$t('page.weightShared.colRemark')"
prop="remark" prop="remark"
min-width="70" min-width="70"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
:label="currentDirectionLabel + ' 权重(1-10000)'" :label="currentWeightColumnLabel"
min-width="200" min-width="200"
align="center" align="center"
> >
@@ -156,65 +154,64 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="逆时针" name="1"> <el-tab-pane :label="$t('page.weightRatio.tabCounterclockwise')" name="1">
<el-tabs v-model="activeTier" type="card" class="tier-tabs"> <el-tabs v-model="activeTier" type="card" class="tier-tabs">
<el-tab-pane v-for="t in tierKeys" :key="'ccw-' + t" :label="t" :name="t"> <el-tab-pane v-for="t in tierKeys" :key="'ccw-' + t" :label="t" :name="t">
<div v-if="getTierItems(t).length === 0" class="empty-tip">该档位暂无配置数据</div> <div v-if="getTierItems(t).length === 0" class="empty-tip">{{ $t('page.weightShared.emptyTier') }}</div>
<template v-else> <template v-else>
<div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'"> <div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'">
<ArtBarChart <ArtBarChart
:key="'ccw-' + activeDirection + '-' + t" :key="'ccw-' + activeDirection + '-' + t"
x-axis-name="点数" :x-axis-name="$t('page.weightShared.xAxisGridNumber')"
:x-axis-data="getTierChartLabels(t)" :x-axis-data="getTierChartLabels(t)"
:data="getTierChartDataForCurrentDirection(t)" :data="getTierChartDataForCurrentDirection(t)"
height="180px" height="180px"
/> />
</div> </div>
<div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'"> <div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'">
当前档位权重合计:<strong>{{ getTierSumForCurrentDirection(t) }}</strong> {{
(各条 1-10000档位内按权重比抽取和不限制 $t('page.weightShared.sumLineSingle', { sum: getTierSumForCurrentDirection(t) })
}}
</div> </div>
<div class="weight-sum weight-sum-t4t5" v-else <div class="weight-sum weight-sum-t4t5" v-else>{{ $t('page.weightShared.t4t5NoteSingle') }}</div>
>T4、T5 仅单一结果,无需配置权重。</div
>
<el-table :data="getTierItems(t)" border size="small" class="weight-table"> <el-table :data="getTierItems(t)" border size="small" class="weight-table">
<el-table-column <el-table-column
label="点数(grid_number)" :label="$t('page.weightShared.colGridNumber')"
prop="grid_number" prop="grid_number"
width="110" width="110"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="结束索引(id)" :label="$t('page.weightShared.colEndIndexId')"
prop="id" prop="id"
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="实际中奖金额" :label="$t('page.weightShared.colRealEv')"
prop="real_ev" prop="real_ev"
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="显示文本" :label="$t('page.weightShared.colUiText')"
prop="ui_text" prop="ui_text"
min-width="70" min-width="70"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="备注" :label="$t('page.weightShared.colRemark')"
prop="remark" prop="remark"
min-width="70" min-width="70"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
:label="currentDirectionLabel + ' 权重(1-10000)'" :label="currentWeightColumnLabel"
min-width="200" min-width="200"
align="center" align="center"
> >
@@ -301,8 +298,14 @@
</el-tabs> </el-tabs>
</div> </div>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('page.weightShared.btnCancel') }}</el-button>
<el-button type="primary" :loading="submitting" @click="handleSubmit">提交</el-button> <el-button
v-permission="'dice:reward:index:batchUpdateWeights'"
type="primary"
:loading="submitting"
@click="handleSubmit"
>{{ $t('page.weightShared.btnSubmit') }}</el-button
>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -311,6 +314,9 @@
import api from '../../../api/reward/index' import api from '../../../api/reward/index'
import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue' import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t, locale } = useI18n()
const TIER_KEYS = ['T1', 'T2', 'T3', 'T4', 'T5'] as const const TIER_KEYS = ['T1', 'T2', 'T3', 'T4', 'T5'] as const
type DirectionKey = 'clockwise' | 'counterclockwise' type DirectionKey = 'clockwise' | 'counterclockwise'
@@ -361,9 +367,14 @@
T5: { '0': [], '1': [] } T5: { '0': [], '1': [] }
}) })
const currentDirectionLabel = computed(() => const currentWeightColumnLabel = computed(() => {
activeDirection.value === '0' ? '顺时针' : '逆时针' locale.value
) const dirLabel =
activeDirection.value === '0'
? t('page.weightRatio.tabClockwise')
: t('page.weightRatio.tabCounterclockwise')
return `${dirLabel} ${t('page.weightShared.weightColSuffix')}`
})
const tierKeys = TIER_KEYS const tierKeys = TIER_KEYS
@@ -465,7 +476,7 @@
grouped.value = parsePayload(res) grouped.value = parsePayload(res)
}) })
.catch(() => { .catch(() => {
ElMessage.error('获取权重数据失败') ElMessage.error(t('page.weightShared.fetchFail'))
}) })
.finally(() => { .finally(() => {
loading.value = false loading.value = false
@@ -494,19 +505,19 @@
function handleSubmit() { function handleSubmit() {
const items = collectItems() const items = collectItems()
if (items.length === 0) { if (items.length === 0) {
ElMessage.info('没有可提交的配置') ElMessage.info(t('page.weightShared.nothingToSubmit'))
return return
} }
submitting.value = true submitting.value = true
api api
.batchUpdateWeights(items) .batchUpdateWeights(items)
.then(() => { .then(() => {
ElMessage.success('保存成功') ElMessage.success(t('page.weightShared.saveSuccess'))
emit('success') emit('success')
handleClose() handleClose()
}) })
.catch((e: { message?: string }) => { .catch((e: { message?: string }) => {
ElMessage.error(e?.message ?? '保存失败') ElMessage.error(e?.message ?? t('page.weightShared.submitFail'))
}) })
.finally(() => { .finally(() => {
submitting.value = false submitting.value = false

View File

@@ -1,24 +1,31 @@
<template> <template>
<ElDialog <ElDialog
v-model="visible" v-model="visible"
title="一键测试权重" :title="$t('page.weightTest.title')"
width="560px" width="560px"
:close-on-click-modal="false" :close-on-click-modal="false"
destroy-on-close destroy-on-close
@close="onClose" @close="onClose"
> >
<ElAlert type="info" :closable="false" show-icon class="weight-test-tip">
<template #title>{{ $t('page.weightTest.alertTitle') }}</template>
{{ $t('page.weightTest.alertBody') }}
</ElAlert>
<ElForm ref="formRef" :model="form" label-width="140px"> <ElForm ref="formRef" :model="form" label-width="140px">
<ElSteps :active="currentStep" finish-status="success" simple class="steps-wrap"> <ElSteps :active="currentStep" finish-status="success" simple class="steps-wrap">
<ElStep title="付费抽奖券" /> <ElStep :title="$t('page.weightTest.stepPaid')" />
<ElStep title="免费抽奖券" /> <ElStep :title="$t('page.weightTest.stepFree')" />
</ElSteps> </ElSteps>
<!-- 第一页付费抽奖券 --> <!-- 第一页付费抽奖券 -->
<div v-show="currentStep === 0" class="step-panel"> <div v-show="currentStep === 0" class="step-panel">
<ElFormItem label="测试数据档位类型" prop="paid_lottery_config_id"> <ElFormItem
:label="$t('page.weightTest.labelLotteryTypePaid')"
prop="paid_lottery_config_id"
>
<ElSelect <ElSelect
v-model="form.paid_lottery_config_id" v-model="form.paid_lottery_config_id"
placeholder="不选则下方自定义档位概率(默认 type=0" :placeholder="$t('page.weightTest.placeholderPaidPool')"
clearable clearable
filterable filterable
style="width: 100%" style="width: 100%"
@@ -32,11 +39,13 @@
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<template v-if="form.paid_lottery_config_id == null"> <template v-if="form.paid_lottery_config_id == null">
<div class="tier-label">自定义档位概率T1T5每档 0-100%五档之和不能超过 100%</div> <div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div>
<ElRow :gutter="12" class="tier-row"> <ElRow :gutter="12" class="tier-row">
<ElCol v-for="t in tierKeys" :key="'paid-' + t" :span="8"> <ElCol v-for="t in tierKeys" :key="'paid-' + t" :span="8">
<div class="tier-field"> <div class="tier-field">
<label class="tier-field-label">档位 {{ t }}%</label> <label class="tier-field-label">{{
$t('page.weightTest.tierFieldLabel', { tier: t })
}}</label>
<input <input
type="number" type="number"
:value="getPaidTier(t)" :value="getPaidTier(t)"
@@ -49,17 +58,25 @@
</div> </div>
</ElCol> </ElCol>
</ElRow> </ElRow>
<div v-if="paidTierSum > 100" class="tier-error" <div v-if="paidTierSum > 100" class="tier-error">{{
>当前五档之和为 {{ paidTierSum }}%不能超过 100%</div $t('page.weightTest.tierSumError', { sum: paidTierSum })
> }}</div>
</template> </template>
<ElFormItem label="顺时针次数" prop="paid_s_count" required> <ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="paid_s_count" required>
<ElSelect v-model="form.paid_s_count" placeholder="请选择" style="width: 100%"> <ElSelect
v-model="form.paid_s_count"
:placeholder="$t('page.weightTest.placeholderSelect')"
style="width: 100%"
>
<ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" /> <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="逆时针次数" prop="paid_n_count" required> <ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="paid_n_count" required>
<ElSelect v-model="form.paid_n_count" placeholder="请选择" style="width: 100%"> <ElSelect
v-model="form.paid_n_count"
:placeholder="$t('page.weightTest.placeholderSelect')"
style="width: 100%"
>
<ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" /> <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
@@ -67,10 +84,13 @@
<!-- 第二页免费抽奖券 --> <!-- 第二页免费抽奖券 -->
<div v-show="currentStep === 1" class="step-panel"> <div v-show="currentStep === 1" class="step-panel">
<ElFormItem label="测试数据档位类型" prop="free_lottery_config_id"> <ElFormItem
:label="$t('page.weightTest.labelLotteryTypeFree')"
prop="free_lottery_config_id"
>
<ElSelect <ElSelect
v-model="form.free_lottery_config_id" v-model="form.free_lottery_config_id"
placeholder="不选则下方自定义档位概率(默认 type=1" :placeholder="$t('page.weightTest.placeholderFreePool')"
clearable clearable
filterable filterable
style="width: 100%" style="width: 100%"
@@ -84,11 +104,13 @@
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<template v-if="form.free_lottery_config_id == null"> <template v-if="form.free_lottery_config_id == null">
<div class="tier-label">自定义档位概率T1T5每档 0-100%五档之和不能超过 100%</div> <div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div>
<ElRow :gutter="12" class="tier-row"> <ElRow :gutter="12" class="tier-row">
<ElCol v-for="t in tierKeys" :key="'free-' + t" :span="8"> <ElCol v-for="t in tierKeys" :key="'free-' + t" :span="8">
<div class="tier-field"> <div class="tier-field">
<label class="tier-field-label">档位 {{ t }}%</label> <label class="tier-field-label">{{
$t('page.weightTest.tierFieldLabel', { tier: t })
}}</label>
<input <input
type="number" type="number"
:value="getFreeTier(t)" :value="getFreeTier(t)"
@@ -101,17 +123,25 @@
</div> </div>
</ElCol> </ElCol>
</ElRow> </ElRow>
<div v-if="freeTierSum > 100" class="tier-error" <div v-if="freeTierSum > 100" class="tier-error">{{
>当前五档之和为 {{ freeTierSum }}%不能超过 100%</div $t('page.weightTest.tierSumError', { sum: freeTierSum })
> }}</div>
</template> </template>
<ElFormItem label="顺时针次数" prop="free_s_count" required> <ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="free_s_count" required>
<ElSelect v-model="form.free_s_count" placeholder="请选择" style="width: 100%"> <ElSelect
v-model="form.free_s_count"
:placeholder="$t('page.weightTest.placeholderSelect')"
style="width: 100%"
>
<ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" /> <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="逆时针次数" prop="free_n_count" required> <ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="free_n_count" required>
<ElSelect v-model="form.free_n_count" placeholder="请选择" style="width: 100%"> <ElSelect
v-model="form.free_n_count"
:placeholder="$t('page.weightTest.placeholderSelect')"
style="width: 100%"
>
<ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" /> <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
@@ -119,14 +149,23 @@
</ElForm> </ElForm>
<template #footer> <template #footer>
<ElButton v-if="currentStep > 0" :disabled="running" @click="currentStep--">上一步</ElButton> <ElButton v-if="currentStep > 0" :disabled="running" @click="currentStep--">{{
<ElButton v-if="currentStep < 1" type="primary" :disabled="running" @click="currentStep++" $t('page.weightTest.btnPrev')
>下一步</ElButton }}</ElButton>
<ElButton v-if="currentStep < 1" type="primary" :disabled="running" @click="currentStep++">{{
$t('page.weightTest.btnNext')
}}</ElButton>
<ElButton
v-if="currentStep === 1"
v-permission="'dice:reward:index:startWeightTest'"
type="primary"
:loading="running"
@click="handleStart"
>{{ $t('page.weightTest.btnStart') }}</ElButton
> >
<ElButton v-if="currentStep === 1" type="primary" :loading="running" @click="handleStart" <ElButton :disabled="running" @click="visible = false">{{
>开始测试</ElButton $t('page.weightTest.btnCancel')
> }}</ElButton>
<ElButton :disabled="running" @click="visible = false">取消</ElButton>
</template> </template>
</ElDialog> </ElDialog>
</template> </template>
@@ -134,6 +173,10 @@
<script setup lang="ts"> <script setup lang="ts">
import api from '../../../api/reward/index' import api from '../../../api/reward/index'
import lotteryPoolApi from '../../../api/lottery_pool_config/index' import lotteryPoolApi from '../../../api/lottery_pool_config/index'
import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const countOptions = [0, 100, 500, 1000, 5000] const countOptions = [0, 100, 500, 1000, 5000]
const tierKeys = ['T1', 'T2', 'T3', 'T4', 'T5'] as const const tierKeys = ['T1', 'T2', 'T3', 'T4', 'T5'] as const
@@ -153,22 +196,15 @@
free_s_count: 100, free_s_count: 100,
free_n_count: 100 free_n_count: 100
}) })
const lotteryOptions = ref<Array<{ id: number; name: string; type: number }>>([]) const lotteryOptions = ref<Array<{ id: number; name: string }>>([])
/** 将 type 转为数字(接口可能返回字符串 "0"/"1" */ /** 付费抽奖券可选档位name=default */
function tierTypeNum(r: { type?: number | string }): number {
const t = r.type ?? 0
return typeof t === 'number' ? t : Number(t) || 0
}
/** 付费抽奖券可选档位type=0 */
const paidLotteryOptions = computed(() => const paidLotteryOptions = computed(() =>
lotteryOptions.value.filter((r) => tierTypeNum(r) === 0) lotteryOptions.value.filter((r) => r.name === 'default')
) )
/** /** 免费抽奖券可选档位:优先 name=killScore若无则显示全部以便下拉有选项 */
* 免费抽奖券可选档位:优先 type=1DiceLotteryPoolConfig.type=1若无则显示全部以便下拉有选项
*/
const freeLotteryOptions = computed(() => { const freeLotteryOptions = computed(() => {
const type1List = lotteryOptions.value.filter((r) => tierTypeNum(r) === 1) const list = lotteryOptions.value.filter((r) => r.name === 'killScore')
return type1List.length > 0 ? type1List : lotteryOptions.value return list.length > 0 ? list : lotteryOptions.value
}) })
const running = ref(false) const running = ref(false)
@@ -211,26 +247,23 @@
async function loadLotteryOptions() { async function loadLotteryOptions() {
try { try {
const list = await lotteryPoolApi.getOptions() const list = await lotteryPoolApi.getOptions()
lotteryOptions.value = list.map( lotteryOptions.value = list.map((r: { id: number; name: string }) => ({
(r: { id: number; name: string; type?: number | string }) => ({ id: r.id,
id: r.id, name: r.name
name: r.name, }))
type: tierTypeNum(r) // 付费抽奖券默认使用 name=default
}) const normal = list.find((r: { name?: string }) => r.name === 'default')
) if (normal) {
// 付费抽奖券默认使用 type=0 的档位类型 form.paid_lottery_config_id = normal.id
const type0 = list.find((r: { type?: number | string }) => tierTypeNum(r) === 0)
if (type0) {
form.paid_lottery_config_id = type0.id
} }
// 免费抽奖券默认使用 type=1 的档位类型DiceLotteryPoolConfig.type=1若无 type=1 则默认选第一项 // 免费抽奖券默认使用 name=killScore若无则默认选第一项
const type1 = list.find((r: { type?: number | string }) => tierTypeNum(r) === 1) const kill = list.find((r: { name?: string }) => r.name === 'killScore')
if (type1) { if (kill) {
form.free_lottery_config_id = type1.id form.free_lottery_config_id = kill.id
} else if (list.length > 0) { } else if (list.length > 0) {
form.free_lottery_config_id = list[0].id form.free_lottery_config_id = list[0].id
} }
} catch (_) { } catch {
lotteryOptions.value = [] lotteryOptions.value = []
} }
} }
@@ -257,7 +290,7 @@
function validateForm(): boolean { function validateForm(): boolean {
if (form.paid_s_count + form.paid_n_count + form.free_s_count + form.free_n_count <= 0) { if (form.paid_s_count + form.paid_n_count + form.free_s_count + form.free_n_count <= 0) {
ElMessage.warning('付费或免费至少一种方向次数之和大于 0') ElMessage.warning(t('page.weightTest.warnTotalSpins'))
return false return false
} }
const needPaidTier = form.paid_lottery_config_id == null const needPaidTier = form.paid_lottery_config_id == null
@@ -265,22 +298,22 @@
if (needPaidTier) { if (needPaidTier) {
const sum = paidTierSum.value const sum = paidTierSum.value
if (sum <= 0) { if (sum <= 0) {
ElMessage.warning('付费未选奖池时T1T5 档位概率之和需大于 0') ElMessage.warning(t('page.weightTest.warnPaidTierSumPositive'))
return false return false
} }
if (sum > 100) { if (sum > 100) {
ElMessage.warning('付费档位概率 T1T5 之和不能超过 100%') ElMessage.warning(t('page.weightTest.warnPaidTierSumMax'))
return false return false
} }
} }
if (needFreeTier) { if (needFreeTier) {
const sum = freeTierSum.value const sum = freeTierSum.value
if (sum <= 0) { if (sum <= 0) {
ElMessage.warning('免费未选奖池时T1T5 档位概率之和需大于 0') ElMessage.warning(t('page.weightTest.warnFreeTierSumPositive'))
return false return false
} }
if (sum > 100) { if (sum > 100) {
ElMessage.warning('免费档位概率 T1T5 之和不能超过 100%') ElMessage.warning(t('page.weightTest.warnFreeTierSumMax'))
return false return false
} }
} }
@@ -292,13 +325,11 @@
running.value = true running.value = true
try { try {
await api.startWeightTest(buildPayload()) await api.startWeightTest(buildPayload())
ElMessage.success( ElMessage.success(t('page.weightTest.successCreated'))
'测试任务已创建,后台将自动执行。请在【玩家抽奖记录(测试数据)】中查看生成的测试数据'
)
visible.value = false visible.value = false
emit('success') emit('success')
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message || '创建测试任务失败') ElMessage.error(e?.message || t('page.weightTest.failCreate'))
} finally { } finally {
running.value = false running.value = false
} }
@@ -312,7 +343,7 @@
} }
}) })
// 切换到免费步骤时,若当前选中 id 不在免费档位列表中,则重置为第一个 type=1 的选项,避免显示错误 // 切换到免费步骤时,若当前选中 id 不在免费档位列表中,则重置为第一个 killScore 的选项,避免显示错误
watch(currentStep, (step) => { watch(currentStep, (step) => {
if (step === 1) { if (step === 1) {
const freeOpts = freeLotteryOptions.value const freeOpts = freeLotteryOptions.value
@@ -325,6 +356,9 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.weight-test-tip {
margin-bottom: 16px;
}
.steps-wrap { .steps-wrap {
margin-bottom: 16px; margin-bottom: 16px;
} }

View File

@@ -5,12 +5,12 @@
<div class="card-header"> <div class="card-header">
<span>{{ $t('page.toolbar.gameRewardConfig') }}</span> <span>{{ $t('page.toolbar.gameRewardConfig') }}</span>
<ElButton <ElButton
v-permission="'dice:reward_config:index:update'" v-permission="'dice:reward_config:index:createRewardReference'"
type="warning" type="warning"
:loading="createRewardLoading" :loading="createRewardLoading"
@click="handleCreateRewardReference" @click="handleCreateRewardReference"
v-ripple v-ripple
title="按规则start_index=config(grid_number).id顺时针 end_index=(start_index+grid_number)%26逆时针 end_index=start_index-grid_number≥0?start_index-grid_number:26+start_index-grid_number" :title="$t('page.toolbar.createRewardRefTitle')"
> >
{{ $t('page.toolbar.createRewardRef') }} {{ $t('page.toolbar.createRewardRef') }}
</ElButton> </ElButton>
@@ -18,9 +18,9 @@
</template> </template>
<ElTabs v-model="activeTab" type="card" class="top-tabs"> <ElTabs v-model="activeTab" type="card" class="top-tabs">
<ElTabPane label="奖励索引" name="index"> <ElTabPane :label="$t('page.configPage.tabIndex')" name="index">
<div class="tab-panel"> <div class="tab-panel">
<div class="panel-tip">色子点数须在 530 之间且本表内不重复</div> <div class="panel-tip">{{ $t('page.configPage.tipIndex') }}</div>
<div class="table-scroll-wrap"> <div class="table-scroll-wrap">
<ElTable <ElTable
v-loading="loading" v-loading="loading"
@@ -29,12 +29,12 @@
size="default" size="default"
class="config-table" class="config-table"
> >
<ElTableColumn label="索引(id)" prop="id" width="60" align="center"> <ElTableColumn :label="$t('page.configPage.colId')" prop="id" width="60" align="center">
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.id }}</span> <span>{{ row.id }}</span>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="色子点数" min-width="100" align="center"> <ElTableColumn :label="$t('page.configPage.colDicePoints')" min-width="100" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInputNumber <ElInputNumber
v-model="row.grid_number" v-model="row.grid_number"
@@ -46,17 +46,25 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="显示文本" min-width="100" align="center"> <ElTableColumn :label="$t('page.configPage.colDisplayText')" min-width="100" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInput v-model="row.ui_text" size="small" placeholder="显示文本(中文)" /> <ElInput
v-model="row.ui_text"
size="small"
:placeholder="$t('page.configPage.placeholderDisplayZh')"
/>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="显示文本(英文)" min-width="120" align="center"> <ElTableColumn :label="$t('page.configPage.colDisplayTextEn')" min-width="120" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInput v-model="row.ui_text_en" size="small" placeholder="显示文本(英文)" /> <ElInput
v-model="row.ui_text_en"
size="small"
:placeholder="$t('page.configPage.placeholderDisplayEn')"
/>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="真实结算" min-width="110" align="center"> <ElTableColumn :label="$t('page.configPage.colRealEv')" min-width="110" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInputNumber <ElInputNumber
v-model="row.real_ev" v-model="row.real_ev"
@@ -66,11 +74,11 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="所属档位" width="100" align="center"> <ElTableColumn :label="$t('page.configPage.colTier')" width="100" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElSelect <ElSelect
v-model="row.tier" v-model="row.tier"
placeholder="档位" :placeholder="$t('page.configPage.placeholderTierSelect')"
clearable clearable
size="small" size="small"
class="full-width" class="full-width"
@@ -83,27 +91,32 @@
</ElSelect> </ElSelect>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="备注" min-width="140" align="center"> <ElTableColumn :label="$t('page.configPage.colRemark')" min-width="140" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInput v-model="row.remark" size="small" placeholder="备注" /> <ElInput
v-model="row.remark"
size="small"
:placeholder="$t('page.configPage.placeholderRemark')"
/>
</template> </template>
</ElTableColumn> </ElTableColumn>
</ElTable> </ElTable>
</div> </div>
<div class="tab-footer"> <div class="tab-footer">
<ElButton type="primary" :loading="savingIndex" @click="handleSaveIndex" <ElButton
>保存</ElButton v-permission="'dice:reward_config:index:batchUpdate'"
type="primary"
:loading="savingIndex"
@click="handleSaveIndex"
>{{ $t('page.configPage.btnSave') }}</ElButton
> >
<ElButton @click="handleResetIndex">重置</ElButton> <ElButton @click="handleResetIndex">{{ $t('page.configPage.btnReset') }}</ElButton>
</div> </div>
</div> </div>
</ElTabPane> </ElTabPane>
<ElTabPane label="大奖权重" name="bigwin"> <ElTabPane :label="$t('page.configPage.tabBigwin')" name="bigwin">
<div class="tab-panel"> <div class="tab-panel">
<div class="panel-tip" <div class="panel-tip">{{ $t('page.configPage.tipBigwin') }}</div>
>从左至右中大奖点数不可改显示信息实际中奖备注权重(0~10000)点数 530
权重固定 100%本表单独立提交仅提交大奖权重</div
>
<div class="table-scroll-wrap"> <div class="table-scroll-wrap">
<ElTable <ElTable
v-loading="loading" v-loading="loading"
@@ -112,22 +125,30 @@
size="default" size="default"
class="config-table bigwin-table" class="config-table bigwin-table"
> >
<ElTableColumn label="中大奖点数" width="100" align="center"> <ElTableColumn :label="$t('page.configPage.colBigwinPoints')" width="100" align="center">
<template #default="{ row }"> <template #default="{ row }">
<span class="readonly-value">{{ row.grid_number }}</span> <span class="readonly-value">{{ row.grid_number }}</span>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="显示信息" min-width="140" align="center"> <ElTableColumn :label="$t('page.configPage.colDisplayInfo')" min-width="140" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInput v-model="row.ui_text" size="small" placeholder="显示信息(中文)" /> <ElInput
v-model="row.ui_text"
size="small"
:placeholder="$t('page.configPage.placeholderDisplayInfoZh')"
/>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="显示信息(英文)" min-width="160" align="center"> <ElTableColumn :label="$t('page.configPage.colDisplayInfoEn')" min-width="160" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInput v-model="row.ui_text_en" size="small" placeholder="显示信息(英文)" /> <ElInput
v-model="row.ui_text_en"
size="small"
:placeholder="$t('page.configPage.placeholderDisplayInfoEn')"
/>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="实际中奖" min-width="120" align="center"> <ElTableColumn :label="$t('page.configPage.colRealPrize')" min-width="120" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInputNumber <ElInputNumber
v-model="row.real_ev" v-model="row.real_ev"
@@ -137,12 +158,16 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="备注" min-width="140" align="center"> <ElTableColumn :label="$t('page.configPage.colRemark')" min-width="140" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElInput v-model="row.remark" size="small" placeholder="备注" /> <ElInput
v-model="row.remark"
size="small"
:placeholder="$t('page.configPage.placeholderRemark')"
/>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn label="权重(0-10000)" min-width="220" align="center"> <ElTableColumn :label="$t('page.configPage.colWeightRange')" min-width="220" align="center">
<template #default="{ row }"> <template #default="{ row }">
<div class="weight-cell"> <div class="weight-cell">
<ElSlider <ElSlider
@@ -163,21 +188,25 @@
class="weight-input" class="weight-input"
/> />
</div> </div>
<span v-if="isBigwinWeightDisabled(row)" class="weight-tip" <span v-if="isBigwinWeightDisabled(row)" class="weight-tip">{{
>点数 530 固定 100%</span $t('page.configPage.weightFixedTip')
> }}</span>
</template> </template>
</ElTableColumn> </ElTableColumn>
</ElTable> </ElTable>
</div> </div>
<div v-if="bigwinRows.length === 0 && !loading" class="empty-tip"> <div v-if="bigwinRows.length === 0 && !loading" class="empty-tip">
暂无 BIGWIN 档位配置请在奖励索引中设置 tier BIGWIN {{ $t('page.configPage.emptyBigwin') }}
</div> </div>
<div class="tab-footer"> <div class="tab-footer">
<ElButton type="primary" :loading="savingBigwin" @click="handleSaveBigwin" <ElButton
>保存</ElButton v-permission="'dice:reward_config:index:saveBigwinWeightsByGrid'"
type="primary"
:loading="savingBigwin"
@click="handleSaveBigwin"
>{{ $t('page.configPage.btnSave') }}</ElButton
> >
<ElButton @click="handleResetBigwin">重置</ElButton> <ElButton @click="handleResetBigwin">{{ $t('page.configPage.btnReset') }}</ElButton>
</div> </div>
</div> </div>
</ElTabPane> </ElTabPane>
@@ -188,8 +217,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { useI18n } from 'vue-i18n'
import api from '../../api/reward_config/index' import api from '../../api/reward_config/index'
const { t } = useI18n()
/** 第一页:奖励索引行(来自 DiceRewardConfig 表) */ /** 第一页:奖励索引行(来自 DiceRewardConfig 表) */
interface IndexRow { interface IndexRow {
id: number id: number
@@ -239,11 +271,11 @@
async function handleCreateRewardReference() { async function handleCreateRewardReference() {
try { try {
await ElMessageBox.confirm( await ElMessageBox.confirm(
'按规则创建奖励对照:起始索引 start_index=奖励配置中 grid_number 对应格位的 id顺时针 end_index=(start_index+摇取点数)%26逆时针 end_index=start_index-摇取点数≥0 则取该值,否则 26+start_index-摇取点数。先清空现有数据再为 5-30 共 26 个点数、顺/逆时针分别生成。是否继续?', t('page.configPage.confirmCreateRefMsg'),
'创建奖励对照', t('page.configPage.confirmCreateRefTitle'),
{ {
confirmButtonText: '确定创建', confirmButtonText: t('page.configPage.confirmCreateRefOk'),
cancelButtonText: '取消', cancelButtonText: t('page.configPage.confirmCreateRefCancel'),
type: 'warning' type: 'warning'
} }
) )
@@ -254,14 +286,23 @@
try { try {
const res: any = await api.createRewardReference() const res: any = await api.createRewardReference()
const data = res?.data ?? res const data = res?.data ?? res
const msg = let msg = t('page.configPage.createRefSuccessSimple')
typeof data === 'object' && data !== null if (typeof data === 'object' && data !== null) {
? `已按 5-30 共26个点数、顺时针+逆时针创建:顺时针新增 ${data.created_clockwise ?? 0} 条、逆时针新增 ${data.created_counterclockwise ?? 0} 条;顺时针更新 ${data.updated_clockwise ?? 0} 条、逆时针更新 ${data.updated_counterclockwise ?? 0}${(data.skipped ?? 0) > 0 ? `${data.skipped} 个点数使用兜底起始索引` : ''}` const skipped = Number(data.skipped ?? 0)
: '创建成功' const skippedPart =
skipped > 0 ? t('page.configPage.createRefSuccessSkipped', { n: skipped }) : ''
msg = t('page.configPage.createRefSuccess', {
cwNew: data.created_clockwise ?? 0,
ccwNew: data.created_counterclockwise ?? 0,
cwUp: data.updated_clockwise ?? 0,
ccwUp: data.updated_counterclockwise ?? 0,
skippedPart
})
}
ElMessage.success(msg) ElMessage.success(msg)
loadIndexList() loadIndexList()
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message ?? '创建奖励对照失败') ElMessage.error(e?.message ?? t('page.configPage.createRefFail'))
} finally { } finally {
createRewardLoading.value = false createRewardLoading.value = false
} }
@@ -280,7 +321,7 @@
indexRowsSnapshot = rows.map((r) => ({ ...r })) indexRowsSnapshot = rows.map((r) => ({ ...r }))
}) })
.catch(() => { .catch(() => {
ElMessage.error('获取奖励索引配置失败') ElMessage.error(t('page.configPage.loadIndexFail'))
}) })
.finally(() => { .finally(() => {
loading.value = false loading.value = false
@@ -311,18 +352,20 @@
function validateIndexFormForSave(): string | null { function validateIndexFormForSave(): string | null {
const toSave = indexRows.value.filter((r) => r.tier !== 'BIGWIN') const toSave = indexRows.value.filter((r) => r.tier !== 'BIGWIN')
if (toSave.length === 0) { if (toSave.length === 0) {
return '暂无奖励索引数据可保存' return t('page.configPage.warnNoIndexToSave')
} }
const nums = toSave.map((r) => Number(r.grid_number)) const nums = toSave.map((r) => Number(r.grid_number))
const outOfRange = nums.filter( const outOfRange = nums.filter(
(n) => Number.isNaN(n) || n < GRID_NUMBER_MIN || n > GRID_NUMBER_MAX (n) => Number.isNaN(n) || n < GRID_NUMBER_MIN || n > GRID_NUMBER_MAX
) )
if (outOfRange.length > 0) { if (outOfRange.length > 0) {
return `色子点数必须在 ${GRID_NUMBER_MIN}${GRID_NUMBER_MAX} 之间` return t('page.configPage.warnGridRange', { min: GRID_NUMBER_MIN, max: GRID_NUMBER_MAX })
} }
const duplicates = findDuplicateValues(nums) const duplicates = findDuplicateValues(nums)
if (duplicates.length > 0) { if (duplicates.length > 0) {
return `色子点数在本表内不能重复,重复的点数为:${duplicates.join('、')}` return t('page.configPage.warnDupGrid', {
list: duplicates.join(t('page.configPage.dupJoiner'))
})
} }
return null return null
} }
@@ -347,10 +390,10 @@
remark: r.remark remark: r.remark
})) }))
await api.batchUpdate(indexPayload) await api.batchUpdate(indexPayload)
ElMessage.success('保存成功') ElMessage.success(t('page.configPage.saveSuccess'))
indexRowsSnapshot = indexRows.value.map((r) => ({ ...r })) indexRowsSnapshot = indexRows.value.map((r) => ({ ...r }))
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message ?? '保存失败') ElMessage.error(e?.message ?? t('page.configPage.saveFail'))
} finally { } finally {
savingIndex.value = false savingIndex.value = false
} }
@@ -359,25 +402,27 @@
/** 奖励索引页:重置为本页数据(重新拉取列表) */ /** 奖励索引页:重置为本页数据(重新拉取列表) */
function handleResetIndex() { function handleResetIndex() {
loadIndexList() loadIndexList()
ElMessage.info('已重新加载奖励索引,恢复为服务器最新数据') ElMessage.info(t('page.configPage.resetIndexReloaded'))
} }
/** 大奖权重表单校验:点数在本表内不重复 */ /** 大奖权重表单校验:点数在本表内不重复 */
function validateBigwinFormForSave(): string | null { function validateBigwinFormForSave(): string | null {
const rows = bigwinRows.value const rows = bigwinRows.value
if (rows.length === 0) { if (rows.length === 0) {
return '暂无 BIGWIN 档位配置可保存' return t('page.configPage.warnNoBigwinToSave')
} }
const nums = rows.map((r) => Number(r.grid_number)) const nums = rows.map((r) => Number(r.grid_number))
const outOfRange = nums.filter( const outOfRange = nums.filter(
(n) => Number.isNaN(n) || n < GRID_NUMBER_MIN || n > GRID_NUMBER_MAX (n) => Number.isNaN(n) || n < GRID_NUMBER_MIN || n > GRID_NUMBER_MAX
) )
if (outOfRange.length > 0) { if (outOfRange.length > 0) {
return `色子点数必须在 ${GRID_NUMBER_MIN}${GRID_NUMBER_MAX} 之间` return t('page.configPage.warnGridRange', { min: GRID_NUMBER_MIN, max: GRID_NUMBER_MAX })
} }
const duplicates = findDuplicateValues(nums) const duplicates = findDuplicateValues(nums)
if (duplicates.length > 0) { if (duplicates.length > 0) {
return `大奖权重本表内点数不能重复,重复的点数为:${duplicates.join('、')}` return t('page.configPage.warnBigwinDupGrid', {
list: duplicates.join(t('page.configPage.dupJoiner'))
})
} }
return null return null
} }
@@ -386,7 +431,7 @@
async function handleSaveBigwin() { async function handleSaveBigwin() {
const rows = bigwinRows.value const rows = bigwinRows.value
if (rows.length === 0) { if (rows.length === 0) {
ElMessage.info('暂无 BIGWIN 档位配置,请先在「奖励索引」中设置 tier 为 BIGWIN') ElMessage.info(t('page.configPage.infoNoBigwin'))
return return
} }
const err = validateBigwinFormForSave() const err = validateBigwinFormForSave()
@@ -413,10 +458,10 @@
: Math.max(0, Math.min(10000, Math.floor(r.weight))) : Math.max(0, Math.min(10000, Math.floor(r.weight)))
})) }))
await api.saveBigwinWeightsByGrid(weightItems) await api.saveBigwinWeightsByGrid(weightItems)
ElMessage.success('保存成功') ElMessage.success(t('page.configPage.saveSuccess'))
loadIndexList() loadIndexList()
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message ?? '保存失败') ElMessage.error(e?.message ?? t('page.configPage.saveFail'))
} finally { } finally {
savingBigwin.value = false savingBigwin.value = false
} }
@@ -425,7 +470,7 @@
/** 大奖权重页重置重新拉取列表BIGWIN 数据随之更新) */ /** 大奖权重页重置重新拉取列表BIGWIN 数据随之更新) */
function handleResetBigwin() { function handleResetBigwin() {
loadIndexList() loadIndexList()
ElMessage.info('已重新加载,大奖权重恢复为服务器最新数据') ElMessage.info(t('page.configPage.resetBigwinReloaded'))
} }
onMounted(() => { onMounted(() => {

View File

@@ -1,33 +1,33 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增奖励配置' : '编辑奖励配置'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="600px" width="600px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="色子点数" prop="grid_number"> <el-form-item :label="$t('page.form.labelDicePoints')" prop="grid_number">
<el-input-number <el-input-number
v-model="formData.grid_number" v-model="formData.grid_number"
placeholder="请输入色子点数" :placeholder="$t('page.form.placeholderDicePoints')"
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
/> />
</el-form-item> </el-form-item>
<el-form-item label="前端显示文本" prop="ui_text"> <el-form-item :label="$t('page.form.labelUiText')" prop="ui_text">
<el-input v-model="formData.ui_text" placeholder="请输入前端显示文本(中文)" /> <el-input v-model="formData.ui_text" :placeholder="$t('page.form.placeholderUiText')"/>
</el-form-item> </el-form-item>
<el-form-item label="前端显示文本(英文)" prop="ui_text_en"> <el-form-item :label="$t('page.form.labelUiTextEn')" prop="ui_text_en">
<el-input v-model="formData.ui_text_en" placeholder="请输入前端显示文本(英文)" /> <el-input v-model="formData.ui_text_en" :placeholder="$t('page.form.placeholderUiTextEn')" />
</el-form-item> </el-form-item>
<el-form-item label="真实资金结算" prop="real_ev"> <el-form-item :label="$t('page.form.labelRealEv')" prop="real_ev">
<el-input-number v-model="formData.real_ev" placeholder="请输入真实资金结算" /> <el-input-number v-model="formData.real_ev" :placeholder="$t('page.form.placeholderRealEv')" />
</el-form-item> </el-form-item>
<el-form-item label="所属档位" prop="tier"> <el-form-item :label="$t('page.form.labelTier')" prop="tier">
<el-select <el-select
v-model="formData.tier" v-model="formData.tier"
placeholder="请选择所属档位" :placeholder="$t('page.form.placeholderTier')"
clearable clearable
style="width: 100%" style="width: 100%"
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
@@ -37,39 +37,39 @@
<el-option label="T3" value="T3" /> <el-option label="T3" value="T3" />
<el-option label="T4" value="T4" /> <el-option label="T4" value="T4" />
<el-option label="T5" value="T5" /> <el-option label="T5" value="T5" />
<el-option label="BIGWIN超级大奖" value="BIGWIN" /> <el-option :label="$t('page.form.tierBigWin')" value="BIGWIN" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- BIGWIN 时可编辑权重10000=100% 中奖0=0% 中奖点数 530 固定 100% 不可改 --> <!-- BIGWIN 时可编辑权重10000=100% 中奖0=0% 中奖点数 530 固定 100% 不可改 -->
<el-form-item v-if="formData.tier === 'BIGWIN'" label="大奖权重" prop="weight"> <el-form-item v-if="formData.tier === 'BIGWIN'" :label="$t('page.form.labelBigWinWeight')" prop="weight">
<el-input-number <el-input-number
v-model="formData.weight" v-model="formData.weight"
:min="0" :min="0"
:max="10000" :max="10000"
:step="100" :step="100"
placeholder="0~1000010000=100%中奖" :placeholder="$t('page.form.placeholderBigWinWeight')"
:disabled="isBigwinWeightDisabled" :disabled="isBigwinWeightDisabled"
/> />
<div v-if="isBigwinWeightDisabled" class="form-tip"> <div v-if="isBigwinWeightDisabled" class="form-tip">
点数 530 摇到必中大奖权重固定 10000 {{ $t('page.form.bigWinWeightDisabledTip') }}
</div> </div>
<div v-else class="form-tip">10000=100% 中奖0=0% 中奖仅对点数 10/15/20/25 生效</div> <div v-else class="form-tip">{{ $t('page.form.bigWinWeightTip') }}</div>
</el-form-item> </el-form-item>
<!-- 权重已迁移至T1-T5 BIGWIN 权重配比弹窗dice_reward BIGWIN 时本弹窗可编辑 weight起始索引已迁移至 dice_reward.start_index --> <!-- 权重已迁移至T1-T5 BIGWIN 权重配比弹窗dice_reward BIGWIN 时本弹窗可编辑 weight起始索引已迁移至 dice_reward.start_index -->
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('page.form.labelRemark')" prop="remark">
<el-input <el-input
v-model="formData.remark" v-model="formData.remark"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入备注" :placeholder="$t('page.form.placeholderRemark')"
maxlength="500" maxlength="500"
show-word-limit show-word-limit
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -78,6 +78,7 @@
import api from '../../../api/reward_config/index' import api from '../../../api/reward_config/index'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -97,6 +98,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -111,14 +113,16 @@
/** /**
* 表单验证规则(权重已迁移至权重配比弹窗) * 表单验证规则(权重已迁移至权重配比弹窗)
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
grid_number: [{ required: true, message: '色子点数必需填写', trigger: 'blur' }], grid_number: [{ required: true, message: t('page.form.ruleDicePointsRequired'), trigger: 'blur' }],
ui_text: [{ required: true, message: '前端显示文本必需填写', trigger: 'blur' }], ui_text: [{ required: true, message: t('page.form.ruleUiTextRequired'), trigger: 'blur' }],
ui_text_en: [{ max: 255, message: '前端显示文本(英文)长度需小于 255 字符', trigger: 'blur' }], ui_text_en: [{ max: 255, message: t('page.form.ruleUiTextEnMax'), trigger: 'blur' }],
real_ev: [{ required: true, message: '真实资金结算必需填写', trigger: 'blur' }], real_ev: [{ required: true, message: t('page.form.ruleRealEvRequired'), trigger: 'blur' }],
tier: [{ required: true, message: '所属档位必需填写', trigger: 'blur' }], tier: [{ required: true, message: t('page.form.ruleTierRequired'), trigger: 'blur' }],
weight: [{ type: 'number', min: 0, max: 10000, message: '大奖权重 0~10000', trigger: 'blur' }] weight: [
}) { type: 'number', min: 0, max: 10000, message: t('page.form.ruleBigWinWeightRange'), trigger: 'blur' }
]
}))
/** 点数 5、30 固定 100% 中大奖,权重不可改 */ /** 点数 5、30 固定 100% 中大奖,权重不可改 */
const isBigwinWeightDisabled = computed( const isBigwinWeightDisabled = computed(
@@ -222,10 +226,10 @@
} }
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(payload) await api.save(payload)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(payload) await api.update(payload)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,29 +1,29 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
title="T1-T5 权重配比(顺时针/逆时针)" :title="$t('page.weightRatio.title')"
width="900px" width="900px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<div class="global-tip"> <div class="global-tip">
权重来自<strong>奖励对照表dice_reward</strong><strong>结束索引DiceRewardConfig.id</strong>区分<strong>顺时针</strong><strong>逆时针</strong>两套权重抽奖时按当前方向取对应权重 {{ $t('page.weightRatio.globalTip') }}
</div> </div>
<el-tabs v-model="activeTier" type="card"> <el-tabs v-model="activeTier" type="card">
<el-tab-pane v-for="t in tierKeys" :key="t" :label="t" :name="t"> <el-tab-pane v-for="t in tierKeys" :key="t" :label="t" :name="t">
<div v-if="getTierItems(t).length === 0" class="empty-tip"> 该档位暂无配置数据 </div> <div v-if="getTierItems(t).length === 0" class="empty-tip">{{ $t('page.weightRatio.emptyTier') }}</div>
<template v-else> <template v-else>
<div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'"> <div class="chart-wrap" v-if="t !== 'T4' && t !== 'T5'">
<div class="chart-row"> <div class="chart-row">
<ArtBarChart <ArtBarChart
x-axis-name="结束索引" :x-axis-name="$t('page.weightRatio.xAxisEndIndex')"
:x-axis-data="getTierChartLabels(t)" :x-axis-data="getTierChartLabels(t)"
:data="getTierChartData(t, 'clockwise')" :data="getTierChartData(t, 'clockwise')"
height="180px" height="180px"
/> />
<ArtBarChart <ArtBarChart
x-axis-name="结束索引" :x-axis-name="$t('page.weightRatio.xAxisEndIndex')"
:x-axis-data="getTierChartLabels(t)" :x-axis-data="getTierChartLabels(t)"
:data="getTierChartData(t, 'counterclockwise')" :data="getTierChartData(t, 'counterclockwise')"
height="180px" height="180px"
@@ -31,20 +31,41 @@
</div> </div>
</div> </div>
<div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'"> <div class="weight-sum" v-if="t !== 'T4' && t !== 'T5'">
当前档位权重合计顺时针<strong>{{ getTierSumForValidation(t, 'clockwise') }}</strong> {{
逆时针<strong>{{ getTierSumForValidation(t, 'counterclockwise') }}</strong> $t('page.weightRatio.sumLine', {
各条 1-10000档位内按权重比抽取和不限制 cw: getTierSumForValidation(t, 'clockwise'),
ccw: getTierSumForValidation(t, 'counterclockwise')
})
}}
</div> </div>
<div class="weight-sum weight-sum-t4t5" v-else> <div class="weight-sum weight-sum-t4t5" v-else>
T4T5 档位抽中时仅有一个结果无需配置权重 {{ $t('page.weightRatio.t4t5Note') }}
</div> </div>
<el-table :data="getTierItems(t)" border size="small" class="weight-table"> <el-table :data="getTierItems(t)" border size="small" class="weight-table">
<el-table-column label="结束索引(id)" prop="id" width="90" align="center" show-overflow-tooltip /> <el-table-column
<el-table-column label="色子点数" prop="grid_number" width="80" align="center" /> :label="$t('page.weightRatio.colEndIndexId')"
<el-table-column label="实际中奖金额" prop="real_ev" width="90" align="center" show-overflow-tooltip /> prop="id"
<el-table-column label="显示文本" prop="ui_text" min-width="70" align="center" show-overflow-tooltip /> width="90"
<el-table-column label="备注" prop="remark" min-width="70" align="center" show-overflow-tooltip /> align="center"
<el-table-column label="顺时针权重(1-10000)" min-width="160" align="center"> show-overflow-tooltip
/>
<el-table-column :label="$t('page.weightRatio.colDicePoints')" prop="grid_number" width="80" align="center" />
<el-table-column
:label="$t('page.weightRatio.colRealEv')"
prop="real_ev"
width="90"
align="center"
show-overflow-tooltip
/>
<el-table-column
:label="$t('page.weightRatio.colUiText')"
prop="ui_text"
min-width="70"
align="center"
show-overflow-tooltip
/>
<el-table-column :label="$t('page.table.remark')" prop="remark" min-width="70" align="center" show-overflow-tooltip />
<el-table-column :label="$t('page.weightRatio.colWeightCw')" min-width="160" align="center">
<template #default="{ row }"> <template #default="{ row }">
<div class="weight-cell-vertical"> <div class="weight-cell-vertical">
<div class="weight-slider-wrap"> <div class="weight-slider-wrap">
@@ -87,7 +108,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="逆时针权重(1-10000)" min-width="160" align="center"> <el-table-column :label="$t('page.weightRatio.colWeightCcw')" min-width="160" align="center">
<template #default="{ row }"> <template #default="{ row }">
<div class="weight-cell-vertical"> <div class="weight-cell-vertical">
<div class="weight-slider-wrap"> <div class="weight-slider-wrap">
@@ -135,8 +156,14 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" :loading="submitting" @click="handleSubmit">提交</el-button> <el-button
v-permission="'dice:reward_config:index:batchUpdateWeights'"
type="primary"
:loading="submitting"
@click="handleSubmit"
>{{ $t('table.form.submit') }}</el-button
>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -145,6 +172,9 @@
import api from '../../../api/reward_config/index' import api from '../../../api/reward_config/index'
import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue' import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const TIER_KEYS = ['T1', 'T2', 'T3', 'T4', 'T5'] as const const TIER_KEYS = ['T1', 'T2', 'T3', 'T4', 'T5'] as const
type DirectionKey = 'clockwise' | 'counterclockwise' type DirectionKey = 'clockwise' | 'counterclockwise'
@@ -335,7 +365,7 @@
grouped.value = parseWeightRatioPayload(res) grouped.value = parseWeightRatioPayload(res)
}) })
.catch(() => { .catch(() => {
ElMessage.error('获取权重配比数据失败') ElMessage.error(t('page.weightRatio.fetchFail'))
}) })
} }
@@ -358,19 +388,19 @@
function handleSubmit() { function handleSubmit() {
const items = collectItems() const items = collectItems()
if (items.length === 0) { if (items.length === 0) {
ElMessage.info('没有可提交的配置') ElMessage.info(t('page.weightRatio.nothingToSubmit'))
return return
} }
submitting.value = true submitting.value = true
api api
.batchUpdateWeights(items) .batchUpdateWeights(items)
.then(() => { .then(() => {
ElMessage.success('保存成功') ElMessage.success(t('page.weightRatio.saveSuccess'))
emit('success') emit('success')
handleClose() handleClose()
}) })
.catch((e: { message?: string }) => { .catch((e: { message?: string }) => {
ElMessage.error(e?.message ?? '保存失败') ElMessage.error(e?.message ?? t('page.weightRatio.submitFail'))
}) })
.finally(() => { .finally(() => {
submitting.value = false submitting.value = false

View File

@@ -42,11 +42,17 @@
</template> </template>
<!-- 付费抽取顺时针逆时针抽取次数兼容旧数据用 s_count/n_count --> <!-- 付费抽取顺时针逆时针抽取次数兼容旧数据用 s_count/n_count -->
<template #paid_draw="{ row }"> <template #paid_draw="{ row }">
<span> {{ getPaidS(row) }} / {{ getPaidN(row) }}</span> <span
>{{ $t('page.table.clockwiseAbbr') }} {{ getPaidS(row) }} /
{{ $t('page.table.counterclockwiseAbbr') }} {{ getPaidN(row) }}</span
>
</template> </template>
<!-- 免费抽取顺时针逆时针抽取次数 --> <!-- 免费抽取顺时针逆时针抽取次数 -->
<template #free_draw="{ row }"> <template #free_draw="{ row }">
<span> {{ row.free_s_count ?? 0 }} / {{ row.free_n_count ?? 0 }}</span> <span
>{{ $t('page.table.clockwiseAbbr') }} {{ row.free_s_count ?? 0 }} /
{{ $t('page.table.counterclockwiseAbbr') }} {{ row.free_n_count ?? 0 }}</span
>
</template> </template>
<!-- 平台赚取金额 --> <!-- 平台赚取金额 -->
<template #platform_profit="{ row }"> <template #platform_profit="{ row }">
@@ -127,7 +133,7 @@
if (s === -1) return t('page.table.statusFail') if (s === -1) return t('page.table.statusFail')
if (s === 1) return t('page.table.statusDone') if (s === 1) return t('page.table.statusDone')
if (s === 0 || s === 2) return t('page.table.statusTesting') if (s === 0 || s === 2) return t('page.table.statusTesting')
return '—' return t('page.detail.dash')
} }
// 付费抽取次数(兼容旧数据:无 paid_s_count 时用 s_count // 付费抽取次数(兼容旧数据:无 paid_s_count 时用 s_count
@@ -144,9 +150,10 @@
// 平台赚取金额展示(未完成或空显示 —) // 平台赚取金额展示(未完成或空显示 —)
function formatPlatformProfit(v: unknown): string { function formatPlatformProfit(v: unknown): string {
if (v === null || v === undefined || v === '') return '—' const dash = t('page.detail.dash')
if (v === null || v === undefined || v === '') return dash
const n = Number(v) const n = Number(v)
if (Number.isNaN(n)) return '—' if (Number.isNaN(n)) return dash
return String(n) return String(n)
} }

View File

@@ -1,7 +1,7 @@
<template> <template>
<el-drawer <el-drawer
v-model="visible" v-model="visible"
title="测试记录详情" :title="$t('page.detail.title')"
:size="drawerSize" :size="drawerSize"
direction="rtl" direction="rtl"
destroy-on-close destroy-on-close
@@ -9,37 +9,39 @@
> >
<template v-if="record"> <template v-if="record">
<div class="detail-section"> <div class="detail-section">
<div class="section-title">基本信息</div> <div class="section-title">{{ $t('page.detail.sectionBasic') }}</div>
<el-descriptions :column="2" border size="small"> <el-descriptions :column="2" border size="small">
<el-descriptions-item label="记录ID"> <el-descriptions-item :label="$t('page.detail.recordId')">
{{ record.id }} {{ record.id }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="测试次数">{{ record.test_count }} </el-descriptions-item> <el-descriptions-item :label="$t('page.detail.testCount')"
<el-descriptions-item label="创建时间"> >{{ record.test_count }}{{ $t('page.detail.testCountSuffix') }}</el-descriptions-item
{{ record.create_time || '—' }} >
<el-descriptions-item :label="$t('page.detail.createTime')">
{{ record.create_time || $t('page.detail.dash') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="执行管理员"> <el-descriptions-item :label="$t('page.detail.admin')">
{{ record.admin_name ?? record.admin_id ?? '—' }} {{ record.admin_name ?? record.admin_id ?? $t('page.detail.dash') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="付费奖池配置ID"> <el-descriptions-item :label="$t('page.detail.paidPoolId')">
{{ record.paid_lottery_config_id ?? record.lottery_config_id ?? '—' }} {{ record.paid_lottery_config_id ?? record.lottery_config_id ?? $t('page.detail.dash') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="免费奖池配置ID"> <el-descriptions-item :label="$t('page.detail.freePoolId')">
{{ record.free_lottery_config_id ?? '—' }} {{ record.free_lottery_config_id ?? $t('page.detail.dash') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="BIGWIN 权重快照"> <el-descriptions-item :label="$t('page.detail.bigwinSnapshot')">
<template v-if="bigwinWeightDisplay.length"> <template v-if="bigwinWeightDisplay.length">
<span v-for="item in bigwinWeightDisplay" :key="item.grid" class="mr-2"> <span v-for="item in bigwinWeightDisplay" :key="item.grid" class="mr-2">
{{ item.grid }}:{{ item.weight }} {{ item.grid }}:{{ item.weight }}
</span> </span>
</template> </template>
<template v-else></template> <template v-else>{{ $t('page.detail.dash') }}</template>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
<div class="detail-section"> <div class="detail-section">
<div class="section-title">付费抽奖档位概率T1-T5测试时使用</div> <div class="section-title">{{ $t('page.detail.sectionPaidTier') }}</div>
<el-table <el-table
v-if="paidTierTableData.length" v-if="paidTierTableData.length"
:data="paidTierTableData" :data="paidTierTableData"
@@ -48,17 +50,17 @@
class="tier-weights-table" class="tier-weights-table"
max-height="160" max-height="160"
> >
<el-table-column prop="tier" label="档位" width="80" align="center" /> <el-table-column prop="tier" :label="$t('page.detail.colTier')" width="80" align="center" />
<el-table-column prop="weight" label="权重" width="100" align="center" /> <el-table-column prop="weight" :label="$t('page.detail.colWeight')" width="100" align="center" />
<el-table-column prop="percent" label="占比" width="100" align="center" /> <el-table-column prop="percent" :label="$t('page.detail.colPercent')" width="100" align="center" />
</el-table> </el-table>
<div v-else class="empty-tip"> <div v-else class="empty-tip">
暂无付费档位数据旧记录可能仅保存 tier_weights_snapshot {{ $t('page.detail.emptyPaidTier') }}
</div> </div>
</div> </div>
<div class="detail-section"> <div class="detail-section">
<div class="section-title">免费抽奖档位概率T1-T5测试时使用</div> <div class="section-title">{{ $t('page.detail.sectionFreeTier') }}</div>
<el-table <el-table
v-if="freeTierTableData.length" v-if="freeTierTableData.length"
:data="freeTierTableData" :data="freeTierTableData"
@@ -67,18 +69,18 @@
class="tier-weights-table" class="tier-weights-table"
max-height="160" max-height="160"
> >
<el-table-column prop="tier" label="档位" width="80" align="center" /> <el-table-column prop="tier" :label="$t('page.detail.colTier')" width="80" align="center" />
<el-table-column prop="weight" label="权重" width="100" align="center" /> <el-table-column prop="weight" :label="$t('page.detail.colWeight')" width="100" align="center" />
<el-table-column prop="percent" label="占比" width="100" align="center" /> <el-table-column prop="percent" :label="$t('page.detail.colPercent')" width="100" align="center" />
</el-table> </el-table>
<div v-else class="empty-tip">暂无免费档位数据</div> <div v-else class="empty-tip">{{ $t('page.detail.emptyFreeTier') }}</div>
</div> </div>
<div class="detail-section"> <div class="detail-section">
<div class="section-title">权重配比快照测试时使用的 T1-T5/BIGWIN 配置</div> <div class="section-title">{{ $t('page.detail.sectionSnapshot') }}</div>
<div class="snapshot-group"> <div class="snapshot-group">
<div class="snapshot-subtitle">顺时针 BIGWIN</div> <div class="snapshot-subtitle">{{ $t('page.detail.subCw') }}</div>
<el-table <el-table
:data="snapshotClockwise" :data="snapshotClockwise"
border border
@@ -86,15 +88,15 @@
max-height="180" max-height="180"
class="snapshot-table" class="snapshot-table"
> >
<el-table-column prop="tier" label="档位" width="80" align="center" /> <el-table-column prop="tier" :label="$t('page.detail.colTier')" width="80" align="center" />
<el-table-column prop="grid_number" label="色子点数" width="100" align="center" /> <el-table-column prop="grid_number" :label="$t('page.detail.colGridNumber')" width="100" align="center" />
<el-table-column prop="weight" label="权重" width="90" align="center" /> <el-table-column prop="weight" :label="$t('page.detail.colWeight')" width="90" align="center" />
</el-table> </el-table>
<div v-if="!snapshotClockwise.length" class="empty-tip">暂无顺时针数据</div> <div v-if="!snapshotClockwise.length" class="empty-tip">{{ $t('page.detail.emptyCw') }}</div>
</div> </div>
<div class="snapshot-group"> <div class="snapshot-group">
<div class="snapshot-subtitle">逆时针 BIGWIN</div> <div class="snapshot-subtitle">{{ $t('page.detail.subCcw') }}</div>
<el-table <el-table
:data="snapshotCounterclockwise" :data="snapshotCounterclockwise"
border border
@@ -102,15 +104,15 @@
max-height="180" max-height="180"
class="snapshot-table" class="snapshot-table"
> >
<el-table-column prop="tier" label="档位" width="80" align="center" /> <el-table-column prop="tier" :label="$t('page.detail.colTier')" width="80" align="center" />
<el-table-column prop="grid_number" label="色子点数" width="100" align="center" /> <el-table-column prop="grid_number" :label="$t('page.detail.colGridNumber')" width="100" align="center" />
<el-table-column prop="weight" label="权重" width="90" align="center" /> <el-table-column prop="weight" :label="$t('page.detail.colWeight')" width="90" align="center" />
</el-table> </el-table>
<div v-if="!snapshotCounterclockwise.length" class="empty-tip">暂无逆时针数据</div> <div v-if="!snapshotCounterclockwise.length" class="empty-tip">{{ $t('page.detail.emptyCcw') }}</div>
</div> </div>
<div class="snapshot-group"> <div class="snapshot-group">
<div class="snapshot-subtitle">BIGWIN DiceRewardConfig 配置快照</div> <div class="snapshot-subtitle">{{ $t('page.detail.subBigwin') }}</div>
<el-table <el-table
:data="bigwinTableData" :data="bigwinTableData"
border border
@@ -118,30 +120,35 @@
max-height="180" max-height="180"
class="snapshot-table" class="snapshot-table"
> >
<el-table-column prop="grid_number" label="色子点数" width="100" align="center" /> <el-table-column prop="grid_number" :label="$t('page.detail.colGridNumber')" width="100" align="center" />
<el-table-column prop="weight" label="权重" width="90" align="center" /> <el-table-column prop="weight" :label="$t('page.detail.colWeight')" width="90" align="center" />
</el-table> </el-table>
<div v-if="!bigwinTableData.length" class="empty-tip">暂无 BIGWIN 数据</div> <div v-if="!bigwinTableData.length" class="empty-tip">{{ $t('page.detail.emptyBigwinTable') }}</div>
</div> </div>
</div> </div>
<div class="detail-section"> <div class="detail-section">
<div class="section-title">落点统计 grid_number 出现次数</div> <div class="section-title">{{ $t('page.detail.sectionResult') }}</div>
<div class="chart-wrap"> <div class="chart-wrap">
<ArtBarChart <ArtBarChart
x-axis-name="色子点数 (grid_number)" :x-axis-name="$t('page.detail.chartXAxis')"
:x-axis-data="chartLabels" :x-axis-data="chartLabels"
:data="chartData" :data="chartData"
height="280px" height="280px"
/> />
</div> </div>
<div v-if="resultTotal === 0" class="empty-tip">暂无落点数据</div> <div v-if="resultTotal === 0" class="empty-tip">{{ $t('page.detail.emptyResult') }}</div>
<div v-else class="result-summary">总落点次数{{ resultTotal }}</div> <div v-else class="result-summary">{{ $t('page.detail.resultTotal', { n: resultTotal }) }}</div>
</div> </div>
<div class="detail-section footer-actions"> <div class="detail-section footer-actions">
<el-button type="primary" :loading="importing" @click="openImport"> <el-button
导入到当前配置 v-permission="'dice:reward_config_record:index:importFromRecord'"
type="primary"
:loading="importing"
@click="openImport"
>
{{ $t('page.detail.btnImport') }}
</el-button> </el-button>
</div> </div>
</template> </template>
@@ -149,21 +156,19 @@
<!-- 导入弹窗 --> <!-- 导入弹窗 -->
<el-dialog <el-dialog
v-model="importVisible" v-model="importVisible"
title="导入到正式配置" :title="$t('page.detail.importTitle')"
width="520px" width="520px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<p class="import-desc"> <p class="import-desc">
将本测试记录导入<strong>DiceReward</strong>格子权重 {{ $t('page.detail.importDesc') }}
<strong>DiceRewardConfig</strong>BIGWIN weight
<strong>DiceLotteryPoolConfig</strong>付费/免费 T1-T5 档位概率请选择要写入的奖池
</p> </p>
<el-form label-width="160px"> <el-form label-width="160px">
<el-form-item label="导入付费档位概率到奖池"> <el-form-item :label="$t('page.detail.importPaidLabel')">
<el-select <el-select
v-model="importPaidLotteryConfigId" v-model="importPaidLotteryConfigId"
placeholder="选择任意奖池(建议付费池)" :placeholder="$t('page.detail.importPaidPlaceholder')"
clearable clearable
filterable filterable
style="width: 100%" style="width: 100%"
@@ -175,12 +180,12 @@
:value="opt.id" :value="opt.id"
/> />
</el-select> </el-select>
<div class="form-tip">不选则使用本记录保存时的付费奖池配置 ID</div> <div class="form-tip">{{ $t('page.detail.importPaidTip') }}</div>
</el-form-item> </el-form-item>
<el-form-item label="导入免费档位概率到奖池"> <el-form-item :label="$t('page.detail.importFreeLabel')">
<el-select <el-select
v-model="importFreeLotteryConfigId" v-model="importFreeLotteryConfigId"
placeholder="选择任意奖池(建议免费池)" :placeholder="$t('page.detail.importFreePlaceholder')"
clearable clearable
filterable filterable
style="width: 100%" style="width: 100%"
@@ -192,12 +197,18 @@
:value="opt.id" :value="opt.id"
/> />
</el-select> </el-select>
<div class="form-tip">不选则使用本记录保存时的免费奖池配置 ID</div> <div class="form-tip">{{ $t('page.detail.importFreeTip') }}</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="importVisible = false">取消</el-button> <el-button @click="importVisible = false">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" :loading="importing" @click="confirmImport">确认导入</el-button> <el-button
v-permission="'dice:reward_config_record:index:importFromRecord'"
type="primary"
:loading="importing"
@click="confirmImport"
>{{ $t('page.detail.btnConfirmImport') }}</el-button
>
</template> </template>
</el-dialog> </el-dialog>
</el-drawer> </el-drawer>
@@ -208,6 +219,9 @@
import recordApi from '../../../api/reward_config_record/index' import recordApi from '../../../api/reward_config_record/index'
import lotteryConfigApi from '../../../api/lottery_pool_config/index' import lotteryConfigApi from '../../../api/lottery_pool_config/index'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t, locale } = useI18n()
const GRID_NUMBERS = [ const GRID_NUMBERS = [
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
@@ -266,24 +280,26 @@
const importing = ref(false) const importing = ref(false)
const importPaidLotteryConfigId = ref<number | null>(null) const importPaidLotteryConfigId = ref<number | null>(null)
const importFreeLotteryConfigId = ref<number | null>(null) const importFreeLotteryConfigId = ref<number | null>(null)
const lotteryConfigOptions = ref<Array<{ id: number; name: string; type: number }>>([]) const lotteryConfigOptions = ref<Array<{ id: number; name: string }>>([])
function tierWeightsToTableData(t: Record<string, number> | null | undefined) { function tierWeightsToTableData(weightsMap: Record<string, number> | null | undefined) {
if (!t || typeof t !== 'object') return [] const dash = t('page.detail.dash')
if (!weightsMap || typeof weightsMap !== 'object') return []
const tiers = ['T1', 'T2', 'T3', 'T4', 'T5'] const tiers = ['T1', 'T2', 'T3', 'T4', 'T5']
const rows = tiers.map((tier) => { const rows = tiers.map((tier) => {
const w = t[tier] ?? t[tier.toLowerCase()] ?? 0 const w = weightsMap[tier] ?? weightsMap[tier.toLowerCase()] ?? 0
return { tier, weight: w } return { tier, weight: w }
}) })
const total = rows.reduce((sum, r) => sum + r.weight, 0) const total = rows.reduce((sum, r) => sum + r.weight, 0)
return rows.map((r) => ({ return rows.map((r) => ({
tier: r.tier, tier: r.tier,
weight: r.weight, weight: r.weight,
percent: total > 0 ? `${((r.weight / total) * 100).toFixed(1)}%` : '—' percent: total > 0 ? `${((r.weight / total) * 100).toFixed(1)}%` : dash
})) }))
} }
const paidTierTableData = computed(() => { const paidTierTableData = computed(() => {
locale.value
const r = props.record const r = props.record
const paidFromRecord = r?.paid_tier_weights const paidFromRecord = r?.paid_tier_weights
const snapshot = r?.tier_weights_snapshot const snapshot = r?.tier_weights_snapshot
@@ -305,6 +321,7 @@
}) })
const freeTierTableData = computed(() => { const freeTierTableData = computed(() => {
locale.value
const r = props.record const r = props.record
const freeFromRecord = r?.free_tier_weights const freeFromRecord = r?.free_tier_weights
const snapshot = r?.tier_weights_snapshot const snapshot = r?.tier_weights_snapshot
@@ -352,6 +369,8 @@
}) })
const snapshotTableData = computed(() => { const snapshotTableData = computed(() => {
locale.value
const dash = t('page.detail.dash')
const snapshot = props.record?.weight_config_snapshot as const snapshot = props.record?.weight_config_snapshot as
| Array<{ | Array<{
tier?: string tier?: string
@@ -364,11 +383,12 @@
return snapshot.map((item) => { return snapshot.map((item) => {
const dir = item.direction const dir = item.direction
return { return {
tier: item.tier ?? '—', tier: item.tier ?? dash,
direction: dir, direction: dir,
direction_label: dir === 0 ? '顺时针' : dir === 1 ? '逆时针' : '—', direction_label:
grid_number: item.grid_number ?? '—', dir === 0 ? t('page.detail.dirCw') : dir === 1 ? t('page.detail.dirCcw') : dash,
weight: item.weight ?? '—' grid_number: item.grid_number ?? dash,
weight: item.weight ?? dash
} }
}) })
}) })
@@ -458,11 +478,11 @@
paid_lottery_config_id: importPaidLotteryConfigId.value ?? undefined, paid_lottery_config_id: importPaidLotteryConfigId.value ?? undefined,
free_lottery_config_id: importFreeLotteryConfigId.value ?? undefined free_lottery_config_id: importFreeLotteryConfigId.value ?? undefined
}) })
ElMessage.success('导入成功,已刷新 DiceReward、DiceRewardConfig(BIGWIN)、奖池配置') ElMessage.success(t('page.detail.importSuccess'))
importVisible.value = false importVisible.value = false
emit('import-done') emit('import-done')
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message ?? '导入失败') ElMessage.error(e?.message ?? t('page.detail.importFail'))
} finally { } finally {
importing.value = false importing.value = false
} }

View File

@@ -1,26 +1,26 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增奖励配置权重测试记录' : '编辑奖励配置权重测试记录'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="600px" width="600px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="测试次数100/500/1000" prop="test_count"> <el-form-item :label="$t('page.form.labelTestCount')" prop="test_count">
<el-input v-model="formData.test_count" placeholder="请输入测试次数100/500/1000" /> <el-input v-model="formData.test_count" :placeholder="$t('page.form.placeholderTestCount')" />
</el-form-item> </el-form-item>
<el-form-item label="测试时权重配比快照:按档位保存 id,grid_number,tier,weight" prop="weight_config_snapshot"> <el-form-item :label="$t('page.form.labelWeightSnapshot')" prop="weight_config_snapshot">
<el-input v-model="formData.weight_config_snapshot" placeholder="请输入测试时权重配比快照:按档位保存 id,grid_number,tier,weight" /> <el-input v-model="formData.weight_config_snapshot" :placeholder="$t('page.form.placeholderWeightSnapshot')" />
</el-form-item> </el-form-item>
<el-form-item label="落点统计grid_number=&gt;出现次数" prop="result_counts"> <el-form-item :label="$t('page.form.labelResultCounts')" prop="result_counts">
<el-input v-model="formData.result_counts" placeholder="请输入落点统计grid_number=&gt;出现次数" /> <el-input v-model="formData.result_counts" :placeholder="$t('page.form.placeholderResultCounts')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -29,6 +29,7 @@
import api from '../../../api/reward_config_record/index' import api from '../../../api/reward_config_record/index'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -48,6 +49,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -62,9 +64,9 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
test_count: [{ required: true, message: '测试次数100/500/1000必需填写', trigger: 'blur' }], test_count: [{ required: true, message: t('page.form.ruleTestCountRequired'), trigger: 'blur' }]
}) }))
/** /**
* 初始数据 * 初始数据
@@ -136,10 +138,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,21 +1,21 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增文件' : '编辑文件'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="800px" width="800px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="100px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="100px">
<el-form-item label="文件名称" prop="origin_name"> <el-form-item :label="$t('page.form.labelFileName')" prop="origin_name">
<el-input v-model="formData.origin_name" placeholder="请输入文件名称" /> <el-input v-model="formData.origin_name" :placeholder="$t('page.form.placeholderFileName')" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@@ -24,6 +24,8 @@
<script setup lang="ts"> <script setup lang="ts">
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import api from '@/api/safeguard/attachment' import api from '@/api/safeguard/attachment'
import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -43,6 +45,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -55,9 +58,9 @@
}) })
// 表单验证规则 // 表单验证规则
const rules: FormRules = { const rules = computed<FormRules>(() => ({
origin_name: [{ required: true, message: '请输入文件名称', trigger: 'blur' }] origin_name: [{ required: true, message: t('page.form.ruleFileNameRequired'), trigger: 'blur' }]
} }))
// 初始表单数据 // 初始表单数据
const initialFormData = { const initialFormData = {
@@ -123,7 +126,7 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'edit') { if (props.dialogType === 'edit') {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,14 +1,14 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增部门' : '编辑部门'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="600px" width="600px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="上级部门" prop="parent_id"> <el-form-item :label="$t('page.form.labelParentDept')" prop="parent_id">
<el-tree-select <el-tree-select
v-model="formData.parent_id" v-model="formData.parent_id"
:data="optionData.treeData" :data="optionData.treeData"
@@ -17,33 +17,33 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="部门名称" prop="name"> <el-form-item :label="$t('page.form.labelDeptName')" prop="name">
<el-input v-model="formData.name" placeholder="请输入部门名称" /> <el-input v-model="formData.name" :placeholder="$t('page.form.placeholderDeptName')" />
</el-form-item> </el-form-item>
<el-form-item label="部门编码" prop="code"> <el-form-item :label="$t('page.form.labelDeptCode')" prop="code">
<el-input v-model="formData.code" placeholder="请输入部门编码" /> <el-input v-model="formData.code" :placeholder="$t('page.form.placeholderDeptCode')" />
</el-form-item> </el-form-item>
<el-form-item label="部门领导"> <el-form-item :label="$t('page.form.labelLeader')">
<sa-user v-model="formData.leader_id" /> <sa-user v-model="formData.leader_id" />
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="remark"> <el-form-item :label="$t('page.form.labelRemark')" prop="remark">
<el-input <el-input
v-model="formData.remark" v-model="formData.remark"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入部门描述" :placeholder="$t('page.form.placeholderRemark')"
/> />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item :label="$t('page.form.labelSort')" prop="sort">
<el-input-number v-model="formData.sort" placeholder="请输入排序" /> <el-input-number v-model="formData.sort" :placeholder="$t('page.form.placeholderSort')" />
</el-form-item> </el-form-item>
<el-form-item label="启用" prop="status"> <el-form-item :label="$t('page.form.labelStatus')" prop="status">
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -52,6 +52,7 @@
import api from '@/api/system/dept' import api from '@/api/system/dept'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -71,6 +72,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
const optionData = reactive({ const optionData = reactive({
@@ -88,11 +90,13 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
parent_id: [{ required: true, message: '请选择上级部门', trigger: 'change' }], parent_id: [
name: [{ required: true, message: '请输入部门名称', trigger: 'blur' }], { required: true, message: t('page.form.ruleParentDeptRequired'), trigger: 'change' }
code: [{ required: true, message: '请输入部门编码', trigger: 'blur' }] ],
}) name: [{ required: true, message: t('page.form.ruleDeptNameRequired'), trigger: 'blur' }],
code: [{ required: true, message: t('page.form.ruleDeptCodeRequired'), trigger: 'blur' }]
}))
/** /**
* 初始数据 * 初始数据
@@ -138,7 +142,7 @@
{ {
id: 0, id: 0,
value: 0, value: 0,
label: '无上级部门', label: t('page.form.noParentDept'),
children: data children: data
} }
] ]
@@ -180,10 +184,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,17 +1,17 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增菜单' : '编辑菜单'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="820px" width="820px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="菜单类型" prop="type"> <el-form-item :label="$t('page.form.labelMenuType')" prop="type">
<sa-radio v-model="formData.type" type="button" dict="menu_type"></sa-radio> <sa-radio v-model="formData.type" type="button" dict="menu_type"></sa-radio>
</el-form-item> </el-form-item>
<el-form-item label="上级菜单" prop="parent_id"> <el-form-item :label="$t('page.form.labelParentMenu')" prop="parent_id">
<el-tree-select <el-tree-select
v-model="formData.parent_id" v-model="formData.parent_id"
:data="optionData.treeData" :data="optionData.treeData"
@@ -22,63 +22,63 @@
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="菜单名称" prop="name"> <el-form-item :label="$t('page.form.labelMenuName')" prop="name">
<el-input v-model="formData.name" placeholder="请输入菜单名称" /> <el-input v-model="formData.name" :placeholder="$t('page.form.labelMenuName')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="formData.type < 3"> <el-col :span="12" v-if="formData.type < 3">
<el-form-item prop="path"> <el-form-item prop="path">
<template #label> <template #label>
<sa-label <sa-label
label="路由地址" :label="$t('page.form.labelRoutePath')"
tooltip="一级菜单:以 / 开头的绝对路径(如 /dashboard 二级及以下:相对路径(如 console、user" :tooltip="$t('page.form.labelRoutePathTip')"
/> />
</template> </template>
<el-input v-model="formData.path" placeholder="如:/dashboard 或 console" /> <el-input v-model="formData.path" :placeholder="$t('page.form.placeholderRoutePath')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="formData.type != 3"> <el-col :span="12" v-if="formData.type != 3">
<el-form-item label="组件名称" prop="code"> <el-form-item :label="$t('page.form.labelComponentName')" prop="code">
<el-input v-model="formData.code" placeholder="如: User" /> <el-input v-model="formData.code" :placeholder="$t('page.form.placeholderComponentName')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="formData.type === 2"> <el-col :span="12" v-if="formData.type === 2">
<el-form-item prop="component"> <el-form-item prop="component">
<template #label> <template #label>
<sa-label label="组件路径" tooltip="填写组件路径views目录下 目录菜单:留空" /> <sa-label :label="$t('page.form.labelComponentPath')" :tooltip="$t('page.form.labelComponentPathTip')" />
</template> </template>
<el-autocomplete <el-autocomplete
class="w-full" class="w-full"
v-model="formData.component" v-model="formData.component"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
clearable clearable
placeholder="如:/system/user 或留空" :placeholder="$t('page.form.placeholderComponentPath')"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="formData.type != 3"> <el-col :span="12" v-if="formData.type != 3">
<el-form-item label="菜单图标" prop="icon"> <el-form-item :label="$t('page.form.labelMenuIcon')" prop="icon">
<sa-icon-picker v-model="formData.icon" /> <sa-icon-picker v-model="formData.icon" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="formData.type === 3"> <el-col :span="12" v-if="formData.type === 3">
<el-form-item label="权限标识" prop="slug"> <el-form-item :label="$t('page.form.labelPermSlug')" prop="slug">
<el-input v-model="formData.slug" placeholder="请输入权限标识" /> <el-input v-model="formData.slug" :placeholder="$t('page.form.placeholderPermSlug')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="formData.type === 4"> <el-col :span="24" v-if="formData.type === 4">
<el-form-item label="外链地址" prop="link_url"> <el-form-item :label="$t('page.form.labelLinkUrl')" prop="link_url">
<el-input v-model="formData.link_url" placeholder="https://saithink.top" /> <el-input v-model="formData.link_url" :placeholder="$t('page.form.placeholderLinkUrl')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="sort"> <el-form-item prop="sort">
<template #label> <template #label>
<sa-label label="排序" tooltip="数字越大越靠前" /> <sa-label :label="$t('page.form.labelSort')" :tooltip="$t('page.form.labelSortTip')" />
</template> </template>
<el-input-number <el-input-number
v-model="formData.sort" v-model="formData.sort"
placeholder="请输入排序" :placeholder="$t('page.form.placeholderSort')"
controls-position="right" controls-position="right"
/> />
</el-form-item> </el-form-item>
@@ -86,7 +86,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="status"> <el-form-item prop="status">
<template #label> <template #label>
<sa-label label="状态" tooltip="禁用后,该菜单项将不可用" /> <sa-label :label="$t('page.form.labelStatus')" :tooltip="$t('page.form.labelStatusTip')" />
</template> </template>
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
@@ -94,7 +94,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="is_iframe"> <el-form-item prop="is_iframe">
<template #label> <template #label>
<sa-label label="是否内嵌" tooltip="外链模式下有效" /> <sa-label :label="$t('page.form.labelIsIframe')" :tooltip="$t('page.form.labelIsIframeTip')" />
</template> </template>
<sa-switch v-model="formData.is_iframe" dict="yes_or_no" :showText="false" /> <sa-switch v-model="formData.is_iframe" dict="yes_or_no" :showText="false" />
</el-form-item> </el-form-item>
@@ -102,7 +102,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="is_keep_alive"> <el-form-item prop="is_keep_alive">
<template #label> <template #label>
<sa-label label="是否缓存" tooltip="切换tabs不刷新" /> <sa-label :label="$t('page.form.labelIsKeepAlive')" :tooltip="$t('page.form.labelIsKeepAliveTip')" />
</template> </template>
<sa-switch v-model="formData.is_keep_alive" dict="yes_or_no" :showText="false" /> <sa-switch v-model="formData.is_keep_alive" dict="yes_or_no" :showText="false" />
</el-form-item> </el-form-item>
@@ -110,7 +110,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="is_hidden"> <el-form-item prop="is_hidden">
<template #label> <template #label>
<sa-label label="是否隐藏" tooltip="不在菜单栏显示,但是可以通过路由访问" /> <sa-label :label="$t('page.form.labelIsHidden')" :tooltip="$t('page.form.labelIsHiddenTip')" />
</template> </template>
<sa-switch v-model="formData.is_hidden" dict="yes_or_no" :showText="false" /> <sa-switch v-model="formData.is_hidden" dict="yes_or_no" :showText="false" />
</el-form-item> </el-form-item>
@@ -118,7 +118,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="is_fixed_tab"> <el-form-item prop="is_fixed_tab">
<template #label> <template #label>
<sa-label label="是否固定" tooltip="固定在tabs导航栏" /> <sa-label :label="$t('page.form.labelIsFixedTab')" :tooltip="$t('page.form.labelIsFixedTabTip')" />
</template> </template>
<sa-switch v-model="formData.is_fixed_tab" dict="yes_or_no" :showText="false" /> <sa-switch v-model="formData.is_fixed_tab" dict="yes_or_no" :showText="false" />
</el-form-item> </el-form-item>
@@ -126,7 +126,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="is_full_page"> <el-form-item prop="is_full_page">
<template #label> <template #label>
<sa-label label="是否全屏" tooltip="不继承左侧菜单和顶部导航栏" /> <sa-label :label="$t('page.form.labelIsFullPage')" :tooltip="$t('page.form.labelIsFullPageTip')" />
</template> </template>
<sa-switch v-model="formData.is_full_page" dict="yes_or_no" :showText="false" /> <sa-switch v-model="formData.is_full_page" dict="yes_or_no" :showText="false" />
</el-form-item> </el-form-item>
@@ -134,8 +134,8 @@
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -144,6 +144,7 @@
import api from '@/api/system/menu' import api from '@/api/system/menu'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -163,6 +164,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
const optionData = reactive({ const optionData = reactive({
@@ -197,14 +199,14 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
parent_id: [{ required: true, message: '请选择上级菜单', trigger: 'change' }], parent_id: [{ required: true, message: t('page.form.ruleParentMenuRequired'), trigger: 'change' }],
name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }], name: [{ required: true, message: t('page.form.ruleMenuNameRequired'), trigger: 'blur' }],
path: [{ required: true, message: '请输入路由地址', trigger: 'blur' }], path: [{ required: true, message: t('page.form.ruleRoutePathRequired'), trigger: 'blur' }],
code: [{ required: true, message: '请输入组件名称', trigger: 'blur' }], code: [{ required: true, message: t('page.form.ruleComponentNameRequired'), trigger: 'blur' }],
slug: [{ required: true, message: '请输入权限标识', trigger: 'blur' }], slug: [{ required: true, message: t('page.form.rulePermSlugRequired'), trigger: 'blur' }],
link_url: [{ required: true, message: '请输入外链地址', trigger: 'blur' }] link_url: [{ required: true, message: t('page.form.ruleLinkUrlRequired'), trigger: 'blur' }]
}) }))
/** /**
* 初始数据 * 初始数据
@@ -302,10 +304,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,37 +1,37 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增岗位' : '编辑岗位'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="600px" width="600px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="岗位名称" prop="name"> <el-form-item :label="$t('page.form.labelName')" prop="name">
<el-input v-model="formData.name" placeholder="请输入岗位名称" /> <el-input v-model="formData.name" :placeholder="$t('page.form.placeholderName')" />
</el-form-item> </el-form-item>
<el-form-item label="岗位编码" prop="code"> <el-form-item :label="$t('page.form.labelCode')" prop="code">
<el-input v-model="formData.code" placeholder="请输入岗位编码" /> <el-input v-model="formData.code" :placeholder="$t('page.form.placeholderCode')" />
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="remark"> <el-form-item :label="$t('page.form.labelRemark')" prop="remark">
<el-input <el-input
v-model="formData.remark" v-model="formData.remark"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入岗位描述" :placeholder="$t('page.form.placeholderRemark')"
/> />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item :label="$t('page.form.labelSort')" prop="sort">
<el-input-number v-model="formData.sort" placeholder="请输入排序" /> <el-input-number v-model="formData.sort" :placeholder="$t('page.form.placeholderSort')" />
</el-form-item> </el-form-item>
<el-form-item label="启用" prop="status"> <el-form-item :label="$t('page.form.labelStatus')" prop="status">
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -40,6 +40,7 @@
import api from '@/api/system/post' import api from '@/api/system/post'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -59,6 +60,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -73,10 +75,10 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
name: [{ required: true, message: '请输入岗位名称', trigger: 'blur' }], name: [{ required: true, message: t('page.form.ruleNameRequired'), trigger: 'blur' }],
code: [{ required: true, message: '请输入岗位编码', trigger: 'blur' }] code: [{ required: true, message: t('page.form.ruleCodeRequired'), trigger: 'blur' }]
}) }))
/** /**
* 初始数据 * 初始数据
@@ -150,10 +152,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,42 +1,40 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增角色' : '编辑角色'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="600px" width="600px"
align-center align-center
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="角色名称" prop="name"> <el-form-item :label="$t('page.form.labelName')" prop="name">
<el-input v-model="formData.name" placeholder="请输入角色名称" /> <el-input v-model="formData.name" :placeholder="$t('page.form.placeholderName')" />
</el-form-item> </el-form-item>
<el-form-item label="角色标识" prop="code"> <el-form-item :label="$t('page.form.labelCode')" prop="code">
<el-input v-model="formData.code" placeholder="请输入角色编码" /> <el-input v-model="formData.code" :placeholder="$t('page.form.placeholderCode')" />
</el-form-item> </el-form-item>
<el-form-item label="角色级别" prop="level"> <el-form-item :label="$t('page.form.labelLevel')" prop="level">
<el-input-number v-model="formData.level" placeholder="角色级别" :max="99" :min="1" /> <el-input-number v-model="formData.level" :placeholder="$t('page.form.labelLevel')" :max="99" :min="1" />
</el-form-item> </el-form-item>
<div class="text-xs text-gray-400 pl-32 pb-4" <div class="text-xs text-gray-400 pl-32 pb-4">{{ $t('page.form.levelTip') }}</div>
>控制角色的权限层级, 不能操作职级高于自己的角色</div <el-form-item :label="$t('page.form.labelRemark')" prop="remark">
>
<el-form-item label="描述" prop="remark">
<el-input <el-input
v-model="formData.remark" v-model="formData.remark"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入角色描述" :placeholder="$t('page.form.placeholderRemark')"
/> />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item :label="$t('page.form.labelSort')" prop="sort">
<el-input-number v-model="formData.sort" placeholder="请输入排序" /> <el-input-number v-model="formData.sort" :placeholder="$t('page.form.placeholderSort')" />
</el-form-item> </el-form-item>
<el-form-item label="启用" prop="status"> <el-form-item :label="$t('page.form.labelStatus')" prop="status">
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -45,6 +43,7 @@
import api from '@/api/system/role' import api from '@/api/system/role'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -64,6 +63,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -78,11 +78,11 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }], name: [{ required: true, message: t('page.form.ruleNameRequired'), trigger: 'blur' }],
code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }], code: [{ required: true, message: t('page.form.ruleCodeRequired'), trigger: 'blur' }],
level: [{ required: true, message: '请输入角色级别', trigger: 'blur' }] level: [{ required: true, message: t('page.form.ruleLevelRequired'), trigger: 'blur' }]
}) }))
/** /**
* 初始数据 * 初始数据
@@ -157,10 +157,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,36 +1,36 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增用户' : '编辑用户'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="800px" width="800px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="100px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="100px">
<el-form-item label="头像" prop="avatar"> <el-form-item :label="$t('page.form.labelAvatar')" prop="avatar">
<sa-image-picker v-model="formData.avatar" round /> <sa-image-picker v-model="formData.avatar" round />
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户名" prop="username"> <el-form-item :label="$t('page.form.labelUsername')" prop="username">
<el-input v-model="formData.username" /> <el-input v-model="formData.username" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="真实姓名" prop="realname"> <el-form-item :label="$t('page.form.labelRealname')" prop="realname">
<el-input v-model="formData.realname" /> <el-input v-model="formData.realname" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="dialogType === 'add'"> <el-row v-if="dialogType === 'add'">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="密码" prop="password"> <el-form-item :label="$t('page.form.labelPassword')" prop="password">
<el-input type="password" v-model="formData.password" show-password /> <el-input type="password" v-model="formData.password" show-password />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="确认密码" prop="password_confirm"> <el-form-item :label="$t('page.form.labelPasswordConfirm')" prop="password_confirm">
<el-input type="password" v-model="formData.password_confirm" show-password /> <el-input type="password" v-model="formData.password_confirm" show-password />
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -38,20 +38,20 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item :label="$t('page.form.labelEmail')" prop="email">
<el-input v-model="formData.email" placeholder="请输入邮箱" /> <el-input v-model="formData.email" :placeholder="$t('page.form.placeholderEmail')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号" prop="phone"> <el-form-item :label="$t('page.form.labelPhone')" prop="phone">
<el-input v-model="formData.phone" placeholder="请输入手机号" /> <el-input v-model="formData.phone" :placeholder="$t('page.form.placeholderPhone')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部门" prop="dept_id"> <el-form-item :label="$t('page.form.labelDept')" prop="dept_id">
<el-tree-select <el-tree-select
v-model="formData.dept_id" v-model="formData.dept_id"
:data="optionData.deptData" :data="optionData.deptData"
@@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="角色" prop="role_ids"> <el-form-item :label="$t('page.form.labelRole')" prop="role_ids">
<el-select v-model="formData.role_ids" multiple clearable> <el-select v-model="formData.role_ids" multiple clearable>
<el-option <el-option
v-for="role in optionData.roleList" v-for="role in optionData.roleList"
@@ -77,7 +77,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="岗位" prop="post_ids"> <el-form-item :label="$t('page.form.labelPost')" prop="post_ids">
<el-select v-model="formData.post_ids" multiple clearable> <el-select v-model="formData.post_ids" multiple clearable>
<el-option <el-option
v-for="post in optionData.postList" v-for="post in optionData.postList"
@@ -89,14 +89,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="性别" prop="gender"> <el-form-item :label="$t('page.form.labelGender')" prop="gender">
<sa-radio v-model="formData.gender" dict="gender" valueType="string" /> <sa-radio v-model="formData.gender" dict="gender" valueType="string" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="状态" prop="status"> <el-form-item :label="$t('page.form.labelStatus')" prop="status">
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -104,12 +104,12 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('page.form.labelRemark')" prop="remark">
<el-input <el-input
v-model="formData.remark" v-model="formData.remark"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入备注" :placeholder="$t('page.form.placeholderRemark')"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -117,8 +117,8 @@
</el-form> </el-form>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@@ -130,6 +130,8 @@
import deptApi from '@/api/system/dept' import deptApi from '@/api/system/dept'
import roleApi from '@/api/system/role' import roleApi from '@/api/system/role'
import postApi from '@/api/system/post' import postApi from '@/api/system/post'
import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -149,6 +151,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
const optionData = reactive({ const optionData = reactive({
@@ -167,30 +170,30 @@
const validatePasswordConfirm = (rule: any, value: any, callback: any) => { const validatePasswordConfirm = (rule: any, value: any, callback: any) => {
if (value !== formData.password) { if (value !== formData.password) {
callback(new Error('两次输入的密码不一致')) callback(new Error(t('page.form.rulePasswordNotMatch')))
} else { } else {
callback() callback()
} }
} }
// 表单验证规则 // 表单验证规则
const rules: FormRules = { const rules = computed<FormRules>(() => ({
username: [ username: [
{ required: true, message: '请输入用户名', trigger: 'blur' }, { required: true, message: t('page.form.ruleUsernameRequired'), trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' } { min: 2, max: 20, message: t('page.form.ruleUsernameLength'), trigger: 'blur' }
], ],
password: [ password: [
{ required: true, message: '请输入密码', trigger: 'blur' }, { required: true, message: t('page.form.rulePasswordRequired'), trigger: 'blur' },
{ min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' } { min: 6, max: 20, message: t('page.form.rulePasswordLength'), trigger: 'blur' }
], ],
password_confirm: [ password_confirm: [
{ required: true, message: '请输入确认密码', trigger: 'blur' }, { required: true, message: t('page.form.rulePasswordConfirmRequired'), trigger: 'blur' },
{ min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }, { min: 6, max: 20, message: t('page.form.rulePasswordLength'), trigger: 'blur' },
{ validator: validatePasswordConfirm, trigger: 'blur' } { validator: validatePasswordConfirm, trigger: 'blur' }
], ],
dept_id: [{ required: true, message: '请选择部门', trigger: 'change' }], dept_id: [{ required: true, message: t('page.form.ruleDeptRequired'), trigger: 'change' }],
role_ids: [{ required: true, message: '请选择角色', trigger: 'blur' }] role_ids: [{ required: true, message: t('page.form.ruleRoleRequired'), trigger: 'blur' }]
} }))
// 初始表单数据 // 初始表单数据
const initialFormData = { const initialFormData = {
@@ -287,10 +290,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -1,30 +1,30 @@
<template> <template>
<el-dialog <el-dialog
v-model="visible" v-model="visible"
:title="dialogType === 'add' ? '新增定时任务' : '编辑定时任务'" :title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="800px" width="800px"
align-center align-center
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px"> <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item label="任务名称" prop="name"> <el-form-item :label="$t('page.form.labelName')" prop="name">
<el-input v-model="formData.name" placeholder="请输入任务名称" /> <el-input v-model="formData.name" :placeholder="$t('page.form.placeholderName')" />
</el-form-item> </el-form-item>
<el-form-item label="任务类型" prop="type"> <el-form-item :label="$t('page.form.labelType')" prop="type">
<sa-select v-model="formData.type" dict="crontab_task_type" /> <sa-select v-model="formData.type" dict="crontab_task_type" />
</el-form-item> </el-form-item>
<el-form-item label="定时规则" prop="task_style"> <el-form-item :label="$t('page.form.labelTaskStyle')" prop="task_style">
<el-space> <el-space>
<el-select v-model="formData.task_style" :style="{ width: '100px' }"> <el-select v-model="formData.task_style" :style="{ width: '100px' }">
<el-option :value="1" label="每天" /> <el-option :value="1" :label="$t('page.form.taskStyleEveryDay')" />
<el-option :value="2" label="每小时" /> <el-option :value="2" :label="$t('page.form.taskStyleEveryHour')" />
<el-option :value="3" label="N小时" /> <el-option :value="3" :label="$t('page.form.taskStyleNHours')" />
<el-option :value="4" label="N分钟" /> <el-option :value="4" :label="$t('page.form.taskStyleNMinutes')" />
<el-option :value="5" label="N秒" /> <el-option :value="5" :label="$t('page.form.taskStyleNSeconds')" />
<el-option :value="6" label="每周" /> <el-option :value="6" :label="$t('page.form.taskStyleEveryWeek')" />
<el-option :value="7" label="每月" /> <el-option :value="7" :label="$t('page.form.taskStyleEveryMonth')" />
<el-option :value="8" label="每年" /> <el-option :value="8" :label="$t('page.form.taskStyleEveryYear')" />
</el-select> </el-select>
<template v-if="formData.task_style == 8"> <template v-if="formData.task_style == 8">
<el-input-number <el-input-number
@@ -35,7 +35,7 @@
controls-position="right" controls-position="right"
:style="{ width: '100px' }" :style="{ width: '100px' }"
/> />
<span></span> <span>{{ $t('page.form.unitMonth') }}</span>
</template> </template>
<template v-if="formData.task_style > 6"> <template v-if="formData.task_style > 6">
<el-input-number <el-input-number
@@ -46,20 +46,20 @@
controls-position="right" controls-position="right"
:style="{ width: '100px' }" :style="{ width: '100px' }"
/> />
<span></span> <span>{{ $t('page.form.unitDay') }}</span>
</template> </template>
<el-select <el-select
v-if="formData.task_style == 6" v-if="formData.task_style == 6"
v-model="formData.week" v-model="formData.week"
:style="{ width: '100px' }" :style="{ width: '100px' }"
> >
<el-option :value="1" label="周一" /> <el-option :value="1" :label="$t('page.form.weekMon')" />
<el-option :value="2" label="周二" /> <el-option :value="2" :label="$t('page.form.weekTue')" />
<el-option :value="3" label="周三" /> <el-option :value="3" :label="$t('page.form.weekWed')" />
<el-option :value="4" label="周四" /> <el-option :value="4" :label="$t('page.form.weekThu')" />
<el-option :value="5" label="周五" /> <el-option :value="5" :label="$t('page.form.weekFri')" />
<el-option :value="6" label="周六" /> <el-option :value="6" :label="$t('page.form.weekSat')" />
<el-option :value="0" label="周日" /> <el-option :value="0" :label="$t('page.form.weekSun')" />
</el-select> </el-select>
<template v-if="[1, 3, 6, 7, 8].includes(formData.task_style)"> <template v-if="[1, 3, 6, 7, 8].includes(formData.task_style)">
<el-input-number <el-input-number
@@ -70,7 +70,7 @@
controls-position="right" controls-position="right"
:style="{ width: '100px' }" :style="{ width: '100px' }"
/> />
<span></span> <span>{{ $t('page.form.unitHour') }}</span>
</template> </template>
<template v-if="formData.task_style != 5"> <template v-if="formData.task_style != 5">
<el-input-number <el-input-number
@@ -81,7 +81,7 @@
controls-position="right" controls-position="right"
:style="{ width: '100px' }" :style="{ width: '100px' }"
/> />
<span></span> <span>{{ $t('page.form.unitMinute') }}</span>
</template> </template>
<template v-if="formData.task_style == 5"> <template v-if="formData.task_style == 5">
<el-input-number <el-input-number
@@ -92,36 +92,41 @@
controls-position="right" controls-position="right"
:style="{ width: '100px' }" :style="{ width: '100px' }"
/> />
<span></span> <span>{{ $t('page.form.unitSecond') }}</span>
</template> </template>
</el-space> </el-space>
</el-form-item> </el-form-item>
<el-form-item label="调用目标" prop="target"> <el-form-item :label="$t('page.form.labelTarget')" prop="target">
<el-input <el-input
v-model="formData.target" v-model="formData.target"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入调用目标" :placeholder="$t('page.form.placeholderTarget')"
/> />
</el-form-item> </el-form-item>
<el-form-item label="任务参数" prop="params"> <el-form-item :label="$t('page.form.labelParams')" prop="params">
<el-input <el-input
v-model="formData.parameter" v-model="formData.parameter"
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入任务参数" :placeholder="$t('page.form.placeholderParams')"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item :label="$t('page.form.labelStatus')" prop="status">
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item :label="$t('page.form.labelRemark')" prop="remark">
<el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="请输入备注" /> <el-input
v-model="formData.remark"
type="textarea"
:rows="2"
:placeholder="$t('page.form.placeholderRemark')"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleClose">取消</el-button> <el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
@@ -130,6 +135,7 @@
import api from '@/api/tool/crontab' import api from '@/api/tool/crontab'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
interface Props { interface Props {
modelValue: boolean modelValue: boolean
@@ -149,6 +155,7 @@
}) })
const emit = defineEmits<Emits>() const emit = defineEmits<Emits>()
const { t } = useI18n()
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()
@@ -163,12 +170,12 @@
/** /**
* 表单验证规则 * 表单验证规则
*/ */
const rules = reactive<FormRules>({ const rules = computed<FormRules>(() => ({
name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }], name: [{ required: true, message: t('page.form.ruleNameRequired'), trigger: 'blur' }],
type: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }], type: [{ required: true, message: t('page.form.ruleTypeRequired'), trigger: 'blur' }],
task_style: [{ required: true, message: '定时规则不能为空', trigger: 'blur' }], task_style: [{ required: true, message: t('page.form.ruleTaskStyleRequired'), trigger: 'blur' }],
target: [{ required: true, message: '调用目标不能为空', trigger: 'blur' }] target: [{ required: true, message: t('page.form.ruleTargetRequired'), trigger: 'blur' }]
}) }))
/** /**
* 初始数据 * 初始数据
@@ -264,10 +271,10 @@
await formRef.value.validate() await formRef.value.validate()
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(formData) await api.save(formData)
ElMessage.success('新增成功') ElMessage.success(t('page.form.addSuccess'))
} else { } else {
await api.update(formData) await api.update(formData)
ElMessage.success('修改成功') ElMessage.success(t('page.form.editSuccess'))
} }
emit('success') emit('success')
handleClose() handleClose()

View File

@@ -80,7 +80,7 @@ class GameController extends BaseController
$userId = (int) ($request->player_id ?? 0); $userId = (int) ($request->player_id ?? 0);
$count = (int) $request->post('count', 0); $count = (int) $request->post('count', 0);
if (!in_array($count, [1, 5, 10], true)) { if (!in_array($count, [1, 5, 10], true)) {
return $this->fail('购买抽奖券错误', ReturnCode::PARAMS_ERROR); return $this->fail('Invalid lottery ticket purchase', ReturnCode::PARAMS_ERROR);
} }
try { try {
@@ -148,25 +148,25 @@ class GameController extends BaseController
$direction = (int) $direction; $direction = (int) $direction;
} }
if (!in_array($direction, [0, 1], true)) { if (!in_array($direction, [0, 1], true)) {
return $this->fail('direction 必须为 0 1', ReturnCode::PARAMS_ERROR); return $this->fail('direction must be 0 or 1', ReturnCode::PARAMS_ERROR);
} }
$player = DicePlayer::find($userId); $player = DicePlayer::find($userId);
if (!$player) { if (!$player) {
return $this->fail('用户不存在', ReturnCode::NOT_FOUND); return $this->fail('User not found', ReturnCode::NOT_FOUND);
} }
$minEv = DiceRewardConfig::getCachedMinRealEv(); $minEv = DiceRewardConfig::getCachedMinRealEv();
$minCoin = abs($minEv + 100); $minCoin = abs($minEv + 100);
$coin = (float) $player->coin; $coin = (float) $player->coin;
if ($coin < $minCoin) { if ($coin < $minCoin) {
$msg = ApiLang::translateParams('当前玩家余额%s小于%s无法继续游戏', [$coin, $minCoin], $request); $msg = ApiLang::translateParams('Balance %s is less than %s, cannot continue', [$coin, $minCoin], $request);
return $this->success([], $msg); return $this->success([], $msg);
} }
$lockName = 'play_start_' . $userId; $lockName = 'play_start_' . $userId;
$lockResult = Db::query('SELECT GET_LOCK(?, 30) as l', [$lockName]); $lockResult = Db::query('SELECT GET_LOCK(?, 30) as l', [$lockName]);
if (empty($lockResult) || (int) ($lockResult[0]['l'] ?? 0) !== 1) { if (empty($lockResult) || (int) ($lockResult[0]['l'] ?? 0) !== 1) {
return $this->fail('请求过于频繁,请稍后再试', ReturnCode::BUSINESS_ERROR); return $this->fail('too many requests, please try again later', ReturnCode::BUSINESS_ERROR);
} }
try { try {
$logic = new PlayStartLogic(); $logic = new PlayStartLogic();
@@ -250,7 +250,7 @@ class GameController extends BaseController
if ($msg === '') { if ($msg === '') {
$msg = '没有原因'; $msg = '没有原因';
} }
return $this->fail('服务超时,' . $msg); return $this->fail('Service timeout: ' . $msg);
} finally { } finally {
Db::execute('SELECT RELEASE_LOCK(?)', [$lockName]); Db::execute('SELECT RELEASE_LOCK(?)', [$lockName]);
} }

View File

@@ -34,7 +34,7 @@ class UserController extends BaseController
$time = $request->post('time'); $time = $request->post('time');
$time = $time !== null && $time !== '' ? (string) $time : (string) time(); $time = $time !== null && $time !== '' ? (string) $time : (string) time();
if ($username === '' || $password === '') { if ($username === '' || $password === '') {
return $this->fail('username、password 不能为空', ReturnCode::PARAMS_ERROR); return $this->fail('USERNAME_PASSWORD_REQUIRED', ReturnCode::PARAMS_ERROR);
} }
try { try {
@@ -68,15 +68,15 @@ class UserController extends BaseController
} }
$token = $token !== null ? trim((string) $token) : ''; $token = $token !== null ? trim((string) $token) : '';
if ($token === '') { if ($token === '') {
return $this->fail('请携带 token', ReturnCode::UNAUTHORIZED); return $this->fail('Please provide token', ReturnCode::UNAUTHORIZED);
} }
$username = UserLogic::getUsernameFromJwtPayload($token); $username = UserLogic::getUsernameFromJwtPayload($token);
if ($username === null || $username === '') { if ($username === null || $username === '') {
return $this->fail('token 无效', ReturnCode::TOKEN_INVALID); return $this->fail('Invalid or expired token', ReturnCode::TOKEN_INVALID);
} }
UserCache::deleteSessionByUsername($username); UserCache::deleteSessionByUsername($username);
UserCache::deletePlayerByUsername($username); UserCache::deletePlayerByUsername($username);
return $this->success('已退出登录'); return $this->success('Logged out successfully');
} }
/** /**
@@ -89,7 +89,7 @@ class UserController extends BaseController
$userId = (int) ($request->player_id ?? 0); $userId = (int) ($request->player_id ?? 0);
$user = UserLogic::getCachedUser($userId); $user = UserLogic::getCachedUser($userId);
if (empty($user)) { if (empty($user)) {
return $this->fail('用户不存在', ReturnCode::NOT_FOUND); return $this->fail('User not found', ReturnCode::NOT_FOUND);
} }
$fields = ['id', 'username', 'phone', 'uid', 'name', 'coin', 'total_ticket_count']; $fields = ['id', 'username', 'phone', 'uid', 'name', 'coin', 'total_ticket_count'];
$info = []; $info = [];
@@ -111,7 +111,7 @@ class UserController extends BaseController
$userId = (int) ($request->player_id ?? 0); $userId = (int) ($request->player_id ?? 0);
$user = UserLogic::getCachedUser($userId); $user = UserLogic::getCachedUser($userId);
if (empty($user)) { if (empty($user)) {
return $this->fail('用户不存在', ReturnCode::NOT_FOUND); return $this->fail('User not found', ReturnCode::NOT_FOUND);
} }
$coin = $user['coin'] ?? 0; $coin = $user['coin'] ?? 0;
if (is_string($coin) && is_numeric($coin)) { if (is_string($coin) && is_numeric($coin)) {

View File

@@ -31,27 +31,27 @@ class AuthTokenController extends BaseController
$signature = trim((string) ($request->get('signature', ''))); $signature = trim((string) ($request->get('signature', '')));
if ($agentId === '' || $secret === '' || $time === '' || $signature === '') { if ($agentId === '' || $secret === '' || $time === '' || $signature === '') {
return $this->fail('缺少参数:agent_idsecrettimesignature 不能为空', ReturnCode::PARAMS_ERROR); return $this->fail('Missing parameters: agent_id, secret, time, signature are required', ReturnCode::PARAMS_ERROR);
} }
$expectedSecret = config('api.auth_token_secret', ''); $expectedSecret = config('api.auth_token_secret', '');
if ($expectedSecret === '') { if ($expectedSecret === '') {
return $this->fail('服务端未配置 API_AUTH_TOKEN_SECRET', ReturnCode::SERVER_ERROR); return $this->fail('API_AUTH_TOKEN_SECRET is not configured', ReturnCode::SERVER_ERROR);
} }
if ($secret !== $expectedSecret) { if ($secret !== $expectedSecret) {
return $this->fail('密钥错误', ReturnCode::FORBIDDEN); return $this->fail('Invalid secret', ReturnCode::FORBIDDEN);
} }
$timeVal = (int) $time; $timeVal = (int) $time;
$tolerance = (int) config('api.auth_token_time_tolerance', 300); $tolerance = (int) config('api.auth_token_time_tolerance', 300);
$now = time(); $now = time();
if ($timeVal < $now - $tolerance || $timeVal > $now + $tolerance) { if ($timeVal < $now - $tolerance || $timeVal > $now + $tolerance) {
return $this->fail('时间戳已过期或无效,请同步时间', ReturnCode::FORBIDDEN); return $this->fail('Timestamp expired or invalid, please sync time', ReturnCode::FORBIDDEN);
} }
$expectedSignature = md5($agentId . $secret . $time); $expectedSignature = md5($agentId . $secret . $time);
if ($signature !== $expectedSignature) { if ($signature !== $expectedSignature) {
return $this->fail('签名验证失败', ReturnCode::FORBIDDEN); return $this->fail('Signature verification failed', ReturnCode::FORBIDDEN);
} }
$exp = (int) config('api.auth_token_exp', 86400); $exp = (int) config('api.auth_token_exp', 86400);
@@ -63,7 +63,7 @@ class AuthTokenController extends BaseController
]); ]);
$token = $tokenResult['access_token']; $token = $tokenResult['access_token'];
if (!AuthTokenCache::setToken($agentId, $token)) { if (!AuthTokenCache::setToken($agentId, $token)) {
return $this->fail('生成 token 失败', ReturnCode::SERVER_ERROR); return $this->fail('Failed to generate token', ReturnCode::SERVER_ERROR);
} }
return $this->success([ return $this->success([

View File

@@ -33,7 +33,7 @@ class GameController extends BaseController
$time = trim((string) ($request->post('time', ''))); $time = trim((string) ($request->post('time', '')));
if ($username === '') { if ($username === '') {
return $this->fail('username 不能为空', ReturnCode::PARAMS_ERROR); return $this->fail('username is required', ReturnCode::PARAMS_ERROR);
} }
if ($password === '') { if ($password === '') {
$password = '123456'; $password = '123456';
@@ -43,11 +43,13 @@ class GameController extends BaseController
} }
$adminId = null; $adminId = null;
$adminIdsInTopDept = null;
$agentId = trim((string) ($request->agent_id ?? '')); $agentId = trim((string) ($request->agent_id ?? ''));
if ($agentId !== '') { if ($agentId !== '') {
$systemUser = SystemUser::where('agent_id', $agentId)->find(); $systemUser = SystemUser::where('agent_id', $agentId)->find();
if ($systemUser) { if ($systemUser) {
$adminId = (int) $systemUser->id; $adminId = (int) $systemUser->id;
$adminIdsInTopDept = UserLogic::getAdminIdsByAgentIdTopDept($agentId);
} }
} }
@@ -56,7 +58,7 @@ class GameController extends BaseController
try { try {
$logic = new UserLogic(); $logic = new UserLogic();
$result = $logic->loginByUsername($username, $password, $lang === 'en' ? 'en' : 'chs', 0.0, $time, $adminId); $result = $logic->loginByUsername($username, $password, $lang === 'en' ? 'en' : 'chs', 0.0, $time, $adminId, $adminIdsInTopDept);
} catch (\plugin\saiadmin\exception\ApiException $e) { } catch (\plugin\saiadmin\exception\ApiException $e) {
return $this->fail($e->getMessage(), ReturnCode::PARAMS_ERROR); return $this->fail($e->getMessage(), ReturnCode::PARAMS_ERROR);
} }
@@ -80,12 +82,12 @@ class GameController extends BaseController
$username = trim((string) ($request->post('username', ''))); $username = trim((string) ($request->post('username', '')));
if ($username === '') { if ($username === '') {
return $this->fail('username 不能为空', ReturnCode::PARAMS_ERROR); return $this->fail('username is required', ReturnCode::PARAMS_ERROR);
} }
$player = DicePlayer::where('username', $username)->find(); $player = DicePlayer::where('username', $username)->find();
if (!$player) { if (!$player) {
return $this->fail('用户不存在', ReturnCode::NOT_FOUND); return $this->fail('User not found', ReturnCode::NOT_FOUND);
} }
$hidden = ['password', 'lottery_config_id', 't1_weight', 't2_weight', 't3_weight', 't4_weight', 't5_weight', 'delete_time']; $hidden = ['password', 'lottery_config_id', 't1_weight', 't2_weight', 't3_weight', 't4_weight', 't5_weight', 'delete_time'];
@@ -247,27 +249,27 @@ class GameController extends BaseController
$coin = $request->post('coin'); $coin = $request->post('coin');
if ($username === '') { if ($username === '') {
return $this->fail('username 不能为空', ReturnCode::PARAMS_ERROR); return $this->fail('username is required', ReturnCode::PARAMS_ERROR);
} }
if ($coin === null || $coin === '') { if ($coin === null || $coin === '') {
return $this->fail('coin 不能为空', ReturnCode::PARAMS_ERROR); return $this->fail('coin is required', ReturnCode::PARAMS_ERROR);
} }
$coinVal = (float) $coin; $coinVal = (float) $coin;
if ($coinVal === 0.0) { if ($coinVal === 0.0) {
return $this->fail('coin 不能为 0', ReturnCode::PARAMS_ERROR); return $this->fail('coin cannot be 0', ReturnCode::PARAMS_ERROR);
} }
$player = DicePlayer::where('username', $username)->find(); $player = DicePlayer::where('username', $username)->find();
if (!$player) { if (!$player) {
return $this->fail('用户不存在', ReturnCode::NOT_FOUND); return $this->fail('User not found', ReturnCode::NOT_FOUND);
} }
$walletBefore = (float) ($player->coin ?? 0); $walletBefore = (float) ($player->coin ?? 0);
$walletAfter = $walletBefore + $coinVal; $walletAfter = $walletBefore + $coinVal;
if ($coinVal < 0 && $walletBefore < -$coinVal) { if ($coinVal < 0 && $walletBefore < -$coinVal) {
return $this->fail('余额不足,无法转出', ReturnCode::BUSINESS_ERROR); return $this->fail('Insufficient balance to transfer', ReturnCode::BUSINESS_ERROR);
} }
$type = $coinVal > 0 ? 0 : 1; $type = $coinVal > 0 ? 0 : 1;
@@ -295,7 +297,7 @@ class GameController extends BaseController
Db::commit(); Db::commit();
} catch (\Throwable $e) { } catch (\Throwable $e) {
Db::rollback(); Db::rollback();
return $this->fail('操作失败:' . $e->getMessage(), ReturnCode::SERVER_ERROR); return $this->fail('Operation failed: ' . $e->getMessage(), ReturnCode::SERVER_ERROR);
} }
// 出于安全:删除该玩家相关缓存,后续 API 调用按需重建 // 出于安全:删除该玩家相关缓存,后续 API 调用按需重建

View File

@@ -2,52 +2,38 @@
declare(strict_types=1); declare(strict_types=1);
/** /**
* API 英文文案(请求头 lang=en 时使用 * API 英文文案(对外接口推荐:英文 key
* key 为中文原文value 为英文 * 请求头 lang=en 时使用key 为英文错误码value 为英文展示文案
*/ */
return [ return [
'success' => 'Success', 'SUCCESS' => 'Success',
'fail' => 'Fail', 'FAIL' => 'Fail',
'username、password 不能为空' => 'username and password are required', 'TOKEN_REQUIRED' => 'Please provide token',
'请携带 token' => 'Please provide token', 'TOKEN_INVALID' => 'Invalid or expired token',
'token 无效' => 'Invalid or expired token', 'TOKEN_EXPIRED_RELOGIN' => 'Token expired, please login again',
'已退出登录' => 'Logged out successfully', 'TOKEN_FORMAT_INVALID' => 'Token format invalid',
'用户不存在' => 'User not found', 'AUTH_TOKEN_REQUIRED' => 'Please provide auth-token',
'username 不能为空' => 'username is required', 'AUTH_TOKEN_EXPIRED' => 'auth-token expired',
'密码错误' => 'Wrong password', 'AUTH_TOKEN_INVALID' => 'auth-token invalid',
'账号已被禁用,无法登录' => 'Account is disabled and cannot log in', 'AUTH_TOKEN_FORMAT_INVALID' => 'auth-token format invalid',
'购买抽奖券错误' => 'Invalid lottery ticket purchase', 'AUTH_TOKEN_INVALID_OR_EXPIRED' => 'auth-token invalid or expired',
'平台币不足' => 'Insufficient balance', 'USER_NOT_FOUND' => 'User not found',
'direction 必须为 0 或 1' => 'direction must be 0 or 1', 'USERNAME_REQUIRED' => 'username is required',
'当前玩家余额%s小于%s无法继续游戏' => 'Balance %s is less than %s, cannot continue', 'USERNAME_PASSWORD_REQUIRED' => 'username and password are required',
'服务超时,' => 'Service timeout: ', 'PASSWORD_WRONG' => 'Wrong password',
'没有原因' => 'Unknown reason', 'ACCOUNT_DISABLED' => 'Account is disabled and cannot log in',
'缺少参数agent_id、secret、time、signature 不能为空' => 'Missing parameters: agent_id, secret, time, signature are required', 'BUY_TICKET_ERROR' => 'Invalid lottery ticket purchase',
'服务端未配置 API_AUTH_TOKEN_SECRET' => 'API_AUTH_TOKEN_SECRET is not configured', 'INSUFFICIENT_BALANCE' => 'Insufficient balance',
'密钥错误' => 'Invalid secret', 'INSUFFICIENT_TICKETS' => 'Insufficient lottery tickets',
'时间戳已过期或无效,请同步时间' => 'Timestamp expired or invalid, please sync time', 'DIRECTION_INVALID' => 'direction must be 0 or 1',
'签名验证失败' => 'Signature verification failed', 'BALANCE_LESS_THAN_MIN' => 'Balance %s is less than %s, cannot continue',
'生成 token 失败' => 'Failed to generate token', 'LOTTERY_CONFIG_NOT_FOUND' => 'Lottery config not found',
'coin 不能为空' => 'coin is required', 'LOTTERY_POOL_CONFIG_NOT_FOUND_DEFAULT' => 'Lottery pool config not found (name=default required)',
'coin 不能为 0' => 'coin cannot be 0', 'LOTTERY_POOL_CONFIG_DEFAULT_NOT_FOUND' => 'No name=default pool config found, please create one first',
'余额不足,无法转出' => 'Insufficient balance to transfer', 'NO_AVAILABLE_REWARD_CONFIG' => 'No available reward config',
'操作失败:' => 'Operation failed: ', 'CONFIG_ID_NOT_FOUND_OR_TIER_EMPTY' => 'Config ID %s not found or tier is empty',
'服务超时,没有原因' => 'Service timeout: Unknown reason', 'DATA_NOT_FOUND' => 'Data not found',
// PlayStartLogic / GameLogic 'BATCH_DELETE_FORBIDDEN' => 'Batch delete is not allowed',
'抽奖券不足' => 'Insufficient lottery tickets', 'SUPER_ADMIN_CANNOT_DELETE' => 'Super admin cannot be deleted',
'奖池配置不存在' => 'Lottery config not found', 'OLD_PASSWORD_WRONG' => 'Old password is incorrect',
'该方向下暂无可用路径配置' => 'No path config available for this direction',
// UserLogic
'手机号格式错误,仅支持 +60 开头的马来西亚号码(如 +60123456789' => 'Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)',
// TokenMiddleware / Auth (api/user/*, api/game/*)
'请携带 auth-token' => 'Please provide auth-token',
'auth-token 已过期' => 'auth-token expired',
'auth-token 无效' => 'auth-token invalid',
'auth-token 格式无效' => 'auth-token format invalid',
'auth-token 无效或已失效' => 'auth-token invalid or expired',
'token 已过期,请重新登录' => 'Token expired, please login again',
'token 格式无效' => 'Token format invalid',
'请注册' => 'Please register',
'请重新登录' => 'Please login again',
'请重新登录(当前账号已在其他处登录)' => 'Please login again (account logged in elsewhere)',
]; ];

View File

@@ -0,0 +1,150 @@
<?php
declare(strict_types=1);
/**
* 旧版兼容:中文 => 英文 映射表
* 历史代码中大量直接抛中文/返回中文 messagelang=en 时用于兼容翻译。
* 新版推荐使用英文错误码key+ resource/translations/api/{zh,en}.php。
*/
return [
'success' => 'Success',
'fail' => 'Fail',
'username、password 不能为空' => 'username and password are required',
'请携带 token' => 'Please provide token',
'token 无效' => 'Invalid or expired token',
'已退出登录' => 'Logged out successfully',
'用户不存在' => 'User not found',
'username 不能为空' => 'username is required',
'密码错误' => 'Wrong password',
'账号已被禁用,无法登录' => 'Account is disabled and cannot log in',
'购买抽奖券错误' => 'Invalid lottery ticket purchase',
'平台币不足' => 'Insufficient balance',
'direction 必须为 0 或 1' => 'direction must be 0 or 1',
'当前玩家余额%s小于%s无法继续游戏' => 'Balance %s is less than %s, cannot continue',
'服务超时,' => 'Service timeout: ',
'没有原因' => 'Unknown reason',
'缺少参数agent_id、secret、time、signature 不能为空' => 'Missing parameters: agent_id, secret, time, signature are required',
'服务端未配置 API_AUTH_TOKEN_SECRET' => 'API_AUTH_TOKEN_SECRET is not configured',
'密钥错误' => 'Invalid secret',
'时间戳已过期或无效,请同步时间' => 'Timestamp expired or invalid, please sync time',
'签名验证失败' => 'Signature verification failed',
'生成 token 失败' => 'Failed to generate token',
'coin 不能为空' => 'coin is required',
'coin 不能为 0' => 'coin cannot be 0',
'余额不足,无法转出' => 'Insufficient balance to transfer',
'操作失败:' => 'Operation failed: ',
'服务超时,没有原因' => 'Service timeout: Unknown reason',
// PlayStartLogic / GameLogic
'抽奖券不足' => 'Insufficient lottery tickets',
'奖池配置不存在' => 'Lottery config not found',
'配置ID %s 不存在或档位为空' => 'Config ID %s not found or tier is empty',
'该方向下暂无可用路径配置' => 'No path config available for this direction',
// Dice / pool config
'奖池配置不存在(需 name=default' => 'Lottery pool config not found (name=default required)',
'暂无可用奖励配置' => 'No available reward config',
'未找到 name=default 的奖池配置,请先创建' => 'No name=default pool config found, please create one first',
// Dice / wallet & tickets
'参数错误:需要有效的 player_id 和 type3=加点4=扣点)' => 'Invalid params: player_id and type are required (3=add, 4=deduct)',
'平台币变动必须大于 0' => 'Coin change must be greater than 0',
'玩家不存在' => 'Player not found',
'扣点数量不能大于当前余额' => 'Deduct amount cannot exceed current balance',
// Dice / reward config record
'测试记录不存在' => 'Test record not found',
'付费奖池配置不存在' => 'Paid pool config not found',
'免费奖池配置不存在' => 'Free pool config not found',
'各抽奖次数仅支持 0、100、500、1000、5000' => 'Counts only support 0, 100, 500, 1000, 5000',
'付费或免费至少一种方向次数之和大于 0' => 'Sum of paid/free direction counts must be greater than 0',
'付费未选择奖池配置时请填写付费自定义档位概率T1T5' => 'When paid pool is not selected, please fill paid custom tier probabilities (T1T5)',
'付费档位概率每档只能 0-100%' => 'Paid tier probability must be between 0 and 100%',
'付费档位概率 T1T5 之和不能超过 100%' => 'Paid tier probabilities (T1T5) sum cannot exceed 100%',
'免费未选择奖池配置时请填写免费自定义档位概率T1T5' => 'When free pool is not selected, please fill free custom tier probabilities (T1T5)',
'免费档位概率每档只能 0-100%' => 'Free tier probability must be between 0 and 100%',
'免费档位概率 T1T5 之和不能超过 100%' => 'Free tier probabilities (T1T5) sum cannot exceed 100%',
// Dice / reward
'存在无效的配置ID' => 'Invalid config ID exists',
'存在无效的 DiceReward id' => 'Invalid DiceReward id exists',
'奖励配置为空,请先维护 dice_reward_config' => 'Reward config is empty, please maintain dice_reward_config first',
// Dice / reward_config
'测试次数仅支持 100、500、1000、5000、10000' => 'Test count only supports 100, 500, 1000, 5000, 10000',
// SaiAdmin permissions & auth
'没有权限操作该部门数据' => 'No permission to operate department data',
'没有权限操作该角色数据' => 'No permission to operate role data',
'没有权限操作该数据' => 'No permission to operate this data',
'禁止批量删除操作' => 'Batch delete is not allowed',
'超级管理员禁止删除' => 'Super admin cannot be deleted',
'原密码错误' => 'Old password is incorrect',
'上级部门和当前部门不能相同' => 'Parent department cannot be the same as current department',
'不能将上级部门设置为当前部门的子部门' => 'Cannot set parent department to a child of current department',
'该部门下存在子部门,请先删除子部门' => 'This department has sub-departments, please delete them first',
'该部门下存在用户,请先删除或者转移用户' => 'This department has users, please delete or transfer them first',
'您的登录凭证错误或者已过期,请重新登录' => 'Your login credential is invalid or expired, please login again',
'登录凭证校验失败' => 'Login credential verification failed',
// Saipackage install
'插件的基础配置信息错误' => 'Plugin base config is invalid',
'插件已经存在' => 'Plugin already exists',
'该插件的安装目录已经被占用' => 'Plugin install directory is already occupied',
'文件不存在' => 'File not found',
// UserLogic
'手机号格式错误,仅支持 +60 开头的马来西亚号码(如 +60123456789' => 'Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)',
// TokenMiddleware / Auth (api/user/*, api/game/*)
'请携带 auth-token' => 'Please provide auth-token',
'auth-token 已过期' => 'auth-token expired',
'auth-token 无效' => 'auth-token invalid',
'auth-token 格式无效' => 'auth-token format invalid',
'auth-token 无效或已失效' => 'auth-token invalid or expired',
'token 已过期,请重新登录' => 'Token expired, please login again',
'token 格式无效' => 'Token format invalid',
'请注册' => 'Please register',
'请重新登录' => 'Please login again',
'请重新登录(当前账号已在其他处登录)' => 'Please login again (account logged in elsewhere)',
// DiceRewardLogic 动态文案(占位符)
'奖励配置需覆盖 26 个格位id 0-25 或 1-26当前仅 %s 条,无法完整生成 5-30 共26个点数、顺时针与逆时针的奖励对照' => 'Reward config must cover 26 cells (id 0-25 or 1-26), currently only %s, cannot generate full 5-30 points and clockwise/counterclockwise mapping',
// 通用
'数据不存在' => 'Data not found',
'不能设置父级为自身' => 'Cannot set parent to self',
'该菜单下存在子菜单,请先删除子菜单' => 'This menu has sub-menus, please delete them first',
'导入文件错误请上传正确的文件格式xlsx' => 'Import file error, please upload correct xlsx file',
'不能操作比当前账户职级高的角色' => 'Cannot operate roles with higher level than current account',
'该字典标识已存在' => 'This dict code already exists',
'修改数据异常,请检查' => 'Update data error, please check',
'删除数据异常,请检查' => 'Delete data error, please check',
'字典类型不存在' => 'Dict type not found',
'配置数据未找到' => 'Config data not found',
'系统默认分组,无法删除' => 'System default group cannot be deleted',
'配置组未找到' => 'Config group not found',
'上级分类和当前分类不能相同' => 'Parent category cannot be the same as current',
'不能将上级分类设置为当前分类的子分类' => 'Cannot set parent category as child of current',
'该部门下存在子分类,请先删除子分类' => 'This category has sub-categories, please delete them first',
'目标分类不存在' => 'Target category not found',
'获取文件资源失败' => 'Failed to get file resource',
'创建图片资源失败' => 'Failed to create image resource',
'文件格式错误' => 'Invalid file format',
'文件保存失败' => 'Failed to save file',
'当前表不支持回收站功能' => 'Current table does not support recycle bin',
'模板不存在' => 'Template not found',
'任务类型异常' => 'Invalid task type',
'数据库配置读取失败' => 'Failed to read database config',
'应用类型必须为plugin或者app' => 'App type must be plugin or app',
'请先设置应用名称' => 'Please set app name first',
'请选择要生成的表' => 'Please select tables to generate',
'非调试模式下,不允许生成文件' => 'File generation not allowed in non-debug mode',
'登录凭获取失败,请检查' => 'Failed to get login credential, please check',
'文件大小超过限制' => 'File size exceeds limit',
'不支持该格式的文件上传' => 'File format not supported for upload',
'该上传模式不存在' => 'Upload mode not found',
'切片上传服务必须在 HTTP 请求环境下调用' => 'Chunk upload must be called in HTTP request context',
'切片文件查找失败,请重新上传' => 'Chunk file not found, please upload again',
'未设置邮件配置' => 'Mail config not set',
'请执行 composer require phpmailer/phpmailer 并重启' => 'Please run composer require phpmailer/phpmailer and restart',
'仅超级管理员能够操作' => 'Only super admin can perform this action',
'等待依赖安装' => 'Waiting for dependencies to be installed',
'插件目录不存在' => 'Plugin directory not found',
'该插件的基础配置信息不完善' => 'Plugin base config is incomplete',
'参数错误' => 'Invalid parameters',
'该分类下存在子分类,请先删除子分类' => 'This category has sub-categories, please delete them first',
'无法打开文件,或者文件创建失败' => 'Cannot open file or create file failed',
'系统生成文件错误' => 'System file generation error',
'模板目录不存在!' => 'Template directory not found',
'文件类型异常,无法生成指定文件!' => 'Invalid file type, cannot generate file',
'前端目录查找失败,必须与后端目录为同级目录!' => 'Frontend directory not found, must be same level as backend',
];

View File

@@ -0,0 +1,40 @@
<?php
declare(strict_types=1);
/**
* API 中文文案(对外接口推荐:英文 key
* 请求头 lang=zh 时使用key 为英文错误码value 为中文展示文案
*/
return [
'SUCCESS' => '成功',
'FAIL' => '失败',
'TOKEN_REQUIRED' => '请携带 token',
'TOKEN_INVALID' => 'token 无效',
'TOKEN_EXPIRED_RELOGIN' => 'token 已过期,请重新登录',
'TOKEN_FORMAT_INVALID' => 'token 格式无效',
'AUTH_TOKEN_REQUIRED' => '请携带 auth-token',
'AUTH_TOKEN_EXPIRED' => 'auth-token 已过期',
'AUTH_TOKEN_INVALID' => 'auth-token 无效',
'AUTH_TOKEN_FORMAT_INVALID' => 'auth-token 格式无效',
'AUTH_TOKEN_INVALID_OR_EXPIRED' => 'auth-token 无效或已失效',
'USER_NOT_FOUND' => '用户不存在',
'USERNAME_REQUIRED' => 'username 不能为空',
'USERNAME_PASSWORD_REQUIRED' => 'username、password 不能为空',
'PASSWORD_WRONG' => '密码错误',
'ACCOUNT_DISABLED' => '账号已被禁用,无法登录',
'BUY_TICKET_ERROR' => '购买抽奖券错误',
'INSUFFICIENT_BALANCE' => '平台币不足',
'INSUFFICIENT_TICKETS' => '抽奖券不足',
'DIRECTION_INVALID' => 'direction 必须为 0 或 1',
'BALANCE_LESS_THAN_MIN' => '当前玩家余额%s小于%s无法继续游戏',
'LOTTERY_CONFIG_NOT_FOUND' => '奖池配置不存在',
'LOTTERY_POOL_CONFIG_NOT_FOUND_DEFAULT' => '奖池配置不存在(需 name=default',
'LOTTERY_POOL_CONFIG_DEFAULT_NOT_FOUND' => '未找到 name=default 的奖池配置,请先创建',
'NO_AVAILABLE_REWARD_CONFIG' => '暂无可用奖励配置',
'CONFIG_ID_NOT_FOUND_OR_TIER_EMPTY' => '配置ID %s 不存在或档位为空',
'DATA_NOT_FOUND' => '数据不存在',
'BATCH_DELETE_FORBIDDEN' => '禁止批量删除操作',
'SUPER_ADMIN_CANNOT_DELETE' => '超级管理员禁止删除',
'OLD_PASSWORD_WRONG' => '原密码错误',
];

View File

@@ -35,7 +35,7 @@ class GameLogic
public function buyLotteryTickets(int $playerId, int $count): array public function buyLotteryTickets(int $playerId, int $count): array
{ {
if (!isset(self::PACKAGES[$count])) { if (!isset(self::PACKAGES[$count])) {
throw new ApiException('购买抽奖券错误'); throw new ApiException('Invalid lottery ticket purchase');
} }
$pack = self::PACKAGES[$count]; $pack = self::PACKAGES[$count];
$cost = $pack['coin']; $cost = $pack['coin'];
@@ -45,11 +45,11 @@ class GameLogic
$player = DicePlayer::find($playerId); $player = DicePlayer::find($playerId);
if (!$player) { if (!$player) {
throw new ApiException('用户不存在'); throw new ApiException('User not found');
} }
$coinBefore = (float) $player->coin; $coinBefore = (float) $player->coin;
if ($coinBefore < $cost) { if ($coinBefore < $cost) {
throw new ApiException('平台币不足'); throw new ApiException('Insufficient balance');
} }
$coinAfter = $coinBefore - $cost; $coinAfter = $coinBefore - $cost;

View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace app\api\logic; namespace app\api\logic;
use app\api\cache\UserCache; use app\api\cache\UserCache;
use app\api\util\ApiLang;
use app\api\service\LotteryService; use app\api\service\LotteryService;
use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig; use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
use app\dice\model\play_record\DicePlayRecord; use app\dice\model\play_record\DicePlayRecord;
@@ -52,49 +53,42 @@ class PlayStartLogic
{ {
$player = DicePlayer::find($playerId); $player = DicePlayer::find($playerId);
if (!$player) { if (!$player) {
throw new ApiException('用户不存在'); throw new ApiException('User not found');
} }
$minEv = DiceRewardConfig::getCachedMinRealEv(); $minEv = DiceRewardConfig::getCachedMinRealEv();
$minCoin = abs($minEv + self::MIN_COIN_EXTRA); $minCoin = abs($minEv + self::MIN_COIN_EXTRA);
$coin = (float) $player->coin; $coin = (float) $player->coin;
if ($coin < $minCoin) { if ($coin < $minCoin) {
throw new ApiException('当前玩家余额'.$coin.'小于'.$minCoin.'无法继续游戏'); throw new ApiException(ApiLang::translateParams('当前玩家余额%s小于%s无法继续游戏', [$coin, $minCoin]));
} }
$paid = (int) ($player->paid_ticket_count ?? 0); $paid = (int) ($player->paid_ticket_count ?? 0);
$free = (int) ($player->free_ticket_count ?? 0); $free = (int) ($player->free_ticket_count ?? 0);
if ($paid + $free <= 0) { if ($paid + $free <= 0) {
throw new ApiException('抽奖券不足'); throw new ApiException('Insufficient lottery tickets');
} }
$lotteryService = LotteryService::getOrCreate($playerId); $lotteryService = LotteryService::getOrCreate($playerId);
$ticketType = LotteryService::drawTicketType($paid, $free); $ticketType = LotteryService::drawTicketType($paid, $free);
$configType0 = DiceLotteryPoolConfig::where('type', 0)->find(); $configType0 = DiceLotteryPoolConfig::where('name', 'default')->find();
$configType1 = DiceLotteryPoolConfig::where('type', 1)->find(); $configType1 = DiceLotteryPoolConfig::where('name', 'killScore')->find();
if (!$configType0) { if (!$configType0) {
throw new ApiException('奖池配置不存在(需 type=0'); throw new ApiException('Lottery pool config not found (name=default required)');
} }
// 杀分时使用 type=1 配置的权重;未杀分时付费用 type=0、免费用 type=1无 type=1 时回退 type=0
$configForWeights = $ticketType === self::LOTTERY_TYPE_PAID
? $configType0
: ($configType1 ?? $configType0);
// 玩家累计盈利:仅统计 lottery_config_id=type=0 的成功对局(中奖金额-100*局数 // 彩金池累计盈利:用于判断是否触发杀分(不再依赖单个玩家累计盈利
$playerQuery = DicePlayRecord::where('player_id', $playerId) // 该值来自 dice_lottery_pool_config.profit_amount
->where('lottery_config_id', $configType0->id) $poolProfitTotal = $configType0->profit_amount ?? 0;
->where('status', self::RECORD_STATUS_SUCCESS);
$playerWinSum = (float) $playerQuery->sum('win_coin');
$playerPlayCount = (int) $playerQuery->count();
$playerProfitTotal = $playerWinSum - 100.0 * $playerPlayCount;
$safetyLine = (int) ($configType0->safety_line ?? 0); $safetyLine = (int) ($configType0->safety_line ?? 0);
// 玩家累计盈利>=安全线时杀分:用 type=1 的 T*_weight并记录 lottery_config_id=type=1 的 id否则用玩家权重记录对应配置 id $killEnabled = ((int) ($configType0->kill_enabled ?? 1)) === 1;
$usePoolWeights = $playerProfitTotal >= $safetyLine && $configType1 !== null; // 盈利>=安全线且开启杀分:付费/免费都用 killScore盈利<安全线:付费用玩家权重,免费用 killScore无则用 default
if ($usePoolWeights) { // 记录 lottery_config_id用池权重时记对应池付费用玩家权重时记 default
$config = $configType1; $usePoolWeights = ($ticketType === self::LOTTERY_TYPE_PAID && $killEnabled && $poolProfitTotal >= $safetyLine && $configType1 !== null)
} else { || ($ticketType === self::LOTTERY_TYPE_FREE);
$config = $configForWeights; $config = $usePoolWeights
} ? (($ticketType === self::LOTTERY_TYPE_FREE && $configType1 === null) ? $configType0 : $configType1)
: $configType0;
// 按档位 T1-T5 抽取后,从 DiceReward 表按当前方向取该档位数据,再按 weight 抽取一条得到 grid_number // 按档位 T1-T5 抽取后,从 DiceReward 表按当前方向取该档位数据,再按 weight 抽取一条得到 grid_number
$rewardInstance = DiceReward::getCachedInstance(); $rewardInstance = DiceReward::getCachedInstance();
@@ -111,6 +105,13 @@ class PlayStartLogic
Log::warning("档位 {$tier} 方向 {$direction} 无任何 DiceReward重新摇取档位"); Log::warning("档位 {$tier} 方向 {$direction} 无任何 DiceReward重新摇取档位");
continue; continue;
} }
if ($usePoolWeights) {
$tierRewards = self::filterOutSuperWinOnlyGrids($tierRewards);
if (empty($tierRewards)) {
Log::warning("档位 {$tier} 方向 {$direction} 杀分档位下排除 5/30 后无可用奖励,重新摇取档位");
continue;
}
}
try { try {
$chosen = self::drawRewardByWeight($tierRewards); $chosen = self::drawRewardByWeight($tierRewards);
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
@@ -124,7 +125,7 @@ class PlayStartLogic
} }
if ($chosen === null) { if ($chosen === null) {
Log::error("多次摇取档位后仍无有效 DiceReward"); Log::error("多次摇取档位后仍无有效 DiceReward");
throw new ApiException('暂无可用奖励配置'); throw new ApiException('No available reward config');
} }
$startIndex = (int) ($chosen['start_index'] ?? 0); $startIndex = (int) ($chosen['start_index'] ?? 0);
@@ -135,36 +136,44 @@ class PlayStartLogic
$rewardWinCoin = $isTierT5 ? $realEv : (100 + $realEv); $rewardWinCoin = $isTierT5 ? $realEv : (100 + $realEv);
// 豹子判定5/30 必豹子10/15/20/25 按 DiceRewardConfig 中 BIGWIN 该点数的 weight 判定0-1000010000=100% // 豹子判定5/30 必豹子10/15/20/25 按 DiceRewardConfig 中 BIGWIN 该点数的 weight 判定0-1000010000=100%
// 杀分档位不触发豹子5/30 已在上方抽取时排除10/15/20/25 仅生成非豹子组合
$superWinCoin = 0; $superWinCoin = 0;
$isWin = 0; $isWin = 0;
$bigWinRealEv = 0.0; $bigWinRealEv = 0.0;
if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) { if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) {
$bigWinConfig = DiceRewardConfig::getCachedByTierAndGridNumber('BIGWIN', $rollNumber); if ($usePoolWeights) {
$alwaysSuperWin = in_array($rollNumber, self::SUPER_WIN_ALWAYS_GRID_NUMBERS, true); // 杀分档位:绝不触发豹子,仅生成非豹子组合,不发放豹子奖金
$doSuperWin = $alwaysSuperWin; $isWin = 0;
if (!$doSuperWin) { $superWinCoin = 0.0;
$bigWinWeight = 10000;
if ($bigWinConfig !== null && isset($bigWinConfig['weight'])) {
$bigWinWeight = min(10000, max(0, (int) $bigWinConfig['weight']));
$bigWinRealEv = (float) ($bigWinConfig['real_ev'] ?? 0);
}
$roll = (random_int(0, PHP_INT_MAX - 1) / (float) PHP_INT_MAX);
$doSuperWin = $bigWinWeight > 0 && $roll < ($bigWinWeight / 10000.0);
} else {
if ($bigWinConfig !== null) {
$bigWinRealEv = (float) ($bigWinConfig['real_ev'] ?? 0);
}
}
if ($doSuperWin) {
$rollArray = $this->getSuperWinRollArray($rollNumber);
$isWin = 1;
$superWinCoin = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS;
// 中 BIGWIN 豹子:不走原奖励流程,不记录原奖励,不触发 T5 再来一次,仅发放豹子奖金
$rewardWinCoin = 0;
$realEv = 0;
$isTierT5 = false;
} else {
$rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber); $rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber);
} else {
$bigWinConfig = DiceRewardConfig::getCachedByTierAndGridNumber('BIGWIN', $rollNumber);
$alwaysSuperWin = in_array($rollNumber, self::SUPER_WIN_ALWAYS_GRID_NUMBERS, true);
$doSuperWin = $alwaysSuperWin;
if (!$doSuperWin) {
$bigWinWeight = 10000;
if ($bigWinConfig !== null && isset($bigWinConfig['weight'])) {
$bigWinWeight = min(10000, max(0, (int) $bigWinConfig['weight']));
$bigWinRealEv = (float) ($bigWinConfig['real_ev'] ?? 0);
}
$roll = (random_int(0, PHP_INT_MAX - 1) / (float) PHP_INT_MAX);
$doSuperWin = $bigWinWeight > 0 && $roll < ($bigWinWeight / 10000.0);
} else {
if ($bigWinConfig !== null) {
$bigWinRealEv = (float) ($bigWinConfig['real_ev'] ?? 0);
}
}
if ($doSuperWin) {
$rollArray = $this->getSuperWinRollArray($rollNumber);
$isWin = 1;
$superWinCoin = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS;
// 中 BIGWIN 豹子:不走原奖励流程,不记录原奖励,不触发 T5 再来一次,仅发放豹子奖金
$rewardWinCoin = 0;
$realEv = 0;
$isTierT5 = false;
} else {
$rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber);
}
} }
} else { } else {
$rollArray = $this->generateRollArrayFromSum($rollNumber); $rollArray = $this->generateRollArrayFromSum($rollNumber);
@@ -256,8 +265,10 @@ class PlayStartLogic
$p->save(); $p->save();
// 玩家累计盈利累加在 type=0 彩金池上:每局按“当前中奖金额(含 BIGWIN - 抽奖券费用 100” // 彩金池累计盈利累加在 name=default 彩金池上:
$perPlayProfit = $winCoin - 100.0; // 付费券:每局按“当前中奖金额(含 BIGWIN - 抽奖券费用 100”
// 免费券:取消票价成本 100只计入中奖金额
$perPlayProfit = ($ticketType === self::LOTTERY_TYPE_PAID) ? ($winCoin - 100.0) : $winCoin;
$addProfit = $perPlayProfit; $addProfit = $perPlayProfit;
try { try {
DiceLotteryPoolConfig::where('id', $type0ConfigId)->update([ DiceLotteryPoolConfig::where('id', $type0ConfigId)->update([
@@ -332,6 +343,21 @@ class PlayStartLogic
/** 该组配置权重均为 0 时抛出,供调用方重试 */ /** 该组配置权重均为 0 时抛出,供调用方重试 */
private const EXCEPTION_WEIGHT_ALL_ZERO = 'REWARD_WEIGHT_ALL_ZERO'; private const EXCEPTION_WEIGHT_ALL_ZERO = 'REWARD_WEIGHT_ALL_ZERO';
/** 杀分档位需排除的豹子号5 和 30 只能组成豹子,无法生成非豹子组合 */
private const KILL_MODE_EXCLUDE_GRIDS = [5, 30];
/**
* 杀分档位下排除 grid_number=5/30 的奖励5/30 只能豹子,无法剔除)
* @return array 排除后的奖励列表,保持索引连续
*/
private static function filterOutSuperWinOnlyGrids(array $rewards): array
{
return array_values(array_filter($rewards, function ($r) {
$g = (int) ($r['grid_number'] ?? 0);
return !in_array($g, self::KILL_MODE_EXCLUDE_GRIDS, true);
}));
}
/** /**
* 按权重抽取一条配置:仅 weight>0 参与抽取weight=0 不会被摇到) * 按权重抽取一条配置:仅 weight>0 参与抽取weight=0 不会被摇到)
* 使用 [0, total) 浮点随机,支持最小权重 0.1%(如 weight=0.1),避免整数随机导致小权重失真 * 使用 [0, total) 浮点随机,支持最小权重 0.1%(如 weight=0.1),避免整数随机导致小权重失真
@@ -465,6 +491,14 @@ class PlayStartLogic
if (empty($tierRewards)) { if (empty($tierRewards)) {
continue; continue;
} }
// 免费券或 killScore 池:与实际流程一致,排除 5/30 且不触发豹子
$useKillMode = ($lotteryType === 1) || ($config !== null && (string) ($config->name ?? '') === 'killScore');
if ($useKillMode) {
$tierRewards = self::filterOutSuperWinOnlyGrids($tierRewards);
if (empty($tierRewards)) {
continue;
}
}
try { try {
$chosen = self::drawRewardByWeight($tierRewards); $chosen = self::drawRewardByWeight($tierRewards);
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
@@ -490,27 +524,34 @@ class PlayStartLogic
$isWin = 0; $isWin = 0;
$bigWinRealEv = 0.0; $bigWinRealEv = 0.0;
if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) { if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) {
$bigWinConfig = DiceRewardConfig::getCachedByTierAndGridNumber('BIGWIN', $rollNumber); if ($useKillMode) {
$alwaysSuperWin = in_array($rollNumber, self::SUPER_WIN_ALWAYS_GRID_NUMBERS, true); // 杀分档位:绝不触发豹子,仅生成非豹子组合,不发放豹子奖金
$doSuperWin = $alwaysSuperWin; $isWin = 0;
if (!$doSuperWin) { $superWinCoin = 0.0;
$bigWinWeight = 10000;
if ($bigWinConfig !== null && isset($bigWinConfig['weight'])) {
$bigWinWeight = min(10000, max(0, (int) $bigWinConfig['weight']));
}
$roll = (random_int(0, PHP_INT_MAX - 1) / (float) PHP_INT_MAX);
$doSuperWin = $bigWinWeight > 0 && $roll < ($bigWinWeight / 10000.0);
}
if ($bigWinConfig !== null && isset($bigWinConfig['real_ev'])) {
$bigWinRealEv = (float) $bigWinConfig['real_ev'];
}
if ($doSuperWin) {
$rollArray = $this->getSuperWinRollArray($rollNumber);
$isWin = 1;
$superWinCoin = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS;
$rewardWinCoin = 0;
} else {
$rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber); $rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber);
} else {
$bigWinConfig = DiceRewardConfig::getCachedByTierAndGridNumber('BIGWIN', $rollNumber);
$alwaysSuperWin = in_array($rollNumber, self::SUPER_WIN_ALWAYS_GRID_NUMBERS, true);
$doSuperWin = $alwaysSuperWin;
if (!$doSuperWin) {
$bigWinWeight = 10000;
if ($bigWinConfig !== null && isset($bigWinConfig['weight'])) {
$bigWinWeight = min(10000, max(0, (int) $bigWinConfig['weight']));
}
$roll = (random_int(0, PHP_INT_MAX - 1) / (float) PHP_INT_MAX);
$doSuperWin = $bigWinWeight > 0 && $roll < ($bigWinWeight / 10000.0);
}
if ($bigWinConfig !== null && isset($bigWinConfig['real_ev'])) {
$bigWinRealEv = (float) $bigWinConfig['real_ev'];
}
if ($doSuperWin) {
$rollArray = $this->getSuperWinRollArray($rollNumber);
$isWin = 1;
$superWinCoin = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS;
$rewardWinCoin = 0;
} else {
$rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber);
}
} }
} else { } else {
$rollArray = $this->generateRollArrayFromSum($rollNumber); $rollArray = $this->generateRollArrayFromSum($rollNumber);

View File

@@ -5,6 +5,8 @@ namespace app\api\logic;
use app\dice\model\player\DicePlayer; use app\dice\model\player\DicePlayer;
use app\api\cache\UserCache; use app\api\cache\UserCache;
use plugin\saiadmin\app\model\system\SystemDept;
use plugin\saiadmin\app\model\system\SystemUser;
use plugin\saiadmin\exception\ApiException; use plugin\saiadmin\exception\ApiException;
use Tinywan\Jwt\JwtToken; use Tinywan\Jwt\JwtToken;
@@ -29,7 +31,7 @@ class UserLogic
public static function validatePhone(string $phone): void public static function validatePhone(string $phone): void
{ {
if (!preg_match(self::PHONE_REGEX, $phone)) { if (!preg_match(self::PHONE_REGEX, $phone)) {
throw new ApiException('手机号格式错误,仅支持 +60 开头的马来西亚号码(如 +60123456789'); throw new ApiException('Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)');
} }
} }
@@ -41,28 +43,105 @@ class UserLogic
return md5(self::PASSWORD_SALT . $password); return md5(self::PASSWORD_SALT . $password);
} }
/**
* 根据 parent_id 向上遍历找到顶级部门parent_id=0
*/
private static function getTopDeptIdByParentId(int $deptId): ?int
{
$currentId = $deptId;
$visited = [];
while ($currentId > 0 && !isset($visited[$currentId])) {
$visited[$currentId] = true;
$dept = SystemDept::find($currentId);
if (!$dept) {
return null;
}
$parentId = (int) ($dept->parent_id ?? 0);
if ($parentId === 0) {
return $currentId;
}
$currentId = $parentId;
}
return $currentId > 0 ? $currentId : null;
}
/**
* 根据顶级部门 id递归获取其下所有部门 id含自身仅用 id 和 parent_id
*/
private static function getAllDeptIdsUnderTop(int $topId): array
{
$deptIds = [$topId];
$prevCount = 0;
while (count($deptIds) > $prevCount) {
$prevCount = count($deptIds);
$children = SystemDept::whereIn('parent_id', $deptIds)->column('id');
$deptIds = array_unique(array_merge($deptIds, array_map('intval', $children)));
}
return array_values($deptIds);
}
/**
* 根据 agent_id 获取当前管理员所在顶级部门下的所有管理员 ID 列表
* 使用 SystemDept 的 id 和 parent_id 字段遍历:先向上找顶级部门(parent_id=0),再向下收集所有子部门
* 用于 getGameUrl 接口判断 DicePlayer 是否属于该部门,同顶级部门下不重复创建玩家
*
* @param string $agentId 代理标识sa_system_user.agent_id
* @return int[] 管理员 ID 列表,空数组表示未找到或无法解析
*/
public static function getAdminIdsByAgentIdTopDept(string $agentId): array
{
$agentId = trim($agentId);
if ($agentId === '') {
return [];
}
$admin = SystemUser::where('agent_id', $agentId)->find();
if (!$admin) {
return [];
}
$deptId = $admin->dept_id ?? null;
if ($deptId === null || $deptId === '') {
return [(int) $admin->id];
}
$deptId = (int) $deptId;
$topId = self::getTopDeptIdByParentId($deptId);
if ($topId === null) {
return [(int) $admin->id];
}
$deptIds = self::getAllDeptIdsUnderTop($topId);
if (empty($deptIds)) {
$deptIds = [$deptId];
}
$adminIds = SystemUser::whereIn('dept_id', $deptIds)->column('id');
return array_map('intval', $adminIds);
}
/** /**
* 登录JSONusername, password, lang, coin, time * 登录JSONusername, password, lang, coin, time
* 存在则校验密码并更新 coin累加不存在则创建用户并写入 coin。 * 存在则校验密码并更新 coin累加不存在则创建用户并写入 coin。
* 将会话写入 Redis返回 token 与前端连接地址。 * 将会话写入 Redis返回 token 与前端连接地址。
* *
* @param int|null $adminId 创建新用户时关联的后台管理员IDsa_system_user.id可选 * @param int|null $adminId 创建新用户时关联的后台管理员IDsa_system_user.id可选
* @param int[]|null $adminIdsInTopDept 当前管理员顶级部门下的所有管理员ID用于按部门范围查找玩家为空时退化为仅按 username 查找
*/ */
public function loginByUsername(string $username, string $password, string $lang, float $coin, string $time, ?int $adminId = null): array public function loginByUsername(string $username, string $password, string $lang, float $coin, string $time, ?int $adminId = null, ?array $adminIdsInTopDept = null): array
{ {
$username = trim($username); $username = trim($username);
if ($username === '') { if ($username === '') {
throw new ApiException('username 不能为空'); throw new ApiException('username is required');
} }
$player = DicePlayer::where('username', $username)->find(); $query = DicePlayer::where('username', $username);
if ($adminIdsInTopDept !== null && !empty($adminIdsInTopDept)) {
$query->whereIn('admin_id', $adminIdsInTopDept);
}
$player = $query->find();
if ($player) { if ($player) {
if ((int) ($player->status ?? 1) === 0) { if ((int) ($player->status ?? 1) === 0) {
throw new ApiException('账号已被禁用,无法登录'); throw new ApiException('Account is disabled and cannot log in');
} }
$hashed = $this->hashPassword($password); $hashed = $this->hashPassword($password);
if ($player->password !== $hashed) { if ($player->password !== $hashed) {
throw new ApiException('密码错误'); throw new ApiException('Wrong password');
} }
$currentCoin = (float) $player->coin; $currentCoin = (float) $player->coin;
$player->coin = $currentCoin + $coin; $player->coin = $currentCoin + $coin;

View File

@@ -25,31 +25,31 @@ class AuthTokenMiddleware implements MiddlewareInterface
$token = $request->header('auth-token'); $token = $request->header('auth-token');
$token = $token !== null ? trim((string) $token) : ''; $token = $token !== null ? trim((string) $token) : '';
if ($token === '') { if ($token === '') {
throw new ApiException('请携带 auth-token', ReturnCode::UNAUTHORIZED); throw new ApiException('Please provide auth-token', ReturnCode::UNAUTHORIZED);
} }
try { try {
$decoded = JwtToken::verify(1, $token); $decoded = JwtToken::verify(1, $token);
} catch (JwtTokenExpiredException $e) { } catch (JwtTokenExpiredException $e) {
throw new ApiException('auth-token 已过期', ReturnCode::TOKEN_INVALID); throw new ApiException('auth-token expired', ReturnCode::TOKEN_INVALID);
} catch (JwtTokenException $e) { } catch (JwtTokenException $e) {
throw new ApiException('auth-token 无效', ReturnCode::TOKEN_INVALID); throw new ApiException('auth-token invalid', ReturnCode::TOKEN_INVALID);
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new ApiException('auth-token 格式无效', ReturnCode::TOKEN_INVALID); throw new ApiException('auth-token format invalid', ReturnCode::TOKEN_INVALID);
} }
$extend = $decoded['extend'] ?? []; $extend = $decoded['extend'] ?? [];
if ((string) ($extend['plat'] ?? '') !== 'api_auth_token') { if ((string) ($extend['plat'] ?? '') !== 'api_auth_token') {
throw new ApiException('auth-token 无效', ReturnCode::TOKEN_INVALID); throw new ApiException('auth-token invalid', ReturnCode::TOKEN_INVALID);
} }
$agentId = trim((string) ($extend['agent_id'] ?? '')); $agentId = trim((string) ($extend['agent_id'] ?? ''));
if ($agentId === '') { if ($agentId === '') {
throw new ApiException('auth-token 无效', ReturnCode::TOKEN_INVALID); throw new ApiException('auth-token invalid', ReturnCode::TOKEN_INVALID);
} }
$currentToken = AuthTokenCache::getTokenByAgentId($agentId); $currentToken = AuthTokenCache::getTokenByAgentId($agentId);
if ($currentToken === null || $currentToken !== $token) { if ($currentToken === null || $currentToken !== $token) {
throw new ApiException('auth-token 无效或已失效', ReturnCode::TOKEN_INVALID); throw new ApiException('auth-token invalid or expired', ReturnCode::TOKEN_INVALID);
} }
$request->agent_id = $agentId; $request->agent_id = $agentId;

View File

@@ -32,38 +32,38 @@ class TokenMiddleware implements MiddlewareInterface
} }
$token = $token !== null ? trim((string) $token) : ''; $token = $token !== null ? trim((string) $token) : '';
if ($token === '') { if ($token === '') {
throw new ApiException('请携带 token', ReturnCode::UNAUTHORIZED); throw new ApiException('Please provide token', ReturnCode::UNAUTHORIZED);
} }
try { try {
$decoded = JwtToken::verify(1, $token); $decoded = JwtToken::verify(1, $token);
} catch (JwtTokenExpiredException $e) { } catch (JwtTokenExpiredException $e) {
throw new ApiException('token 已过期,请重新登录', ReturnCode::TOKEN_INVALID); throw new ApiException('Token expired, please login again', ReturnCode::TOKEN_INVALID);
} catch (JwtTokenException $e) { } catch (JwtTokenException $e) {
throw new ApiException('token 无效', ReturnCode::TOKEN_INVALID); throw new ApiException('Invalid or expired token', ReturnCode::TOKEN_INVALID);
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new ApiException('token 格式无效', ReturnCode::TOKEN_INVALID); throw new ApiException('Token format invalid', ReturnCode::TOKEN_INVALID);
} }
$extend = $decoded['extend'] ?? []; $extend = $decoded['extend'] ?? [];
if ((string) ($extend['plat'] ?? '') !== 'api_login') { if ((string) ($extend['plat'] ?? '') !== 'api_login') {
throw new ApiException('token 无效', ReturnCode::TOKEN_INVALID); throw new ApiException('Invalid or expired token', ReturnCode::TOKEN_INVALID);
} }
$username = trim((string) ($extend['username'] ?? '')); $username = trim((string) ($extend['username'] ?? ''));
if ($username === '') { if ($username === '') {
throw new ApiException('token 无效', ReturnCode::TOKEN_INVALID); throw new ApiException('Invalid or expired token', ReturnCode::TOKEN_INVALID);
} }
$currentToken = UserCache::getSessionTokenByUsername($username); $currentToken = UserCache::getSessionTokenByUsername($username);
if ($currentToken === null || $currentToken === '') { if ($currentToken === null || $currentToken === '') {
$player = DicePlayer::where('username', $username)->find(); $player = DicePlayer::where('username', $username)->find();
if (!$player) { if (!$player) {
throw new ApiException('请注册', ReturnCode::TOKEN_INVALID); throw new ApiException('Please register', ReturnCode::TOKEN_INVALID);
} }
throw new ApiException('请重新登录', ReturnCode::TOKEN_INVALID); throw new ApiException('Please login again', ReturnCode::TOKEN_INVALID);
} }
if ($currentToken !== $token) { if ($currentToken !== $token) {
throw new ApiException('请重新登录(当前账号已在其他处登录)', ReturnCode::TOKEN_INVALID); throw new ApiException('Please login again (account logged in elsewhere)', ReturnCode::TOKEN_INVALID);
} }
// 优先从 Redis 缓存取玩家,避免每次请求都查库 // 优先从 Redis 缓存取玩家,避免每次请求都查库
@@ -76,7 +76,7 @@ class TokenMiddleware implements MiddlewareInterface
$player = DicePlayer::where('username', $username)->find(); $player = DicePlayer::where('username', $username)->find();
if (!$player) { if (!$player) {
UserCache::deleteSessionByUsername($username); UserCache::deleteSessionByUsername($username);
throw new ApiException('请重新登录', ReturnCode::TOKEN_INVALID); throw new ApiException('Please login again', ReturnCode::TOKEN_INVALID);
} }
UserCache::setPlayerByUsername($username, $player->hidden(['password'])->toArray()); UserCache::setPlayerByUsername($username, $player->hidden(['password'])->toArray());
} }

View File

@@ -56,8 +56,8 @@ class LotteryService
if (!$player) { if (!$player) {
throw new \RuntimeException('玩家不存在'); throw new \RuntimeException('玩家不存在');
} }
$config0 = DiceLotteryPoolConfig::where('type', 0)->find(); $config0 = DiceLotteryPoolConfig::where('name', 'default')->find();
$config1 = DiceLotteryPoolConfig::where('type', 1)->find(); $config1 = DiceLotteryPoolConfig::where('name', 'killScore')->find();
$s = new self($playerId); $s = new self($playerId);
$s->configType0Id = $config0 ? (int) $config0->id : null; $s->configType0Id = $config0 ? (int) $config0->id : null;
$s->configType1Id = $config1 ? (int) $config1->id : null; $s->configType1Id = $config1 ? (int) $config1->id : null;

View File

@@ -6,7 +6,9 @@ namespace app\api\util;
use support\Request; use support\Request;
/** /**
* API 多语言:根据请求头 langen=英文zh=中文)翻译返回文案 * API 多语言(兼容 Webman 多语言配置)
* 根据请求头 langzh=中文en=英文)返回对应文案;
* 无 lang 请求头时使用 config('translation.locale') 推断zh_CN/zh→中文en→英文
*/ */
class ApiLang class ApiLang
{ {
@@ -14,47 +16,96 @@ class ApiLang
private const LANG_EN = 'en'; private const LANG_EN = 'en';
private const LANG_ZH = 'zh'; private const LANG_ZH = 'zh';
/** @var array<string, string>|null */ /** @var array<string, array<string, string>> lang => [ key => message ] */
private static ?array $enMap = null; private static array $messages = [];
/** /**
* 从请求中获取语言:lang 请求头 en=英文zh=中文,默认 zh * 从请求中获取语言:优先读 header lang否则按 Webman config('translation.locale') 推断
*/ */
public static function getLang(?Request $request = null): string public static function getLang(?Request $request = null): string
{ {
$request = $request ?? (function_exists('request') ? request() : null); $request = $request ?? (function_exists('request') ? request() : null);
if ($request === null) { if ($request !== null) {
return self::LANG_ZH; $lang = $request->header(self::LANG_HEADER);
} if ($lang !== null && $lang !== '') {
$lang = $request->header(self::LANG_HEADER); $lang = strtolower(trim((string) $lang));
if ($lang !== null && $lang !== '') { if ($lang === self::LANG_EN) {
$lang = strtolower(trim((string) $lang)); return self::LANG_EN;
if ($lang === self::LANG_EN) { }
return self::LANG_EN; if ($lang === self::LANG_ZH || $lang === 'chs') {
} return self::LANG_ZH;
if ($lang === self::LANG_ZH || $lang === 'chs') { }
return self::LANG_ZH;
} }
} }
return self::LANG_ZH; $locale = (string) (function_exists('config') ? config('translation.locale', 'zh_CN') : 'zh_CN');
return stripos($locale, 'en') !== false ? self::LANG_EN : self::LANG_ZH;
} }
/** /**
* 翻译文案:当前请求语言为 en 时返回英文,否则返回原文(中文) * 翻译文案(对外接口 message
* @param string $message 中文或原文 * - 推荐:抛英文 key如 USER_NOT_FOUND根据 lang 返回对应语言
* @param Request|null $request 当前请求,不传则自动取 request() * - 兼容仍抛中文原文时lang=en 按旧映射翻译,否则原样返回
*
* 语言文件优先从 Webman config('translation.path')/api/{lang}.php 加载
*/ */
public static function translate(string $message, ?Request $request = null): string public static function translate(string $message, ?Request $request = null): string
{ {
$lang = self::getLang($request); $lang = self::getLang($request);
if ($lang !== self::LANG_EN) { $map = self::loadMessages($lang);
return $message; if (isset($map[$message])) {
return (string) $map[$message];
} }
if (self::$enMap === null) {
$path = dirname(__DIR__) . '/lang/en.php'; // 若传入的是中文/原文,则按固定规则生成英文 keyMSG_XXXXXXXX再翻译
self::$enMap = is_file($path) ? (require $path) : []; $key = self::toMsgKey($message);
if ($key !== null && isset($map[$key])) {
return (string) $map[$key];
} }
return self::$enMap[$message] ?? $message;
return $message;
}
/**
* 加载某语言的 API 文案推荐key=英文value=对应语言文案)
*/
private static function loadMessages(string $locale): array
{
if (isset(self::$messages[$locale])) {
return self::$messages[$locale];
}
$path = null;
if (function_exists('config')) {
$base = rtrim((string) config('translation.path', ''), DIRECTORY_SEPARATOR);
if ($base !== '') {
$path = $base . DIRECTORY_SEPARATOR . 'api' . DIRECTORY_SEPARATOR . $locale . '.php';
}
}
if ($path !== null && is_file($path)) {
self::$messages[$locale] = require $path;
return self::$messages[$locale];
}
// 回退到 app/api/lang/{lang}.php同样使用英文 key
$fallback = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $locale . '.php';
self::$messages[$locale] = is_file($fallback) ? (require $fallback) : [];
return self::$messages[$locale];
}
/**
* 将原文转换为英文 key只包含英文字符/数字/下划线MSG_XXXXXXXXcrc32
* 若入参已经是英文 key则返回 null表示无需转换
*/
private static function toMsgKey(string $message): ?string
{
$trim = trim($message);
if ($trim === '') {
return null;
}
// 已经是英文错误码 key只允许 A-Z/0-9/_且至少 3 位)
if (preg_match('/^[A-Z0-9_]{3,}$/', $trim) === 1) {
return null;
}
return 'MSG_' . strtoupper(sprintf('%08X', crc32($trim)));
} }
/** /**

View File

@@ -60,7 +60,7 @@ class DiceConfigController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -76,9 +76,9 @@ class DiceConfigController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -94,9 +94,9 @@ class DiceConfigController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -110,13 +110,13 @@ class DiceConfigController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -30,22 +30,20 @@ class DiceLotteryPoolConfigController extends BaseController
} }
/** /**
* 获取 DiceLotteryPoolConfig 列表数据,用于 lottery_config_id 下拉(值为 id显示为 name并附带 type、T1-T5 档位权重 * 获取 DiceLotteryPoolConfig 列表数据,用于 lottery_config_id 下拉(值为 id显示为 name并附带 T1-T5 档位权重
* type0=付费抽奖券1=免费抽奖券;一键测试权重中付费默认选 type=0免费默认选 type=1
* @param Request $request * @param Request $request
* @return Response 返回 [ ['id' => int, 'name' => string, 'type' => int, 't1_weight' => int, ... 't5_weight' => int], ... ] * @return Response 返回 [ ['id' => int, 'name' => string, 't1_weight' => int, ... 't5_weight' => int], ... ]
*/ */
#[Permission('色子奖池配置列表', 'dice:lottery_pool_config:index:index')] #[Permission('色子奖池配置列表', 'dice:lottery_pool_config:index:index')]
public function getOptions(Request $request): Response public function getOptions(Request $request): Response
{ {
$list = DiceLotteryPoolConfig::field('id,name,type,t1_weight,t2_weight,t3_weight,t4_weight,t5_weight') $list = DiceLotteryPoolConfig::field('id,name,t1_weight,t2_weight,t3_weight,t4_weight,t5_weight')
->order('id', 'asc') ->order('id', 'asc')
->select(); ->select();
$data = $list->map(function ($item) { $data = $list->map(function ($item) {
return [ return [
'id' => (int) $item['id'], 'id' => (int) $item['id'],
'name' => (string) ($item['name'] ?? ''), 'name' => (string) ($item['name'] ?? ''),
'type' => (int) ($item['type'] ?? 0),
't1_weight' => (int) ($item['t1_weight'] ?? 0), 't1_weight' => (int) ($item['t1_weight'] ?? 0),
't2_weight' => (int) ($item['t2_weight'] ?? 0), 't2_weight' => (int) ($item['t2_weight'] ?? 0),
't3_weight' => (int) ($item['t3_weight'] ?? 0), 't3_weight' => (int) ($item['t3_weight'] ?? 0),
@@ -87,7 +85,7 @@ class DiceLotteryPoolConfigController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -103,9 +101,9 @@ class DiceLotteryPoolConfigController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -121,9 +119,9 @@ class DiceLotteryPoolConfigController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -137,13 +135,13 @@ class DiceLotteryPoolConfigController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -151,7 +149,7 @@ class DiceLotteryPoolConfigController extends BaseController
* 获取当前彩金池Redis 实例化,无则按 type=0 创建) * 获取当前彩金池Redis 实例化,无则按 type=0 创建)
* 返回含玩家累计盈利 profit_amount 实时值,供前端轮询展示 * 返回含玩家累计盈利 profit_amount 实时值,供前端轮询展示
*/ */
#[Permission('色子奖池配置列表', 'dice:lottery_pool_config:index:index')] #[Permission('色子奖池配置列表', 'dice:lottery_pool_config:index:getCurrentPool')]
public function getCurrentPool(Request $request): Response public function getCurrentPool(Request $request): Response
{ {
$data = $this->logic->getCurrentPool(); $data = $this->logic->getCurrentPool();
@@ -161,21 +159,21 @@ class DiceLotteryPoolConfigController extends BaseController
/** /**
* 更新当前彩金池:仅可修改 safety_line、t1_weightt5_weight不可修改 profit_amount * 更新当前彩金池:仅可修改 safety_line、t1_weightt5_weight不可修改 profit_amount
*/ */
#[Permission('色子奖池配置修改', 'dice:lottery_pool_config:index:update')] #[Permission('色子奖池配置修改', 'dice:lottery_pool_config:index:updateCurrentPool')]
public function updateCurrentPool(Request $request): Response public function updateCurrentPool(Request $request): Response
{ {
$data = $request->post(); $data = $request->post();
$this->logic->updateCurrentPool($data); $this->logic->updateCurrentPool($data);
return $this->success('保存成功'); return $this->success('save success');
} }
/** /**
* 重置当前彩金池的玩家累计盈利:将 profit_amount 置为 0 * 重置当前彩金池的玩家累计盈利:将 profit_amount 置为 0
*/ */
#[Permission('色子奖池配置修改', 'dice:lottery_pool_config:index:update')] #[Permission('色子奖池配置修改', 'dice:lottery_pool_config:index:resetProfitAmount')]
public function resetProfitAmount(Request $request): Response public function resetProfitAmount(Request $request): Response
{ {
$this->logic->resetProfitAmount(); $this->logic->resetProfitAmount();
return $this->success('重置成功'); return $this->success('reset success');
} }
} }

View File

@@ -60,7 +60,16 @@ class DicePlayRecordController extends BaseController
'diceRewardConfig', 'diceRewardConfig',
'diceLotteryPoolConfig', 'diceLotteryPoolConfig',
]); ]);
// 按当前筛选条件统计:平台总盈利 = 付费抽奖(lottery_type=0)次数×100 - 玩家总收益(win_coin 求和)
$sumQuery = clone $query;
$playerTotalWin = (float) $sumQuery->sum('win_coin');
$paidCountQuery = clone $query;
$paidCount = (int) $paidCountQuery->where('lottery_type', 0)->count();
$totalWinCoin = $paidCount * 100 - $playerTotalWin;
$data = $this->logic->getList($query); $data = $this->logic->getList($query);
$data['total_win_coin'] = $totalWinCoin;
return $this->success($data); return $this->success($data);
} }
@@ -120,11 +129,11 @@ class DicePlayRecordController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$model = $this->logic->read($id); $model = $this->logic->read($id);
if (!$model) { if (!$model) {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限查看该记录'); return $this->fail('no permission to view this record');
} }
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
@@ -142,9 +151,9 @@ class DicePlayRecordController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -160,9 +169,9 @@ class DicePlayRecordController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -176,13 +185,13 @@ class DicePlayRecordController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -75,7 +75,7 @@ class DicePlayRecordTestController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -91,9 +91,9 @@ class DicePlayRecordTestController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -109,9 +109,9 @@ class DicePlayRecordTestController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -125,13 +125,13 @@ class DicePlayRecordTestController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -140,15 +140,15 @@ class DicePlayRecordTestController extends BaseController
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
#[Permission('玩家抽奖记录(测试数据)删除', 'dice:play_record_test:index:destroy')] #[Permission('玩家抽奖记录(测试数据)删除', 'dice:play_record_test:index:clearAll')]
public function clearAll(Request $request): Response public function clearAll(Request $request): Response
{ {
try { try {
$table = (new \app\dice\model\play_record_test\DicePlayRecordTest())->getTable(); $table = (new \app\dice\model\play_record_test\DicePlayRecordTest())->getTable();
Db::execute('TRUNCATE TABLE `' . $table . '`'); Db::execute('TRUNCATE TABLE `' . $table . '`');
return $this->success('已清空所有测试数据'); return $this->success('all test data cleared');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return $this->fail('清空失败:' . $e->getMessage()); return $this->fail('clear failed: ' . $e->getMessage());
} }
} }
} }

View File

@@ -110,11 +110,11 @@ class DicePlayerController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$model = $this->logic->read($id); $model = $this->logic->read($id);
if (!$model) { if (!$model) {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限查看该记录'); return $this->fail('no permission to view this record');
} }
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
@@ -142,9 +142,9 @@ class DicePlayerController extends BaseController
if ($player && $player->username !== '') { if ($player && $player->username !== '') {
UserCache::deletePlayerByUsername($player->username); UserCache::deletePlayerByUsername($player->username);
} }
return $this->success('添加成功'); return $this->success('add success');
} }
return $this->fail('添加失败'); return $this->fail('add failed');
} }
/** /**
@@ -161,7 +161,7 @@ class DicePlayerController extends BaseController
if ($model) { if ($model) {
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限修改该记录'); return $this->fail('no permission to update this record');
} }
} }
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
@@ -172,9 +172,9 @@ class DicePlayerController extends BaseController
if ($player && $player->username !== '') { if ($player && $player->username !== '') {
UserCache::deletePlayerByUsername($player->username); UserCache::deletePlayerByUsername($player->username);
} }
return $this->success('修改成功'); return $this->success('update success');
} }
return $this->fail('修改失败'); return $this->fail('update failed');
} }
/** /**
@@ -188,16 +188,16 @@ class DicePlayerController extends BaseController
$id = $request->input('id'); $id = $request->input('id');
$status = $request->input('status'); $status = $request->input('status');
if ($id === null || $id === '') { if ($id === null || $id === '') {
return $this->fail('缺少参数 id'); return $this->fail('missing parameter id');
} }
if ($status === null || $status === '') { if ($status === null || $status === '') {
return $this->fail('缺少参数 status'); return $this->fail('missing parameter status');
} }
$model = $this->logic->read($id); $model = $this->logic->read($id);
if ($model) { if ($model) {
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限修改该记录'); return $this->fail('no permission to update this record');
} }
} }
$this->logic->edit($id, ['status' => (int) $status]); $this->logic->edit($id, ['status' => (int) $status]);
@@ -207,7 +207,7 @@ class DicePlayerController extends BaseController
if ($player && $player->username !== '') { if ($player && $player->username !== '') {
UserCache::deletePlayerByUsername($player->username); UserCache::deletePlayerByUsername($player->username);
} }
return $this->success('修改成功'); return $this->success('update success');
} }
/** /**
@@ -220,7 +220,7 @@ class DicePlayerController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$ids = is_array($ids) ? $ids : explode(',', (string) $ids); $ids = is_array($ids) ? $ids : explode(',', (string) $ids);
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
@@ -235,7 +235,7 @@ class DicePlayerController extends BaseController
} }
$ids = $validIds; $ids = $validIds;
if (empty($ids)) { if (empty($ids)) {
return $this->fail('无权限删除所选数据'); return $this->fail('no permission to delete selected data');
} }
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
@@ -248,9 +248,9 @@ class DicePlayerController extends BaseController
UserCache::deletePlayerByUsername($player->username); UserCache::deletePlayerByUsername($player->username);
} }
} }
return $this->success('删除成功'); return $this->success('delete success');
} }
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -88,11 +88,11 @@ class DicePlayerTicketRecordController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$model = $this->logic->read($id); $model = $this->logic->read($id);
if (!$model) { if (!$model) {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限查看该记录'); return $this->fail('no permission to view this record');
} }
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
@@ -110,9 +110,9 @@ class DicePlayerTicketRecordController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -128,9 +128,9 @@ class DicePlayerTicketRecordController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -144,13 +144,13 @@ class DicePlayerTicketRecordController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -85,15 +85,15 @@ class DicePlayerWalletRecordController extends BaseController
{ {
$playerId = $request->input('player_id'); $playerId = $request->input('player_id');
if ($playerId === null || $playerId === '') { if ($playerId === null || $playerId === '') {
return $this->fail('缺少 player_id'); return $this->fail('missing player_id');
} }
$player = DicePlayer::field('coin,admin_id')->where('id', $playerId)->find(); $player = DicePlayer::field('coin,admin_id')->where('id', $playerId)->find();
if (!$player) { if (!$player) {
return $this->fail('玩家不存在'); return $this->fail('Player not found');
} }
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($player->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($player->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限操作该玩家'); return $this->fail('no permission to operate this player');
} }
return $this->success(['wallet_before' => (float) $player['coin']]); return $this->success(['wallet_before' => (float) $player['coin']]);
} }
@@ -109,11 +109,11 @@ class DicePlayerWalletRecordController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$model = $this->logic->read($id); $model = $this->logic->read($id);
if (!$model) { if (!$model) {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($model->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限查看该记录'); return $this->fail('no permission to view this record');
} }
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
@@ -124,7 +124,7 @@ class DicePlayerWalletRecordController extends BaseController
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
#[Permission('玩家钱包流水添加', 'dice:player_wallet_record:index:save')] #[Permission('玩家钱包流水添加', 'dice:player_wallet_record:index:adminOperate')]
public function adminOperate(Request $request): Response public function adminOperate(Request $request): Response
{ {
$data = $request->post(); $data = $request->post();
@@ -133,13 +133,13 @@ class DicePlayerWalletRecordController extends BaseController
$coin = isset($data['coin']) ? (float) $data['coin'] : null; $coin = isset($data['coin']) ? (float) $data['coin'] : null;
if ($playerId === null || $playerId === '') { if ($playerId === null || $playerId === '') {
return $this->fail('请选择玩家'); return $this->fail('please select player');
} }
if (!in_array($type, [3, 4], true)) { if (!in_array($type, [3, 4], true)) {
return $this->fail('操作类型必须为 3=加点 或 4=扣点'); return $this->fail('operation type must be 3 (add) or 4 (deduct)');
} }
if ($coin === null || $coin <= 0) { if ($coin === null || $coin <= 0) {
return $this->fail('平台币变动必须大于 0'); return $this->fail('Coin change must be greater than 0');
} }
$data['player_id'] = $playerId; $data['player_id'] = $playerId;
@@ -163,43 +163,25 @@ class DicePlayerWalletRecordController extends BaseController
} }
} }
if ($adminId === null || $adminId <= 0) { if ($adminId === null || $adminId <= 0) {
return $this->fail('请先登录'); return $this->fail('please login first');
} }
$player = DicePlayer::field('admin_id')->where('id', $playerId)->find(); $player = DicePlayer::field('admin_id')->where('id', $playerId)->find();
if ($player) { if ($player) {
$allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null); $allowedIds = AdminScopeHelper::getAllowedAdminIds($this->adminInfo ?? null);
if ($allowedIds !== null && !in_array((int) ($player->admin_id ?? 0), $allowedIds, true)) { if ($allowedIds !== null && !in_array((int) ($player->admin_id ?? 0), $allowedIds, true)) {
return $this->fail('无权限操作该玩家'); return $this->fail('no permission to operate this player');
} }
} }
try { try {
$this->logic->adminOperate($data, $adminId); $this->logic->adminOperate($data, $adminId);
return $this->success('操作成功'); return $this->success('operation success');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }
} }
/**
* 保存数据
* @param Request $request
* @return Response
*/
#[Permission('玩家钱包流水添加', 'dice:player_wallet_record:index:save')]
public function save(Request $request): Response
{
$data = $request->post();
$this->validate('save', $data);
$result = $this->logic->add($data);
if ($result) {
return $this->success('添加成功');
} else {
return $this->fail('添加失败');
}
}
/** /**
* 更新数据 * 更新数据
* @param Request $request * @param Request $request
@@ -212,30 +194,9 @@ class DicePlayerWalletRecordController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
/**
* 删除数据
* @param Request $request
* @return Response
*/
#[Permission('玩家钱包流水删除', 'dice:player_wallet_record:index:destroy')]
public function destroy(Request $request): Response
{
$ids = $request->post('ids', '');
if (empty($ids)) {
return $this->fail('请选择要删除的数据');
}
$result = $this->logic->destroy($ids);
if ($result) {
return $this->success('删除成功');
} else {
return $this->fail('删除失败');
}
}
} }

View File

@@ -29,11 +29,11 @@ class DiceRewardController extends BaseController
{ {
$direction = $request->input('direction', null); $direction = $request->input('direction', null);
if ($direction === null || $direction === '') { if ($direction === null || $direction === '') {
return $this->fail('请传入 direction0=顺时针 1=逆时针)'); return $this->fail('please provide direction (0=clockwise, 1=counterclockwise)');
} }
$direction = (int) $direction; $direction = (int) $direction;
if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) { if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) {
return $this->fail('direction 必须为 0顺时针或 1逆时针'); return $this->fail('direction must be 0 (clockwise) or 1 (counterclockwise)');
} }
$tier = $request->input('tier', ''); $tier = $request->input('tier', '');
$page = (int) $request->input('page', 1); $page = (int) $request->input('page', 1);
@@ -85,7 +85,7 @@ class DiceRewardController extends BaseController
* 参数lottery_config_id 可选,不选则传 paid_tier_weights / free_tier_weights 自定义档位; * 参数lottery_config_id 可选,不选则传 paid_tier_weights / free_tier_weights 自定义档位;
* paid_s_count, paid_n_count, free_s_count, free_n_count或兼容旧版 s_count, n_count * paid_s_count, paid_n_count, free_s_count, free_n_count或兼容旧版 s_count, n_count
*/ */
#[Permission('奖励对照列表', 'dice:reward:index:index')] #[Permission('一键测试权重', 'dice:reward:index:startWeightTest')]
public function startWeightTest(Request $request): Response public function startWeightTest(Request $request): Response
{ {
$post = is_array($request->post()) ? $request->post() : []; $post = is_array($request->post()) ? $request->post() : [];
@@ -120,11 +120,11 @@ class DiceRewardController extends BaseController
{ {
$recordId = (int) $request->input('record_id', 0); $recordId = (int) $request->input('record_id', 0);
if ($recordId <= 0) { if ($recordId <= 0) {
return $this->fail('请传入 record_id'); return $this->fail('please provide record_id');
} }
$record = DiceRewardConfigRecord::find($recordId); $record = DiceRewardConfigRecord::find($recordId);
if (!$record) { if (!$record) {
return $this->fail('记录不存在'); return $this->fail('record not found');
} }
$arr = $record->toArray(); $arr = $record->toArray();
$data = [ $data = [
@@ -147,9 +147,9 @@ class DiceRewardController extends BaseController
try { try {
$table = (new DicePlayRecordTest())->getTable(); $table = (new DicePlayRecordTest())->getTable();
Db::execute('TRUNCATE TABLE `' . $table . '`'); Db::execute('TRUNCATE TABLE `' . $table . '`');
return $this->success('已清空测试数据'); return $this->success('test data cleared');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return $this->fail('清空失败:' . $e->getMessage()); return $this->fail('clear failed: ' . $e->getMessage());
} }
} }
@@ -157,17 +157,17 @@ class DiceRewardController extends BaseController
* 权重编辑弹窗:按方向+点数批量更新权重(写入 dice_reward * 权重编辑弹窗:按方向+点数批量更新权重(写入 dice_reward
* 参数items: [{ grid_number, weight_clockwise, weight_counterclockwise }, ...] * 参数items: [{ grid_number, weight_clockwise, weight_counterclockwise }, ...]
*/ */
#[Permission('奖励对照修改', 'dice:reward:index:update')] #[Permission('权重配比', 'dice:reward:index:batchUpdateWeights')]
public function batchUpdateWeights(Request $request): Response public function batchUpdateWeights(Request $request): Response
{ {
$items = $request->post('items', []); $items = $request->post('items', []);
if (!is_array($items)) { if (!is_array($items)) {
return $this->fail('参数 items 必须为数组'); return $this->fail('parameter items must be an array');
} }
try { try {
$logic = new DiceRewardLogic(); $logic = new DiceRewardLogic();
$logic->batchUpdateWeights($items); $logic->batchUpdateWeights($items);
return $this->success('保存成功'); return $this->success('save success');
} catch (\plugin\saiadmin\exception\ApiException $e) { } catch (\plugin\saiadmin\exception\ApiException $e) {
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }
@@ -182,16 +182,16 @@ class DiceRewardController extends BaseController
{ {
$direction = (int) $request->post('direction', 0); $direction = (int) $request->post('direction', 0);
if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) { if (!in_array($direction, [DiceReward::DIRECTION_CLOCKWISE, DiceReward::DIRECTION_COUNTERCLOCKWISE], true)) {
return $this->fail('direction 必须为 0顺时针或 1逆时针'); return $this->fail('direction must be 0 (clockwise) or 1 (counterclockwise)');
} }
$items = $request->post('items', []); $items = $request->post('items', []);
if (!is_array($items)) { if (!is_array($items)) {
return $this->fail('参数 items 必须为数组'); return $this->fail('parameter items must be an array');
} }
try { try {
$logic = new DiceRewardLogic(); $logic = new DiceRewardLogic();
$logic->batchUpdateWeightsByDirection($direction, $items); $logic->batchUpdateWeightsByDirection($direction, $items);
return $this->success('保存成功'); return $this->success('save success');
} catch (\plugin\saiadmin\exception\ApiException $e) { } catch (\plugin\saiadmin\exception\ApiException $e) {
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }

View File

@@ -64,7 +64,7 @@ class DiceRewardConfigController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -80,9 +80,9 @@ class DiceRewardConfigController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -98,9 +98,9 @@ class DiceRewardConfigController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -109,12 +109,12 @@ class DiceRewardConfigController extends BaseController
* @param Request $request items: [{ id, grid_number?, ui_text?, real_ev?, tier?, remark? }, ...] * @param Request $request items: [{ id, grid_number?, ui_text?, real_ev?, tier?, remark? }, ...]
* @return Response * @return Response
*/ */
#[Permission('奖励配置修改', 'dice:reward_config:index:update')] #[Permission('修改奖励索引', 'dice:reward_config:index:batchUpdate')]
public function batchUpdate(Request $request): Response public function batchUpdate(Request $request): Response
{ {
$items = $request->post('items', []); $items = $request->post('items', []);
if (! is_array($items)) { if (! is_array($items)) {
return $this->fail('参数 items 必须为数组'); return $this->fail('parameter items must be an array');
} }
$err = $this->logic->validateBatchUpdateItems($items); $err = $this->logic->validateBatchUpdateItems($items);
if ($err !== null) { if ($err !== null) {
@@ -124,7 +124,7 @@ class DiceRewardConfigController extends BaseController
$this->validate('batch_update', array_merge($item, ['id' => $item['id']])); $this->validate('batch_update', array_merge($item, ['id' => $item['id']]));
} }
$this->logic->batchUpdate($items); $this->logic->batchUpdate($items);
return $this->success('保存成功'); return $this->success('save success');
} }
/** /**
@@ -137,13 +137,13 @@ class DiceRewardConfigController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -166,17 +166,17 @@ class DiceRewardConfigController extends BaseController
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
#[Permission('奖励配置修改', 'dice:reward_config:index:update')] #[Permission('修改色子点数权重', 'dice:reward_config:index:batchUpdateWeights')]
public function batchUpdateWeights(Request $request): Response public function batchUpdateWeights(Request $request): Response
{ {
$items = $request->post('items', []); $items = $request->post('items', []);
if (!is_array($items)) { if (!is_array($items)) {
return $this->fail('参数 items 必须为数组'); return $this->fail('parameter items must be an array');
} }
try { try {
$rewardLogic = new DiceRewardLogic(); $rewardLogic = new DiceRewardLogic();
$rewardLogic->batchUpdateWeights($items); $rewardLogic->batchUpdateWeights($items);
return $this->success('保存成功'); return $this->success('save success');
} catch (\plugin\saiadmin\exception\ApiException $e) { } catch (\plugin\saiadmin\exception\ApiException $e) {
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }
@@ -188,19 +188,19 @@ class DiceRewardConfigController extends BaseController
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
#[Permission('奖励配置修改', 'dice:reward_config:index:update')] #[Permission('大奖权重修改', 'dice:reward_config:index:saveBigwinWeightsByGrid')]
public function saveBigwinWeightsByGrid(Request $request): Response public function saveBigwinWeightsByGrid(Request $request): Response
{ {
$items = $request->post('items', []); $items = $request->post('items', []);
if (! is_array($items)) { if (! is_array($items)) {
return $this->fail('参数 items 必须为数组'); return $this->fail('parameter items must be an array');
} }
$err = $this->logic->validateBigwinWeightItems($items); $err = $this->logic->validateBigwinWeightItems($items);
if ($err !== null) { if ($err !== null) {
return $this->fail($err); return $this->fail($err);
} }
$this->logic->batchUpdateBigwinWeight($items); $this->logic->batchUpdateBigwinWeight($items);
return $this->success('保存成功'); return $this->success('save success');
} }
/** /**
@@ -209,13 +209,13 @@ class DiceRewardConfigController extends BaseController
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
#[Permission('奖励配置修改', 'dice:reward_config:index:update')] #[Permission('创建奖励对照', 'dice:reward_config:index:createRewardReference')]
public function createRewardReference(Request $request): Response public function createRewardReference(Request $request): Response
{ {
try { try {
$rewardLogic = new DiceRewardLogic(); $rewardLogic = new DiceRewardLogic();
$result = $rewardLogic->createRewardReferenceFromConfig(); $result = $rewardLogic->createRewardReferenceFromConfig();
return $this->success($result, '创建奖励对照成功'); return $this->success($result, 'create reward mapping success');
} catch (\plugin\saiadmin\exception\ApiException $e) { } catch (\plugin\saiadmin\exception\ApiException $e) {
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }

View File

@@ -59,7 +59,7 @@ class DiceRewardConfigRecordController extends BaseController
$data['admin_name'] = $this->getAdminName((int) ($data['admin_id'] ?? 0)); $data['admin_name'] = $this->getAdminName((int) ($data['admin_id'] ?? 0));
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -96,9 +96,9 @@ class DiceRewardConfigRecordController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -114,9 +114,9 @@ class DiceRewardConfigRecordController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -130,13 +130,13 @@ class DiceRewardConfigRecordController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -144,12 +144,12 @@ class DiceRewardConfigRecordController extends BaseController
* 导入:测试记录 → DiceReward、DiceRewardConfig(BIGWIN)、DiceLotteryPoolConfig(付费/免费 T1-T5) * 导入:测试记录 → DiceReward、DiceRewardConfig(BIGWIN)、DiceLotteryPoolConfig(付费/免费 T1-T5)
* @param Request $request record_id, paid_lottery_config_id(可选), free_lottery_config_id(可选), lottery_config_id(兼容旧版) * @param Request $request record_id, paid_lottery_config_id(可选), free_lottery_config_id(可选), lottery_config_id(兼容旧版)
*/ */
#[Permission('奖励配置权重测试记录列表', 'dice:reward_config_record:index:index')] #[Permission('导入权重配置', 'dice:reward_config_record:index:importFromRecord')]
public function importFromRecord(Request $request): Response public function importFromRecord(Request $request): Response
{ {
$recordId = (int) $request->post('record_id', 0); $recordId = (int) $request->post('record_id', 0);
if ($recordId <= 0) { if ($recordId <= 0) {
return $this->fail('请指定测试记录'); return $this->fail('please specify test record');
} }
$paidId = $request->post('paid_lottery_config_id', null); $paidId = $request->post('paid_lottery_config_id', null);
$freeId = $request->post('free_lottery_config_id', null); $freeId = $request->post('free_lottery_config_id', null);
@@ -159,7 +159,7 @@ class DiceRewardConfigRecordController extends BaseController
$lotteryConfigId = $legacyId !== null && $legacyId !== '' ? (int) $legacyId : null; $lotteryConfigId = $legacyId !== null && $legacyId !== '' ? (int) $legacyId : null;
try { try {
$this->logic->importFromRecord($recordId, $paidLotteryConfigId, $freeLotteryConfigId, $lotteryConfigId); $this->logic->importFromRecord($recordId, $paidLotteryConfigId, $freeLotteryConfigId, $lotteryConfigId);
return $this->success('导入成功,已刷新 DiceRewardDiceRewardConfig(BIGWIN)、奖池配置'); return $this->success('import success, refreshed DiceReward, DiceRewardConfig(BIGWIN), and pool config');
} catch (\plugin\saiadmin\exception\ApiException $e) { } catch (\plugin\saiadmin\exception\ApiException $e) {
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());
} }

View File

@@ -34,21 +34,22 @@ class DiceLotteryPoolConfigLogic extends BaseLogic
* 获取当前彩金池type=0+ 杀分权重为 type=1 的只读展示 * 获取当前彩金池type=0+ 杀分权重为 type=1 的只读展示
* profit_amount 每次从 DB 实时读取t1_weightt5_weight 来自 type=1杀分权重不可在弹窗内修改 * profit_amount 每次从 DB 实时读取t1_weightt5_weight 来自 type=1杀分权重不可在弹窗内修改
* *
* @return array{id:int,name:string,safety_line:int,t1_weight:int,...,t5_weight:int,profit_amount:float} * @return array{id:int,name:string,safety_line:int,kill_enabled:int,t1_weight:int,...,t5_weight:int,profit_amount:float}
*/ */
public function getCurrentPool(): array public function getCurrentPool(): array
{ {
$configType0 = DiceLotteryPoolConfig::where('type', 0)->find(); $configType0 = DiceLotteryPoolConfig::where('name', 'default')->find();
if (!$configType0) { if (!$configType0) {
throw new ApiException('未找到 type=0 的奖池配置,请先创建'); throw new ApiException('No name=default pool config found, please create one first');
} }
$configType1 = DiceLotteryPoolConfig::where('type', 1)->find(); $configType1 = DiceLotteryPoolConfig::where('name', 'killScore')->find();
$row0 = $configType0->toArray(); $row0 = $configType0->toArray();
$profitAmount = isset($row0['profit_amount']) ? (float) $row0['profit_amount'] : (isset($row0['ev']) ? (float) $row0['ev'] : 0.0); $profitAmount = isset($row0['profit_amount']) ? (float) $row0['profit_amount'] : (isset($row0['ev']) ? (float) $row0['ev'] : 0.0);
$pool = [ $pool = [
'id' => (int) $row0['id'], 'id' => (int) $row0['id'],
'name' => (string) ($row0['name'] ?? ''), 'name' => (string) ($row0['name'] ?? ''),
'safety_line' => (int) ($row0['safety_line'] ?? 0), 'safety_line' => (int) ($row0['safety_line'] ?? 0),
'kill_enabled' => (int) ($row0['kill_enabled'] ?? 1),
'profit_amount' => $profitAmount, 'profit_amount' => $profitAmount,
]; ];
$row1 = $configType1 ? $configType1->toArray() : []; $row1 = $configType1 ? $configType1->toArray() : [];
@@ -61,19 +62,28 @@ class DiceLotteryPoolConfigLogic extends BaseLogic
} }
/** /**
* 更新当前彩金池:仅允许修改 type=0 的 safety_line杀分权重来自 type=1不可在此接口修改 * 更新当前彩金池:仅允许修改 type=0 的 safety_line、kill_enabled(杀分权重来自 type=1不可在此接口修改
* *
* @param array{safety_line?:int} $data * @param array{safety_line?:int,kill_enabled?:int} $data
*/ */
public function updateCurrentPool(array $data): void public function updateCurrentPool(array $data): void
{ {
$pool = $this->getCurrentPool(); $pool = $this->getCurrentPool();
$id = (int) $pool['id']; $id = (int) $pool['id'];
if (!array_key_exists('safety_line', $data)) { if (!array_key_exists('safety_line', $data) && !array_key_exists('kill_enabled', $data)) {
return; return;
} }
$safetyLine = (int) $data['safety_line']; $update = [];
DiceLotteryPoolConfig::where('id', $id)->update(['safety_line' => $safetyLine]); if (array_key_exists('safety_line', $data)) {
$update['safety_line'] = (int) $data['safety_line'];
}
if (array_key_exists('kill_enabled', $data)) {
$update['kill_enabled'] = ((int) $data['kill_enabled']) === 1 ? 1 : 0;
}
if ($update === []) {
return;
}
DiceLotteryPoolConfig::where('id', $id)->update($update);
} }
/** /**

View File

@@ -22,6 +22,8 @@ class DicePlayRecordLogic extends BaseLogic
public function __construct() public function __construct()
{ {
$this->model = new DicePlayRecord(); $this->model = new DicePlayRecord();
// 默认按主键倒序:最新数据优先展示
$this->setOrderType('DESC');
} }
/** /**

View File

@@ -22,6 +22,8 @@ class DicePlayerTicketRecordLogic extends BaseLogic
public function __construct() public function __construct()
{ {
$this->model = new DicePlayerTicketRecord(); $this->model = new DicePlayerTicketRecord();
// 默认按主键倒序:最新数据优先展示
$this->setOrderType('DESC');
} }
/** /**

View File

@@ -23,6 +23,8 @@ class DicePlayerWalletRecordLogic extends BaseLogic
public function __construct() public function __construct()
{ {
$this->model = new DicePlayerWalletRecord(); $this->model = new DicePlayerWalletRecord();
// 默认按主键倒序:最新数据优先展示
$this->setOrderType('DESC');
} }
/** /**
@@ -50,20 +52,20 @@ class DicePlayerWalletRecordLogic extends BaseLogic
$coin = (float) ($data['coin'] ?? 0); $coin = (float) ($data['coin'] ?? 0);
if ($playerId <= 0 || !in_array($type, [3, 4], true)) { if ($playerId <= 0 || !in_array($type, [3, 4], true)) {
throw new ApiException('参数错误:需要有效的 player_id type3=加点4=扣点)'); throw new ApiException('Invalid params: player_id and type are required (3=add, 4=deduct)');
} }
if ($coin <= 0) { if ($coin <= 0) {
throw new ApiException('平台币变动必须大于 0'); throw new ApiException('Coin change must be greater than 0');
} }
$player = DicePlayer::where('id', $playerId)->find(); $player = DicePlayer::where('id', $playerId)->find();
if (!$player) { if (!$player) {
throw new ApiException('玩家不存在'); throw new ApiException('Player not found');
} }
$walletBefore = (float) ($player['coin'] ?? 0); $walletBefore = (float) ($player['coin'] ?? 0);
if ($type === 4 && $walletBefore < $coin) { if ($type === 4 && $walletBefore < $coin) {
throw new ApiException('扣点数量不能大于当前余额'); throw new ApiException('Deduct amount cannot exceed current balance');
} }
$walletAfter = $type === 3 ? $walletBefore + $coin : $walletBefore - $coin; $walletAfter = $type === 3 ? $walletBefore + $coin : $walletBefore - $coin;

View File

@@ -86,13 +86,13 @@ class DiceRewardLogic
$id = isset($item['id']) ? (int) $item['id'] : 0; $id = isset($item['id']) ? (int) $item['id'] : 0;
$weight = isset($item['weight']) ? (int) $item['weight'] : self::WEIGHT_MIN; $weight = isset($item['weight']) ? (int) $item['weight'] : self::WEIGHT_MIN;
if ($id <= 0) { if ($id <= 0) {
throw new ApiException('存在无效的配置ID'); throw new ApiException('Invalid config ID exists');
} }
$weight = max(self::WEIGHT_MIN, min(self::WEIGHT_MAX, $weight)); $weight = max(self::WEIGHT_MIN, min(self::WEIGHT_MAX, $weight));
$tier = DiceRewardConfig::where('id', $id)->value('tier'); $tier = DiceRewardConfig::where('id', $id)->value('tier');
if ($tier === null || $tier === '') { if ($tier === null || $tier === '') {
throw new ApiException('配置ID ' . $id . ' 不存在或档位为空'); throw new ApiException(\app\api\util\ApiLang::translateParams('配置ID %s 不存在或档位为空', [$id]));
} }
$tier = (string) $tier; $tier = (string) $tier;
@@ -199,7 +199,7 @@ class DiceRewardLogic
$id = isset($item['reward_id']) ? (int) $item['reward_id'] : 0; $id = isset($item['reward_id']) ? (int) $item['reward_id'] : 0;
} }
if ($id <= 0) { if ($id <= 0) {
throw new ApiException('存在无效的 DiceReward id'); throw new ApiException('Invalid DiceReward id exists');
} }
$weight = isset($item['weight']) ? (int) $item['weight'] : self::WEIGHT_MIN; $weight = isset($item['weight']) ? (int) $item['weight'] : self::WEIGHT_MIN;
$weight = max(self::WEIGHT_MIN, min(self::WEIGHT_MAX, $weight)); $weight = max(self::WEIGHT_MIN, min(self::WEIGHT_MAX, $weight));
@@ -313,12 +313,15 @@ class DiceRewardLogic
{ {
$list = DiceRewardConfig::order('id', 'asc')->select()->toArray(); $list = DiceRewardConfig::order('id', 'asc')->select()->toArray();
if (empty($list)) { if (empty($list)) {
throw new ApiException('奖励配置为空,请先维护 dice_reward_config'); throw new ApiException('Reward config is empty, please maintain dice_reward_config first');
} }
$configCount = count($list); $configCount = count($list);
if ($configCount < self::BOARD_SIZE) { if ($configCount < self::BOARD_SIZE) {
throw new ApiException( throw new ApiException(
'奖励配置需覆盖 26 个格位id 0-25 或 1-26当前仅 ' . $configCount . ' 条,无法完整生成 5-30 共26个点数、顺时针与逆时针的奖励对照' \app\api\util\ApiLang::translateParams(
'奖励配置需覆盖 26 个格位id 0-25 或 1-26当前仅 %s 条,无法完整生成 5-30 共26个点数、顺时针与逆时针的奖励对照',
[$configCount]
)
); );
} }

View File

@@ -319,7 +319,7 @@ class DiceRewardConfigLogic extends BaseLogic
{ {
$allowedCounts = [100, 500, 1000, 5000, 10000]; $allowedCounts = [100, 500, 1000, 5000, 10000];
if (!in_array($testCount, $allowedCounts, true)) { if (!in_array($testCount, $allowedCounts, true)) {
throw new ApiException('测试次数仅支持 1005001000500010000'); throw new ApiException('Test count only supports 100, 500, 1000, 5000, 10000');
} }
$grouped = []; $grouped = [];
@@ -333,7 +333,7 @@ class DiceRewardConfigLogic extends BaseLogic
$config = DiceLotteryPoolConfig::find($lotteryConfigId); $config = DiceLotteryPoolConfig::find($lotteryConfigId);
} }
if (!$config) { if (!$config) {
$config = DiceLotteryPoolConfig::where('type', 0)->find(); $config = DiceLotteryPoolConfig::where('name', 'default')->find();
} }
if ($config) { if ($config) {
$tierWeights = [ $tierWeights = [

View File

@@ -20,6 +20,8 @@ class DiceRewardConfigRecordLogic extends BaseLogic
public function __construct() public function __construct()
{ {
$this->model = new DiceRewardConfigRecord(); $this->model = new DiceRewardConfigRecord();
// 默认按主键倒序:最新数据优先展示
$this->setOrderType('DESC');
} }
/** /**
@@ -81,7 +83,7 @@ class DiceRewardConfigRecordLogic extends BaseLogic
{ {
$record = $this->model->find($recordId); $record = $this->model->find($recordId);
if (!$record) { if (!$record) {
throw new ApiException('测试记录不存在'); throw new ApiException('Test record not found');
} }
$record = is_array($record) ? $record : $record->toArray(); $record = is_array($record) ? $record : $record->toArray();
@@ -195,7 +197,7 @@ class DiceRewardConfigRecordLogic extends BaseLogic
if (is_array($paidData) && $paidTargetId > 0) { if (is_array($paidData) && $paidTargetId > 0) {
$pool = DiceLotteryPoolConfig::find($paidTargetId); $pool = DiceLotteryPoolConfig::find($paidTargetId);
if (!$pool) { if (!$pool) {
throw new ApiException('付费奖池配置不存在'); throw new ApiException('Paid pool config not found');
} }
$update = [ $update = [
't1_weight' => (int) ($paidData['T1'] ?? $paidData['t1'] ?? 0), 't1_weight' => (int) ($paidData['T1'] ?? $paidData['t1'] ?? 0),
@@ -209,7 +211,7 @@ class DiceRewardConfigRecordLogic extends BaseLogic
if (is_array($freeData) && $freeTargetId > 0) { if (is_array($freeData) && $freeTargetId > 0) {
$pool = DiceLotteryPoolConfig::find($freeTargetId); $pool = DiceLotteryPoolConfig::find($freeTargetId);
if (!$pool) { if (!$pool) {
throw new ApiException('免费奖池配置不存在'); throw new ApiException('Free pool config not found');
} }
$update = [ $update = [
't1_weight' => (int) ($freeData['T1'] ?? $freeData['t1'] ?? 0), 't1_weight' => (int) ($freeData['T1'] ?? $freeData['t1'] ?? 0),
@@ -264,12 +266,12 @@ class DiceRewardConfigRecordLogic extends BaseLogic
foreach ([$paidS, $paidN, $freeS, $freeN] as $c) { foreach ([$paidS, $paidN, $freeS, $freeN] as $c) {
if ($c !== 0 && !in_array($c, $allowed, true)) { if ($c !== 0 && !in_array($c, $allowed, true)) {
throw new ApiException('各抽奖次数仅支持 0、10050010005000'); throw new ApiException('Counts only support 0, 100, 500, 1000, 5000');
} }
} }
$total = $paidS + $paidN + $freeS + $freeN; $total = $paidS + $paidN + $freeS + $freeN;
if ($total <= 0) { if ($total <= 0) {
throw new ApiException('付费或免费至少一种方向次数之和大于 0'); throw new ApiException('Sum of paid/free direction counts must be greater than 0');
} }
$snapshot = []; $snapshot = [];
@@ -314,7 +316,7 @@ class DiceRewardConfigRecordLogic extends BaseLogic
if ($paidConfigId > 0) { if ($paidConfigId > 0) {
$config = DiceLotteryPoolConfig::find($paidConfigId); $config = DiceLotteryPoolConfig::find($paidConfigId);
if (!$config) { if (!$config) {
throw new ApiException('付费奖池配置不存在'); throw new ApiException('Paid pool config not found');
} }
$tierWeightsSnapshot['paid'] = [ $tierWeightsSnapshot['paid'] = [
'T1' => (int) ($config->t1_weight ?? 0), 'T1' => (int) ($config->t1_weight ?? 0),
@@ -326,19 +328,19 @@ class DiceRewardConfigRecordLogic extends BaseLogic
} else { } else {
$paidTierWeights = $params['paid_tier_weights'] ?? null; $paidTierWeights = $params['paid_tier_weights'] ?? null;
if (!is_array($paidTierWeights)) { if (!is_array($paidTierWeights)) {
throw new ApiException('付费未选择奖池配置时,请填写付费自定义档位概率(T1T5'); throw new ApiException('When paid pool is not selected, please fill paid custom tier probabilities (T1T5)');
} }
$tiers = ['T1', 'T2', 'T3', 'T4', 'T5']; $tiers = ['T1', 'T2', 'T3', 'T4', 'T5'];
foreach ($tiers as $t) { foreach ($tiers as $t) {
$v = (int) ($paidTierWeights[$t] ?? 0); $v = (int) ($paidTierWeights[$t] ?? 0);
if ($v < 0 || $v > 100) { if ($v < 0 || $v > 100) {
throw new ApiException('付费档位概率每档只能 0-100%'); throw new ApiException('Paid tier probability must be between 0 and 100%');
} }
$paidTierWeights[$t] = $v; $paidTierWeights[$t] = $v;
} }
$paidSum = array_sum(array_intersect_key($paidTierWeights, array_flip($tiers))); $paidSum = array_sum(array_intersect_key($paidTierWeights, array_flip($tiers)));
if ($paidSum > 100) { if ($paidSum > 100) {
throw new ApiException('付费档位概率 T1T5 之和不能超过 100%'); throw new ApiException('Paid tier probabilities (T1T5) sum cannot exceed 100%');
} }
$tierWeightsSnapshot['paid'] = $paidTierWeights; $tierWeightsSnapshot['paid'] = $paidTierWeights;
} }
@@ -346,7 +348,7 @@ class DiceRewardConfigRecordLogic extends BaseLogic
if ($freeConfigId > 0) { if ($freeConfigId > 0) {
$config = DiceLotteryPoolConfig::find($freeConfigId); $config = DiceLotteryPoolConfig::find($freeConfigId);
if (!$config) { if (!$config) {
throw new ApiException('免费奖池配置不存在'); throw new ApiException('Free pool config not found');
} }
$tierWeightsSnapshot['free'] = [ $tierWeightsSnapshot['free'] = [
'T1' => (int) ($config->t1_weight ?? 0), 'T1' => (int) ($config->t1_weight ?? 0),
@@ -358,19 +360,19 @@ class DiceRewardConfigRecordLogic extends BaseLogic
} else { } else {
$freeTierWeights = $params['free_tier_weights'] ?? null; $freeTierWeights = $params['free_tier_weights'] ?? null;
if (!is_array($freeTierWeights)) { if (!is_array($freeTierWeights)) {
throw new ApiException('免费未选择奖池配置时,请填写免费自定义档位概率(T1T5'); throw new ApiException('When free pool is not selected, please fill free custom tier probabilities (T1T5)');
} }
$tiers = ['T1', 'T2', 'T3', 'T4', 'T5']; $tiers = ['T1', 'T2', 'T3', 'T4', 'T5'];
foreach ($tiers as $t) { foreach ($tiers as $t) {
$v = (int) ($freeTierWeights[$t] ?? 0); $v = (int) ($freeTierWeights[$t] ?? 0);
if ($v < 0 || $v > 100) { if ($v < 0 || $v > 100) {
throw new ApiException('免费档位概率每档只能 0-100%'); throw new ApiException('Free tier probability must be between 0 and 100%');
} }
$freeTierWeights[$t] = $v; $freeTierWeights[$t] = $v;
} }
$freeSum = array_sum(array_intersect_key($freeTierWeights, array_flip($tiers))); $freeSum = array_sum(array_intersect_key($freeTierWeights, array_flip($tiers)));
if ($freeSum > 100) { if ($freeSum > 100) {
throw new ApiException('免费档位概率 T1T5 之和不能超过 100%'); throw new ApiException('Free tier probabilities (T1T5) sum cannot exceed 100%');
} }
$tierWeightsSnapshot['free'] = $freeTierWeights; $tierWeightsSnapshot['free'] = $freeTierWeights;
} }

View File

@@ -14,6 +14,7 @@ use support\think\Db;
/** /**
* 一键测试权重:单进程后台执行模拟摇色子,写入 dice_play_record_test 并更新 dice_reward_config_record 进度 * 一键测试权重:单进程后台执行模拟摇色子,写入 dice_play_record_test 并更新 dice_reward_config_record 进度
* 抽奖逻辑与 PlayStartLogic 一致:使用 name=default 的安全线、杀分开关;盈利<安全线时付费用玩家权重、免费用 killScore盈利>=安全线且杀分开启时付费/免费均用 killScore
*/ */
class WeightTestRunner class WeightTestRunner
{ {
@@ -21,7 +22,7 @@ class WeightTestRunner
/** /**
* 执行指定测试记录:按付费/免费、顺/逆方向交替模拟(付费顺→付费逆→免费顺→免费逆),每 10 条写入一次测试表并更新进度 * 执行指定测试记录:按付费/免费、顺/逆方向交替模拟(付费顺→付费逆→免费顺→免费逆),每 10 条写入一次测试表并更新进度
* 支持1lottery_config_id 有值时用奖池配置档位权重2无值时用记录中的 paid_tier_weights / free_tier_weights * 使用与 playStart 相同的彩金池逻辑name=default 的安全线/kill_enabled付费用 paid_tier_weights玩家权重或 killScore免费用 killScore
* @param int $recordId dice_reward_config_record.id * @param int $recordId dice_reward_config_record.id
*/ */
public function run(int $recordId): void public function run(int $recordId): void
@@ -50,48 +51,37 @@ class WeightTestRunner
$total = $paidS + $paidN + $freeS + $freeN; $total = $paidS + $paidN + $freeS + $freeN;
} }
$paidConfigId = (int) ($record->paid_lottery_config_id ?? 0); $configType0 = DiceLotteryPoolConfig::where('name', 'default')->find();
$freeConfigId = (int) ($record->free_lottery_config_id ?? 0); $configType1 = DiceLotteryPoolConfig::where('name', 'killScore')->find();
if ($paidConfigId <= 0) { if (!$configType0) {
$paidConfigId = (int) ($record->lottery_config_id ?? 0); $this->markFailed($recordId, '彩金池配置 name=default 不存在');
}
if ($freeConfigId <= 0) {
$freeConfigId = (int) ($record->lottery_config_id ?? 0);
}
$paidConfig = $paidConfigId > 0 ? DiceLotteryPoolConfig::find($paidConfigId) : null;
$freeConfig = $freeConfigId > 0 ? DiceLotteryPoolConfig::find($freeConfigId) : null;
if ($paidConfigId > 0 && !$paidConfig) {
$this->markFailed($recordId, '付费奖池配置不存在');
return;
}
if ($freeConfigId > 0 && !$freeConfig) {
$this->markFailed($recordId, '免费奖池配置不存在');
return; return;
} }
$safetyLine = (int) ($configType0->safety_line ?? 0);
$killEnabled = ((int) ($configType0->kill_enabled ?? 1)) === 1;
$paidTierWeights = (is_array($record->paid_tier_weights ?? null) && $record->paid_tier_weights !== []) $paidTierWeights = (is_array($record->paid_tier_weights ?? null) && $record->paid_tier_weights !== [])
? $record->paid_tier_weights ? $record->paid_tier_weights
: null; : [
$freeTierWeights = (is_array($record->free_tier_weights ?? null) && $record->free_tier_weights !== []) 'T1' => (int) ($configType0->t1_weight ?? 0),
? $record->free_tier_weights 'T2' => (int) ($configType0->t2_weight ?? 0),
: null; 'T3' => (int) ($configType0->t3_weight ?? 0),
if ($paidConfig === null && $paidTierWeights === null) { 'T4' => (int) ($configType0->t4_weight ?? 0),
$this->markFailed($recordId, '付费未选奖池时需提供 paid_tier_weights'); 'T5' => (int) ($configType0->t5_weight ?? 0),
return; ];
} if (array_sum($paidTierWeights) <= 0) {
if ($freeConfig === null && $freeTierWeights === null) { $this->markFailed($recordId, '需提供 paid_tier_weights(玩家权重,盈利未达安全线时付费抽奖使用)或选择 default 奖池');
$this->markFailed($recordId, '免费未选奖池时需提供 free_tier_weights');
return; return;
} }
$freeConfig = $configType1 !== null ? $configType1 : $configType0;
// 每次测试开始前清空进程内静态缓存,强制从共享缓存读取最新 BIGWIN/奖励配置,与数据库一致 // 每次测试开始前清空进程内静态缓存,强制从共享缓存读取最新 BIGWIN/奖励配置,与数据库一致
DiceRewardConfig::clearRequestInstance(); DiceRewardConfig::clearRequestInstance();
DiceReward::clearRequestInstance(); DiceReward::clearRequestInstance();
// 测试时按“单个虚拟玩家”累计中奖金额来判断是否触发杀分:达到 safety_line 前用自定义档位(玩家权重),达到后用奖池权重 // 彩金池累计盈利:用于判断是否触发杀分(不再依赖单个玩家累计盈利)
$paidSafetyLine = $paidConfig !== null ? (int) ($paidConfig->safety_line ?? 0) : 0; $poolProfitTotal = $configType0->profit_amount ?? 0;
$freeSafetyLine = $freeConfig !== null ? (int) ($freeConfig->safety_line ?? 0) : 0;
$paidPlayerWinTotal = 0.0;
$freePlayerWinTotal = 0.0;
$playLogic = new PlayStartLogic(); $playLogic = new PlayStartLogic();
$resultCounts = []; $resultCounts = [];
@@ -101,40 +91,38 @@ class WeightTestRunner
try { try {
for ($i = 0; $i < $paidS; $i++) { for ($i = 0; $i < $paidS; $i++) {
$usePoolWeights = $paidConfig !== null && $paidPlayerWinTotal >= $paidSafetyLine && $paidSafetyLine > 0; $usePoolWeights = $killEnabled && $poolProfitTotal >= $safetyLine && $configType1 !== null;
$paidConfig = $usePoolWeights ? $configType1 : $configType0;
$customWeights = $usePoolWeights ? null : $paidTierWeights; $customWeights = $usePoolWeights ? null : $paidTierWeights;
$row = $playLogic->simulateOnePlay($paidConfig, 0, 0, $customWeights); $row = $playLogic->simulateOnePlay($paidConfig, 0, 0, $customWeights);
$this->accumulatePlayerWin($row, $paidPlayerWinTotal); $this->accumulateProfitForDefault($row, 0, $paidConfig, $configType0, $poolProfitTotal);
$this->aggregate($row, $resultCounts, $tierCounts); $this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId); $buffer[] = $this->rowForInsert($row, $recordId);
$done++; $done++;
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts); $this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts);
} }
for ($i = 0; $i < $paidN; $i++) { for ($i = 0; $i < $paidN; $i++) {
$usePoolWeights = $paidConfig !== null && $paidPlayerWinTotal >= $paidSafetyLine && $paidSafetyLine > 0; $usePoolWeights = $killEnabled && $poolProfitTotal >= $safetyLine && $configType1 !== null;
$paidConfig = $usePoolWeights ? $configType1 : $configType0;
$customWeights = $usePoolWeights ? null : $paidTierWeights; $customWeights = $usePoolWeights ? null : $paidTierWeights;
$row = $playLogic->simulateOnePlay($paidConfig, 1, 0, $customWeights); $row = $playLogic->simulateOnePlay($paidConfig, 1, 0, $customWeights);
$this->accumulatePlayerWin($row, $paidPlayerWinTotal); $this->accumulateProfitForDefault($row, 0, $paidConfig, $configType0, $poolProfitTotal);
$this->aggregate($row, $resultCounts, $tierCounts); $this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId); $buffer[] = $this->rowForInsert($row, $recordId);
$done++; $done++;
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts); $this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts);
} }
for ($i = 0; $i < $freeS; $i++) { for ($i = 0; $i < $freeS; $i++) {
$usePoolWeights = $freeConfig !== null && $freePlayerWinTotal >= $freeSafetyLine && $freeSafetyLine > 0; $row = $playLogic->simulateOnePlay($freeConfig, 0, 1, null);
$customWeights = $usePoolWeights ? null : $freeTierWeights; $this->accumulateProfitForDefault($row, 1, $freeConfig, $configType0, $poolProfitTotal);
$row = $playLogic->simulateOnePlay($freeConfig, 0, 1, $customWeights);
$this->accumulatePlayerWin($row, $freePlayerWinTotal);
$this->aggregate($row, $resultCounts, $tierCounts); $this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId); $buffer[] = $this->rowForInsert($row, $recordId);
$done++; $done++;
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts); $this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts);
} }
for ($i = 0; $i < $freeN; $i++) { for ($i = 0; $i < $freeN; $i++) {
$usePoolWeights = $freeConfig !== null && $freePlayerWinTotal >= $freeSafetyLine && $freeSafetyLine > 0; $row = $playLogic->simulateOnePlay($freeConfig, 1, 1, null);
$customWeights = $usePoolWeights ? null : $freeTierWeights; $this->accumulateProfitForDefault($row, 1, $freeConfig, $configType0, $poolProfitTotal);
$row = $playLogic->simulateOnePlay($freeConfig, 1, 1, $customWeights);
$this->accumulatePlayerWin($row, $freePlayerWinTotal);
$this->aggregate($row, $resultCounts, $tierCounts); $this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId); $buffer[] = $this->rowForInsert($row, $recordId);
$done++; $done++;
@@ -152,13 +140,20 @@ class WeightTestRunner
} }
} }
/** 累加单个虚拟玩家在测试过程中的中奖金额win_coin */ /**
private function accumulatePlayerWin(array $row, float &$runningWinTotal): void * 累加彩金池累计盈利,用于触发杀分,与 PlayStartLogic 一致
* @param int $lotteryType 0=付费券1=免费券
* @param object $usedConfig 本次使用的奖池配置(仅用于校验非空)
* @param object $configType0 name=default 的彩金池
* @param float $playerProfitTotal 实际为“彩金池累计盈利”滚动值
*/
private function accumulateProfitForDefault(array $row, int $lotteryType, $usedConfig, $configType0, float &$playerProfitTotal): void
{ {
if (!isset($row['win_coin'])) { if (($lotteryType !== 0 && $lotteryType !== 1) || $usedConfig === null || $configType0 === null || !isset($row['win_coin'])) {
return; return;
} }
$runningWinTotal += (float) $row['win_coin']; $winCoin = (float) $row['win_coin'];
$playerProfitTotal += $lotteryType === 0 ? ($winCoin - 100.0) : $winCoin;
} }
private function aggregate(array $row, array &$resultCounts, array &$tierCounts): void private function aggregate(array $row, array &$resultCounts, array &$tierCounts): void

View File

@@ -11,13 +11,13 @@ use plugin\saiadmin\basic\think\BaseModel;
/** /**
* 色子奖池配置模型 * 色子奖池配置模型
* *
* dice_lottery_config 色子奖池配置 * dice_lottery_pool_config 色子奖池配置
* *
* @property $id ID * @property $id ID
* @property $name 名称 * @property $name 名称
* @property $remark 备注 * @property $remark 备注
* @property $type 奖池类型
* @property $safety_line 安全线 * @property $safety_line 安全线
* @property $kill_enabled 是否启用杀分0=关闭 1=开启
* @property $create_time 创建时间 * @property $create_time 创建时间
* @property $update_time 修改时间 * @property $update_time 修改时间
* @property $t1_weight T1池权重 * @property $t1_weight T1池权重
@@ -39,7 +39,7 @@ class DiceLotteryPoolConfig extends BaseModel
* 数据库表名称 * 数据库表名称
* @var string * @var string
*/ */
protected $table = 'dice_lottery_config'; protected $table = 'dice_lottery_pool_config';
/** /**
* 名称 搜索 * 名称 搜索
@@ -49,13 +49,4 @@ class DiceLotteryPoolConfig extends BaseModel
$query->where('name', 'like', '%'.$value.'%'); $query->where('name', 'like', '%'.$value.'%');
} }
/**
* 奖池类型 搜索type=0/1/2 等)
*/
public function searchTypeAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('type', '=', $value);
}
}
} }

View File

@@ -78,26 +78,26 @@ class DicePlayer extends BaseModel
if ($name === null || $name === '') { if ($name === null || $name === '') {
$model->setAttr('name', $uid); $model->setAttr('name', $uid);
} }
// 创建玩家时:未指定则自动保存 lottery_config_id 为 DiceLotteryPoolConfig type=0 的 id没有则为 0 // 创建玩家时:未指定则自动保存 lottery_config_id 为 DiceLotteryPoolConfig name=default 的 id没有则为 0
try { try {
$lotteryConfigId = $model->getAttr('lottery_config_id'); $lotteryConfigId = $model->getAttr('lottery_config_id');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$lotteryConfigId = null; $lotteryConfigId = null;
} }
if ($lotteryConfigId === null || $lotteryConfigId === '' || (int) $lotteryConfigId === 0) { if ($lotteryConfigId === null || $lotteryConfigId === '' || (int) $lotteryConfigId === 0) {
$config = DiceLotteryPoolConfig::where('type', 0)->find(); $config = DiceLotteryPoolConfig::where('name', 'default')->find();
$model->setAttr('lottery_config_id', $config ? (int) $config->id : 0); $model->setAttr('lottery_config_id', $config ? (int) $config->id : 0);
} }
// 彩金池权重默认取 type=0 的奖池配置 // 彩金池权重默认取 name=default 的奖池配置
self::setDefaultWeightsFromLotteryConfig($model); self::setDefaultWeightsFromLotteryConfig($model);
} }
/** /**
* 从 DiceLotteryPoolConfig type=0 取 t1_weightt5_weight 作为玩家未设置时的默认值 * 从 DiceLotteryPoolConfig name=default 取 t1_weightt5_weight 作为玩家未设置时的默认值
*/ */
protected static function setDefaultWeightsFromLotteryConfig(DicePlayer $model): void protected static function setDefaultWeightsFromLotteryConfig(DicePlayer $model): void
{ {
$config = DiceLotteryPoolConfig::where('type', 0)->find(); $config = DiceLotteryPoolConfig::where('name', 'default')->find();
if (!$config) { if (!$config) {
return; return;
} }

View File

@@ -18,7 +18,6 @@ class DiceLotteryPoolConfigValidate extends BaseValidate
*/ */
protected $rule = [ protected $rule = [
'name' => 'require', 'name' => 'require',
'type' => 'require',
't1_weight' => 'require', 't1_weight' => 'require',
't2_weight' => 'require', 't2_weight' => 'require',
't3_weight' => 'require', 't3_weight' => 'require',
@@ -31,7 +30,6 @@ class DiceLotteryPoolConfigValidate extends BaseValidate
*/ */
protected $message = [ protected $message = [
'name' => '名称必须填写', 'name' => '名称必须填写',
'type' => '奖池类型必须填写',
't1_weight' => 'T1池权重必须填写', 't1_weight' => 'T1池权重必须填写',
't2_weight' => 'T2池权重必须填写', 't2_weight' => 'T2池权重必须填写',
't3_weight' => 'T3池权重必须填写', 't3_weight' => 'T3池权重必须填写',
@@ -45,7 +43,6 @@ class DiceLotteryPoolConfigValidate extends BaseValidate
protected $scene = [ protected $scene = [
'save' => [ 'save' => [
'name', 'name',
'type',
't1_weight', 't1_weight',
't2_weight', 't2_weight',
't3_weight', 't3_weight',
@@ -54,7 +51,6 @@ class DiceLotteryPoolConfigValidate extends BaseValidate
], ],
'update' => [ 'update' => [
'name', 'name',
'type',
't1_weight', 't1_weight',
't2_weight', 't2_weight',
't3_weight', 't3_weight',

View File

@@ -69,7 +69,7 @@ The exact implementation is in the dice game logic layer and related services. A
3. Get or create lottery pool: 3. Get or create lottery pool:
- `LotteryService::getOrCreate()` - `LotteryService::getOrCreate()`
- Reads from Redis; if missing, reads from DB (for example, `DiceLotteryPoolConfig::where('type', 0/1)->find()`). - Reads from Redis; if missing, reads from DB (for example, `DiceLotteryPoolConfig::where('name','default/killScore')->find()`).
4. Load concrete pool config for this play: 4. Load concrete pool config for this play:
- `DiceLotteryPoolConfig::find($configId)` - `DiceLotteryPoolConfig::find($configId)`
@@ -115,7 +115,7 @@ Goal: hot paths should hit Redis most of the time, and DB should primarily be fo
- In `playStart`, ensure player is loaded once and reused (do not call `DicePlayer::find` multiple times per request). - In `playStart`, ensure player is loaded once and reused (do not call `DicePlayer::find` multiple times per request).
3. EV update strategy: 3. EV update strategy:
- Repeated `UPDATE dice_lottery_config SET ev = ev - ?` on a hot row causes lock contention. - Repeated `UPDATE dice_lottery_pool_config SET ev = ev - ?` on a hot row causes lock contention.
- Better: - Better:
- Accumulate EV deltas in Redis (per pool or per shard). - Accumulate EV deltas in Redis (per pool or per shard).
- Periodic cron job to aggregate Redis deltas back into MySQL in batches. - Periodic cron job to aggregate Redis deltas back into MySQL in batches.

View File

@@ -67,7 +67,7 @@
3. **获取或创建奖池LotteryService** 3. **获取或创建奖池LotteryService**
- 调用 `LotteryService::getOrCreate()` - 调用 `LotteryService::getOrCreate()`
- 优先从 Redis 中读取奖池信息; - 优先从 Redis 中读取奖池信息;
- 若缓存不存在,则从 DB 中加载:如 `DiceLotteryPoolConfig::where('type', 0/1)->find()` - 若缓存不存在,则从 DB 中加载:如 `DiceLotteryPoolConfig::where('name','default/killScore')->find()`
4. **根据本次玩法加载奖池配置** 4. **根据本次玩法加载奖池配置**
- 调用 `DiceLotteryPoolConfig::find($configId)` - 调用 `DiceLotteryPoolConfig::find($configId)`
@@ -113,7 +113,7 @@
-`playStart` 中,玩家信息应只查询一次:`$player = DicePlayer::find($playerId)`,后续逻辑统一使用 `$player`,避免重复 `find` -`playStart` 中,玩家信息应只查询一次:`$player = DicePlayer::find($playerId)`,后续逻辑统一使用 `$player`,避免重复 `find`
3. **EV 更新策略** 3. **EV 更新策略**
- 频繁在在线请求中执行 `UPDATE dice_lottery_config SET ev = ev - ?`,会造成该行热点锁竞争; - 频繁在在线请求中执行 `UPDATE dice_lottery_pool_config SET ev = ev - ?`,会造成该行热点锁竞争;
- 建议: - 建议:
- 在线请求仅将 EV 变动累加到 Redis 计数器; - 在线请求仅将 EV 变动累加到 Redis 计数器;
- 通过定时任务批量同步 Redis 中的统计数据回 MySQL。 - 通过定时任务批量同步 Redis 中的统计数据回 MySQL。

View File

@@ -63,7 +63,7 @@ class InstallController extends OpenController
clearstatcache(); clearstatcache();
if (is_file($env)) { if (is_file($env)) {
return $this->fail('管理后台已经安装如需重新安装请删除根目录env配置文件并重启'); return $this->fail('admin already installed, to reinstall please delete env file and restart');
} }
$user = $request->post('username'); $user = $request->post('username');
@@ -82,13 +82,13 @@ class InstallController extends OpenController
} catch (\Throwable $e) { } catch (\Throwable $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (stripos($message, 'Access denied for user')) { if (stripos($message, 'Access denied for user')) {
return $this->fail('数据库用户名或密码错误'); return $this->fail('database username or password is incorrect');
} }
if (stripos($message, 'Connection refused')) { if (stripos($message, 'Connection refused')) {
return $this->fail('Connection refused. 请确认数据库IP端口是否正确数据库已经启动'); return $this->fail('connection refused, please check database ip/port and ensure database is running');
} }
if (stripos($message, 'timed out')) { if (stripos($message, 'timed out')) {
return $this->fail('数据库连接超时请确认数据库IP端口是否正确安全组及防火墙已经放行端口'); return $this->fail('database connection timeout, please check ip/port and firewall/security group rules');
} }
throw $e; throw $e;
} }
@@ -98,7 +98,7 @@ class InstallController extends OpenController
$smt = $db->query("show tables like 'sa_system_menu';"); $smt = $db->query("show tables like 'sa_system_menu';");
$tables = $smt->fetchAll(); $tables = $smt->fetchAll();
if (count($tables) > 0) { if (count($tables) > 0) {
return $this->fail('数据库已经安装,请勿重复安装'); return $this->fail('database already installed, please do not install again');
} }
if ($dataType == 'demo') { if ($dataType == 'demo') {
@@ -108,7 +108,7 @@ class InstallController extends OpenController
} }
if (!is_file($sql_file)) { if (!is_file($sql_file)) {
return $this->fail('数据库SQL文件不存在'); return $this->fail('database SQL file not found');
} }
$sql_query = file_get_contents($sql_file); $sql_query = file_get_contents($sql_file);
@@ -151,7 +151,7 @@ EOF;
restore_error_handler(); restore_error_handler();
} }
return $this->success('安装成功'); return $this->success('install success');
} }
/** /**

View File

@@ -53,7 +53,7 @@ class LoginController extends BaseController
if ($captchaEnabled) { if ($captchaEnabled) {
$captcha = new Captcha(); $captcha = new Captcha();
if (!$captcha->checkCaptcha($uuid, $code)) { if (!$captcha->checkCaptcha($uuid, $code)) {
return $this->fail('验证码错误'); return $this->fail('captcha error');
} }
} }
$logic = new SystemUserLogic(); $logic = new SystemUserLogic();

View File

@@ -37,14 +37,14 @@ class SystemController extends BaseController
if ($adminInfo === null || !is_array($adminInfo) || !isset($adminInfo['id'])) { if ($adminInfo === null || !is_array($adminInfo) || !isset($adminInfo['id'])) {
$token = getCurrentInfo(); $token = getCurrentInfo();
if (!is_array($token) || empty($token['id'])) { if (!is_array($token) || empty($token['id'])) {
return $this->fail('登录已过期或用户信息无效,请重新登录', 401); return $this->fail('login expired or invalid, please login again', 401);
} }
$adminInfo = UserInfoCache::getUserInfo($token['id']); $adminInfo = UserInfoCache::getUserInfo($token['id']);
if (empty($adminInfo) || !isset($adminInfo['id'])) { if (empty($adminInfo) || !isset($adminInfo['id'])) {
$adminInfo = UserInfoCache::setUserInfo($token['id']); $adminInfo = UserInfoCache::setUserInfo($token['id']);
} }
if (empty($adminInfo) || !isset($adminInfo['id'])) { if (empty($adminInfo) || !isset($adminInfo['id'])) {
return $this->fail('登录已过期或用户信息无效,请重新登录', 401); return $this->fail('login expired or invalid, please login again', 401);
} }
$this->adminInfo = $adminInfo; $this->adminInfo = $adminInfo;
} }
@@ -86,7 +86,7 @@ class SystemController extends BaseController
public function menu(): Response public function menu(): Response
{ {
if (!$this->ensureAdminInfo()) { if (!$this->ensureAdminInfo()) {
return $this->fail('登录已过期或用户信息无效,请重新登录', 401); return $this->fail('login expired or invalid, please login again', 401);
} }
$data = UserMenuCache::getUserMenu($this->adminInfo['id']); $data = UserMenuCache::getUserMenu($this->adminInfo['id']);
return $this->success($data); return $this->success($data);
@@ -151,7 +151,7 @@ class SystemController extends BaseController
$config = Storage::getConfig('local'); $config = Storage::getConfig('local');
$logic = new SystemAttachmentLogic(); $logic = new SystemAttachmentLogic();
$data = $logic->saveNetworkImage($url, $config); $data = $logic->saveNetworkImage($url, $config);
return $this->success($data, '操作成功'); return $this->success($data, 'operation success');
} }
/** /**
@@ -228,7 +228,7 @@ class SystemController extends BaseController
UserInfoCache::clearUserInfo($this->adminId); UserInfoCache::clearUserInfo($this->adminId);
UserAuthCache::clearUserAuth($this->adminId); UserAuthCache::clearUserAuth($this->adminId);
UserMenuCache::clearUserMenu($this->adminId); UserMenuCache::clearUserMenu($this->adminId);
return $this->success([], '清除缓存成功!'); return $this->success([], 'clear cache success');
} }
/** /**

View File

@@ -78,11 +78,11 @@ class DataBaseController extends BaseController
if (!empty($ids)) { if (!empty($ids)) {
$result = $this->logic->delete($table, $ids); $result = $this->logic->delete($table, $ids);
if (!$result) { if (!$result) {
return $this->fail('操作失败'); return $this->fail('operation failed');
} }
return $this->success('操作成功'); return $this->success('operation success');
} else { } else {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
} }
@@ -99,11 +99,11 @@ class DataBaseController extends BaseController
if (!empty($ids)) { if (!empty($ids)) {
$result = $this->logic->recovery($table, $ids); $result = $this->logic->recovery($table, $ids);
if (!$result) { if (!$result) {
return $this->fail('操作失败'); return $this->fail('operation failed');
} }
return $this->success('操作成功'); return $this->success('operation success');
} else { } else {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
} }
@@ -130,7 +130,7 @@ class DataBaseController extends BaseController
{ {
$tables = $request->input('tables', []); $tables = $request->input('tables', []);
$this->logic->optimizeTable($tables); $this->logic->optimizeTable($tables);
return $this->success('优化成功'); return $this->success('optimize success');
} }
/** /**
@@ -141,7 +141,7 @@ class DataBaseController extends BaseController
{ {
$tables = $request->input('tables', []); $tables = $request->input('tables', []);
$this->logic->fragmentTable($tables); $this->logic->fragmentTable($tables);
return $this->success('清理成功'); return $this->success('clean success');
} }
} }

View File

@@ -57,9 +57,9 @@ class SystemAttachmentController extends BaseController
$data = $request->post(); $data = $request->post();
$result = $this->logic->edit($data['id'], ['origin_name' => $data['origin_name']]); $result = $this->logic->edit($data['id'], ['origin_name' => $data['origin_name']]);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -73,13 +73,13 @@ class SystemAttachmentController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -94,13 +94,13 @@ class SystemAttachmentController extends BaseController
$category_id = $request->post('category_id', ''); $category_id = $request->post('category_id', '');
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids) || empty($category_id)) { if (empty($ids) || empty($category_id)) {
return $this->fail('参数错误,请检查参数'); return $this->fail('invalid parameters, please check');
} }
$result = $this->logic->move($category_id, $ids); $result = $this->logic->move($category_id, $ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -57,7 +57,7 @@ class SystemCategoryController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -73,9 +73,9 @@ class SystemCategoryController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -91,9 +91,9 @@ class SystemCategoryController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -107,13 +107,13 @@ class SystemCategoryController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -62,9 +62,9 @@ class SystemConfigController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -80,9 +80,9 @@ class SystemConfigController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -96,13 +96,13 @@ class SystemConfigController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -117,10 +117,10 @@ class SystemConfigController extends BaseController
$group_id = $request->post('group_id'); $group_id = $request->post('group_id');
$config = $request->post('config'); $config = $request->post('config');
if (empty($group_id) || empty($config)) { if (empty($group_id) || empty($config)) {
return $this->fail('参数错误'); return $this->fail('Invalid parameters');
} }
$this->logic->batchUpdate($group_id, $config); $this->logic->batchUpdate($group_id, $config);
return $this->success('操作成功'); return $this->success('operation success');
} }
} }

View File

@@ -61,9 +61,9 @@ class SystemConfigGroupController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -80,9 +80,9 @@ class SystemConfigGroupController extends BaseController
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
ConfigCache::clearConfig($data['code']); ConfigCache::clearConfig($data['code']);
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -96,13 +96,13 @@ class SystemConfigGroupController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -116,7 +116,7 @@ class SystemConfigGroupController extends BaseController
{ {
$email = $request->input('email', ''); $email = $request->input('email', '');
if (empty($email)) { if (empty($email)) {
return $this->fail('请输入邮箱'); return $this->fail('please input email');
} }
$subject = "测试邮件"; $subject = "测试邮件";
$code = "9527"; $code = "9527";
@@ -137,11 +137,11 @@ class SystemConfigGroupController extends BaseController
$model->status = 'failure'; $model->status = 'failure';
$model->response = $result; $model->response = $result;
$model->save(); $model->save();
return $this->fail('发送失败,请查看日志'); return $this->fail('send failed, please check logs');
} else { } else {
$model->status = 'success'; $model->status = 'success';
$model->save(); $model->save();
return $this->success([], '发送成功'); return $this->success([], 'send success');
} }
} catch (\Exception $e) { } catch (\Exception $e) {
$model->status = 'failure'; $model->status = 'failure';

View File

@@ -59,7 +59,7 @@ class SystemDeptController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -75,9 +75,9 @@ class SystemDeptController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -93,9 +93,9 @@ class SystemDeptController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -109,13 +109,13 @@ class SystemDeptController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -63,9 +63,9 @@ class SystemDictDataController extends BaseController
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
DictCache::clear(); DictCache::clear();
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -82,9 +82,9 @@ class SystemDictDataController extends BaseController
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
DictCache::clear(); DictCache::clear();
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -98,14 +98,14 @@ class SystemDictDataController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
DictCache::clear(); DictCache::clear();
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -61,9 +61,9 @@ class SystemDictTypeController extends BaseController
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
DictCache::clear(); DictCache::clear();
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -80,9 +80,9 @@ class SystemDictTypeController extends BaseController
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
DictCache::clear(); DictCache::clear();
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -96,14 +96,14 @@ class SystemDictTypeController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
DictCache::clear(); DictCache::clear();
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -51,9 +51,9 @@ class SystemLogController extends BaseController
$logic = new SystemLoginLogLogic(); $logic = new SystemLoginLogLogic();
if (!empty($ids)) { if (!empty($ids)) {
$logic->destroy($ids); $logic->destroy($ids);
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
} }
@@ -91,9 +91,9 @@ class SystemLogController extends BaseController
$logic = new SystemOperLogLogic(); $logic = new SystemOperLogLogic();
if (!empty($ids)) { if (!empty($ids)) {
$logic->destroy($ids); $logic->destroy($ids);
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
} }

View File

@@ -59,13 +59,13 @@ class SystemMailController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -61,7 +61,7 @@ class SystemMenuController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -78,9 +78,9 @@ class SystemMenuController extends BaseController
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
UserMenuCache::clearMenuCache(); UserMenuCache::clearMenuCache();
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -97,9 +97,9 @@ class SystemMenuController extends BaseController
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
UserMenuCache::clearMenuCache(); UserMenuCache::clearMenuCache();
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -113,14 +113,14 @@ class SystemMenuController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
UserMenuCache::clearMenuCache(); UserMenuCache::clearMenuCache();
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }

View File

@@ -60,7 +60,7 @@ class SystemPostController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -76,9 +76,9 @@ class SystemPostController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -94,9 +94,9 @@ class SystemPostController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -110,13 +110,13 @@ class SystemPostController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -130,10 +130,10 @@ class SystemPostController extends BaseController
{ {
$file = current($request->file()); $file = current($request->file());
if (!$file || !$file->isValid()) { if (!$file || !$file->isValid()) {
return $this->fail('未找到上传文件'); return $this->fail('uploaded file not found');
} }
$this->logic->import($file); $this->logic->import($file);
return $this->success('导入成功'); return $this->success('import success');
} }
/** /**

View File

@@ -66,7 +66,7 @@ class SystemRoleController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -82,9 +82,9 @@ class SystemRoleController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -100,9 +100,9 @@ class SystemRoleController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -116,13 +116,13 @@ class SystemRoleController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -150,7 +150,7 @@ class SystemRoleController extends BaseController
$id = $request->post('id'); $id = $request->post('id');
$menu_ids = $request->post('menu_ids'); $menu_ids = $request->post('menu_ids');
$this->logic->saveMenuPermission($id, $menu_ids); $this->logic->saveMenuPermission($id, $menu_ids);
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**

View File

@@ -75,11 +75,11 @@ class SystemServerController extends BaseController
{ {
$tag = $request->input('tag', ''); $tag = $request->input('tag', '');
if (empty($tag)) { if (empty($tag)) {
return $this->fail('请选择要删除的缓存'); return $this->fail('please select cache to delete');
} }
Cache::tag($tag)->clear(); Cache::tag($tag)->clear();
Cache::delete($tag); Cache::delete($tag);
return $this->success('删除成功'); return $this->success('delete success');
} }
} }

View File

@@ -65,7 +65,7 @@ class SystemUserController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -81,9 +81,9 @@ class SystemUserController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -99,9 +99,9 @@ class SystemUserController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -116,9 +116,9 @@ class SystemUserController extends BaseController
$ids = $request->input('ids', ''); $ids = $request->input('ids', '');
if (!empty($ids)) { if (!empty($ids)) {
$this->logic->destroy($ids); $this->logic->destroy($ids);
return $this->success('操作成功'); return $this->success('operation success');
} else { } else {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
} }
@@ -134,7 +134,7 @@ class SystemUserController extends BaseController
UserInfoCache::clearUserInfo($id); UserInfoCache::clearUserInfo($id);
UserAuthCache::clearUserAuth($id); UserAuthCache::clearUserAuth($id);
UserMenuCache::clearUserMenu($id); UserMenuCache::clearUserMenu($id);
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**
@@ -148,12 +148,12 @@ class SystemUserController extends BaseController
$id = $request->post('id', ''); $id = $request->post('id', '');
$password = $request->post('password', ''); $password = $request->post('password', '');
if ($id == 1) { if ($id == 1) {
return $this->fail('超级管理员不允许重置密码'); return $this->fail('super admin cannot reset password');
} }
$data = ['password' => password_hash($password, PASSWORD_DEFAULT)]; $data = ['password' => password_hash($password, PASSWORD_DEFAULT)];
$this->logic->authEdit($id, $data); $this->logic->authEdit($id, $data);
UserInfoCache::clearUserInfo($id); UserInfoCache::clearUserInfo($id);
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**
@@ -169,7 +169,7 @@ class SystemUserController extends BaseController
$data = ['dashboard' => $dashboard]; $data = ['dashboard' => $dashboard];
$this->logic->authEdit($id, $data); $this->logic->authEdit($id, $data);
UserInfoCache::clearUserInfo($id); UserInfoCache::clearUserInfo($id);
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**
@@ -187,9 +187,9 @@ class SystemUserController extends BaseController
$result = $this->logic->updateInfo($this->adminId, $data); $result = $this->logic->updateInfo($this->adminId, $data);
if ($result) { if ($result) {
UserInfoCache::clearUserInfo($this->adminId); UserInfoCache::clearUserInfo($this->adminId);
return $this->success('操作成功'); return $this->success('operation success');
} else { } else {
return $this->fail('操作失败'); return $this->fail('operation failed');
} }
} }
@@ -205,6 +205,6 @@ class SystemUserController extends BaseController
$newPassword = $request->input('newPassword'); $newPassword = $request->input('newPassword');
$this->logic->modifyPassword($this->adminId, $oldPassword, $newPassword); $this->logic->modifyPassword($this->adminId, $oldPassword, $newPassword);
UserInfoCache::clearUserInfo($this->adminId); UserInfoCache::clearUserInfo($this->adminId);
return $this->success('修改成功'); return $this->success('update success');
} }
} }

View File

@@ -61,9 +61,9 @@ class CrontabController extends BaseController
$this->validate('save', $data); $this->validate('save', $data);
$result = $this->logic->add($data); $result = $this->logic->add($data);
if ($result) { if ($result) {
return $this->success('添加成功'); return $this->success('add success');
} else { } else {
return $this->fail('添加失败'); return $this->fail('add failed');
} }
} }
@@ -79,9 +79,9 @@ class CrontabController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -95,13 +95,13 @@ class CrontabController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -116,13 +116,13 @@ class CrontabController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$status = $request->input('status', 1); $status = $request->input('status', 1);
if (empty($id)) { if (empty($id)) {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
$result = $this->logic->changeStatus($id, $status); $result = $this->logic->changeStatus($id, $status);
if ($result) { if ($result) {
return $this->success('操作成功'); return $this->success('operation success');
} else { } else {
return $this->fail('操作失败'); return $this->fail('operation failed');
} }
} }
@@ -137,9 +137,9 @@ class CrontabController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$result = $this->logic->run($id); $result = $this->logic->run($id);
if ($result) { if ($result) {
return $this->success('执行成功'); return $this->success('execute success');
} else { } else {
return $this->fail('执行失败'); return $this->fail('execution failed');
} }
} }
@@ -173,9 +173,9 @@ class CrontabController extends BaseController
if (!empty($ids)) { if (!empty($ids)) {
$logic = new CrontabLogLogic(); $logic = new CrontabLogLogic();
$logic->destroy($ids); $logic->destroy($ids);
return $this->success('操作成功'); return $this->success('operation success');
} else { } else {
return $this->fail('参数错误,请检查'); return $this->fail('invalid parameters, please check');
} }
} }
} }

View File

@@ -59,7 +59,7 @@ class GenerateTablesController extends BaseController
$data = is_array($model) ? $model : $model->toArray(); $data = is_array($model) ? $model : $model->toArray();
return $this->success($data); return $this->success($data);
} else { } else {
return $this->fail('未查找到信息'); return $this->fail('not found');
} }
} }
@@ -75,9 +75,9 @@ class GenerateTablesController extends BaseController
$this->validate('update', $data); $this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data); $result = $this->logic->edit($data['id'], $data);
if ($result) { if ($result) {
return $this->success('修改成功'); return $this->success('update success');
} else { } else {
return $this->fail('修改失败'); return $this->fail('update failed');
} }
} }
@@ -91,13 +91,13 @@ class GenerateTablesController extends BaseController
{ {
$ids = $request->post('ids', ''); $ids = $request->post('ids', '');
if (empty($ids)) { if (empty($ids)) {
return $this->fail('请选择要删除的数据'); return $this->fail('please select data to delete');
} }
$result = $this->logic->destroy($ids); $result = $this->logic->destroy($ids);
if ($result) { if ($result) {
return $this->success('删除成功'); return $this->success('delete success');
} else { } else {
return $this->fail('删除失败'); return $this->fail('delete failed');
} }
} }
@@ -112,7 +112,7 @@ class GenerateTablesController extends BaseController
$names = $request->input('names', []); $names = $request->input('names', []);
$source = $request->input('source', ''); $source = $request->input('source', '');
$this->logic->loadTable($names, $source); $this->logic->loadTable($names, $source);
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**
@@ -125,7 +125,7 @@ class GenerateTablesController extends BaseController
{ {
$id = $request->input('id', ''); $id = $request->input('id', '');
$this->logic->sync($id); $this->logic->sync($id);
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**
@@ -159,7 +159,7 @@ class GenerateTablesController extends BaseController
$id = $request->input('id', ''); $id = $request->input('id', '');
$this->logic->generateFile($id); $this->logic->generateFile($id);
UserMenuCache::clearMenuCache(); UserMenuCache::clearMenuCache();
return $this->success('操作成功'); return $this->success('operation success');
} }
/** /**

View File

@@ -68,7 +68,7 @@ if (!function_exists('downloadFile')) {
if (file_exists($base_dir . DIRECTORY_SEPARATOR . $file_name)) { if (file_exists($base_dir . DIRECTORY_SEPARATOR . $file_name)) {
return response()->download($base_dir . DIRECTORY_SEPARATOR . $file_name, urlencode($file_name)); return response()->download($base_dir . DIRECTORY_SEPARATOR . $file_name, urlencode($file_name));
} else { } else {
throw new ApiException('模板不存在'); throw new ApiException('Template not found');
} }
} }
} }

View File

@@ -158,7 +158,7 @@ class DatabaseLogic extends BaseLogic
$isDeleteTime = true; $isDeleteTime = true;
} }
if (!$isDeleteTime) { if (!$isDeleteTime) {
throw new ApiException('当前表不支持回收站功能'); throw new ApiException('Current table does not support recycle bin');
} }
// 查询软删除数据 // 查询软删除数据
$request = request(); $request = request();

View File

@@ -38,7 +38,7 @@ class SystemAttachmentLogic extends BaseLogic
{ {
$category = SystemCategory::where('id', $category_id)->findOrEmpty(); $category = SystemCategory::where('id', $category_id)->findOrEmpty();
if ($category->isEmpty()) { if ($category->isEmpty()) {
throw new ApiException('目标分类不存在'); throw new ApiException('Target category not found');
} }
return $this->model->whereIn('id', $ids)->update(['category_id' => $category_id]); return $this->model->whereIn('id', $ids)->update(['category_id' => $category_id]);
} }
@@ -54,11 +54,11 @@ class SystemAttachmentLogic extends BaseLogic
{ {
$image_data = file_get_contents($url); $image_data = file_get_contents($url);
if ($image_data === false) { if ($image_data === false) {
throw new ApiException('获取文件资源失败'); throw new ApiException('Failed to get file resource');
} }
$image_resource = imagecreatefromstring($image_data); $image_resource = imagecreatefromstring($image_data);
if (!$image_resource) { if (!$image_resource) {
throw new ApiException('创建图片资源失败'); throw new ApiException('Failed to create image resource');
} }
$filename = basename($url); $filename = basename($url);
$file_extension = pathinfo($filename, PATHINFO_EXTENSION); $file_extension = pathinfo($filename, PATHINFO_EXTENSION);
@@ -84,11 +84,11 @@ class SystemAttachmentLogic extends BaseLogic
break; break;
default: default:
imagedestroy($image_resource); imagedestroy($image_resource);
throw new ApiException('文件格式错误'); throw new ApiException('Invalid file format');
} }
imagedestroy($image_resource); imagedestroy($image_resource);
if (!$result) { if (!$result) {
throw new ApiException('文件保存失败'); throw new ApiException('Failed to save file');
} }
$hash = md5_file($save_path); $hash = md5_file($save_path);

View File

@@ -41,14 +41,14 @@ class SystemCategoryLogic extends BaseLogic
{ {
$data = $this->handleData($data); $data = $this->handleData($data);
if ($data['parent_id'] == $id) { if ($data['parent_id'] == $id) {
throw new ApiException('上级分类和当前分类不能相同'); throw new ApiException('Parent category cannot be the same as current');
} }
if (in_array($id, explode(',', $data['level']))) { if (in_array($id, explode(',', $data['level']))) {
throw new ApiException('不能将上级分类设置为当前分类的子分类'); throw new ApiException('Cannot set parent category as child of current');
} }
$model = $this->model->findOrEmpty($id); $model = $this->model->findOrEmpty($id);
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
return $model->save($data); return $model->save($data);
} }
@@ -60,7 +60,7 @@ class SystemCategoryLogic extends BaseLogic
{ {
$num = $this->model->where('parent_id', 'in', $ids)->count(); $num = $this->model->where('parent_id', 'in', $ids)->count();
if ($num > 0) { if ($num > 0) {
throw new ApiException('该部门下存在子分类,请先删除子分类'); throw new ApiException('This category has sub-categories, please delete them first');
} else { } else {
return $this->model->destroy($ids); return $this->model->destroy($ids);
} }

View File

@@ -34,10 +34,10 @@ class SystemConfigGroupLogic extends BaseLogic
$id = $ids[0]; $id = $ids[0];
$model = $this->model->where('id', $id)->findOrEmpty(); $model = $this->model->where('id', $id)->findOrEmpty();
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('配置数据未找到'); throw new ApiException('Config data not found');
} }
if (in_array(intval($id), [1, 2, 3])) { if (in_array(intval($id), [1, 2, 3])) {
throw new ApiException('系统默认分组,无法删除'); throw new ApiException('System default group cannot be deleted');
} }
Db::startTrans(); Db::startTrans();
try { try {
@@ -51,7 +51,7 @@ class SystemConfigGroupLogic extends BaseLogic
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
throw new ApiException('删除数据异常,请检查'); throw new ApiException('Delete data error, please check');
} }
} }
} }

View File

@@ -63,7 +63,7 @@ class SystemConfigLogic extends BaseLogic
{ {
$group = SystemConfigGroup::find($group_id); $group = SystemConfigGroup::find($group_id);
if (!$group) { if (!$group) {
throw new ApiException('配置组未找到'); throw new ApiException('Config group not found');
} }
$saveData = []; $saveData = [];
foreach ($config as $key => $value) { foreach ($config as $key => $value) {

View File

@@ -44,10 +44,10 @@ class SystemDeptLogic extends BaseLogic
$oldLevel = $data['level'] . $id . ','; $oldLevel = $data['level'] . $id . ',';
$data = $this->handleData($data); $data = $this->handleData($data);
if ($data['parent_id'] == $id) { if ($data['parent_id'] == $id) {
throw new ApiException('上级部门和当前部门不能相同'); throw new ApiException('Parent department cannot be the same as current department');
} }
if (in_array($id, explode(',', $data['level']))) { if (in_array($id, explode(',', $data['level']))) {
throw new ApiException('不能将上级部门设置为当前部门的子部门'); throw new ApiException('Cannot set parent department to a child of current department');
} }
$newLevel = $data['level'] . $id . ','; $newLevel = $data['level'] . $id . ',';
$deptIds = $this->model->where('level', 'like', $oldLevel . '%')->column('id'); $deptIds = $this->model->where('level', 'like', $oldLevel . '%')->column('id');
@@ -65,11 +65,11 @@ class SystemDeptLogic extends BaseLogic
{ {
$num = $this->model->where('parent_id', 'in', $ids)->count(); $num = $this->model->where('parent_id', 'in', $ids)->count();
if ($num > 0) { if ($num > 0) {
throw new ApiException('该部门下存在子部门,请先删除子部门'); throw new ApiException('This department has sub-departments, please delete them first');
} else { } else {
$count = SystemUser::where('dept_id', 'in', $ids)->count(); $count = SystemUser::where('dept_id', 'in', $ids)->count();
if ($count > 0) { if ($count > 0) {
throw new ApiException('该部门下存在用户,请先删除或者转移用户'); throw new ApiException('This department has users, please delete or transfer them first');
} }
return $this->model->destroy($ids); return $this->model->destroy($ids);
} }

View File

@@ -35,7 +35,7 @@ class SystemDictDataLogic extends BaseLogic
{ {
$type = SystemDictType::where('id', $data['type_id'])->findOrEmpty(); $type = SystemDictType::where('id', $data['type_id'])->findOrEmpty();
if ($type->isEmpty()) { if ($type->isEmpty()) {
throw new ApiException('字典类型不存在'); throw new ApiException('Dict type not found');
} }
$data['code'] = $type->code; $data['code'] = $type->code;
$model = $this->model->create($data); $model = $this->model->create($data);

View File

@@ -32,7 +32,7 @@ class SystemDictTypeLogic extends BaseLogic
{ {
$model = $this->model->where('code', $data['code'])->findOrEmpty(); $model = $this->model->where('code', $data['code'])->findOrEmpty();
if (!$model->isEmpty()) { if (!$model->isEmpty()) {
throw new ApiException('该字典标识已存在'); throw new ApiException('This dict code already exists');
} }
return $this->model->save($data); return $this->model->save($data);
} }
@@ -52,7 +52,7 @@ class SystemDictTypeLogic extends BaseLogic
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
throw new ApiException('修改数据异常,请检查'); throw new ApiException('Update data error, please check');
} }
} }
@@ -72,7 +72,7 @@ class SystemDictTypeLogic extends BaseLogic
return $result; return $result;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
throw new ApiException('删除数据异常,请检查'); throw new ApiException('Delete data error, please check');
} }
} }

View File

@@ -43,7 +43,7 @@ class SystemMenuLogic extends BaseLogic
{ {
$data = $this->handleData($data); $data = $this->handleData($data);
if ($data['parent_id'] == $id) { if ($data['parent_id'] == $id) {
throw new ApiException('不能设置父级为自身'); throw new ApiException('Cannot set parent to self');
} }
return $this->model->update($data, ['id' => $id]); return $this->model->update($data, ['id' => $id]);
} }
@@ -55,7 +55,7 @@ class SystemMenuLogic extends BaseLogic
{ {
$num = $this->model->where('parent_id', 'in', $ids)->count(); $num = $this->model->where('parent_id', 'in', $ids)->count();
if ($num > 0) { if ($num > 0) {
throw new ApiException('该菜单下存在子菜单,请先删除子菜单'); throw new ApiException('This menu has sub-menus, please delete them first');
} else { } else {
return $this->model->destroy($ids); return $this->model->destroy($ids);
} }

View File

@@ -65,7 +65,7 @@ class SystemPostLogic extends BaseLogic
} }
$this->saveAll($data); $this->saveAll($data);
} catch (\Exception $e) { } catch (\Exception $e) {
throw new ApiException('导入文件错误请上传正确的文件格式xlsx'); throw new ApiException('Import file error, please upload correct xlsx file');
} }
} }

View File

@@ -43,7 +43,7 @@ class SystemRoleLogic extends BaseLogic
{ {
$model = $this->model->findOrEmpty($id); $model = $this->model->findOrEmpty($id);
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
$data = $this->handleData($data); $data = $this->handleData($data);
return $model->save($data); return $model->save($data);
@@ -60,7 +60,7 @@ class SystemRoleLogic extends BaseLogic
$num = SystemRole::where('level', '>=', $maxLevel)->whereIn('id', $ids)->count(); $num = SystemRole::where('level', '>=', $maxLevel)->whereIn('id', $ids)->count();
if ($num > 0) { if ($num > 0) {
throw new ApiException('不能操作比当前账户职级高的角色'); throw new ApiException('Cannot operate roles with higher level than current account');
} else { } else {
return $this->model->destroy($ids); return $this->model->destroy($ids);
} }
@@ -75,7 +75,7 @@ class SystemRoleLogic extends BaseLogic
$levelArr = array_column($this->adminInfo['roleList'], 'level'); $levelArr = array_column($this->adminInfo['roleList'], 'level');
$maxLevel = max($levelArr); $maxLevel = max($levelArr);
if ($data['level'] >= $maxLevel) { if ($data['level'] >= $maxLevel) {
throw new ApiException('不能操作比当前账户职级高的角色'); throw new ApiException('Cannot operate roles with higher level than current account');
} }
return $data; return $data;
} }

View File

@@ -85,7 +85,7 @@ class SystemUserLogic extends BaseLogic
if ($this->adminInfo['id'] > 1) { if ($this->adminInfo['id'] > 1) {
// 部门保护 // 部门保护
if (!$this->deptProtect($this->adminInfo['deptList'], $data['dept_id'])) { if (!$this->deptProtect($this->adminInfo['deptList'], $data['dept_id'])) {
throw new ApiException('没有权限操作该部门数据'); throw new ApiException('No permission to operate department data');
} }
} }
return $data; return $data;
@@ -105,11 +105,11 @@ class SystemUserLogic extends BaseLogic
if ($this->adminInfo['id'] > 1) { if ($this->adminInfo['id'] > 1) {
// 部门保护 // 部门保护
if (!$this->deptProtect($this->adminInfo['deptList'], $data['dept_id'])) { if (!$this->deptProtect($this->adminInfo['deptList'], $data['dept_id'])) {
throw new ApiException('没有权限操作该部门数据'); throw new ApiException('No permission to operate department data');
} }
// 越权保护 // 越权保护
if (!$this->roleProtect($this->adminInfo['roleList'], $role_ids)) { if (!$this->roleProtect($this->adminInfo['roleList'], $role_ids)) {
throw new ApiException('没有权限操作该角色数据'); throw new ApiException('No permission to operate role data');
} }
} }
$user = SystemUser::create($data); $user = SystemUser::create($data);
@@ -142,16 +142,16 @@ class SystemUserLogic extends BaseLogic
} }
$user = $query->findOrEmpty(); $user = $query->findOrEmpty();
if ($user->isEmpty()) { if ($user->isEmpty()) {
throw new ApiException('没有权限操作该数据'); throw new ApiException('No permission to operate this data');
} }
if ($this->adminInfo['id'] > 1) { if ($this->adminInfo['id'] > 1) {
// 部门保护 // 部门保护
if (!$this->deptProtect($this->adminInfo['deptList'], $data['dept_id'])) { if (!$this->deptProtect($this->adminInfo['deptList'], $data['dept_id'])) {
throw new ApiException('没有权限操作该部门数据'); throw new ApiException('No permission to operate department data');
} }
// 越权保护 // 越权保护
if (!$this->roleProtect($this->adminInfo['roleList'], $role_ids)) { if (!$this->roleProtect($this->adminInfo['roleList'], $role_ids)) {
throw new ApiException('没有权限操作该角色数据'); throw new ApiException('No permission to operate role data');
} }
} }
$result = parent::edit($id, $data); $result = parent::edit($id, $data);
@@ -179,12 +179,12 @@ class SystemUserLogic extends BaseLogic
{ {
if (is_array($ids)) { if (is_array($ids)) {
if (count($ids) > 1) { if (count($ids) > 1) {
throw new ApiException('禁止批量删除操作'); throw new ApiException('Batch delete is not allowed');
} }
$ids = $ids[0]; $ids = $ids[0];
} }
if ($ids == 1) { if ($ids == 1) {
throw new ApiException('超级管理员禁止删除'); throw new ApiException('Super admin cannot be deleted');
} }
$query = $this->model->where('id', $ids); $query = $this->model->where('id', $ids);
// 超级管理员可删除任意用户,普通管理员仅可删除当前部门和子部门的用户 // 超级管理员可删除任意用户,普通管理员仅可删除当前部门和子部门的用户
@@ -193,14 +193,14 @@ class SystemUserLogic extends BaseLogic
} }
$user = $query->findOrEmpty(); $user = $query->findOrEmpty();
if ($user->isEmpty()) { if ($user->isEmpty()) {
throw new ApiException('没有权限操作该数据'); throw new ApiException('No permission to operate this data');
} }
if ($this->adminInfo['id'] > 1) { if ($this->adminInfo['id'] > 1) {
$role_ids = $user->roles->toArray() ?: []; $role_ids = $user->roles->toArray() ?: [];
if (!empty($role_ids)) { if (!empty($role_ids)) {
// 越权保护 // 越权保护
if (!$this->roleProtect($this->adminInfo['roleList'], array_column($role_ids, 'id'))) { if (!$this->roleProtect($this->adminInfo['roleList'], array_column($role_ids, 'id'))) {
throw new ApiException('没有权限操作该角色数据'); throw new ApiException('No permission to operate role data');
} }
} }
} }
@@ -283,7 +283,7 @@ class SystemUserLogic extends BaseLogic
$model->password = password_hash($newPassword, PASSWORD_DEFAULT); $model->password = password_hash($newPassword, PASSWORD_DEFAULT);
return $model->save(); return $model->save();
} else { } else {
throw new ApiException('原密码错误'); throw new ApiException('Old password is incorrect');
} }
} }
@@ -298,7 +298,7 @@ class SystemUserLogic extends BaseLogic
$query->auth($this->adminInfo['deptList']); $query->auth($this->adminInfo['deptList']);
$user = $query->findOrEmpty(); $user = $query->findOrEmpty();
if ($user->isEmpty()) { if ($user->isEmpty()) {
throw new ApiException('没有权限操作该数据'); throw new ApiException('No permission to operate this data');
} }
} }
parent::edit($id, $data); parent::edit($id, $data);

View File

@@ -50,7 +50,7 @@ class CrontabLogic extends BaseLogic
6 => "0 {$minute} {$hour} * * {$week}", 6 => "0 {$minute} {$hour} * * {$week}",
7 => "0 {$minute} {$hour} {$day} * *", 7 => "0 {$minute} {$hour} {$day} * *",
8 => "0 {$minute} {$hour} {$day} {$month} *", 8 => "0 {$minute} {$hour} {$day} {$month} *",
default => throw new ApiException("任务类型异常"), default => throw new ApiException('Invalid task type'),
}; };
// 定时任务模型新增 // 定时任务模型新增
@@ -95,13 +95,13 @@ class CrontabLogic extends BaseLogic
6 => "0 {$minute} {$hour} * * {$week}", 6 => "0 {$minute} {$hour} * * {$week}",
7 => "0 {$minute} {$hour} {$day} * *", 7 => "0 {$minute} {$hour} {$day} * *",
8 => "0 {$minute} {$hour} {$day} {$month} *", 8 => "0 {$minute} {$hour} {$day} {$month} *",
default => throw new ApiException("任务类型异常"), default => throw new ApiException('Invalid task type'),
}; };
// 查询任务数据 // 查询任务数据
$model = $this->model->findOrEmpty($id); $model = $this->model->findOrEmpty($id);
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
$result = $model->save([ $result = $model->save([
@@ -134,7 +134,7 @@ class CrontabLogic extends BaseLogic
{ {
if (is_array($ids)) { if (is_array($ids)) {
if (count($ids) > 1) { if (count($ids) > 1) {
throw new ApiException('禁止批量删除操作'); throw new ApiException('Batch delete is not allowed');
} }
$ids = $ids[0]; $ids = $ids[0];
} }
@@ -157,7 +157,7 @@ class CrontabLogic extends BaseLogic
{ {
$model = $this->model->findOrEmpty($id); $model = $this->model->findOrEmpty($id);
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
$result = $model->save(['status' => $status]); $result = $model->save(['status' => $status]);
if ($result) { if ($result) {

View File

@@ -63,7 +63,7 @@ class GenerateTablesLogic extends BaseLogic
$data = config('think-orm.connections'); $data = config('think-orm.connections');
$config = $data[$source]; $config = $data[$source];
if (!$config) { if (!$config) {
throw new ApiException('数据库配置读取失败'); throw new ApiException('Failed to read database config');
} }
$prefix = $config['prefix'] ?? ''; $prefix = $config['prefix'] ?? '';
@@ -262,10 +262,10 @@ class GenerateTablesLogic extends BaseLogic
{ {
$table = $this->model->findOrEmpty($id); $table = $this->model->findOrEmpty($id);
if (!in_array($table['template'], ["plugin", "app"])) { if (!in_array($table['template'], ["plugin", "app"])) {
throw new ApiException('应用类型必须为plugin或者app'); throw new ApiException('App type must be plugin or app');
} }
if (empty($table['namespace'])) { if (empty($table['namespace'])) {
throw new ApiException('请先设置应用名称'); throw new ApiException('Please set app name first');
} }
$columns = $this->columnLogic->where('table_id', $id) $columns = $this->columnLogic->where('table_id', $id)
@@ -320,11 +320,11 @@ class GenerateTablesLogic extends BaseLogic
{ {
$table = $this->model->where('id', $id)->findOrEmpty(); $table = $this->model->where('id', $id)->findOrEmpty();
if ($table->isEmpty()) { if ($table->isEmpty()) {
throw new ApiException('请选择要生成的表'); throw new ApiException('Please select tables to generate');
} }
$debug = config('app.debug', true); $debug = config('app.debug', true);
if (!$debug) { if (!$debug) {
throw new ApiException('非调试模式下,不允许生成文件'); throw new ApiException('File generation not allowed in non-debug mode');
} }
$this->updateMenu($table); $this->updateMenu($table);
$this->genModule($id); $this->genModule($id);

View File

@@ -27,10 +27,10 @@ class CheckLogin implements MiddlewareInterface
try { try {
$token = JwtToken::getExtend(); $token = JwtToken::getExtend();
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new ApiException('您的登录凭证错误或者已过期,请重新登录', 401); throw new ApiException('Your login credential is invalid or expired, please login again', 401);
} }
if ($token['plat'] !== 'saiadmin') { if ($token['plat'] !== 'saiadmin') {
throw new ApiException('登录凭证校验失败'); throw new ApiException('Login credential verification failed');
} }
// 一次合并设置,避免 setHeader 覆盖导致只保留最后一个 // 一次合并设置,避免 setHeader 覆盖导致只保留最后一个
$request->setHeader(array_merge($request->header() ?: [], [ $request->setHeader(array_merge($request->header() ?: [], [

View File

@@ -30,7 +30,7 @@ class SystemLog implements MiddlewareInterface
// 记录日志 // 记录日志
Event::emit('user.operateLog', true); Event::emit('user.operateLog', true);
} catch (\Throwable $e) { } catch (\Throwable $e) {
throw new ApiException('登录凭获取失败,请检查'); throw new ApiException('Failed to get login credential, please check');
} }
} }
return $handler($request); return $handler($request);

View File

@@ -47,7 +47,7 @@ class BaseLogic extends AbstractLogic
{ {
$model = $this->model->find($id); $model = $this->model->find($id);
if (!$model) { if (!$model) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
return $model->update($data); return $model->update($data);
} }
@@ -61,7 +61,7 @@ class BaseLogic extends AbstractLogic
{ {
$model = $this->model->find($id); $model = $this->model->find($id);
if (!$model) { if (!$model) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
return $model; return $model;
} }

View File

@@ -47,7 +47,7 @@ class BaseLogic extends AbstractLogic
{ {
$model = $this->model->findOrEmpty($id); $model = $this->model->findOrEmpty($id);
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
return $model->save($data); return $model->save($data);
} }
@@ -61,7 +61,7 @@ class BaseLogic extends AbstractLogic
{ {
$model = $this->model->findOrEmpty($id); $model = $this->model->findOrEmpty($id);
if ($model->isEmpty()) { if ($model->isEmpty()) {
throw new ApiException('数据不存在'); throw new ApiException('Data not found');
} }
return $model; return $model;
} }

View File

@@ -18,10 +18,7 @@ class ApiException extends BusinessException
public function render(Request $request): ?Response public function render(Request $request): ?Response
{ {
$message = $this->getMessage(); $message = $this->getMessage();
$path = $request->path(); $message = \app\api\util\ApiLang::translate($message, $request);
if (str_contains($path, 'api/')) {
$message = \app\api\util\ApiLang::translate($message, $request);
}
return json(['code' => $this->getCode() ?: 500, 'message' => $message]); return json(['code' => $this->getCode() ?: 500, 'message' => $message]);
} }
} }

View File

@@ -26,7 +26,7 @@ class EmailService
$logic = new SystemConfigLogic(); $logic = new SystemConfigLogic();
$config = $logic->getGroup('email_config'); $config = $logic->getGroup('email_config');
if (!$config) { if (!$config) {
throw new ApiException('未设置邮件配置'); throw new ApiException('Mail config not set');
} }
return $config; return $config;
} }
@@ -38,7 +38,7 @@ class EmailService
public static function getMailer(): PHPMailer public static function getMailer(): PHPMailer
{ {
if (!class_exists(PHPMailer::class)) { if (!class_exists(PHPMailer::class)) {
throw new ApiException('请执行 composer require phpmailer/phpmailer 并重启'); throw new ApiException('Please run composer require phpmailer/phpmailer and restart');
} }
$config = static::getConfig(); $config = static::getConfig();
$mailer = new PHPMailer(); $mailer = new PHPMailer();

View File

@@ -54,7 +54,7 @@ class ChunkUploadService
{ {
$allow_file = Arr::getConfigValue($this->config, 'upload_allow_file'); $allow_file = Arr::getConfigValue($this->config, 'upload_allow_file');
if (!in_array($data['ext'], explode(',', $allow_file))) { if (!in_array($data['ext'], explode(',', $allow_file))) {
throw new ApiException('不支持该格式的文件上传'); throw new ApiException('File format not supported for upload');
} }
// 检查已经上传的分片文件 // 检查已经上传的分片文件
for ($i = 0; $i < $data['total']; ++$i) { for ($i = 0; $i < $data['total']; ++$i) {
@@ -80,11 +80,11 @@ class ChunkUploadService
{ {
$allow_file = Arr::getConfigValue($this->config, 'upload_allow_file'); $allow_file = Arr::getConfigValue($this->config, 'upload_allow_file');
if (!in_array($data['ext'], explode(',', $allow_file))) { if (!in_array($data['ext'], explode(',', $allow_file))) {
throw new ApiException('不支持该格式的文件上传'); throw new ApiException('File format not supported for upload');
} }
$request = request(); $request = request();
if (!$request) { if (!$request) {
throw new ApiException('切片上传服务必须在 HTTP 请求环境下调用'); throw new ApiException('Chunk upload must be called in HTTP request context');
} }
$uploadFile = current($request->file()); $uploadFile = current($request->file());
$chunkName = $this->path . "{$data['hash']}_{$data['total']}_{$data['index']}.chunk"; $chunkName = $this->path . "{$data['hash']}_{$data['total']}_{$data['index']}.chunk";
@@ -107,7 +107,7 @@ class ChunkUploadService
for ($i = 0; $i < $data['total']; ++$i) { for ($i = 0; $i < $data['total']; ++$i) {
$chunkFile = $this->path . "{$data['hash']}_{$data['total']}_{$i}.chunk"; $chunkFile = $this->path . "{$data['hash']}_{$data['total']}_{$i}.chunk";
if (!file_exists($chunkFile)) { if (!file_exists($chunkFile)) {
throw new ApiException('切片文件查找失败,请重新上传'); throw new ApiException('Chunk file not found, please upload again');
} }
fwrite($fileHandle, file_get_contents($chunkFile)); fwrite($fileHandle, file_get_contents($chunkFile));
unlink($chunkFile); unlink($chunkFile);

View File

@@ -34,17 +34,17 @@ class UploadService
$ext = $file->getUploadExtension() ?: null; $ext = $file->getUploadExtension() ?: null;
$file_size = $file->getSize(); $file_size = $file->getSize();
if ($file_size > Arr::getConfigValue($uploadConfig, 'upload_size')) { if ($file_size > Arr::getConfigValue($uploadConfig, 'upload_size')) {
throw new ApiException('文件大小超过限制'); throw new ApiException('File size exceeds limit');
} }
$allow_file = Arr::getConfigValue($uploadConfig, 'upload_allow_file'); $allow_file = Arr::getConfigValue($uploadConfig, 'upload_allow_file');
$allow_image = Arr::getConfigValue($uploadConfig, 'upload_allow_image'); $allow_image = Arr::getConfigValue($uploadConfig, 'upload_allow_image');
if ($upload == 'image') { if ($upload == 'image') {
if (!in_array($ext, explode(',', $allow_image))) { if (!in_array($ext, explode(',', $allow_image))) {
throw new ApiException('不支持该格式的文件上传'); throw new ApiException('File format not supported for upload');
} }
} else { } else {
if (!in_array($ext, explode(',', $allow_file))) { if (!in_array($ext, explode(',', $allow_file))) {
throw new ApiException('不支持该格式的文件上传'); throw new ApiException('File format not supported for upload');
} }
} }
switch ($type) { switch ($type) {
@@ -115,7 +115,7 @@ class UploadService
]; ];
break; break;
default: default:
throw new ApiException('该上传模式不存在'); throw new ApiException('Upload mode not found');
} }
return new $config['adapter'](array_merge( return new $config['adapter'](array_merge(
$config, $config,

View File

@@ -53,7 +53,7 @@ class CodeEngine
// 判断模板是否存在 // 判断模板是否存在
if (!is_dir($config['template_path'])) { if (!is_dir($config['template_path'])) {
throw new ApiException('模板目录不存在!'); throw new ApiException('Template directory not found');
} }
// 判断文件生成目录是否存在 // 判断文件生成目录是否存在
if (!is_dir($config['generate_path'])) { if (!is_dir($config['generate_path'])) {
@@ -160,7 +160,7 @@ class CodeEngine
} }
if (empty($outPath)) { if (empty($outPath)) {
throw new ApiException('文件类型异常,无法生成指定文件!'); throw new ApiException('Invalid file type, cannot generate file');
} }
if (!is_dir(dirname($outPath))) { if (!is_dir(dirname($outPath))) {
mkdir(dirname($outPath), 0777, true); mkdir(dirname($outPath), 0777, true);
@@ -176,7 +176,7 @@ class CodeEngine
{ {
$rootPath = dirname(base_path()) . DS . $this->value['generate_path']; $rootPath = dirname(base_path()) . DS . $this->value['generate_path'];
if (!is_dir($rootPath)) { if (!is_dir($rootPath)) {
throw new ApiException('前端目录查找失败,必须与后端目录为同级目录!'); throw new ApiException('Frontend directory not found, must be same level as backend');
} }
$rootPath = $rootPath . DS . 'src' . DS . 'views' . DS . 'plugin' . DS . $this->value['namespace']; $rootPath = $rootPath . DS . 'src' . DS . 'views' . DS . 'plugin' . DS . $this->value['namespace'];
@@ -199,7 +199,7 @@ class CodeEngine
} }
if (empty($outPath)) { if (empty($outPath)) {
throw new ApiException('文件类型异常,无法生成指定文件!'); throw new ApiException('Invalid file type, cannot generate file');
} }
if (!is_dir(dirname($outPath))) { if (!is_dir(dirname($outPath))) {
mkdir(dirname($outPath), 0777, true); mkdir(dirname($outPath), 0777, true);

View File

@@ -57,7 +57,7 @@ class CodeZip
$zipName = $config['generate_path'].'.zip'; $zipName = $config['generate_path'].'.zip';
$dirPath = $config['generate_path']; $dirPath = $config['generate_path'];
if ($zipArc->open($zipName, \ZipArchive::OVERWRITE | \ZipArchive::CREATE) !== true) { if ($zipArc->open($zipName, \ZipArchive::OVERWRITE | \ZipArchive::CREATE) !== true) {
throw new ApiException('无法打开文件,或者文件创建失败'); throw new ApiException('Cannot open file or create file failed');
} }
$this->addFileToZip($dirPath, $zipArc); $this->addFileToZip($dirPath, $zipArc);
$zipArc->close(); $zipArc->close();
@@ -158,7 +158,7 @@ class CodeZip
@readfile($fileName); @readfile($fileName);
@unlink($fileName); @unlink($fileName);
} catch (\Throwable $th) { } catch (\Throwable $th) {
throw new ApiException('系统生成文件错误'); throw new ApiException('System file generation error');
} }
} }
} }

View File

@@ -25,7 +25,7 @@ class InstallController extends BaseController
{ {
parent::__construct(); parent::__construct();
if ($this->adminId > 1) { if ($this->adminId > 1) {
throw new ApiException('仅超级管理员能够操作'); throw new ApiException('Only super admin can perform this action');
} }
} }
@@ -105,17 +105,17 @@ class InstallController extends BaseController
{ {
$spl_file = current($request->file()); $spl_file = current($request->file());
if (!$spl_file->isValid()) { if (!$spl_file->isValid()) {
return $this->fail('上传文件校验失败'); return $this->fail('upload file validation failed');
} }
$config = config('plugin.saipackage.upload', [ $config = config('plugin.saipackage.upload', [
'size' => 1024 * 1024 * 5, 'size' => 1024 * 1024 * 5,
'type' => ['zip'] 'type' => ['zip']
]); ]);
if (!in_array($spl_file->getUploadExtension(), $config['type'])) { if (!in_array($spl_file->getUploadExtension(), $config['type'])) {
return $this->fail('文件格式上传失败,请选择zip格式文件上传'); return $this->fail('upload failed, please upload zip file');
} }
if ($spl_file->getSize() > $config['size']) { if ($spl_file->getSize() > $config['size']) {
return $this->fail('文件大小不能超过5M'); return $this->fail('file size cannot exceed 5M');
} }
$install = new InstallLogic(); $install = new InstallLogic();
$info = $install->upload($spl_file); $info = $install->upload($spl_file);
@@ -132,7 +132,7 @@ class InstallController extends BaseController
{ {
$appName = $request->post("appName", ''); $appName = $request->post("appName", '');
if (empty($appName)) { if (empty($appName)) {
return $this->fail('参数错误'); return $this->fail('Invalid parameters');
} }
$install = new InstallLogic($appName); $install = new InstallLogic($appName);
$info = $install->install(); $info = $install->install();
@@ -150,12 +150,12 @@ class InstallController extends BaseController
{ {
$appName = $request->post("appName", ''); $appName = $request->post("appName", '');
if (empty($appName)) { if (empty($appName)) {
return $this->fail('参数错误'); return $this->fail('Invalid parameters');
} }
$install = new InstallLogic($appName); $install = new InstallLogic($appName);
$install->uninstall(); $install->uninstall();
UserMenuCache::clearMenuCache(); UserMenuCache::clearMenuCache();
return $this->success('卸载插件成功'); return $this->success('uninstall plugin success');
} }
/** /**
@@ -167,7 +167,7 @@ class InstallController extends BaseController
{ {
Server::restart(); Server::restart();
return $this->success('重载成功'); return $this->success('reload success');
} }
// ========== 商店代理接口 ========== // ========== 商店代理接口 ==========
@@ -278,7 +278,7 @@ class InstallController extends BaseController
{ {
$token = $request->input('token'); $token = $request->input('token');
if (empty($token)) { if (empty($token)) {
return $this->fail('未登录'); return $this->fail('not logged in');
} }
$result = $this->proxyRequest( $result = $this->proxyRequest(
@@ -299,7 +299,7 @@ class InstallController extends BaseController
{ {
$token = $request->input('token'); $token = $request->input('token');
if (empty($token)) { if (empty($token)) {
return $this->fail('未登录'); return $this->fail('not logged in');
} }
$result = $this->proxyRequest( $result = $this->proxyRequest(
@@ -322,7 +322,7 @@ class InstallController extends BaseController
$appId = $request->input('app_id'); $appId = $request->input('app_id');
if (empty($token)) { if (empty($token)) {
return $this->fail('未登录'); return $this->fail('not logged in');
} }
$result = $this->proxyRequest( $result = $this->proxyRequest(
@@ -345,11 +345,11 @@ class InstallController extends BaseController
$versionId = $request->input('id'); $versionId = $request->input('id');
if (empty($token)) { if (empty($token)) {
return $this->fail('未登录'); return $this->fail('not logged in');
} }
if (empty($versionId)) { if (empty($versionId)) {
return $this->fail('版本ID不能为空'); return $this->fail('version id is required');
} }
$result = $this->proxyRequest( $result = $this->proxyRequest(
@@ -365,7 +365,7 @@ class InstallController extends BaseController
} }
if (!isset($result['raw'])) { if (!isset($result['raw'])) {
return $this->fail('下载失败'); return $this->fail('download failed');
} }
// 保存临时 zip 文件 // 保存临时 zip 文件
@@ -380,7 +380,7 @@ class InstallController extends BaseController
$install = new InstallLogic(); $install = new InstallLogic();
$info = $install->uploadFromPath($tempZip); $info = $install->uploadFromPath($tempZip);
return $this->success($info, '下载成功,请在插件列表中安装'); return $this->success($info, 'download success, please install in plugin list');
} catch (Throwable $e) { } catch (Throwable $e) {
@unlink($tempZip); @unlink($tempZip);
return $this->fail($e->getMessage()); return $this->fail($e->getMessage());

View File

@@ -108,7 +108,7 @@ class InstallLogic
if (empty($info['app'])) { if (empty($info['app'])) {
Filesystem::delDir($copyToDir); Filesystem::delDir($copyToDir);
// 基本配置不完整 // 基本配置不完整
throw new ApiException('插件的基础配置信息错误'); throw new ApiException('Plugin base config is invalid');
} }
@@ -127,14 +127,14 @@ class InstallLogic
$upgrade = Version::compare($nextVersion, $info['version']); $upgrade = Version::compare($nextVersion, $info['version']);
if (!$upgrade) { if (!$upgrade) {
Filesystem::delDir($copyToDir); Filesystem::delDir($copyToDir);
throw new ApiException('插件已经存在'); throw new ApiException('Plugin already exists');
} }
} }
if (Filesystem::dirIsEmpty($this->appDir) || (!Filesystem::dirIsEmpty($this->appDir) && !$upgrade)) { if (Filesystem::dirIsEmpty($this->appDir) || (!Filesystem::dirIsEmpty($this->appDir) && !$upgrade)) {
Filesystem::delDir($copyToDir); Filesystem::delDir($copyToDir);
// 模块目录被占 // 模块目录被占
throw new ApiException('该插件的安装目录已经被占用'); throw new ApiException('Plugin install directory is already occupied');
} }
} }
@@ -167,7 +167,7 @@ class InstallLogic
public function uploadFromPath(string $zipPath): array public function uploadFromPath(string $zipPath): array
{ {
if (!is_file($zipPath)) { if (!is_file($zipPath)) {
throw new ApiException('文件不存在'); throw new ApiException('File not found');
} }
// 解压 // 解压
@@ -181,7 +181,7 @@ class InstallLogic
$info = Server::getIni($copyToDir); $info = Server::getIni($copyToDir);
if (empty($info['app'])) { if (empty($info['app'])) {
Filesystem::delDir($copyToDir); Filesystem::delDir($copyToDir);
throw new ApiException('插件的基础配置信息错误'); throw new ApiException('Plugin base config is invalid');
} }
$this->appName = $info['app']; $this->appName = $info['app'];
@@ -199,13 +199,13 @@ class InstallLogic
$upgrade = Version::compare($nextVersion, $info['version']); $upgrade = Version::compare($nextVersion, $info['version']);
if (!$upgrade) { if (!$upgrade) {
Filesystem::delDir($copyToDir); Filesystem::delDir($copyToDir);
throw new ApiException('插件已经存在'); throw new ApiException('Plugin already exists');
} }
} }
if (Filesystem::dirIsEmpty($this->appDir) || (!Filesystem::dirIsEmpty($this->appDir) && !$upgrade)) { if (Filesystem::dirIsEmpty($this->appDir) || (!Filesystem::dirIsEmpty($this->appDir) && !$upgrade)) {
Filesystem::delDir($copyToDir); Filesystem::delDir($copyToDir);
throw new ApiException('该插件的安装目录已经被占用'); throw new ApiException('Plugin install directory is already occupied');
} }
} }
@@ -237,11 +237,11 @@ class InstallLogic
{ {
$state = $this->getInstallState(); $state = $this->getInstallState();
if ($state == self::INSTALLED || $state == self::DIRECTORY_OCCUPIED) { if ($state == self::INSTALLED || $state == self::DIRECTORY_OCCUPIED) {
throw new ApiException('插件已经存在'); throw new ApiException('Plugin already exists');
} }
if ($state == self::DEPENDENT_WAIT_INSTALL) { if ($state == self::DEPENDENT_WAIT_INSTALL) {
throw new ApiException('等待依赖安装'); throw new ApiException('Waiting for dependencies to be installed');
} }
echo '开始安装[' . $this->appName . ']' . PHP_EOL; echo '开始安装[' . $this->appName . ']' . PHP_EOL;
@@ -351,14 +351,14 @@ class InstallLogic
public function checkPackage(): bool public function checkPackage(): bool
{ {
if (!is_dir($this->appDir)) { if (!is_dir($this->appDir)) {
throw new ApiException('插件目录不存在'); throw new ApiException('Plugin directory not found');
} }
$info = $this->getInfo(); $info = $this->getInfo();
$infoKeys = ['app', 'title', 'about', 'author', 'version', 'state']; $infoKeys = ['app', 'title', 'about', 'author', 'version', 'state'];
foreach ($infoKeys as $value) { foreach ($infoKeys as $value) {
if (!array_key_exists($value, $info)) { if (!array_key_exists($value, $info)) {
Filesystem::delDir($this->appDir); Filesystem::delDir($this->appDir);
throw new ApiException('该插件的基础配置信息不完善'); throw new ApiException('Plugin base config is incomplete');
} }
} }
return true; return true;
@@ -527,6 +527,6 @@ class InstallLogic
} elseif ($arr) { } elseif ($arr) {
return Server::setIni($this->appDir, $arr); return Server::setIni($this->appDir, $arr);
} }
throw new ApiException('参数错误'); throw new ApiException('Invalid parameters');
} }
} }

View File

@@ -0,0 +1,346 @@
<?php
declare(strict_types=1);
return [
'ACCOUNT_DISABLED' => 'Account is disabled and cannot log in',
'API_AUTH_TOKEN_SECRET is not configured' => 'API_AUTH_TOKEN_SECRET is not configured',
'AUTH_TOKEN_EXPIRED' => 'auth-token expired',
'AUTH_TOKEN_FORMAT_INVALID' => 'auth-token format invalid',
'AUTH_TOKEN_INVALID' => 'auth-token invalid',
'AUTH_TOKEN_INVALID_OR_EXPIRED' => 'auth-token invalid or expired',
'AUTH_TOKEN_REQUIRED' => 'Please provide auth-token',
'Account is disabled and cannot log in' => 'Account is disabled and cannot log in',
'App type must be plugin or app' => 'App type must be plugin or app',
'BALANCE_LESS_THAN_MIN' => 'Balance %s is less than %s, cannot continue',
'BATCH_DELETE_FORBIDDEN' => 'Batch delete is not allowed',
'BUY_TICKET_ERROR' => 'Invalid lottery ticket purchase',
'Balance %s is less than %s, cannot continue' => 'Balance %s is less than %s, cannot continue',
'Batch delete is not allowed' => 'Batch delete is not allowed',
'CONFIG_ID_NOT_FOUND_OR_TIER_EMPTY' => 'Config ID %s not found or tier is empty',
'Cannot open file or create file failed' => 'Cannot open file or create file failed',
'Cannot operate roles with higher level than current account' => 'Cannot operate roles with higher level than current account',
'Cannot set parent category as child of current' => 'Cannot set parent category as child of current',
'Cannot set parent department to a child of current department' => 'Cannot set parent department to a child of current department',
'Cannot set parent to self' => 'Cannot set parent to self',
'Chunk file not found, please upload again' => 'Chunk file not found, please upload again',
'Chunk upload must be called in HTTP request context' => 'Chunk upload must be called in HTTP request context',
'Coin change must be greater than 0' => 'Coin change must be greater than 0',
'Config data not found' => 'Config data not found',
'Config group not found' => 'Config group not found',
'Counts only support 0, 100, 500, 1000, 5000' => 'Counts only support 0, 100, 500, 1000, 5000',
'Current table does not support recycle bin' => 'Current table does not support recycle bin',
'DATA_NOT_FOUND' => 'Data not found',
'DIRECTION_INVALID' => 'direction must be 0 or 1',
'Data not found' => 'Data not found',
'Deduct amount cannot exceed current balance' => 'Deduct amount cannot exceed current balance',
'Delete data error, please check' => 'Delete data error, please check',
'Dict type not found' => 'Dict type not found',
'FAIL' => 'Fail',
'Failed to create image resource' => 'Failed to create image resource',
'Failed to generate token' => 'Failed to generate token',
'Failed to get file resource' => 'Failed to get file resource',
'Failed to get login credential, please check' => 'Failed to get login credential, please check',
'Failed to read database config' => 'Failed to read database config',
'Failed to save file' => 'Failed to save file',
'File format not supported for upload' => 'File format not supported for upload',
'File generation not allowed in non-debug mode' => 'File generation not allowed in non-debug mode',
'File not found' => 'File not found',
'File size exceeds limit' => 'File size exceeds limit',
'Free pool config not found' => 'Free pool config not found',
'Free tier probabilities (T1T5) sum cannot exceed 100%' => 'Free tier probabilities (T1T5) sum cannot exceed 100%',
'Free tier probability must be between 0 and 100%' => 'Free tier probability must be between 0 and 100%',
'Frontend directory not found, must be same level as backend' => 'Frontend directory not found, must be same level as backend',
'INSUFFICIENT_BALANCE' => 'Insufficient balance',
'INSUFFICIENT_TICKETS' => 'Insufficient lottery tickets',
'Import file error, please upload correct xlsx file' => 'Import file error, please upload correct xlsx file',
'Insufficient balance' => 'Insufficient balance',
'Insufficient balance to transfer' => 'Insufficient balance to transfer',
'Insufficient lottery tickets' => 'Insufficient lottery tickets',
'Invalid DiceReward id exists' => 'Invalid DiceReward id exists',
'Invalid config ID exists' => 'Invalid config ID exists',
'Invalid file format' => 'Invalid file format',
'Invalid file type, cannot generate file' => 'Invalid file type, cannot generate file',
'Invalid lottery ticket purchase' => 'Invalid lottery ticket purchase',
'Invalid or expired token' => 'Invalid or expired token',
'Invalid parameters' => 'Invalid parameters',
'Invalid params: player_id and type are required (3=add, 4=deduct)' => 'Invalid params: player_id and type are required (3=add, 4=deduct)',
'Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)' => 'Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)',
'Invalid secret' => 'Invalid secret',
'Invalid task type' => 'Invalid task type',
'LOTTERY_CONFIG_NOT_FOUND' => 'Lottery config not found',
'LOTTERY_POOL_CONFIG_DEFAULT_NOT_FOUND' => 'No name=default pool config found, please create one first',
'LOTTERY_POOL_CONFIG_NOT_FOUND_DEFAULT' => 'Lottery pool config not found (name=default required)',
'Logged out successfully' => 'Logged out successfully',
'Login credential verification failed' => 'Login credential verification failed',
'Lottery pool config not found (name=default required)' => 'Lottery pool config not found (name=default required)',
'MSG_022FA411' => 'App type must be plugin or app',
'MSG_04BF8179' => 'Data not found',
'MSG_06F06DA6' => 'Invalid or expired token',
'MSG_0A17D195' => 'Paid tier probability must be between 0 and 100%',
'MSG_0A9A3E28' => 'Batch delete is not allowed',
'MSG_0BCF9CBC' => 'Test count only supports 100, 500, 1000, 5000, 10000',
'MSG_0CBB8FF6' => 'Service timeout: ',
'MSG_0D49B785' => 'Old password is incorrect',
'MSG_0FE75E2C' => 'Chunk upload must be called in HTTP request context',
'MSG_146A3F0D' => 'Dict type not found',
'MSG_17740DB3' => 'Token format invalid',
'MSG_1798E4D4' => 'Template not found',
'MSG_19E651B8' => 'coin is required',
'MSG_1A499109' => 'File not found',
'MSG_1BB27051' => 'auth-token expired',
'MSG_1C1718A6' => 'Plugin already exists',
'MSG_2240AD6D' => 'auth-token invalid',
'MSG_2273437E' => 'Balance %s is less than %s, cannot continue',
'MSG_22C6787F' => 'Chunk file not found, please upload again',
'MSG_25BF8A8D' => 'Deduct amount cannot exceed current balance',
'MSG_2830AE01' => 'Service timeout: Unknown reason',
'MSG_2ED0C7A8' => 'Plugin base config is invalid',
'MSG_2EE75A5E' => 'System file generation error',
'MSG_2EFE74EE' => 'File generation not allowed in non-debug mode',
'MSG_2F100DB4' => 'Cannot operate roles with higher level than current account',
'MSG_334CE26A' => 'No permission to operate this data',
'MSG_35FB9BA0' => 'File format not supported for upload',
'MSG_381A19AE' => 'Upload mode not found',
'MSG_3A4A6DE6' => 'username is required',
'MSG_3A4FF81F' => 'No permission to operate department data',
'MSG_3C99F7F7' => 'Reward config is empty, please maintain dice_reward_config first',
'MSG_3DBFEA33' => 'Invalid file format',
'MSG_43C4D703' => 'This department has users, please delete or transfer them first',
'MSG_47FDBDD0' => 'Config group not found',
'MSG_4CA58C61' => 'Update data error, please check',
'MSG_4F1D271A' => 'Invalid DiceReward id exists',
'MSG_521593FB' => 'Please set app name first',
'MSG_557E5109' => 'Failed to get file resource',
'MSG_559AAE0E' => 'No permission to operate role data',
'MSG_560E6D91' => 'No path config available for this direction',
'MSG_5643EE10' => 'Failed to generate token',
'MSG_569EC863' => 'Current table does not support recycle bin',
'MSG_56B44907' => 'Target category not found',
'MSG_5CE17D6B' => 'auth-token invalid or expired',
'MSG_5FF3A2BE' => 'Failed to read database config',
'MSG_609A300B' => 'Insufficient balance',
'MSG_60B9FC38' => 'Failed to get login credential, please check',
'MSG_64A3C830' => 'User not found',
'MSG_67C66962' => 'No name=default pool config found, please create one first',
'MSG_6C16260B' => 'When free pool is not selected, please fill free custom tier probabilities (T1T5)',
'MSG_6CA924A1' => 'Lottery pool config not found (name=default required)',
'MSG_6F00DFB2' => 'Success',
'MSG_7310FDB8' => 'Frontend directory not found, must be same level as backend',
'MSG_74E3CB84' => 'No available reward config',
'MSG_75C6A69F' => 'Please provide auth-token',
'MSG_7845F2E9' => 'Delete data error, please check',
'MSG_86272B49' => 'Fail',
'MSG_8865D363' => 'coin cannot be 0',
'MSG_8B6AA32A' => 'Cannot set parent category as child of current',
'MSG_8C2E3CE6' => 'Please login again (account logged in elsewhere)',
'MSG_8FDBA3F1' => 'This dict code already exists',
'MSG_91272513' => 'Invalid lottery ticket purchase',
'MSG_94EE6593' => 'Plugin install directory is already occupied',
'MSG_9501E2EF' => 'Insufficient balance to transfer',
'MSG_950B6072' => 'Config data not found',
'MSG_9A01DFBF' => 'Plugin base config is incomplete',
'MSG_9D195F25' => 'Account is disabled and cannot log in',
'MSG_9EE0801C' => 'Cannot open file or create file failed',
'MSG_9F6B51C8' => 'Invalid file type, cannot generate file',
'MSG_A049A679' => 'This category has sub-categories, please delete them first',
'MSG_A3165463' => 'Only super admin can perform this action',
'MSG_A4FB6212' => 'Failed to save file',
'MSG_A6A8EA8F' => 'Plugin directory not found',
'MSG_A72A7DC6' => 'This department has sub-departments, please delete them first',
'MSG_A778ABB9' => 'auth-token format invalid',
'MSG_ADA80442' => 'Please login again',
'MSG_AE73E6F3' => 'API_AUTH_TOKEN_SECRET is not configured',
'MSG_B387239D' => 'Paid tier probabilities (T1T5) sum cannot exceed 100%',
'MSG_B5C2F2F6' => 'Counts only support 0, 100, 500, 1000, 5000',
'MSG_B5CD5C51' => 'Test record not found',
'MSG_B720629D' => 'username and password are required',
'MSG_BA173F12' => 'Sum of paid/free direction counts must be greater than 0',
'MSG_BAC2EFB0' => 'Parent department cannot be the same as current department',
'MSG_BB3C5A3F' => 'direction must be 0 or 1',
'MSG_BBD3198A' => 'Invalid params: player_id and type are required (3=add, 4=deduct)',
'MSG_BD8AD1D3' => 'Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)',
'MSG_BEB15D55' => 'Invalid parameters',
'MSG_C2E4B3DC' => 'Invalid task type',
'MSG_C2F02095' => 'Insufficient lottery tickets',
'MSG_C3CB20DC' => 'Free tier probability must be between 0 and 100%',
'MSG_C43809BC' => 'Operation failed: ',
'MSG_C548E557' => 'Missing parameters: agent_id, secret, time, signature are required',
'MSG_C5D5D5E1' => 'Cannot set parent department to a child of current department',
'MSG_C803EA6F' => 'Please register',
'MSG_C80C5EF5' => 'Failed to create image resource',
'MSG_C9BFC7E9' => 'Lottery config not found',
'MSG_CDEA9DD8' => 'Your login credential is invalid or expired, please login again',
'MSG_D15C0759' => 'Invalid secret',
'MSG_D1D1C0A0' => 'Template directory not found',
'MSG_D1E7769C' => 'Parent category cannot be the same as current',
'MSG_D224020F' => 'Free pool config not found',
'MSG_D75845B2' => 'Free tier probabilities (T1T5) sum cannot exceed 100%',
'MSG_DB560C68' => 'Please run composer require phpmailer/phpmailer and restart',
'MSG_DEE31D19' => 'Timestamp expired or invalid, please sync time',
'MSG_DF93D5F9' => 'Token expired, please login again',
'MSG_E12FF883' => 'File size exceeds limit',
'MSG_E15B47C6' => 'Super admin cannot be deleted',
'MSG_E1BFE655' => 'Mail config not set',
'MSG_E5849544' => 'Wrong password',
'MSG_E66BC216' => 'This menu has sub-menus, please delete them first',
'MSG_E6E6288B' => 'System default group cannot be deleted',
'MSG_E84B2B0A' => 'Logged out successfully',
'MSG_E8C8EC80' => 'Invalid config ID exists',
'MSG_E96B26B9' => 'Coin change must be greater than 0',
'MSG_EEDAAC44' => 'Waiting for dependencies to be installed',
'MSG_F0F5F561' => 'Config ID %s not found or tier is empty',
'MSG_F12E5DBA' => 'Reward config must cover 26 cells (id 0-25 or 1-26), currently only %s, cannot generate full 5-30 points and clockwise/counterclockwise mapping',
'MSG_F2643E83' => 'Login credential verification failed',
'MSG_F58CB5C8' => 'This category has sub-categories, please delete them first',
'MSG_F5F9FF11' => 'Paid pool config not found',
'MSG_F7BBA776' => 'Unknown reason',
'MSG_F8EB5084' => 'Signature verification failed',
'MSG_FA5FF202' => 'Cannot set parent to self',
'MSG_FB4C0ADF' => 'Please select tables to generate',
'MSG_FBC50B18' => 'Player not found',
'MSG_FC1E3345' => 'Import file error, please upload correct xlsx file',
'MSG_FDADA275' => 'When paid pool is not selected, please fill paid custom tier probabilities (T1T5)',
'MSG_FE1B67CA' => 'Please provide token',
'Mail config not set' => 'Mail config not set',
'Missing parameters: agent_id, secret, time, signature are required' => 'Missing parameters: agent_id, secret, time, signature are required',
'NO_AVAILABLE_REWARD_CONFIG' => 'No available reward config',
'No available reward config' => 'No available reward config',
'No name=default pool config found, please create one first' => 'No name=default pool config found, please create one first',
'No permission to operate department data' => 'No permission to operate department data',
'No permission to operate role data' => 'No permission to operate role data',
'No permission to operate this data' => 'No permission to operate this data',
'OLD_PASSWORD_WRONG' => 'Old password is incorrect',
'Old password is incorrect' => 'Old password is incorrect',
'Only super admin can perform this action' => 'Only super admin can perform this action',
'Operation failed: ' => 'Operation failed: ',
'PASSWORD_WRONG' => 'Wrong password',
'Paid pool config not found' => 'Paid pool config not found',
'Paid tier probabilities (T1T5) sum cannot exceed 100%' => 'Paid tier probabilities (T1T5) sum cannot exceed 100%',
'Paid tier probability must be between 0 and 100%' => 'Paid tier probability must be between 0 and 100%',
'Parent category cannot be the same as current' => 'Parent category cannot be the same as current',
'Parent department cannot be the same as current department' => 'Parent department cannot be the same as current department',
'Player not found' => 'Player not found',
'Please login again' => 'Please login again',
'Please login again (account logged in elsewhere)' => 'Please login again (account logged in elsewhere)',
'Please provide auth-token' => 'Please provide auth-token',
'Please provide token' => 'Please provide token',
'Please register' => 'Please register',
'Please run composer require phpmailer/phpmailer and restart' => 'Please run composer require phpmailer/phpmailer and restart',
'Please select tables to generate' => 'Please select tables to generate',
'Please set app name first' => 'Please set app name first',
'Plugin already exists' => 'Plugin already exists',
'Plugin base config is incomplete' => 'Plugin base config is incomplete',
'Plugin base config is invalid' => 'Plugin base config is invalid',
'Plugin directory not found' => 'Plugin directory not found',
'Plugin install directory is already occupied' => 'Plugin install directory is already occupied',
'Reward config is empty, please maintain dice_reward_config first' => 'Reward config is empty, please maintain dice_reward_config first',
'SUCCESS' => 'Success',
'SUPER_ADMIN_CANNOT_DELETE' => 'Super admin cannot be deleted',
'Service timeout: ' => 'Service timeout: ',
'Signature verification failed' => 'Signature verification failed',
'Sum of paid/free direction counts must be greater than 0' => 'Sum of paid/free direction counts must be greater than 0',
'Super admin cannot be deleted' => 'Super admin cannot be deleted',
'System default group cannot be deleted' => 'System default group cannot be deleted',
'System file generation error' => 'System file generation error',
'TOKEN_EXPIRED_RELOGIN' => 'Token expired, please login again',
'TOKEN_FORMAT_INVALID' => 'Token format invalid',
'TOKEN_INVALID' => 'Invalid or expired token',
'TOKEN_REQUIRED' => 'Please provide token',
'Target category not found' => 'Target category not found',
'Template directory not found' => 'Template directory not found',
'Template not found' => 'Template not found',
'Test count only supports 100, 500, 1000, 5000, 10000' => 'Test count only supports 100, 500, 1000, 5000, 10000',
'Test record not found' => 'Test record not found',
'This category has sub-categories, please delete them first' => 'This category has sub-categories, please delete them first',
'This department has sub-departments, please delete them first' => 'This department has sub-departments, please delete them first',
'This department has users, please delete or transfer them first' => 'This department has users, please delete or transfer them first',
'This dict code already exists' => 'This dict code already exists',
'This menu has sub-menus, please delete them first' => 'This menu has sub-menus, please delete them first',
'Timestamp expired or invalid, please sync time' => 'Timestamp expired or invalid, please sync time',
'Token expired, please login again' => 'Token expired, please login again',
'Token format invalid' => 'Token format invalid',
'USERNAME_PASSWORD_REQUIRED' => 'username and password are required',
'USERNAME_REQUIRED' => 'username is required',
'USER_NOT_FOUND' => 'User not found',
'Update data error, please check' => 'Update data error, please check',
'Upload mode not found' => 'Upload mode not found',
'User not found' => 'User not found',
'Waiting for dependencies to be installed' => 'Waiting for dependencies to be installed',
'When free pool is not selected, please fill free custom tier probabilities (T1T5)' => 'When free pool is not selected, please fill free custom tier probabilities (T1T5)',
'When paid pool is not selected, please fill paid custom tier probabilities (T1T5)' => 'When paid pool is not selected, please fill paid custom tier probabilities (T1T5)',
'Wrong password' => 'Wrong password',
'Your login credential is invalid or expired, please login again' => 'Your login credential is invalid or expired, please login again',
'add failed' => 'add failed',
'add success' => 'add success',
'admin already installed, to reinstall please delete env file and restart' => 'admin already installed, to reinstall please delete env file and restart',
'all test data cleared' => 'all test data cleared',
'auth-token expired' => 'auth-token expired',
'auth-token format invalid' => 'auth-token format invalid',
'auth-token invalid' => 'auth-token invalid',
'auth-token invalid or expired' => 'auth-token invalid or expired',
'captcha error' => 'captcha error',
'clean success' => 'clean success',
'clear cache success' => 'clear cache success',
'clear failed: ' => 'clear failed: ',
'coin cannot be 0' => 'coin cannot be 0',
'coin is required' => 'coin is required',
'connection refused, please check database ip/port and ensure database is running' => 'connection refused, please check database ip/port and ensure database is running',
'create reward mapping success' => 'create reward mapping success',
'database SQL file not found' => 'database SQL file not found',
'database already installed, please do not install again' => 'database already installed, please do not install again',
'database connection timeout, please check ip/port and firewall/security group rules' => 'database connection timeout, please check ip/port and firewall/security group rules',
'database username or password is incorrect' => 'database username or password is incorrect',
'delete failed' => 'delete failed',
'delete success' => 'delete success',
'direction must be 0 (clockwise) or 1 (counterclockwise)' => 'direction must be 0 (clockwise) or 1 (counterclockwise)',
'direction must be 0 or 1' => 'direction must be 0 or 1',
'download failed' => 'download failed',
'download success, please install in plugin list' => 'download success, please install in plugin list',
'execute success' => 'execute success',
'execution failed' => 'execution failed',
'file size cannot exceed 5M' => 'file size cannot exceed 5M',
'import success' => 'import success',
'import success, refreshed DiceReward, DiceRewardConfig(BIGWIN), and pool config' => 'import success, refreshed DiceReward, DiceRewardConfig(BIGWIN), and pool config',
'install success' => 'install success',
'invalid parameters, please check' => 'invalid parameters, please check',
'login expired or invalid, please login again' => 'login expired or invalid, please login again',
'missing parameter id' => 'missing parameter id',
'missing parameter status' => 'missing parameter status',
'missing player_id' => 'missing player_id',
'no permission to delete selected data' => 'no permission to delete selected data',
'no permission to operate this player' => 'no permission to operate this player',
'no permission to update this record' => 'no permission to update this record',
'no permission to view this record' => 'no permission to view this record',
'not found' => 'not found',
'not logged in' => 'not logged in',
'operation failed' => 'operation failed',
'operation success' => 'operation success',
'operation type must be 3 (add) or 4 (deduct)' => 'operation type must be 3 (add) or 4 (deduct)',
'optimize success' => 'optimize success',
'parameter items must be an array' => 'parameter items must be an array',
'please input email' => 'please input email',
'please login first' => 'please login first',
'please provide direction (0=clockwise, 1=counterclockwise)' => 'please provide direction (0=clockwise, 1=counterclockwise)',
'please provide record_id' => 'please provide record_id',
'please select cache to delete' => 'please select cache to delete',
'please select data to delete' => 'please select data to delete',
'please select player' => 'please select player',
'please specify test record' => 'please specify test record',
'record not found' => 'record not found',
'reload success' => 'reload success',
'reset success' => 'reset success',
'save success' => 'save success',
'send failed, please check logs' => 'send failed, please check logs',
'send success' => 'send success',
'super admin cannot reset password' => 'super admin cannot reset password',
'test data cleared' => 'test data cleared',
'too many requests, please try again later' => 'too many requests, please try again later',
'uninstall plugin success' => 'uninstall plugin success',
'update failed' => 'update failed',
'update success' => 'update success',
'upload failed, please upload zip file' => 'upload failed, please upload zip file',
'upload file validation failed' => 'upload file validation failed',
'uploaded file not found' => 'uploaded file not found',
'username is required' => 'username is required',
'version id is required' => 'version id is required',
];

View File

@@ -0,0 +1,346 @@
<?php
declare(strict_types=1);
return [
'ACCOUNT_DISABLED' => '账号已被禁用,无法登录',
'API_AUTH_TOKEN_SECRET is not configured' => '服务端未配置 API_AUTH_TOKEN_SECRET',
'AUTH_TOKEN_EXPIRED' => 'auth-token 已过期',
'AUTH_TOKEN_FORMAT_INVALID' => 'auth-token 格式无效',
'AUTH_TOKEN_INVALID' => 'auth-token 无效',
'AUTH_TOKEN_INVALID_OR_EXPIRED' => 'auth-token 无效或已失效',
'AUTH_TOKEN_REQUIRED' => '请携带 auth-token',
'Account is disabled and cannot log in' => '账号已被禁用,无法登录',
'App type must be plugin or app' => '应用类型必须为plugin或者app',
'BALANCE_LESS_THAN_MIN' => '当前玩家余额%s小于%s无法继续游戏',
'BATCH_DELETE_FORBIDDEN' => '禁止批量删除操作',
'BUY_TICKET_ERROR' => '购买抽奖券错误',
'Balance %s is less than %s, cannot continue' => '当前玩家余额%s小于%s无法继续游戏',
'Batch delete is not allowed' => '禁止批量删除操作',
'CONFIG_ID_NOT_FOUND_OR_TIER_EMPTY' => '配置ID %s 不存在或档位为空',
'Cannot open file or create file failed' => '无法打开文件,或者文件创建失败',
'Cannot operate roles with higher level than current account' => '不能操作比当前账户职级高的角色',
'Cannot set parent category as child of current' => '不能将上级分类设置为当前分类的子分类',
'Cannot set parent department to a child of current department' => '不能将上级部门设置为当前部门的子部门',
'Cannot set parent to self' => '不能设置父级为自身',
'Chunk file not found, please upload again' => '切片文件查找失败,请重新上传',
'Chunk upload must be called in HTTP request context' => '切片上传服务必须在 HTTP 请求环境下调用',
'Coin change must be greater than 0' => '平台币变动必须大于 0',
'Config data not found' => '配置数据未找到',
'Config group not found' => '配置组未找到',
'Counts only support 0, 100, 500, 1000, 5000' => '各抽奖次数仅支持 0、100、500、1000、5000',
'Current table does not support recycle bin' => '当前表不支持回收站功能',
'DATA_NOT_FOUND' => '数据不存在',
'DIRECTION_INVALID' => 'direction 必须为 0 或 1',
'Data not found' => '数据不存在',
'Deduct amount cannot exceed current balance' => '扣点数量不能大于当前余额',
'Delete data error, please check' => '删除数据异常,请检查',
'Dict type not found' => '字典类型不存在',
'FAIL' => '失败',
'Failed to create image resource' => '创建图片资源失败',
'Failed to generate token' => '生成 token 失败',
'Failed to get file resource' => '获取文件资源失败',
'Failed to get login credential, please check' => '登录凭获取失败,请检查',
'Failed to read database config' => '数据库配置读取失败',
'Failed to save file' => '文件保存失败',
'File format not supported for upload' => '不支持该格式的文件上传',
'File generation not allowed in non-debug mode' => '非调试模式下,不允许生成文件',
'File not found' => '文件不存在',
'File size exceeds limit' => '文件大小超过限制',
'Free pool config not found' => '免费奖池配置不存在',
'Free tier probabilities (T1T5) sum cannot exceed 100%' => '免费档位概率 T1T5 之和不能超过 100%',
'Free tier probability must be between 0 and 100%' => '免费档位概率每档只能 0-100%',
'Frontend directory not found, must be same level as backend' => '前端目录查找失败,必须与后端目录为同级目录!',
'INSUFFICIENT_BALANCE' => '平台币不足',
'INSUFFICIENT_TICKETS' => '抽奖券不足',
'Import file error, please upload correct xlsx file' => '导入文件错误请上传正确的文件格式xlsx',
'Insufficient balance' => '平台币不足',
'Insufficient balance to transfer' => '余额不足,无法转出',
'Insufficient lottery tickets' => '抽奖券不足',
'Invalid DiceReward id exists' => '存在无效的 DiceReward id',
'Invalid config ID exists' => '存在无效的配置ID',
'Invalid file format' => '文件格式错误',
'Invalid file type, cannot generate file' => '文件类型异常,无法生成指定文件!',
'Invalid lottery ticket purchase' => '购买抽奖券错误',
'Invalid or expired token' => 'token 无效',
'Invalid parameters' => '参数错误',
'Invalid params: player_id and type are required (3=add, 4=deduct)' => '参数错误:需要有效的 player_id 和 type3=加点4=扣点)',
'Invalid phone format, only +60 Malaysia numbers supported (e.g. +60123456789)' => '手机号格式错误,仅支持 +60 开头的马来西亚号码(如 +60123456789',
'Invalid secret' => '密钥错误',
'Invalid task type' => '任务类型异常',
'LOTTERY_CONFIG_NOT_FOUND' => '奖池配置不存在',
'LOTTERY_POOL_CONFIG_DEFAULT_NOT_FOUND' => '未找到 name=default 的奖池配置,请先创建',
'LOTTERY_POOL_CONFIG_NOT_FOUND_DEFAULT' => '奖池配置不存在(需 name=default',
'Logged out successfully' => '已退出登录',
'Login credential verification failed' => '登录凭证校验失败',
'Lottery pool config not found (name=default required)' => '奖池配置不存在(需 name=default',
'MSG_022FA411' => '应用类型必须为plugin或者app',
'MSG_04BF8179' => '数据不存在',
'MSG_06F06DA6' => 'token 无效',
'MSG_0A17D195' => '付费档位概率每档只能 0-100%',
'MSG_0A9A3E28' => '禁止批量删除操作',
'MSG_0BCF9CBC' => '测试次数仅支持 100、500、1000、5000、10000',
'MSG_0CBB8FF6' => '服务超时,',
'MSG_0D49B785' => '原密码错误',
'MSG_0FE75E2C' => '切片上传服务必须在 HTTP 请求环境下调用',
'MSG_146A3F0D' => '字典类型不存在',
'MSG_17740DB3' => 'token 格式无效',
'MSG_1798E4D4' => '模板不存在',
'MSG_19E651B8' => 'coin 不能为空',
'MSG_1A499109' => '文件不存在',
'MSG_1BB27051' => 'auth-token 已过期',
'MSG_1C1718A6' => '插件已经存在',
'MSG_2240AD6D' => 'auth-token 无效',
'MSG_2273437E' => '当前玩家余额%s小于%s无法继续游戏',
'MSG_22C6787F' => '切片文件查找失败,请重新上传',
'MSG_25BF8A8D' => '扣点数量不能大于当前余额',
'MSG_2830AE01' => '服务超时,没有原因',
'MSG_2ED0C7A8' => '插件的基础配置信息错误',
'MSG_2EE75A5E' => '系统生成文件错误',
'MSG_2EFE74EE' => '非调试模式下,不允许生成文件',
'MSG_2F100DB4' => '不能操作比当前账户职级高的角色',
'MSG_334CE26A' => '没有权限操作该数据',
'MSG_35FB9BA0' => '不支持该格式的文件上传',
'MSG_381A19AE' => '该上传模式不存在',
'MSG_3A4A6DE6' => 'username 不能为空',
'MSG_3A4FF81F' => '没有权限操作该部门数据',
'MSG_3C99F7F7' => '奖励配置为空,请先维护 dice_reward_config',
'MSG_3DBFEA33' => '文件格式错误',
'MSG_43C4D703' => '该部门下存在用户,请先删除或者转移用户',
'MSG_47FDBDD0' => '配置组未找到',
'MSG_4CA58C61' => '修改数据异常,请检查',
'MSG_4F1D271A' => '存在无效的 DiceReward id',
'MSG_521593FB' => '请先设置应用名称',
'MSG_557E5109' => '获取文件资源失败',
'MSG_559AAE0E' => '没有权限操作该角色数据',
'MSG_560E6D91' => '该方向下暂无可用路径配置',
'MSG_5643EE10' => '生成 token 失败',
'MSG_569EC863' => '当前表不支持回收站功能',
'MSG_56B44907' => '目标分类不存在',
'MSG_5CE17D6B' => 'auth-token 无效或已失效',
'MSG_5FF3A2BE' => '数据库配置读取失败',
'MSG_609A300B' => '平台币不足',
'MSG_60B9FC38' => '登录凭获取失败,请检查',
'MSG_64A3C830' => '用户不存在',
'MSG_67C66962' => '未找到 name=default 的奖池配置,请先创建',
'MSG_6C16260B' => '免费未选择奖池配置时请填写免费自定义档位概率T1T5',
'MSG_6CA924A1' => '奖池配置不存在(需 name=default',
'MSG_6F00DFB2' => 'success',
'MSG_7310FDB8' => '前端目录查找失败,必须与后端目录为同级目录!',
'MSG_74E3CB84' => '暂无可用奖励配置',
'MSG_75C6A69F' => '请携带 auth-token',
'MSG_7845F2E9' => '删除数据异常,请检查',
'MSG_86272B49' => 'fail',
'MSG_8865D363' => 'coin 不能为 0',
'MSG_8B6AA32A' => '不能将上级分类设置为当前分类的子分类',
'MSG_8C2E3CE6' => '请重新登录(当前账号已在其他处登录)',
'MSG_8FDBA3F1' => '该字典标识已存在',
'MSG_91272513' => '购买抽奖券错误',
'MSG_94EE6593' => '该插件的安装目录已经被占用',
'MSG_9501E2EF' => '余额不足,无法转出',
'MSG_950B6072' => '配置数据未找到',
'MSG_9A01DFBF' => '该插件的基础配置信息不完善',
'MSG_9D195F25' => '账号已被禁用,无法登录',
'MSG_9EE0801C' => '无法打开文件,或者文件创建失败',
'MSG_9F6B51C8' => '文件类型异常,无法生成指定文件!',
'MSG_A049A679' => '该分类下存在子分类,请先删除子分类',
'MSG_A3165463' => '仅超级管理员能够操作',
'MSG_A4FB6212' => '文件保存失败',
'MSG_A6A8EA8F' => '插件目录不存在',
'MSG_A72A7DC6' => '该部门下存在子部门,请先删除子部门',
'MSG_A778ABB9' => 'auth-token 格式无效',
'MSG_ADA80442' => '请重新登录',
'MSG_AE73E6F3' => '服务端未配置 API_AUTH_TOKEN_SECRET',
'MSG_B387239D' => '付费档位概率 T1T5 之和不能超过 100%',
'MSG_B5C2F2F6' => '各抽奖次数仅支持 0、100、500、1000、5000',
'MSG_B5CD5C51' => '测试记录不存在',
'MSG_B720629D' => 'username、password 不能为空',
'MSG_BA173F12' => '付费或免费至少一种方向次数之和大于 0',
'MSG_BAC2EFB0' => '上级部门和当前部门不能相同',
'MSG_BB3C5A3F' => 'direction 必须为 0 或 1',
'MSG_BBD3198A' => '参数错误:需要有效的 player_id 和 type3=加点4=扣点)',
'MSG_BD8AD1D3' => '手机号格式错误,仅支持 +60 开头的马来西亚号码(如 +60123456789',
'MSG_BEB15D55' => '参数错误',
'MSG_C2E4B3DC' => '任务类型异常',
'MSG_C2F02095' => '抽奖券不足',
'MSG_C3CB20DC' => '免费档位概率每档只能 0-100%',
'MSG_C43809BC' => '操作失败:',
'MSG_C548E557' => '缺少参数agent_id、secret、time、signature 不能为空',
'MSG_C5D5D5E1' => '不能将上级部门设置为当前部门的子部门',
'MSG_C803EA6F' => '请注册',
'MSG_C80C5EF5' => '创建图片资源失败',
'MSG_C9BFC7E9' => '奖池配置不存在',
'MSG_CDEA9DD8' => '您的登录凭证错误或者已过期,请重新登录',
'MSG_D15C0759' => '密钥错误',
'MSG_D1D1C0A0' => '模板目录不存在!',
'MSG_D1E7769C' => '上级分类和当前分类不能相同',
'MSG_D224020F' => '免费奖池配置不存在',
'MSG_D75845B2' => '免费档位概率 T1T5 之和不能超过 100%',
'MSG_DB560C68' => '请执行 composer require phpmailer/phpmailer 并重启',
'MSG_DEE31D19' => '时间戳已过期或无效,请同步时间',
'MSG_DF93D5F9' => 'token 已过期,请重新登录',
'MSG_E12FF883' => '文件大小超过限制',
'MSG_E15B47C6' => '超级管理员禁止删除',
'MSG_E1BFE655' => '未设置邮件配置',
'MSG_E5849544' => '密码错误',
'MSG_E66BC216' => '该菜单下存在子菜单,请先删除子菜单',
'MSG_E6E6288B' => '系统默认分组,无法删除',
'MSG_E84B2B0A' => '已退出登录',
'MSG_E8C8EC80' => '存在无效的配置ID',
'MSG_E96B26B9' => '平台币变动必须大于 0',
'MSG_EEDAAC44' => '等待依赖安装',
'MSG_F0F5F561' => '配置ID %s 不存在或档位为空',
'MSG_F12E5DBA' => '奖励配置需覆盖 26 个格位id 0-25 或 1-26当前仅 %s 条,无法完整生成 5-30 共26个点数、顺时针与逆时针的奖励对照',
'MSG_F2643E83' => '登录凭证校验失败',
'MSG_F58CB5C8' => '该部门下存在子分类,请先删除子分类',
'MSG_F5F9FF11' => '付费奖池配置不存在',
'MSG_F7BBA776' => '没有原因',
'MSG_F8EB5084' => '签名验证失败',
'MSG_FA5FF202' => '不能设置父级为自身',
'MSG_FB4C0ADF' => '请选择要生成的表',
'MSG_FBC50B18' => '玩家不存在',
'MSG_FC1E3345' => '导入文件错误请上传正确的文件格式xlsx',
'MSG_FDADA275' => '付费未选择奖池配置时请填写付费自定义档位概率T1T5',
'MSG_FE1B67CA' => '请携带 token',
'Mail config not set' => '未设置邮件配置',
'Missing parameters: agent_id, secret, time, signature are required' => '缺少参数agent_id、secret、time、signature 不能为空',
'NO_AVAILABLE_REWARD_CONFIG' => '暂无可用奖励配置',
'No available reward config' => '暂无可用奖励配置',
'No name=default pool config found, please create one first' => '未找到 name=default 的奖池配置,请先创建',
'No permission to operate department data' => '没有权限操作该部门数据',
'No permission to operate role data' => '没有权限操作该角色数据',
'No permission to operate this data' => '没有权限操作该数据',
'OLD_PASSWORD_WRONG' => '原密码错误',
'Old password is incorrect' => '原密码错误',
'Only super admin can perform this action' => '仅超级管理员能够操作',
'Operation failed: ' => '操作失败:',
'PASSWORD_WRONG' => '密码错误',
'Paid pool config not found' => '付费奖池配置不存在',
'Paid tier probabilities (T1T5) sum cannot exceed 100%' => '付费档位概率 T1T5 之和不能超过 100%',
'Paid tier probability must be between 0 and 100%' => '付费档位概率每档只能 0-100%',
'Parent category cannot be the same as current' => '上级分类和当前分类不能相同',
'Parent department cannot be the same as current department' => '上级部门和当前部门不能相同',
'Player not found' => '玩家不存在',
'Please login again' => '请重新登录',
'Please login again (account logged in elsewhere)' => '请重新登录(当前账号已在其他处登录)',
'Please provide auth-token' => '请携带 auth-token',
'Please provide token' => '请携带 token',
'Please register' => '请注册',
'Please run composer require phpmailer/phpmailer and restart' => '请执行 composer require phpmailer/phpmailer 并重启',
'Please select tables to generate' => '请选择要生成的表',
'Please set app name first' => '请先设置应用名称',
'Plugin already exists' => '插件已经存在',
'Plugin base config is incomplete' => '该插件的基础配置信息不完善',
'Plugin base config is invalid' => '插件的基础配置信息错误',
'Plugin directory not found' => '插件目录不存在',
'Plugin install directory is already occupied' => '该插件的安装目录已经被占用',
'Reward config is empty, please maintain dice_reward_config first' => '奖励配置为空,请先维护 dice_reward_config',
'SUCCESS' => '成功',
'SUPER_ADMIN_CANNOT_DELETE' => '超级管理员禁止删除',
'Service timeout: ' => '服务超时,',
'Signature verification failed' => '签名验证失败',
'Sum of paid/free direction counts must be greater than 0' => '付费或免费至少一种方向次数之和大于 0',
'Super admin cannot be deleted' => '超级管理员禁止删除',
'System default group cannot be deleted' => '系统默认分组,无法删除',
'System file generation error' => '系统生成文件错误',
'TOKEN_EXPIRED_RELOGIN' => 'token 已过期,请重新登录',
'TOKEN_FORMAT_INVALID' => 'token 格式无效',
'TOKEN_INVALID' => 'token 无效',
'TOKEN_REQUIRED' => '请携带 token',
'Target category not found' => '目标分类不存在',
'Template directory not found' => '模板目录不存在!',
'Template not found' => '模板不存在',
'Test count only supports 100, 500, 1000, 5000, 10000' => '测试次数仅支持 100、500、1000、5000、10000',
'Test record not found' => '测试记录不存在',
'This category has sub-categories, please delete them first' => '该部门下存在子分类,请先删除子分类',
'This department has sub-departments, please delete them first' => '该部门下存在子部门,请先删除子部门',
'This department has users, please delete or transfer them first' => '该部门下存在用户,请先删除或者转移用户',
'This dict code already exists' => '该字典标识已存在',
'This menu has sub-menus, please delete them first' => '该菜单下存在子菜单,请先删除子菜单',
'Timestamp expired or invalid, please sync time' => '时间戳已过期或无效,请同步时间',
'Token expired, please login again' => 'token 已过期,请重新登录',
'Token format invalid' => 'token 格式无效',
'USERNAME_PASSWORD_REQUIRED' => 'username、password 不能为空',
'USERNAME_REQUIRED' => 'username 不能为空',
'USER_NOT_FOUND' => '用户不存在',
'Update data error, please check' => '修改数据异常,请检查',
'Upload mode not found' => '该上传模式不存在',
'User not found' => '用户不存在',
'Waiting for dependencies to be installed' => '等待依赖安装',
'When free pool is not selected, please fill free custom tier probabilities (T1T5)' => '免费未选择奖池配置时请填写免费自定义档位概率T1T5',
'When paid pool is not selected, please fill paid custom tier probabilities (T1T5)' => '付费未选择奖池配置时请填写付费自定义档位概率T1T5',
'Wrong password' => '密码错误',
'Your login credential is invalid or expired, please login again' => '您的登录凭证错误或者已过期,请重新登录',
'add failed' => '添加失败',
'add success' => '添加成功',
'admin already installed, to reinstall please delete env file and restart' => '管理后台已经安装如需重新安装请删除根目录env配置文件并重启',
'all test data cleared' => '已清空所有测试数据',
'auth-token expired' => 'auth-token 已过期',
'auth-token format invalid' => 'auth-token 格式无效',
'auth-token invalid' => 'auth-token 无效',
'auth-token invalid or expired' => 'auth-token 无效或已失效',
'captcha error' => '验证码错误',
'clean success' => '清理成功',
'clear cache success' => '清除缓存成功!',
'clear failed: ' => '清空失败:',
'coin cannot be 0' => 'coin 不能为 0',
'coin is required' => 'coin 不能为空',
'connection refused, please check database ip/port and ensure database is running' => 'Connection refused. 请确认数据库IP端口是否正确数据库已经启动',
'create reward mapping success' => '创建奖励对照成功',
'database SQL file not found' => '数据库SQL文件不存在',
'database already installed, please do not install again' => '数据库已经安装,请勿重复安装',
'database connection timeout, please check ip/port and firewall/security group rules' => '数据库连接超时请确认数据库IP端口是否正确安全组及防火墙已经放行端口',
'database username or password is incorrect' => '数据库用户名或密码错误',
'delete failed' => '删除失败',
'delete success' => '删除成功',
'direction must be 0 (clockwise) or 1 (counterclockwise)' => 'direction 必须为 0顺时针或 1逆时针',
'direction must be 0 or 1' => 'direction 必须为 0 或 1',
'download failed' => '下载失败',
'download success, please install in plugin list' => '下载成功,请在插件列表中安装',
'execute success' => '执行成功',
'execution failed' => '执行失败',
'file size cannot exceed 5M' => '文件大小不能超过5M',
'import success' => '导入成功',
'import success, refreshed DiceReward, DiceRewardConfig(BIGWIN), and pool config' => '导入成功,已刷新 DiceReward、DiceRewardConfig(BIGWIN)、奖池配置',
'install success' => '安装成功',
'invalid parameters, please check' => '参数错误,请检查',
'login expired or invalid, please login again' => '登录已过期或用户信息无效,请重新登录',
'missing parameter id' => '缺少参数 id',
'missing parameter status' => '缺少参数 status',
'missing player_id' => '缺少 player_id',
'no permission to delete selected data' => '无权限删除所选数据',
'no permission to operate this player' => '无权限操作该玩家',
'no permission to update this record' => '无权限修改该记录',
'no permission to view this record' => '无权限查看该记录',
'not found' => '未查找到信息',
'not logged in' => '未登录',
'operation failed' => '操作失败',
'operation success' => '操作成功',
'operation type must be 3 (add) or 4 (deduct)' => '操作类型必须为 3=加点 或 4=扣点',
'optimize success' => '优化成功',
'parameter items must be an array' => '参数 items 必须为数组',
'please input email' => '请输入邮箱',
'please login first' => '请先登录',
'please provide direction (0=clockwise, 1=counterclockwise)' => '请传入 direction0=顺时针 1=逆时针)',
'please provide record_id' => '请传入 record_id',
'please select cache to delete' => '请选择要删除的缓存',
'please select data to delete' => '请选择要删除的数据',
'please select player' => '请选择玩家',
'please specify test record' => '请指定测试记录',
'record not found' => '记录不存在',
'reload success' => '重载成功',
'reset success' => '重置成功',
'save success' => '保存成功',
'send failed, please check logs' => '发送失败,请查看日志',
'send success' => '发送成功',
'super admin cannot reset password' => '超级管理员不允许重置密码',
'test data cleared' => '已清空测试数据',
'too many requests, please try again later' => '请求过于频繁,请稍后再试',
'uninstall plugin success' => '卸载插件成功',
'update failed' => '修改失败',
'update success' => '修改成功',
'upload failed, please upload zip file' => '文件格式上传失败,请选择zip格式文件上传',
'upload file validation failed' => '上传文件校验失败',
'uploaded file not found' => '未找到上传文件',
'username is required' => 'username 不能为空',
'version id is required' => '版本ID不能为空',
];

View File

@@ -0,0 +1,50 @@
<?php
declare(strict_types=1);
/**
* 将 “中文=>英文” 的历史映射(可临时放在 $legacy 变量里)转换为英文 key 映射:
* - resource/translations/api/en.php: key=MSG_XXXXXXXX, value=英文
* - resource/translations/api/zh.php: key=MSG_XXXXXXXX, value=中文
*
* 同时保留 resource/translations/api/{zh,en}.php 中已存在的显式英文错误码。
*/
$root = dirname(__DIR__);
$enPath = $root . '/resource/translations/api/en.php';
$zhPath = $root . '/resource/translations/api/zh.php';
$legacy = [];
$en = is_file($enPath) ? (require $enPath) : [];
$zh = is_file($zhPath) ? (require $zhPath) : [];
foreach ($legacy as $cn => $enVal) {
if (!is_string($cn) || $cn === '' || !is_string($enVal)) {
continue;
}
$key = 'MSG_' . strtoupper(sprintf('%08X', crc32($cn)));
if (!isset($en[$key])) {
$en[$key] = $enVal;
}
if (!isset($zh[$key])) {
$zh[$key] = $cn;
}
}
$dump = static function (array $arr): string {
ksort($arr);
$out = "<?php\ndeclare(strict_types=1);\n\nreturn [\n";
foreach ($arr as $k => $v) {
$k = str_replace("'", "\\'", (string) $k);
$v = str_replace("'", "\\'", (string) $v);
$out .= " '{$k}' => '{$v}',\n";
}
$out .= "];\n";
return $out;
};
file_put_contents($enPath, $dump($en));
file_put_contents($zhPath, $dump($zh));
echo "done\n";

View File

@@ -0,0 +1,184 @@
<?php
declare(strict_types=1);
/**
* 批量把代码中的中文 message 替换为英文短句(显式英文,不是错误码):
* - return $this->success('中文...')
* - return $this->fail('中文...', ...)
* - throw new ApiException('中文...', ...)
*
* 英文短句来源resource/translations/api/en.php 与 zh.php 中的 MSG_ 对照crc32 中文生成 key
* 同时自动把“英文短句 => 英文/中文”写入 resource/translations/api/{en,zh}.phpWebman 标准路径)。
*
* 用法:
* php server/scripts/replace_cn_messages_with_en.php
*/
$root = dirname(__DIR__);
$serverDir = $root;
$enPath = $root . '/resource/translations/api/en.php';
$zhPath = $root . '/resource/translations/api/zh.php';
$enMap = is_file($enPath) ? (require $enPath) : [];
$zhMap = is_file($zhPath) ? (require $zhPath) : [];
/** @var array<string, string> $cnToEn */
$cnToEn = [];
foreach ($zhMap as $k => $cn) {
if (!is_string($k) || !is_string($cn)) {
continue;
}
if (strncmp($k, 'MSG_', 4) !== 0) {
continue;
}
$en = $enMap[$k] ?? null;
if (is_string($en) && $en !== '') {
$cnToEn[$cn] = $en;
}
}
$fallbackCn = [
'添加成功' => 'add success',
'修改成功' => 'update success',
'删除成功' => 'delete success',
'操作成功' => 'operation success',
'保存成功' => 'save success',
'执行成功' => 'execute success',
'安装成功' => 'install success',
'导入成功' => 'import success',
'发送成功' => 'send success',
'重载成功' => 'reload success',
'重置成功' => 'reset success',
'卸载插件成功' => 'uninstall plugin success',
'优化成功' => 'optimize success',
'清理成功' => 'clean success',
'清除缓存成功!' => 'clear cache success',
'已清空测试数据' => 'test data cleared',
'已清空所有测试数据' => 'all test data cleared',
'创建奖励对照成功' => 'create reward mapping success',
'导入成功,已刷新 DiceReward、DiceRewardConfig(BIGWIN)、奖池配置' => 'import success, refreshed DiceReward, DiceRewardConfig(BIGWIN), and pool config',
'下载成功,请在插件列表中安装' => 'download success, please install in plugin list',
];
$containsCn = static function (string $s): bool {
return preg_match('/[\x{4e00}-\x{9fff}]/u', $s) === 1;
};
$quote = static function (string $s): string {
return "'" . str_replace("'", "\\'", $s) . "'";
};
$dump = static function (array $arr): string {
ksort($arr);
$out = "<?php\ndeclare(strict_types=1);\n\nreturn [\n";
foreach ($arr as $k => $v) {
$k = str_replace("'", "\\'", (string) $k);
$v = str_replace("'", "\\'", (string) $v);
$out .= " '{$k}' => '{$v}',\n";
}
$out .= "];\n";
return $out;
};
$files = [];
$it = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($serverDir, FilesystemIterator::SKIP_DOTS)
);
foreach ($it as $file) {
/** @var SplFileInfo $file */
if (!$file->isFile()) {
continue;
}
$path = $file->getPathname();
if (substr($path, -4) !== '.php') {
continue;
}
// 跳过 translations 目录与 scripts 自己,避免自我替换
$norm = str_replace('\\', '/', $path);
if (str_contains($norm, '/resource/translations/')) {
continue;
}
if (str_contains($norm, '/scripts/replace_cn_messages_with_en.php')) {
continue;
}
$files[] = $path;
}
$totalReplaced = 0;
$touchedFiles = 0;
$addedKeys = 0;
foreach ($files as $path) {
$content = file_get_contents($path);
if (!is_string($content) || $content === '') {
continue;
}
$replacedInFile = 0;
$newContent = $content;
// 只处理单引号字符串:'...'
$patterns = [
// return $this->success('中文')
'/(\$this->success\(\s*)\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/' => 'success',
// return $this->success($data, '中文')
'/(\$this->success\([^\\)]*?,\s*)\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/' => 'success_msg',
// return $this->fail('中文', ...)
'/(\$this->fail\(\s*)\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/' => 'fail',
// throw new ApiException('中文', ...)
'/(throw\s+new\s+ApiException\(\s*)\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/' => 'exception',
];
foreach ($patterns as $regex => $type) {
$newContent = preg_replace_callback($regex, function (array $m) use (
$containsCn,
$quote,
&$cnToEn,
$fallbackCn,
&$enMap,
&$zhMap,
&$replacedInFile,
&$addedKeys,
$type
) {
$prefix = $m[1];
$raw = $m[2];
$cn = stripcslashes($raw);
if (!$containsCn($cn)) {
return $m[0];
}
$en = $cnToEn[$cn] ?? ($fallbackCn[$cn] ?? null);
if (!is_string($en) || $en === '') {
return $m[0];
}
// 写入翻译表:英文短句作为 key
if (!isset($enMap[$en])) {
$enMap[$en] = $en;
$addedKeys++;
}
if (!isset($zhMap[$en])) {
$zhMap[$en] = $cn;
$addedKeys++;
}
$replacedInFile++;
return $prefix . $quote($en);
}, $newContent) ?? $newContent;
}
if ($replacedInFile > 0 && $newContent !== $content) {
file_put_contents($path, $newContent);
$totalReplaced += $replacedInFile;
$touchedFiles++;
}
}
file_put_contents($enPath, $dump($enMap));
file_put_contents($zhPath, $dump($zhMap));
echo "touched_files={$touchedFiles}\n";
echo "replaced={$totalReplaced}\n";
echo "added_translation_pairs={$addedKeys}\n";

View File

@@ -0,0 +1,108 @@
<?php
declare(strict_types=1);
/**
* 修复替换结果:把代码里的 'E_XXXXXXXX'crc32 的十六进制)替换为真正英文短句。
* 英文短句来源resource/translations/api/en.php 的 MSG_XXXXXXXX。
*
* 同时确保 translations/api/{en,zh}.php 中包含:
* - key=英文短句, en=英文短句
* - key=英文短句, zh=对应中文
*/
$root = dirname(__DIR__);
$serverDir = $root;
$enPath = $root . '/resource/translations/api/en.php';
$zhPath = $root . '/resource/translations/api/zh.php';
$enMap = is_file($enPath) ? (require $enPath) : [];
$zhMap = is_file($zhPath) ? (require $zhPath) : [];
$dump = static function (array $arr): string {
ksort($arr);
$out = "<?php\ndeclare(strict_types=1);\n\nreturn [\n";
foreach ($arr as $k => $v) {
$k = str_replace("'", "\\'", (string) $k);
$v = str_replace("'", "\\'", (string) $v);
$out .= " '{$k}' => '{$v}',\n";
}
$out .= "];\n";
return $out;
};
$files = [];
$it = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($serverDir, FilesystemIterator::SKIP_DOTS)
);
foreach ($it as $file) {
/** @var SplFileInfo $file */
if (!$file->isFile()) {
continue;
}
$path = $file->getPathname();
if (substr($path, -4) !== '.php') {
continue;
}
$norm = str_replace('\\', '/', $path);
if (str_contains($norm, '/resource/translations/')) {
continue;
}
if (str_contains($norm, '/scripts/')) {
continue;
}
$files[] = $path;
}
$touchedFiles = 0;
$replaced = 0;
$added = 0;
foreach ($files as $path) {
$content = file_get_contents($path);
if (!is_string($content) || $content === '') {
continue;
}
$newContent = preg_replace_callback(
"/(['\"])E_([0-9A-Fa-f]{8})\\1/",
function (array $m) use (&$enMap, &$zhMap, &$replaced, &$added) {
$hex = strtoupper($m[2]);
$msgKey = 'MSG_' . $hex;
$en = $enMap[$msgKey] ?? null;
$zh = $zhMap[$msgKey] ?? null;
if (!is_string($en) || $en === '') {
return $m[0];
}
if (!is_string($zh) || $zh === '') {
$zh = $msgKey;
}
if (!isset($enMap[$en])) {
$enMap[$en] = $en;
$added++;
}
if (!isset($zhMap[$en])) {
$zhMap[$en] = $zh;
$added++;
}
$replaced++;
return "'" . str_replace("'", "\\'", $en) . "'";
},
$content
);
if (is_string($newContent) && $newContent !== $content) {
file_put_contents($path, $newContent);
$touchedFiles++;
}
}
file_put_contents($enPath, $dump($enMap));
file_put_contents($zhPath, $dump($zhMap));
echo "touched_files={$touchedFiles}\n";
echo "replaced={$replaced}\n";
echo "added_translation_pairs={$added}\n";

View File

@@ -0,0 +1,215 @@
<?php
declare(strict_types=1);
/**
* 通过 git diff 恢复 E_XXXXXXXX 对应的原中文,并替换为英文短句:
* - 在 server 下查找 "'E_XXXXXXXX'" 并替换为 "'<english phrase>'"
* - 同时写入 resource/translations/api/{en,zh}.phpenglish=>english / english=>中文
*
* 英文短句来源优先级:
* 1) resource/translations/api/en.php 与 zh.php 中的 MSG_ 对照(中文=>英文)
* 2) 内置常用中文短语翻译表
*/
$root = dirname(__DIR__);
$repoRoot = dirname($root);
$enPath = $root . '/resource/translations/api/en.php';
$zhPath = $root . '/resource/translations/api/zh.php';
$enMap = is_file($enPath) ? (require $enPath) : [];
$zhMap = is_file($zhPath) ? (require $zhPath) : [];
/** @var array<string, string> $cnToEn 基于 MSG_ 的中文=>英文 */
$cnToEn = [];
foreach ($zhMap as $k => $cn) {
if (!is_string($k) || !is_string($cn)) {
continue;
}
if (strncmp($k, 'MSG_', 4) !== 0) {
continue;
}
$en = $enMap[$k] ?? null;
if (is_string($en) && $en !== '') {
$cnToEn[$cn] = $en;
}
}
/** 常用中文短语翻译(兜底) */
$fallbackCn = [
'未查找到信息' => 'not found',
'记录不存在' => 'record not found',
'数据不存在' => 'data not found',
'添加失败' => 'add failed',
'修改失败' => 'update failed',
'删除失败' => 'delete failed',
'请选择要删除的数据' => 'please select data to delete',
'参数错误,请检查' => 'invalid parameters, please check',
'参数错误,请检查参数' => 'invalid parameters, please check',
'操作失败' => 'operation failed',
'执行失败' => 'execution failed',
'请先登录' => 'please login first',
'未登录' => 'not logged in',
'下载失败' => 'download failed',
'请求过于频繁,请稍后再试' => 'too many requests, please try again later',
'验证码错误' => 'captcha error',
'请选择要删除的缓存' => 'please select cache to delete',
'请选择要删除的数据' => 'please select data to delete',
'请选择要生成的表' => 'please select tables to generate',
'发送失败,请查看日志' => 'send failed, please check logs',
'请输入邮箱' => 'please input email',
'版本ID不能为空' => 'version id is required',
'上传文件校验失败' => 'upload file validation failed',
'文件大小不能超过5M' => 'file size cannot exceed 5M',
'文件格式上传失败,请选择zip格式文件上传' => 'upload failed, please upload zip file',
'登录已过期或用户信息无效,请重新登录' => 'login expired or invalid, please login again',
'超级管理员不允许重置密码' => 'super admin cannot reset password',
'未找到上传文件' => 'uploaded file not found',
'参数 items 必须为数组' => 'parameter items must be an array',
'缺少参数 id' => 'missing parameter id',
'缺少参数 status' => 'missing parameter status',
'缺少 player_id' => 'missing player_id',
'缺少参数agent_id、secret、time、signature 不能为空' => 'missing parameters: agent_id, secret, time, signature are required',
'无权限查看该记录' => 'no permission to view this record',
'无权限修改该记录' => 'no permission to update this record',
'无权限删除所选数据' => 'no permission to delete selected data',
'无权限操作该玩家' => 'no permission to operate this player',
'请选择玩家' => 'please select player',
'操作类型必须为 3=加点 或 4=扣点' => 'operation type must be 3 (add) or 4 (deduct)',
'请指定测试记录' => 'please specify test record',
'请传入 record_id' => 'please provide record_id',
'请传入 direction0=顺时针 1=逆时针)' => 'please provide direction (0=clockwise, 1=counterclockwise)',
'direction 必须为 0顺时针或 1逆时针' => 'direction must be 0 (clockwise) or 1 (counterclockwise)',
'清空失败:' => 'clear failed: ',
'管理后台已经安装如需重新安装请删除根目录env配置文件并重启' => 'admin already installed, to reinstall please delete env file and restart',
'数据库用户名或密码错误' => 'database username or password is incorrect',
'Connection refused. 请确认数据库IP端口是否正确数据库已经启动' => 'connection refused, please check database ip/port and ensure database is running',
'数据库连接超时请确认数据库IP端口是否正确安全组及防火墙已经放行端口' => 'database connection timeout, please check ip/port and firewall/security group rules',
'数据库已经安装,请勿重复安装' => 'database already installed, please do not install again',
'数据库SQL文件不存在' => 'database SQL file not found',
];
$dump = static function (array $arr): string {
ksort($arr);
$out = "<?php\ndeclare(strict_types=1);\n\nreturn [\n";
foreach ($arr as $k => $v) {
$k = str_replace("'", "\\'", (string) $k);
$v = str_replace("'", "\\'", (string) $v);
$out .= " '{$k}' => '{$v}',\n";
}
$out .= "];\n";
return $out;
};
$diff = shell_exec('git -C ' . escapeshellarg($repoRoot) . ' diff -U0 -- server');
if (!is_string($diff) || $diff === '') {
echo "no diff\n";
exit(0);
}
/** @var array<string, string> $hexToCn */
$hexToCn = [];
$lines = preg_split("/\r\n|\n|\r/", $diff) ?: [];
$prevCn = null;
foreach ($lines as $line) {
// - return $this->fail('未查找到信息');
if (preg_match("/^\\-.*'([^']*?)'.*$/u", $line, $m) === 1) {
$maybeCn = $m[1];
if (preg_match('/[\x{4e00}-\x{9fff}]/u', $maybeCn) === 1) {
$prevCn = $maybeCn;
continue;
}
}
// + return $this->fail('E_FC6490F8');
if ($prevCn !== null && preg_match("/^\\+.*'E_([0-9A-Fa-f]{8})'.*$/", $line, $m) === 1) {
$hexToCn[strtoupper($m[1])] = $prevCn;
$prevCn = null;
continue;
}
// reset when encountering unrelated added/removed line
if (strlen($line) > 0 && ($line[0] === '+' || $line[0] === '-')) {
$prevCn = null;
}
}
if ($hexToCn === []) {
echo "no E_ mappings found in diff\n";
exit(0);
}
// 替换代码中的 E_XXXXXXXX
$serverDir = $root;
$files = [];
$it = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($serverDir, FilesystemIterator::SKIP_DOTS)
);
foreach ($it as $file) {
/** @var SplFileInfo $file */
if (!$file->isFile()) {
continue;
}
$path = $file->getPathname();
if (substr($path, -4) !== '.php') {
continue;
}
$norm = str_replace('\\', '/', $path);
if (str_contains($norm, '/resource/translations/')) {
continue;
}
if (str_contains($norm, '/scripts/')) {
continue;
}
$files[] = $path;
}
$touched = 0;
$replaced = 0;
$addedPairs = 0;
foreach ($files as $path) {
$content = file_get_contents($path);
if (!is_string($content) || $content === '') {
continue;
}
$new = preg_replace_callback(
"/(['\"])E_([0-9A-Fa-f]{8})\\1/",
function (array $m) use (&$enMap, &$zhMap, &$replaced, &$addedPairs, $hexToCn, $cnToEn, $fallbackCn) {
$hex = strtoupper($m[2]);
$cn = $hexToCn[$hex] ?? null;
if (!is_string($cn) || $cn === '') {
return $m[0];
}
$en = $cnToEn[$cn] ?? ($fallbackCn[$cn] ?? null);
if (!is_string($en) || $en === '') {
return $m[0];
}
if (!isset($enMap[$en])) {
$enMap[$en] = $en;
$addedPairs++;
}
if (!isset($zhMap[$en])) {
$zhMap[$en] = $cn;
$addedPairs++;
}
$replaced++;
return "'" . str_replace("'", "\\'", $en) . "'";
},
$content
);
if (is_string($new) && $new !== $content) {
file_put_contents($path, $new);
$touched++;
}
}
file_put_contents($enPath, $dump($enMap));
file_put_contents($zhPath, $dump($zhMap));
echo "touched_files={$touched}\n";
echo "replaced={$replaced}\n";
echo "added_translation_pairs={$addedPairs}\n";