From fe3910cbe1e67ab435f10a5d613c48bad16b3d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B9=AF=E6=9C=AC=20=E9=96=8B?= Date: Thu, 19 Oct 2023 07:35:30 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Merged=20PR=20509:=20Pipeline=E3=81=AE?= =?UTF-8?q?=E7=92=B0=E5=A2=83=E5=A4=89=E6=95=B0=E8=BF=BD=E5=BE=932?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task2896: Pipelineの環境変数追従2](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2896) - 環境変数を追加 ## レビューポイント - 情報共有 ## 動作確認状況 - なし --- azure-pipelines-staging.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml index 22dd085..46175dc 100644 --- a/azure-pipelines-staging.yml +++ b/azure-pipelines-staging.yml @@ -76,10 +76,13 @@ jobs: ADB2C_CLIENT_SECRET: $(adb2c-client-secret) MAIL_FROM: xxxxxx APP_DOMAIN: xxxxxxxxx - EMAIL_CONFIRM_LIFETIME : 0 - TENANT_NAME : xxxxxxxxxxxx - SIGNIN_FLOW_NAME : xxxxxxxxxxxx - STORAGE_TOKEN_EXPIRE_TIME : 0 + EMAIL_CONFIRM_LIFETIME: 0 + TENANT_NAME: xxxxxxxxxxxx + SIGNIN_FLOW_NAME: xxxxxxxxxxxx + STORAGE_TOKEN_EXPIRE_TIME: 0 + REFRESH_TOKEN_LIFETIME_WEB: 0 + REFRESH_TOKEN_LIFETIME_DEFAULT: 0 + ACCESS_TOKEN_LIFETIME_WEB: 0 - task: Docker@0 displayName: build inputs: From 83e923d15e19eb84dabb9dbeb7f02222b8dafda9 Mon Sep 17 00:00:00 2001 From: "saito.k" Date: Thu, 19 Oct 2023 17:17:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?mysql=E3=81=A7=E5=AF=BE=E5=BF=9C=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84type=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repositories/accounts/entity/account.entity.ts | 8 ++++---- .../entity/checkout_permission.entity.ts | 4 ++-- .../repositories/licenses/entity/license.entity.ts | 12 ++++++------ .../src/repositories/tasks/entity/task.entity.ts | 4 ++-- .../repositories/workflows/entity/workflow.entity.ts | 4 ++-- .../workflows/entity/workflow_typists.entity.ts | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dictation_server/src/repositories/accounts/entity/account.entity.ts b/dictation_server/src/repositories/accounts/entity/account.entity.ts index 74a0a0a..7663f47 100644 --- a/dictation_server/src/repositories/accounts/entity/account.entity.ts +++ b/dictation_server/src/repositories/accounts/entity/account.entity.ts @@ -13,7 +13,7 @@ export class Account { @PrimaryGeneratedColumn() id: number; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) parent_account_id: number | null; @Column() @@ -34,13 +34,13 @@ export class Account { @Column({ default: false }) verified: boolean; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) primary_admin_user_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) secondary_admin_user_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) active_worktype_id: number | null; @Column({ nullable: true, type: 'datetime' }) diff --git a/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts b/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts index 1269c1f..2ff148e 100644 --- a/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts +++ b/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts @@ -18,10 +18,10 @@ export class CheckoutPermission { @Column({}) task_id: number; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) user_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) user_group_id: number | null; @OneToOne(() => User, (user) => user.id) diff --git a/dictation_server/src/repositories/licenses/entity/license.entity.ts b/dictation_server/src/repositories/licenses/entity/license.entity.ts index b8e2cd2..c3adf94 100644 --- a/dictation_server/src/repositories/licenses/entity/license.entity.ts +++ b/dictation_server/src/repositories/licenses/entity/license.entity.ts @@ -79,16 +79,16 @@ export class License { @Column() status: string; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) allocated_user_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) order_id: number | null; @Column({ nullable: true, type: 'datetime' }) deleted_at: Date | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) delete_order_id: number | null; @Column({ nullable: true, type: 'datetime' }) @@ -244,16 +244,16 @@ export class LicenseArchive { @Column() status: string; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) allocated_user_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) order_id: number | null; @Column({ nullable: true, type: 'datetime' }) deleted_at: Date | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) delete_order_id: number | null; @Column({ nullable: true, type: 'datetime' }) diff --git a/dictation_server/src/repositories/tasks/entity/task.entity.ts b/dictation_server/src/repositories/tasks/entity/task.entity.ts index c734e1f..27da363 100644 --- a/dictation_server/src/repositories/tasks/entity/task.entity.ts +++ b/dictation_server/src/repositories/tasks/entity/task.entity.ts @@ -26,11 +26,11 @@ export class Task { audio_file_id: number; @Column() status: string; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) typist_user_id: number | null; @Column() priority: string; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) template_file_id: number | null; @Column({ nullable: true, type: 'datetime' }) started_at: Date | null; diff --git a/dictation_server/src/repositories/workflows/entity/workflow.entity.ts b/dictation_server/src/repositories/workflows/entity/workflow.entity.ts index 6c51d96..52af3e2 100644 --- a/dictation_server/src/repositories/workflows/entity/workflow.entity.ts +++ b/dictation_server/src/repositories/workflows/entity/workflow.entity.ts @@ -24,10 +24,10 @@ export class Workflow { @Column() author_id: number; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) worktype_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) template_id: number | null; @Column({ nullable: true, type: 'datetime' }) diff --git a/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts b/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts index f92d02e..31f8cbd 100644 --- a/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts +++ b/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts @@ -19,10 +19,10 @@ export class WorkflowTypist { @Column() workflow_id: number; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) typist_id: number | null; - @Column({ nullable: true, type: 'unsigned big int' }) + @Column({ nullable: true, type: 'int' }) typist_group_id: number | null; @Column({ nullable: true, type: 'datetime' })