feat: 计划任务容器中执行增加 Command 选项 (#4398)

Refs #4363

backend/app/dto/cronjob.go

@@ -8,6 +8,7 @@ type CronjobCreate struct {
 	Spec string `json:"spec" validate:"required"`
 
 	Script         string `json:"script"`
+	Command        string `json:"command"`
 	ContainerName  string `json:"containerName"`
 	AppID          string `json:"appID"`
 	Website        string `json:"website"`
@@ -28,6 +29,7 @@ type CronjobUpdate struct {
 	Spec string `json:"spec" validate:"required"`
 
 	Script         string `json:"script"`
+	Command        string `json:"command"`
 	ContainerName  string `json:"containerName"`
 	AppID          string `json:"appID"`
 	Website        string `json:"website"`
@@ -70,6 +72,7 @@ type CronjobInfo struct {
 	Spec string `json:"spec"`
 
 	Script          string `json:"script"`
+	Command         string `json:"command"`
 	ContainerName   string `json:"containerName"`
 	AppID           string `json:"appID"`
 	Website         string `json:"website"`

backend/app/model/cronjob.go

@@ -9,6 +9,7 @@ type Cronjob struct {
 	Type string `gorm:"type:varchar(64);not null" json:"type"`
 	Spec string `gorm:"type:varchar(64);not null" json:"spec"`
 
+	Command        string `gorm:"type:varchar(64)" json:"command"`
 	ContainerName  string `gorm:"type:varchar(64)" json:"containerName"`
 	Script         string `gorm:"longtext" json:"script"`
 	Website        string `gorm:"type:varchar(64)" json:"website"`

backend/app/service/cornjob.go

@@ -265,6 +265,7 @@ func (u *CronjobService) Update(id uint, req dto.CronjobUpdate) error {
 	upMap["name"] = req.Name
 	upMap["spec"] = spec
 	upMap["script"] = req.Script
+	upMap["command"] = req.Command
 	upMap["container_name"] = req.ContainerName
 	upMap["app_id"] = req.AppID
 	upMap["website"] = req.Website

backend/app/service/cronjob_helper.go

@@ -38,7 +38,11 @@ func (u *CronjobService) HandleJob(cronjob *model.Cronjob) {
 			_ = cronjobRepo.UpdateRecords(record.ID, map[string]interface{}{"records": record.Records})
 			script := cronjob.Script
 			if len(cronjob.ContainerName) != 0 {
-				script = fmt.Sprintf("docker exec %s %s", cronjob.ContainerName, cronjob.Script)
+				command := "sh"
+				if len(cronjob.Command) != 0 {
+					command = cronjob.Command
+				}
+				script = fmt.Sprintf("docker exec %s %s -c \"%s\"", cronjob.ContainerName, command, strings.ReplaceAll(cronjob.Script, "\"", "\\\""))
 			}
 			err = u.handleShell(cronjob.Type, cronjob.Name, script, record.Records)
 			u.removeExpiredLog(*cronjob)

backend/init/migration/migrate.go

@@ -76,6 +76,7 @@ func Init() {
 		migrations.AddSnapshotIgnore,
 		migrations.AddDatabaseIsDelete,
 		migrations.AddXpackHideMenu,
+		migrations.AddCronjobCommand,
 	})
 	if err := m.Migrate(); err != nil {
 		global.LOG.Error(err)

backend/init/migration/migrations/v_1_10.go

@@ -35,3 +35,13 @@ var AddXpackHideMenu = &gormigrate.Migration{
 		return nil
 	},
 }
+
+var AddCronjobCommand = &gormigrate.Migration{
+	ID: "20240403-add-cronjob-command",
+	Migrate: func(tx *gorm.DB) error {
+		if err := tx.AutoMigrate(&model.Cronjob{}); err != nil {
+			return err
+		}
+		return nil
+	},
+}

frontend/src/api/interface/cronjob.ts

@@ -9,6 +9,8 @@ export namespace Cronjob {
         specObjs: Array<SpecObj>;
 
         script: string;
+        isCustom: boolean;
+        command: string;
         inContainer: boolean;
         containerName: string;
         appID: string;

frontend/src/views/container/container/terminal/index.vue

@@ -82,7 +82,7 @@ const acceptParams = async (params: DialogProps): Promise<void> => {
     title.value = params.container;
     form.isCustom = false;
     form.user = '';
-    form.command = '/bin/bash';
+    form.command = '/bin/sh';
     terminalOpen.value = false;
 };
 

frontend/src/views/cronjob/operate/index.vue

@@ -152,6 +152,26 @@
                             <el-option v-for="item in containerOptions" :key="item" :value="item" :label="item" />
                         </el-select>
                     </el-form-item>
+                    <el-form-item
+                        v-if="hasScript() && dialogData.rowData!.inContainer"
+                        :label="$t('container.command')"
+                        prop="command"
+                        :rules="Rules.requiredInput"
+                    >
+                        <el-checkbox style="width: 100px" border v-model="dialogData.rowData!.isCustom">
+                            {{ $t('container.custom') }}
+                        </el-checkbox>
+                        <el-select
+                            style="width: calc(100% - 100px)"
+                            filterable
+                            clearable
+                            v-model="dialogData.rowData!.command"
+                        >
+                            <el-option value="ash" label="/bin/ash" />
+                            <el-option value="bash" label="/bin/bash" />
+                            <el-option value="sh" label="/bin/sh" />
+                        </el-select>
+                    </el-form-item>
 
                     <el-form-item v-if="hasScript()" :label="$t('cronjob.shellContent')" prop="script">
                         <el-input clearable type="textarea" :rows="5" v-model="dialogData.rowData!.script" />
@@ -374,6 +394,12 @@ const acceptParams = (params: DialogProps): void => {
     if (dialogData.value.rowData.backupAccounts) {
         dialogData.value.rowData.backupAccountList = dialogData.value.rowData.backupAccounts.split(',');
     }
+    dialogData.value.rowData!.command = dialogData.value.rowData!.command || 'sh';
+    dialogData.value.rowData!.isCustom =
+        dialogData.value.rowData!.command !== 'sh' &&
+        dialogData.value.rowData!.command !== 'bash' &&
+        dialogData.value.rowData!.command === 'ash';
+
     title.value = i18n.global.t('cronjob.' + dialogData.value.title);
     if (dialogData.value?.rowData?.exclusionRules) {
         dialogData.value.rowData.exclusionRules = dialogData.value.rowData.exclusionRules.replaceAll(',', '\n');