From 888eabe15494e3b8b94aeafe60b88e74eeeb37b4 Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Thu, 24 Oct 2024 23:30:25 +0800 Subject: [PATCH 01/13] finish fake ai --- .../fakegpt/assets/icon_l_en.svg | 23 +++++++++ .../fakegpt/assets/icon_s_en.svg | 23 +++++++++ .../model-providers/fakegpt/fakegpt.yaml | 30 +++++++++++ .../fakegpt/llm/fakegpt-1.0.yaml | 51 +++++++++++++++++++ .../vertex_ai/llm/gemini-1.0-pro-vision.yaml | 2 +- .../vertex_ai/llm/gemini-1.0-pro.yaml | 2 +- .../vertex_ai/llm/gemini-1.5-flash-001.yaml | 2 +- .../vertex_ai/llm/gemini-1.5-flash-002.yaml | 2 +- .../vertex_ai/llm/gemini-1.5-pro-001.yaml | 2 +- .../vertex_ai/llm/gemini-1.5-pro-002.yaml | 2 +- .../llm/gemini-flash-experimental.yaml | 2 +- .../llm/gemini-pro-experimental.yaml | 2 +- controller/system/iml.go | 8 +-- module/ai/iml.go | 6 ++- 14 files changed, 144 insertions(+), 13 deletions(-) create mode 100644 ai-provider/model-runtime/model-providers/fakegpt/assets/icon_l_en.svg create mode 100644 ai-provider/model-runtime/model-providers/fakegpt/assets/icon_s_en.svg create mode 100644 ai-provider/model-runtime/model-providers/fakegpt/fakegpt.yaml create mode 100644 ai-provider/model-runtime/model-providers/fakegpt/llm/fakegpt-1.0.yaml diff --git a/ai-provider/model-runtime/model-providers/fakegpt/assets/icon_l_en.svg b/ai-provider/model-runtime/model-providers/fakegpt/assets/icon_l_en.svg new file mode 100644 index 00000000..913864bf --- /dev/null +++ b/ai-provider/model-runtime/model-providers/fakegpt/assets/icon_l_en.svg @@ -0,0 +1,23 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ai-provider/model-runtime/model-providers/fakegpt/assets/icon_s_en.svg b/ai-provider/model-runtime/model-providers/fakegpt/assets/icon_s_en.svg new file mode 100644 index 00000000..913864bf --- /dev/null +++ b/ai-provider/model-runtime/model-providers/fakegpt/assets/icon_s_en.svg @@ -0,0 +1,23 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ai-provider/model-runtime/model-providers/fakegpt/fakegpt.yaml b/ai-provider/model-runtime/model-providers/fakegpt/fakegpt.yaml new file mode 100644 index 00000000..26bbd23d --- /dev/null +++ b/ai-provider/model-runtime/model-providers/fakegpt/fakegpt.yaml @@ -0,0 +1,30 @@ +provider: fakegpt +label: + en_US: FakeGPT +description: + en_US: FakeGPT is a fake model provider that does not actually connect to any model service. It is useful for testing and development purposes. +icon_small: + en_US: icon_s_en.svg +icon_large: + en_US: icon_l_en.svg +background: "#FCFDFF" +help: + title: + en_US: Get your Access Details from Google + url: + en_US: https://apipark.com +supported_model_types: + - llm + - text-embedding +configurate_methods: + - predefined-model +provider_credential_schema: + credential_form_schemas: + - variable: apikey + label: + en_US: API Key + type: secret-input + required: true + placeholder: + en_US: Enter your API key +address: https://apipark.com \ No newline at end of file diff --git a/ai-provider/model-runtime/model-providers/fakegpt/llm/fakegpt-1.0.yaml b/ai-provider/model-runtime/model-providers/fakegpt/llm/fakegpt-1.0.yaml new file mode 100644 index 00000000..ebee0690 --- /dev/null +++ b/ai-provider/model-runtime/model-providers/fakegpt/llm/fakegpt-1.0.yaml @@ -0,0 +1,51 @@ +model: fakegpt-1.0 +label: + en_US: FakeGPT 1.0 +model_type: llm +features: + - agent-thought + - vision +model_properties: + mode: chat + context_size: 200000 +parameter_rules: + - name: max_tokens + use_template: max_tokens + required: true + type: int + default: 4096 + min: 1 + max: 4096 + help: + zh_Hans: 停止前生成的最大令牌数。 + en_US: The maximum number of tokens to generate before stopping. + - name: temperature + use_template: temperature + required: false + type: float + default: 1 + min: 0.0 + max: 1.0 + help: + zh_Hans: 生成内容的随机性。 + en_US: The amount of randomness injected into the response. + - name: top_p + required: false + type: float + default: 0.999 + min: 0.000 + max: 1.000 + help: + zh_Hans: 在核采样中，按概率递减顺序计算每个后续标记的所有选项的累积分布，并在达到 top_p 指定的特定概率时将其切断。您应该更改温度或top_p，但不能同时更改两者。 + en_US: In nucleus sampling, computes the cumulative distribution over all the options for each subsequent token in decreasing probability order and cuts it off once it reaches a particular probability specified by top_p. You should alter either temperature or top_p, but not both. + - name: top_k + required: false + type: int + default: 0 + min: 0 + # tip docs from aws has error, max value is 500 + max: 500 + help: + zh_Hans: 对于每个后续标记，仅从前 K 个选项中进行采样。使用 top_k 删除长尾低概率响应。 + en_US: Only sample from the top K options for each subsequent token. Use top_k to remove long tail low probability responses. + diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro-vision.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro-vision.yaml index ebb276b8..4630f063 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro-vision.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro-vision.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 2048 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro.yaml index c3259738..7a50d8c1 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.0-pro.yaml @@ -23,7 +23,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-001.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-001.yaml index f5386be0..1d9a0b0c 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-001.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-001.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-002.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-002.yaml index 97bd44f0..066d4ba3 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-002.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-flash-002.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-001.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-001.yaml index 5e08f229..33d2c25a 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-001.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-001.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-002.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-002.yaml index 8f327ea2..8b4c33cc 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-002.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-1.5-pro-002.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-flash-experimental.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-flash-experimental.yaml index 0f5eb34c..ef340372 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-flash-experimental.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-flash-experimental.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-pro-experimental.yaml b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-pro-experimental.yaml index fa31cabb..cff10423 100644 --- a/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-pro-experimental.yaml +++ b/ai-provider/model-runtime/model-providers/vertex_ai/llm/gemini-pro-experimental.yaml @@ -24,7 +24,7 @@ parameter_rules: use_template: presence_penalty - name: frequency_penalty use_template: frequency_penalty - - name: max_output_tokens + - name: max_tokens use_template: max_tokens required: true default: 8192 diff --git a/controller/system/iml.go b/controller/system/iml.go index 3739419e..b05cac3c 100644 --- a/controller/system/iml.go +++ b/controller/system/iml.go @@ -319,12 +319,12 @@ func (i *imlInitController) OnInit() { } func (i *imlInitController) createAIService(ctx context.Context, teamID string, input *service_dto.CreateService) error { - providerId := "openai" - err := i.providerModule.UpdateProviderConfig(ctx, "openai", &ai_dto.UpdateConfig{ - Config: "{\n \"openai_api_base\": \"API Base\",\n \"openai_api_key\": \"API Key\",\n \"openai_organization\": \"Organization\"\n}", + providerId := "fakegpt" + err := i.providerModule.UpdateProviderConfig(ctx, providerId, &ai_dto.UpdateConfig{ + Config: "{\n \"apikey\": \"xxx\" \n}", }) if err != nil { - return fmt.Errorf("update openai config error: %v", err) + return fmt.Errorf("update %s config error: %v", providerId, err) } input.Provider = &providerId if input.Id == "" { diff --git a/module/ai/iml.go b/module/ai/iml.go index c1547850..65d17cc5 100644 --- a/module/ai/iml.go +++ b/module/ai/iml.go @@ -147,7 +147,11 @@ func (i *imlProviderModule) Provider(ctx context.Context, id string) (*ai_dto.Pr } defaultLLM, has := p.GetModel(info.DefaultLLM) if !has { - return nil, fmt.Errorf("ai provider llm not found") + model, has := p.DefaultModel(model_runtime.ModelTypeLLM) + if !has { + return nil, fmt.Errorf("ai provider llm not found") + } + defaultLLM = model } return &ai_dto.Provider{ Id: info.Id, From 9e253086efa24d07a3aa320cc53d9de209360af8 Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Thu, 24 Oct 2024 23:42:55 +0800 Subject: [PATCH 02/13] fix get llm error --- module/ai/iml.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/ai/iml.go b/module/ai/iml.go index 65d17cc5..a6a0c8a2 100644 --- a/module/ai/iml.go +++ b/module/ai/iml.go @@ -201,7 +201,7 @@ func (i *imlProviderModule) LLMs(ctx context.Context, driver string) ([]*ai_dto. DefaultLLMLogo: defaultLLM.Logo(), Logo: p.Logo(), Configured: false, - }, err + }, nil } return items, &ai_dto.ProviderItem{Id: info.Id, Name: info.Name, DefaultLLM: info.DefaultLLM, Logo: p.Logo(), Configured: true}, nil From 97aa6ee0d6747680bedb5453bc3f6147d4de112a Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 25 Oct 2024 09:27:00 +0800 Subject: [PATCH 03/13] fix: update translation --- .../common/src/locales/keyHashMap.json | 5 +-- .../common/src/locales/scan/en-US.json | 4 ++- .../common/src/locales/scan/ja-JP.json | 7 ++-- .../src/locales/scan/newJson/en-US.json | 3 +- .../src/locales/scan/newJson/ja-JP.json | 30 ----------------- .../src/locales/scan/newJson/zh-CN.json | 7 ++-- .../src/locales/scan/newJson/zh-TW.json | 32 ++----------------- .../src/locales/scan/oldJson/en-US.json | 23 +------------ .../src/locales/scan/oldJson/ja-JP.json | 3 +- .../src/locales/scan/oldJson/zh-CN.json | 3 +- .../src/locales/scan/oldJson/zh-TW.json | 3 +- .../common/src/locales/scan/zh-TW.json | 4 ++- .../management/ServiceHubManagement.tsx | 6 ++-- 13 files changed, 30 insertions(+), 100 deletions(-) diff --git a/frontend/packages/common/src/locales/keyHashMap.json b/frontend/packages/common/src/locales/keyHashMap.json index 35479eaf..534968c4 100644 --- a/frontend/packages/common/src/locales/keyHashMap.json +++ b/frontend/packages/common/src/locales/keyHashMap.json @@ -627,10 +627,10 @@ "搜索服务": "K66ea2f0", "审核中": "K8adf7f8b", "添加消费者": "K84c4dc71", - "暂无服务描述": "Ka4b45550", + "暂无消费者描述": "Kc3b7bfa8", "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务": "K5c4e2865", "订阅的服务数量：已通过 (0) 个，申请中 (1) 个": "K3c7b175f", - "输入名称、ID 查找服务": "K40a89bd8", + "输入名称、ID 查找消费者": "K3a6f905d", "退出测试": "Kbe3e9335", "服务市场": "K370a3eb2", "服务详情": "Kf7ec36d", @@ -645,6 +645,7 @@ "版本": "K81634069", "更新时间": "Keefda53d", "无标签": "K96a2f1c8", + "暂无服务描述": "Ka4b45550", "API 数量": "K72b0c0b3", "接入消费者数量": "K70b79760", "关联标签": "K96059c69", diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index e9f91be4..2811dec3 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -654,5 +654,7 @@ "K6e32a344": "Number of Services", "Ka701316": "Number of Auths", "K9eaa2eb6": "List", - "Kfaec39e9": "Block" + "Kfaec39e9": "Block", + "Kc3b7bfa8": "No Consumer Description", + "K3a6f905d": "Enter Name, ID to Search Consumer" } diff --git a/frontend/packages/common/src/locales/scan/ja-JP.json b/frontend/packages/common/src/locales/scan/ja-JP.json index a2f9812f..7902b78c 100644 --- a/frontend/packages/common/src/locales/scan/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/ja-JP.json @@ -672,8 +672,11 @@ "K67b530f": "コンシューマー名", "K11f34de": "コンシューマー ID", "Kc01002": "コンシューマーを削除", - "K84c4dc71": "コンシューマーエンティティを作成および管理し、各コンシューマーは複数の API サービスにサブスクライブできます。呼び出し前に適切な権限が付与されていることを確認してください。コンシューマー用に API キーなどの認証方法を生成して、安全に API サービスを呼び出せます。", "K40a89bd8": "名前または ID を入力してサービスを検索", "Kba74f26d": "コンシューマーを接続", - "K70b79760": "接続コンシューマー数" + "K70b79760": "接続コンシューマー数", + "K5c4e2865": "コンシューマーエンティティを作成および管理し、各コンシューマーは複数の API サービスにサブスクライブできます。呼び出し前に適切な権限が付与されていることを確認してください。コンシューマー用に API キーなどの認証方法を生成して、安全に API サービスを呼び出せます。", + "K84c4dc71": "コンシューマーを追加", + "Kc3b7bfa8": "コンシューマーの説明がありません", + "K3a6f905d": "名前、IDを入力してコンシューマーを検索" } diff --git a/frontend/packages/common/src/locales/scan/newJson/en-US.json b/frontend/packages/common/src/locales/scan/newJson/en-US.json index 9e26dfee..7a73a41b 100644 --- a/frontend/packages/common/src/locales/scan/newJson/en-US.json +++ b/frontend/packages/common/src/locales/scan/newJson/en-US.json @@ -1 +1,2 @@ -{} \ No newline at end of file +{ +} \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json index fcba28fd..7a73a41b 100644 --- a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json @@ -1,32 +1,2 @@ { - "K7acfcfad": "消费者", - "Kc8054dba": "消费者开发者", - "Keb1673a6": "消费者管理员", - "K1fc2cc28": "无需审核：允许任何消费者调用该服务", - "K8dabb98e": "人工审核：仅允许通过人工审核的消费者调用该服务", - "K7c1fb123": "申请方-消费者", - "K93c2696e": "上线结果", - "K6e32a344": "订阅服务数量", - "Ka701316": "鉴权数量", - "K9eaa2eb6": "列表", - "Kfaec39e9": "块", - "Kdea9a418": "为了安全地调用 API，你需要创建一个消费者以及Token。", - "Keee27105": "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。", - "Kaa717866": "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。", - "Kd2c34e2c": "AI 服务", - "K62840d62": "REST 服务", - "K4c72fb6f": "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。", - "K61cca533": "消费者调用统计", - "Kdfff59d4": "请选择消费者", - "K386857bd": "消费者调用量 Top10", - "Kb684c806": "搜索或选择消费者", - "Ke0fbd1c8": "消费者管理", - "K67b530f": "消费者名称", - "K11f34de": "消费者 ID", - "Kc01002": "删除消费者", - "K84c4dc71": "添加消费者", - "K5c4e2865": "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务", - "K40a89bd8": "输入名称、ID 查找服务", - "Kba74f26d": "接入消费者", - "K70b79760": "接入消费者数量" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json index f16c4723..0e647920 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json @@ -1,7 +1,4 @@ { - "K93c2696e": "上线结果", - "K6e32a344": "订阅服务数量", - "Ka701316": "鉴权数量", - "K9eaa2eb6": "列表", - "Kfaec39e9": "块" + "Kc3b7bfa8": "暂无消费者描述", + "K3a6f905d": "输入名称、ID 查找消费者" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json index fcba28fd..0e647920 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json @@ -1,32 +1,4 @@ { - "K7acfcfad": "消费者", - "Kc8054dba": "消费者开发者", - "Keb1673a6": "消费者管理员", - "K1fc2cc28": "无需审核：允许任何消费者调用该服务", - "K8dabb98e": "人工审核：仅允许通过人工审核的消费者调用该服务", - "K7c1fb123": "申请方-消费者", - "K93c2696e": "上线结果", - "K6e32a344": "订阅服务数量", - "Ka701316": "鉴权数量", - "K9eaa2eb6": "列表", - "Kfaec39e9": "块", - "Kdea9a418": "为了安全地调用 API，你需要创建一个消费者以及Token。", - "Keee27105": "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。", - "Kaa717866": "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。", - "Kd2c34e2c": "AI 服务", - "K62840d62": "REST 服务", - "K4c72fb6f": "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。", - "K61cca533": "消费者调用统计", - "Kdfff59d4": "请选择消费者", - "K386857bd": "消费者调用量 Top10", - "Kb684c806": "搜索或选择消费者", - "Ke0fbd1c8": "消费者管理", - "K67b530f": "消费者名称", - "K11f34de": "消费者 ID", - "Kc01002": "删除消费者", - "K84c4dc71": "添加消费者", - "K5c4e2865": "创建并管理自己的消费者实体，每个消费者可以订阅多个API服务，确保在调用之前已获得相应权限。你可以为消费者生成 API 密钥等鉴权方式，用于安全地调用 API 服务", - "K40a89bd8": "输入名称、ID 查找服务", - "Kba74f26d": "接入消费者", - "K70b79760": "接入消费者数量" + "Kc3b7bfa8": "暂无消费者描述", + "K3a6f905d": "输入名称、ID 查找消费者" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/oldJson/en-US.json b/frontend/packages/common/src/locales/scan/oldJson/en-US.json index 6cabbaaf..08de42fa 100644 --- a/frontend/packages/common/src/locales/scan/oldJson/en-US.json +++ b/frontend/packages/common/src/locales/scan/oldJson/en-US.json @@ -1,24 +1,3 @@ { - "Kfe93ef35": "Application", - "Kffd7e274": "No Review: All applications are allowed to subscribe to this service", - "K8a8b13e4": "Manual Review: Only reviewed and approved applications can subscribe to this service", - "K9bdd8403": "To securely call APIs, you need to create an application and a token.", - "Kc8239422": "Teams include personnel, applications, and services. Data between different teams is isolated, and can be used to manage different departments/project teams/teams within the enterprise.", - "Ka0a8840a": "Review subscription requests from other applications. Only approved requests can initiate API calls.", - "K5ece3bac": "Set up teams and members. You can then create services and applications, subscribe to APIs within the team. Members can only see services and applications within their team.", - "K1512e983": "Application Call Statistics", - "Kb4d2007f": "Please Select Application", - "Kc0915603": "Application Top 10", - "Kd8a7a689": "Search or Select Application", - "Kb7e869a4": "Application Settings", - "K5168eb63": "Application Name", - "K546e46f": "Application ID", - "K95764d1d": "Delete Application", - "K667bbbe7": "Add Application", - "K8723422e": "Access Application", - "K93d5a66e": "Number of Access Applications", - "K216a1ac7": "Application Developer", - "K27924db": "Application Administrator", - "Kd55c6887": "Review", - "K831aa6c0": "Applicant - Application" + "K40a89bd8": "Enter Name, ID to Search Member" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/oldJson/ja-JP.json b/frontend/packages/common/src/locales/scan/oldJson/ja-JP.json index 0813c11e..b5c29e42 100644 --- a/frontend/packages/common/src/locales/scan/oldJson/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/oldJson/ja-JP.json @@ -20,5 +20,6 @@ "K216a1ac7": "アプリケーション開発者", "K27924db": "アプリケーション管理者", "Kd55c6887": "レビュー", - "K831aa6c0": "申請元-アプリケーション" + "K831aa6c0": "申請元-アプリケーション", + "K40a89bd8": "名前または ID を入力してサービスを検索" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/oldJson/zh-CN.json b/frontend/packages/common/src/locales/scan/oldJson/zh-CN.json index 8103f44e..35fb722a 100644 --- a/frontend/packages/common/src/locales/scan/oldJson/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/oldJson/zh-CN.json @@ -20,5 +20,6 @@ "K216a1ac7": "消费者开发者", "K27924db": "消费者管理员", "Kd55c6887": "审核", - "K831aa6c0": "申请方-消费者" + "K831aa6c0": "申请方-消费者", + "K40a89bd8": "输入名称、ID 查找服务" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/oldJson/zh-TW.json b/frontend/packages/common/src/locales/scan/oldJson/zh-TW.json index 5de69cea..adfc47cc 100644 --- a/frontend/packages/common/src/locales/scan/oldJson/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/oldJson/zh-TW.json @@ -20,5 +20,6 @@ "K216a1ac7": "應用程式開發者", "K27924db": "應用程式管理員", "Kd55c6887": "審核", - "K831aa6c0": "申請方-應用程式" + "K831aa6c0": "申請方-應用程式", + "K40a89bd8": "輸入名稱、ID 查找服務" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/zh-TW.json b/frontend/packages/common/src/locales/scan/zh-TW.json index 94b80e17..af886d2a 100644 --- a/frontend/packages/common/src/locales/scan/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/zh-TW.json @@ -676,5 +676,7 @@ "K5c4e2865": "創建並管理自己的消費者實體，每個消費者可以訂閱多個API服務，確保在調用之前已獲得相應權限。你可以為消費者生成 API 密鑰等鑒權方式，用於安全地調用 API 服務", "K40a89bd8": "輸入名稱、ID 查找服務", "Kba74f26d": "接入消費者", - "K70b79760": "接入消費者數量" + "K70b79760": "接入消費者數量", + "Kc3b7bfa8": "暫無消費者描述", + "K3a6f905d": "輸入名稱、ID 查找消費者" } diff --git a/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx b/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx index a6ea2b6b..8db42868 100644 --- a/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx +++ b/frontend/packages/market/src/pages/serviceHub/management/ServiceHubManagement.tsx @@ -196,7 +196,7 @@ useEffect(() => { item.type === 'addNewItem' ?{openModal('add')}}>
{$t('添加消费者')}
 : {setAppName(item.name);navigateTo(`/consumer/${teamId}/inside/${item.id}/service`)}}> - {item.description || $t('暂无服务描述')} + {item.description || $t('暂无消费者描述')} } ); @@ -293,8 +293,8 @@ const TableArea = memo(({language, getServiceList, addNewApp, setTableHttpReload id="service_hub_list" columns={[...columns]} request={()=>getServiceList()} - addNewBtnTitle={$t("添加服务")} - searchPlaceholder={$t("输入名称、ID 查找服务")} + addNewBtnTitle={$t("添加消费者")} + searchPlaceholder={$t("输入名称、ID 查找消费者")} onAddNewBtnClick={addNewApp} onChange={() => { setTableHttpReload(false) From b9c61f8b94acc377053db813bce0807c46707a60 Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Fri, 25 Oct 2024 09:32:12 +0800 Subject: [PATCH 04/13] update issue templete --- .github/ISSUE_TEMPLATE/bug_report.yml | 11 +++++------ .github/ISSUE_TEMPLATE/request_help.yml | 2 +- common/version/version.go | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index da994f4f..c8806d68 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -45,19 +45,18 @@ body: label: Steps to Reproduce description: Share the steps you took so that we can reproduce the issue. Reports without proper steps details will likely be closed. placeholder: | - 1. Run apinto via the Docker image. - 2. Create a Route with the Admin API. - 3. Try configuring ... - 4. ... + 1. Run APIPark via the Docker image. + 2. Try configuring ... + 3. ... validations: - required: true + required: false - type: textarea id: environment attributes: label: Environment description: Share your environment details. Reports without proper environment details will likely be closed. value: | - - APINTO Dashboard version (run `apinto dashboard version`): + - APINTO Dashboard version: - Operating system (run `uname -a`): validations: required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/request_help.yml b/.github/ISSUE_TEMPLATE/request_help.yml index 076cbb92..5ffa869a 100644 --- a/.github/ISSUE_TEMPLATE/request_help.yml +++ b/.github/ISSUE_TEMPLATE/request_help.yml @@ -25,7 +25,7 @@ body: label: Environment description: Share your environment details. Reports without proper environment details will likely be closed. value: | - - APIPark version (run `apinto dashboard version`): + - APIPark version: - Operating system (run `uname -a`): validations: required: true \ No newline at end of file diff --git a/common/version/version.go b/common/version/version.go index bcacbb3c..b6e5d2e7 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/urfave/cli/v2" + "github.com/urfave/cli" ) // These should be set via go build -ldflags -X 'xxxx'. @@ -20,7 +20,7 @@ var profileInfo []byte func init() { buffer := &bytes.Buffer{} - fmt.Fprintf(buffer, "Apinto version: %s\n", Version) + fmt.Fprintf(buffer, "APIPark version: %s\n", Version) fmt.Fprintf(buffer, "Golang version: %s\n", goVersion) fmt.Fprintf(buffer, "Git commit hash: %s\n", gitCommit) fmt.Fprintf(buffer, "Built on: %s\n", BuildTime) From 76f009c546163950c70ee83295a3eb9f8cd40079 Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:02:23 +0800 Subject: [PATCH 05/13] fix: AI Model config bug --- .../packages/core/src/pages/aiSetting/AiSettingModal.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/packages/core/src/pages/aiSetting/AiSettingModal.tsx b/frontend/packages/core/src/pages/aiSetting/AiSettingModal.tsx index 159360fe..9155a703 100644 --- a/frontend/packages/core/src/pages/aiSetting/AiSettingModal.tsx +++ b/frontend/packages/core/src/pages/aiSetting/AiSettingModal.tsx @@ -106,10 +106,7 @@ const AiSettingModalContent = forwardRef {x.id} {x?.scopes?.map(s=>{s?.toLocaleUpperCase()})} - }))} - onChange={(e)=>{ - form.setFieldValue('config',llmList?.find(x=>x.id===e)?.config) - }}> + }))}> From 95d87f71834f6aadd030a20f5ebec35435d0a4b1 Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Fri, 25 Oct 2024 14:21:50 +0800 Subject: [PATCH 06/13] tmp commit --- go.mod | 7 +++---- go.sum | 11 +++++------ module/team/iml.go | 4 ++-- resources/access/role.yaml | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 03187bb3..0bc17fb0 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/google/uuid v1.6.0 github.com/influxdata/influxdb-client-go/v2 v2.14.0 - github.com/urfave/cli/v2 v2.27.2 + github.com/urfave/cli v1.22.16 golang.org/x/crypto v0.24.0 gopkg.in/yaml.v3 v3.0.1 gorm.io/gorm v1.25.5 @@ -26,7 +26,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -62,7 +62,6 @@ require ( github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect @@ -76,4 +75,4 @@ require ( gorm.io/driver/mysql v1.5.2 // indirect ) -//replace github.com/eolinker/ap-account => ../../eolinker/ap-account +replace github.com/eolinker/ap-account => ../../eolinker/ap-account diff --git a/go.sum b/go.sum index 13e39a7e..c10fa993 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= @@ -18,8 +19,8 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/ github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= -github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc= +github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -139,10 +140,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI= -github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM= -github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= -github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= +github.com/urfave/cli v1.22.16 h1:MH0k6uJxdwdeWQTwhSO42Pwr4YLrNLwBtg1MRgTqPdQ= +github.com/urfave/cli v1.22.16/go.mod h1:EeJR6BKodywf4zciqrdw6hpCPk68JO9z5LazXZMn5Po= go.etcd.io/etcd/client/pkg/v3 v3.5.13 h1:RVZSAnWWWiI5IrYAXjQorajncORbS0zI48LQlE2kQWg= go.etcd.io/etcd/client/pkg/v3 v3.5.13/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= diff --git a/module/team/iml.go b/module/team/iml.go index a61f9854..4a291939 100644 --- a/module/team/iml.go +++ b/module/team/iml.go @@ -111,13 +111,13 @@ func (m *imlTeamModule) Create(ctx context.Context, input *team_dto.CreateTeam) if err != nil { return err } - supperRole, err := m.roleService.GetSupperRole(ctx, role.GroupTeam) + superRole, err := m.roleService.GetSupperRole(ctx, role.GroupTeam) if err != nil { return err } return m.roleMemberService.Add(ctx, &role.AddMember{ - Role: supperRole.Id, + Role: superRole.Id, User: input.Master, Target: role.TeamTarget(input.Id), }) diff --git a/resources/access/role.yaml b/resources/access/role.yaml index 30054bb5..5b752025 100644 --- a/resources/access/role.yaml +++ b/resources/access/role.yaml @@ -1,6 +1,6 @@ system: - - name: supper admin - value: supper_admin + - name: super admin + value: super_admin permits: - system.dashboard.run_view.view - system.devops.ai_provider.manager From 14d94e33bb6539dc3a57552756cb794fb040f3d8 Mon Sep 17 00:00:00 2001 From: HaoZhen Liu Date: Fri, 25 Oct 2024 14:30:57 +0800 Subject: [PATCH 07/13] update translation --- frontend/packages/common/src/locales/scan/en-US.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index e9f91be4..55bcb24c 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -580,8 +580,8 @@ "Kd7d84192": "Name", "Kc88e03b6": "Team Roles", "Ke08ff808": "Addition Date", - "K19a3ebe0": "Successful Requests", - "Kcaa8259": "Successful Forwards", + "K19a3ebe0": "Success", + "Kcaa8259": "Success", "K17f93984": "API", "K888f038f": "Failed Status Code Count", "Ke792d01c": "Service Association", @@ -607,7 +607,7 @@ "Ke108c369": "Success", "K9168d3e": "Redirecting to Login Page", "K2f8a7ab7": "Review Comments Not Provided", - "Kb858d78a": "Copy Successful", + "Kb858d78a": "Copied", "K26e85d15": "Copy Failed, Please Copy Manually", "Kd60d204": "Service Team", "K823bfe63": "Online", From 66e4be0b57ca8f9bcc3539a2dd252d1f87da07d8 Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Fri, 25 Oct 2024 14:30:58 +0800 Subject: [PATCH 08/13] update ao-account dependent version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0bc17fb0..4d86b706 100644 --- a/go.mod +++ b/go.mod @@ -75,4 +75,4 @@ require ( gorm.io/driver/mysql v1.5.2 // indirect ) -replace github.com/eolinker/ap-account => ../../eolinker/ap-account +replace github.com/eolinker/ap-account => ../ap-account From dc6a9a53f0807e9beca78642491338a3bbdef9fd Mon Sep 17 00:00:00 2001 From: Liujian <824010343@qq.com> Date: Fri, 25 Oct 2024 14:32:11 +0800 Subject: [PATCH 09/13] update ao-account dependent version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4d86b706..2d2bf464 100644 --- a/go.mod +++ b/go.mod @@ -75,4 +75,4 @@ require ( gorm.io/driver/mysql v1.5.2 // indirect ) -replace github.com/eolinker/ap-account => ../ap-account +replace github.com/eolinker/ap-account => ../aoaccount From 62d47077b1ddceabcf9215a25982bfd929eff8c1 Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:22:06 +0800 Subject: [PATCH 10/13] fix: Remove guest's account setting & update translation --- .../src/components/aoplatform/BasicLayout.tsx | 27 ++++++++----------- .../aoplatform/UnUsedWordForTranslate.tsx | 14 ++++++++++ frontend/packages/common/src/const/type.ts | 2 ++ .../common/src/locales/keyHashMap.json | 14 ++++++++++ .../src/locales/scan/newJson/en-US.json | 14 ++++++++++ .../src/locales/scan/newJson/ja-JP.json | 14 ++++++++++ .../src/locales/scan/newJson/zh-CN.json | 14 ++++++++++ .../src/locales/scan/newJson/zh-TW.json | 16 +++++++++-- .../api/AiServiceInsideRouterCreate.tsx | 4 +-- .../core/src/pages/system/SystemList.tsx | 2 +- 10 files changed, 100 insertions(+), 21 deletions(-) diff --git a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx index 207996b8..7843ef1f 100644 --- a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx +++ b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx @@ -1,19 +1,15 @@ import { - ConfigProvider, - Dropdown, MenuProps, App, - Button} from 'antd'; + Button, + ConfigProvider, + Dropdown} from 'antd'; +import { Outlet, useLocation, useNavigate} from "react-router-dom"; import Logo from '@common/assets/layout-logo.png'; import AvatarPic from '@common/assets/default-avatar.png' -import {Outlet, useLocation, useNavigate} from "react-router-dom"; -import { useEffect, useMemo, useState} from "react"; +import { useEffect, useMemo, useState} from "react"; import { useGlobalContext } from '@common/contexts/GlobalStateContext.tsx'; import { PERMISSION_DEFINITION } from '@common/const/permissions.ts'; - import { - ProConfigProvider, - ProLayout, - } from '@ant-design/pro-components'; import { BasicResponse, RESPONSE_TIPS, routerKeyMap, STATUS_CODE } from '@common/const/const.tsx'; import { UserInfoType } from '@common/const/type.ts'; import { useFetch } from '@common/hooks/http.ts'; @@ -21,6 +17,7 @@ import { ProjectFilled } from '@ant-design/icons'; import { getNavItem } from '@common/utils/navigation'; import { Icon } from '@iconify/react'; import { $t } from '@common/locales'; +import { ProConfigProvider, ProLayout } from '@ant-design/pro-components'; import LanguageSetting from './LanguageSetting'; const APP_MODE = import.meta.env.VITE_APP_MODE; @@ -41,9 +38,8 @@ const themeToken = { const navigator = useNavigate() const location = useLocation() const currentUrl = location.pathname - const { state,accessData,checkPermission,accessInit} = useGlobalContext() - const [pathname, setPathname] = useState(currentUrl); - const mainPage = project === 'core' ?'/service/list':'/serviceHub/list' + const { state,accessData,checkPermission,accessInit,dispatch,resetAccess,getGlobalAccessData} = useGlobalContext() + const [pathname, setPathname] = useState(currentUrl); const mainPage = project === 'core' ?'/service/list':'/serviceHub/list' const TOTAL_MENU_ITEMS:MenuProps['items'] = useMemo(() => [ getNavItem($t('工作空间'), 'workspace','/guide/page',, [ @@ -126,7 +122,6 @@ const themeToken = { const { message } = App.useApp() - const { dispatch,resetAccess,getGlobalAccessData} = useGlobalContext() const [userInfo,setUserInfo] = useState() const {fetchData} = useFetch() const navigate = useNavigate(); @@ -163,8 +158,8 @@ const themeToken = { }) } - const items: MenuProps['items'] = [ - { + const items: MenuProps['items'] = useMemo(() => [ + userInfo?.type !== 'guest' && { key: '2', label: ( ) }, - ]; + ].filter(Boolean), [userInfo]); diff --git a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx index 981fd393..d2d76808 100644 --- a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx +++ b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx @@ -137,6 +137,20 @@ export const TranslateWord = ()=>{ {$t('鉴权数量')} {$t('列表')} {$t('块')} + {$t('HTTP 请求头')} + {$t('全等匹配')} + {$t('前缀匹配')} + {$t('后缀匹配')} + {$t('子串匹配')} + {$t('非等匹配')} + {$t('空值匹配')} + {$t('存在匹配')} + {$t('区分大小写的正则匹配')} + {$t('不区分大小写的正则匹配')} + {$t('任意匹配')} + {$t('驳回')} + {$t('已订阅')} + {$t('取消申请')} ) diff --git a/frontend/packages/common/src/const/type.ts b/frontend/packages/common/src/const/type.ts index 1ea206cc..094d858e 100644 --- a/frontend/packages/common/src/const/type.ts +++ b/frontend/packages/common/src/const/type.ts @@ -7,6 +7,8 @@ export type UserInfoType = { email: string phone: string avatar: string + type:string + } export type UserProfileProps = { diff --git a/frontend/packages/common/src/locales/keyHashMap.json b/frontend/packages/common/src/locales/keyHashMap.json index 534968c4..0731b7e7 100644 --- a/frontend/packages/common/src/locales/keyHashMap.json +++ b/frontend/packages/common/src/locales/keyHashMap.json @@ -212,6 +212,20 @@ "鉴权数量": "Ka701316", "列表": "K9eaa2eb6", "块": "Kfaec39e9", + "HTTP 请求头": "K76036e25", + "全等匹配": "K44607e3f", + "前缀匹配": "Kc287500a", + "后缀匹配": "Kfc0b1147", + "子串匹配": "Ka4a92043", + "非等匹配": "K30b2e44f", + "空值匹配": "Kb1587991", + "存在匹配": "K1e97dbd8", + "区分大小写的正则匹配": "K87c5a801", + "不区分大小写的正则匹配": "K95f062f1", + "任意匹配": "Kfbd230a5", + "驳回": "Kd85208a3", + "已订阅": "Kad6aa439", + "取消申请": "K9a68443b", "暂无操作权限，请联系管理员分配。": "K23fda291", "微信小程序": "K4618cb0a", "获取文件,需填路径": "Ka854f511", diff --git a/frontend/packages/common/src/locales/scan/newJson/en-US.json b/frontend/packages/common/src/locales/scan/newJson/en-US.json index 7a73a41b..522f3e8d 100644 --- a/frontend/packages/common/src/locales/scan/newJson/en-US.json +++ b/frontend/packages/common/src/locales/scan/newJson/en-US.json @@ -1,2 +1,16 @@ { + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json index 7a73a41b..522f3e8d 100644 --- a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json @@ -1,2 +1,16 @@ { + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json index 0e647920..1ac9637f 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json @@ -1,4 +1,18 @@ { + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请", "Kc3b7bfa8": "暂无消费者描述", "K3a6f905d": "输入名称、ID 查找消费者" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json index 0e647920..522f3e8d 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json @@ -1,4 +1,16 @@ { - "Kc3b7bfa8": "暂无消费者描述", - "K3a6f905d": "输入名称、ID 查找消费者" + "K76036e25": "HTTP 请求头", + "K44607e3f": "全等匹配", + "Kc287500a": "前缀匹配", + "Kfc0b1147": "后缀匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "区分大小写的正则匹配", + "K95f062f1": "不区分大小写的正则匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "驳回", + "Kad6aa439": "已订阅", + "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx b/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx index 0377e05e..e983f90d 100644 --- a/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx +++ b/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx @@ -256,7 +256,7 @@ const AiServiceInsideRouterCreate = () => { - + { }]} noStyle > - { if((e.target.value as string).endsWith('/*')){ form.setFieldValue('path',e.target.value.slice(0,-2)) diff --git a/frontend/packages/core/src/pages/system/SystemList.tsx b/frontend/packages/core/src/pages/system/SystemList.tsx index 8f53ae96..fa906a19 100644 --- a/frontend/packages/core/src/pages/system/SystemList.tsx +++ b/frontend/packages/core/src/pages/system/SystemList.tsx @@ -153,7 +153,7 @@ const SystemList:FC = ()=>{ From 1d275e33133c9c1a05748e084ab5b2ffd7ba4861 Mon Sep 17 00:00:00 2001 From: Scarqin Date: Fri, 25 Oct 2024 15:44:42 +0800 Subject: [PATCH 11/13] Update README.md --- frontend/README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/README.md b/frontend/README.md index 61e84890..b27fef50 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,10 +1,17 @@ # 部署 ## 安装依赖 - 建议使用pnpm - `npm install -g pnpm` - 使用pnpm安装依赖 - `pnpm install` + 建议使用 pnpm + ``` + npm install -g pnpm +``` + + 使用pnpm安装依赖 + ``` + pnpm install +``` ## 编译 - `pnpm run build` \ No newline at end of file +``` + pnpm run build +``` From 99002fa1cf0a6732662d8ca34274ac7c729b0285 Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:16:15 +0800 Subject: [PATCH 12/13] fix: update translation --- .../aoplatform/UnUsedWordForTranslate.tsx | 6 +++++ .../common/src/locales/keyHashMap.json | 6 +++++ .../common/src/locales/scan/en-US.json | 22 ++++++++++++++++++- .../common/src/locales/scan/ja-JP.json | 22 ++++++++++++++++++- .../src/locales/scan/newJson/en-US.json | 14 ------------ .../src/locales/scan/newJson/ja-JP.json | 14 ------------ .../src/locales/scan/newJson/zh-CN.json | 6 +++++ .../src/locales/scan/newJson/zh-TW.json | 14 ------------ .../common/src/locales/scan/zh-TW.json | 22 ++++++++++++++++++- 9 files changed, 81 insertions(+), 45 deletions(-) diff --git a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx index d2d76808..ff20fc74 100644 --- a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx +++ b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx @@ -151,6 +151,12 @@ export const TranslateWord = ()=>{ {$t('驳回')} {$t('已订阅')} {$t('取消申请')} + {$t('透传客户端请求 Host')} + {$t('使用上游服务 Host')} + {$t('重写 Host')} + {$t('动态服务发现')} + {$t('地址')} + {$t('新增')} ) diff --git a/frontend/packages/common/src/locales/keyHashMap.json b/frontend/packages/common/src/locales/keyHashMap.json index 0731b7e7..0d0d5bb7 100644 --- a/frontend/packages/common/src/locales/keyHashMap.json +++ b/frontend/packages/common/src/locales/keyHashMap.json @@ -226,6 +226,12 @@ "驳回": "Kd85208a3", "已订阅": "Kad6aa439", "取消申请": "K9a68443b", + "透传客户端请求 Host": "Kaeba0229", + "使用上游服务 Host": "K6d7e2fd0", + "重写 Host": "K31332633", + "动态服务发现": "K2c2bc64f", + "地址": "K78b1ca25", + "新增": "K1644b775", "暂无操作权限，请联系管理员分配。": "K23fda291", "微信小程序": "K4618cb0a", "获取文件,需填路径": "Ka854f511", diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index 7f32cdda..2221e09d 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -656,5 +656,25 @@ "K9eaa2eb6": "List", "Kfaec39e9": "Block", "Kc3b7bfa8": "No Consumer Description", - "K3a6f905d": "Enter Name, ID to Search Consumer" + "K3a6f905d": "Enter Name, ID to Search Consumer", + "K76036e25": "HTTP Request Header", + "K44607e3f": "Exact Match", + "Kc287500a": "Prefix Match", + "Kfc0b1147": "Suffix Match", + "Ka4a92043": "Substring Match", + "K30b2e44f": "Non-Exact Match", + "Kb1587991": "Null Match", + "K1e97dbd8": "Exists Match", + "K87c5a801": "Case-Sensitive Regex Match", + "K95f062f1": "Case-Insensitive Regex Match", + "Kfbd230a5": "Any Match", + "Kd85208a3": "Reject", + "Kad6aa439": "Subscribed", + "K9a68443b": "Cancel Request", + "Kaeba0229": "Pass-through Client Request Host", + "K6d7e2fd0": "Use Upstream Service Host", + "K31332633": "Rewrite Host", + "K2c2bc64f": "Dynamic Service Discovery", + "K78b1ca25": "Address", + "K1644b775": "Add" } diff --git a/frontend/packages/common/src/locales/scan/ja-JP.json b/frontend/packages/common/src/locales/scan/ja-JP.json index 7902b78c..6a937b5c 100644 --- a/frontend/packages/common/src/locales/scan/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/ja-JP.json @@ -678,5 +678,25 @@ "K5c4e2865": "コンシューマーエンティティを作成および管理し、各コンシューマーは複数の API サービスにサブスクライブできます。呼び出し前に適切な権限が付与されていることを確認してください。コンシューマー用に API キーなどの認証方法を生成して、安全に API サービスを呼び出せます。", "K84c4dc71": "コンシューマーを追加", "Kc3b7bfa8": "コンシューマーの説明がありません", - "K3a6f905d": "名前、IDを入力してコンシューマーを検索" + "K3a6f905d": "名前、IDを入力してコンシューマーを検索", + "K76036e25": "HTTPリクエストヘッダー", + "K44607e3f": "完全一致", + "Kc287500a": "プレフィックス一致", + "Kfc0b1147": "サフィックス一致", + "Ka4a92043": "部分一致", + "K30b2e44f": "非完全一致", + "Kb1587991": "ヌル一致", + "K1e97dbd8": "存在一致", + "K87c5a801": "大文字小文字を区別する正規表現一致", + "K95f062f1": "大文字小文字を区別しない正規表現一致", + "Kfbd230a5": "任意一致", + "Kd85208a3": "拒否", + "Kad6aa439": "申し込み済み", + "K9a68443b": "申し込み取消", + "Kaeba0229": "クライアントリクエストホストのパススルー", + "K6d7e2fd0": "上位サービスホストの使用", + "K31332633": "ホストの書き換え", + "K2c2bc64f": "動的サービス発見", + "K78b1ca25": "アドレス", + "K1644b775": "追加" } diff --git a/frontend/packages/common/src/locales/scan/newJson/en-US.json b/frontend/packages/common/src/locales/scan/newJson/en-US.json index 522f3e8d..7a73a41b 100644 --- a/frontend/packages/common/src/locales/scan/newJson/en-US.json +++ b/frontend/packages/common/src/locales/scan/newJson/en-US.json @@ -1,16 +1,2 @@ { - "K76036e25": "HTTP 请求头", - "K44607e3f": "全等匹配", - "Kc287500a": "前缀匹配", - "Kfc0b1147": "后缀匹配", - "Ka4a92043": "子串匹配", - "K30b2e44f": "非等匹配", - "Kb1587991": "空值匹配", - "K1e97dbd8": "存在匹配", - "K87c5a801": "区分大小写的正则匹配", - "K95f062f1": "不区分大小写的正则匹配", - "Kfbd230a5": "任意匹配", - "Kd85208a3": "驳回", - "Kad6aa439": "已订阅", - "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json index 522f3e8d..7a73a41b 100644 --- a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json @@ -1,16 +1,2 @@ { - "K76036e25": "HTTP 请求头", - "K44607e3f": "全等匹配", - "Kc287500a": "前缀匹配", - "Kfc0b1147": "后缀匹配", - "Ka4a92043": "子串匹配", - "K30b2e44f": "非等匹配", - "Kb1587991": "空值匹配", - "K1e97dbd8": "存在匹配", - "K87c5a801": "区分大小写的正则匹配", - "K95f062f1": "不区分大小写的正则匹配", - "Kfbd230a5": "任意匹配", - "Kd85208a3": "驳回", - "Kad6aa439": "已订阅", - "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json index 1ac9637f..201b5675 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json @@ -13,6 +13,12 @@ "Kd85208a3": "驳回", "Kad6aa439": "已订阅", "K9a68443b": "取消申请", + "Kaeba0229": "透传客户端请求 Host", + "K6d7e2fd0": "使用上游服务 Host", + "K31332633": "重写 Host", + "K2c2bc64f": "动态服务发现", + "K78b1ca25": "地址", + "K1644b775": "新增", "Kc3b7bfa8": "暂无消费者描述", "K3a6f905d": "输入名称、ID 查找消费者" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json index 522f3e8d..7a73a41b 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json @@ -1,16 +1,2 @@ { - "K76036e25": "HTTP 请求头", - "K44607e3f": "全等匹配", - "Kc287500a": "前缀匹配", - "Kfc0b1147": "后缀匹配", - "Ka4a92043": "子串匹配", - "K30b2e44f": "非等匹配", - "Kb1587991": "空值匹配", - "K1e97dbd8": "存在匹配", - "K87c5a801": "区分大小写的正则匹配", - "K95f062f1": "不区分大小写的正则匹配", - "Kfbd230a5": "任意匹配", - "Kd85208a3": "驳回", - "Kad6aa439": "已订阅", - "K9a68443b": "取消申请" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/zh-TW.json b/frontend/packages/common/src/locales/scan/zh-TW.json index af886d2a..c750d0bc 100644 --- a/frontend/packages/common/src/locales/scan/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/zh-TW.json @@ -678,5 +678,25 @@ "Kba74f26d": "接入消費者", "K70b79760": "接入消費者數量", "Kc3b7bfa8": "暫無消費者描述", - "K3a6f905d": "輸入名稱、ID 查找消費者" + "K3a6f905d": "輸入名稱、ID 查找消費者", + "K76036e25": "HTTP請求頭", + "K44607e3f": "全等匹配", + "Kc287500a": "前綴匹配", + "Kfc0b1147": "後綴匹配", + "Ka4a92043": "子串匹配", + "K30b2e44f": "非等匹配", + "Kb1587991": "空值匹配", + "K1e97dbd8": "存在匹配", + "K87c5a801": "區分大小寫的正則匹配", + "K95f062f1": "不區分大小寫的正則匹配", + "Kfbd230a5": "任意匹配", + "Kd85208a3": "駁回", + "Kad6aa439": "已訂閱", + "K9a68443b": "取消申請", + "Kaeba0229": "透傳客戶端請求Host", + "K6d7e2fd0": "使用上游服務Host", + "K31332633": "重寫Host", + "K2c2bc64f": "動態服務發現", + "K78b1ca25": "位址", + "K1644b775": "新增" } From f433c28e756f8d177a97198bc9628d76481d57a2 Mon Sep 17 00:00:00 2001 From: maggieyyy <61950669+maggieyyy@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:34:06 +0800 Subject: [PATCH 13/13] fix: update translation --- .../src/components/aoplatform/UnUsedWordForTranslate.tsx | 2 ++ frontend/packages/common/src/locales/keyHashMap.json | 2 ++ frontend/packages/common/src/locales/scan/en-US.json | 6 ++++-- frontend/packages/common/src/locales/scan/ja-JP.json | 6 ++++-- .../packages/common/src/locales/scan/newJson/en-US.json | 3 +-- .../packages/common/src/locales/scan/newJson/ja-JP.json | 3 +-- .../packages/common/src/locales/scan/newJson/zh-CN.json | 2 ++ .../packages/common/src/locales/scan/newJson/zh-TW.json | 3 +-- frontend/packages/common/src/locales/scan/zh-TW.json | 6 ++++-- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx index ff20fc74..02b3e24c 100644 --- a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx +++ b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx @@ -145,6 +145,7 @@ export const TranslateWord = ()=>{ {$t('非等匹配')} {$t('空值匹配')} {$t('存在匹配')} + {$t('不存在匹配')} {$t('区分大小写的正则匹配')} {$t('不区分大小写的正则匹配')} {$t('任意匹配')} @@ -157,6 +158,7 @@ export const TranslateWord = ()=>{ {$t('动态服务发现')} {$t('地址')} {$t('新增')} + {$t('申请方消费者')} ) diff --git a/frontend/packages/common/src/locales/keyHashMap.json b/frontend/packages/common/src/locales/keyHashMap.json index 0d0d5bb7..89227607 100644 --- a/frontend/packages/common/src/locales/keyHashMap.json +++ b/frontend/packages/common/src/locales/keyHashMap.json @@ -220,6 +220,7 @@ "非等匹配": "K30b2e44f", "空值匹配": "Kb1587991", "存在匹配": "K1e97dbd8", + "不存在匹配": "Kc8ee3e62", "区分大小写的正则匹配": "K87c5a801", "不区分大小写的正则匹配": "K95f062f1", "任意匹配": "Kfbd230a5", @@ -232,6 +233,7 @@ "动态服务发现": "K2c2bc64f", "地址": "K78b1ca25", "新增": "K1644b775", + "申请方消费者": "Kec91f0db", "暂无操作权限，请联系管理员分配。": "K23fda291", "微信小程序": "K4618cb0a", "获取文件,需填路径": "Ka854f511", diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index 2221e09d..d3c8158a 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -664,7 +664,6 @@ "Ka4a92043": "Substring Match", "K30b2e44f": "Non-Exact Match", "Kb1587991": "Null Match", - "K1e97dbd8": "Exists Match", "K87c5a801": "Case-Sensitive Regex Match", "K95f062f1": "Case-Insensitive Regex Match", "Kfbd230a5": "Any Match", @@ -676,5 +675,8 @@ "K31332633": "Rewrite Host", "K2c2bc64f": "Dynamic Service Discovery", "K78b1ca25": "Address", - "K1644b775": "Add" + "K1644b775": "Add", + "Kc8ee3e62": "Non-Existence", + "K1e97dbd8": "Existence", + "Kec91f0db": "Applicant Consumer" } diff --git a/frontend/packages/common/src/locales/scan/ja-JP.json b/frontend/packages/common/src/locales/scan/ja-JP.json index 6a937b5c..b9f63dd8 100644 --- a/frontend/packages/common/src/locales/scan/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/ja-JP.json @@ -686,7 +686,6 @@ "Ka4a92043": "部分一致", "K30b2e44f": "非完全一致", "Kb1587991": "ヌル一致", - "K1e97dbd8": "存在一致", "K87c5a801": "大文字小文字を区別する正規表現一致", "K95f062f1": "大文字小文字を区別しない正規表現一致", "Kfbd230a5": "任意一致", @@ -698,5 +697,8 @@ "K31332633": "ホストの書き換え", "K2c2bc64f": "動的サービス発見", "K78b1ca25": "アドレス", - "K1644b775": "追加" + "K1644b775": "追加", + "Kc8ee3e62": "存在しない", + "K1e97dbd8": "存在する", + "Kec91f0db": "申請側コンシューマー" } diff --git a/frontend/packages/common/src/locales/scan/newJson/en-US.json b/frontend/packages/common/src/locales/scan/newJson/en-US.json index 7a73a41b..9e26dfee 100644 --- a/frontend/packages/common/src/locales/scan/newJson/en-US.json +++ b/frontend/packages/common/src/locales/scan/newJson/en-US.json @@ -1,2 +1 @@ -{ -} \ No newline at end of file +{} \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json index 7a73a41b..9e26dfee 100644 --- a/frontend/packages/common/src/locales/scan/newJson/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/newJson/ja-JP.json @@ -1,2 +1 @@ -{ -} \ No newline at end of file +{} \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json index 201b5675..b98863ab 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-CN.json @@ -7,6 +7,7 @@ "K30b2e44f": "非等匹配", "Kb1587991": "空值匹配", "K1e97dbd8": "存在匹配", + "Kc8ee3e62": "不存在匹配", "K87c5a801": "区分大小写的正则匹配", "K95f062f1": "不区分大小写的正则匹配", "Kfbd230a5": "任意匹配", @@ -19,6 +20,7 @@ "K2c2bc64f": "动态服务发现", "K78b1ca25": "地址", "K1644b775": "新增", + "Kec91f0db": "申请方消费者", "Kc3b7bfa8": "暂无消费者描述", "K3a6f905d": "输入名称、ID 查找消费者" } \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json index 7a73a41b..9e26dfee 100644 --- a/frontend/packages/common/src/locales/scan/newJson/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/newJson/zh-TW.json @@ -1,2 +1 @@ -{ -} \ No newline at end of file +{} \ No newline at end of file diff --git a/frontend/packages/common/src/locales/scan/zh-TW.json b/frontend/packages/common/src/locales/scan/zh-TW.json index c750d0bc..0c12871f 100644 --- a/frontend/packages/common/src/locales/scan/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/zh-TW.json @@ -686,7 +686,6 @@ "Ka4a92043": "子串匹配", "K30b2e44f": "非等匹配", "Kb1587991": "空值匹配", - "K1e97dbd8": "存在匹配", "K87c5a801": "區分大小寫的正則匹配", "K95f062f1": "不區分大小寫的正則匹配", "Kfbd230a5": "任意匹配", @@ -698,5 +697,8 @@ "K31332633": "重寫Host", "K2c2bc64f": "動態服務發現", "K78b1ca25": "位址", - "K1644b775": "新增" + "K1644b775": "新增", + "Kc8ee3e62": "不存在匹配", + "K1e97dbd8": "存在匹配", + "Kec91f0db": "申請方消費者" }