From dcbdb0af4d11c6f0ed597c6e2b05205bc9af6a7e Mon Sep 17 00:00:00 2001
From: Aaron3S <chenyang@fit2cloud.com>
Date: Wed, 30 Nov 2022 16:24:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=88=87=E6=8D=A2,=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ops/models/job.py           | 10 +++++++++-
 apps/ops/serializers/adhoc.py    |  6 ++----
 apps/ops/serializers/playbook.py |  5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py
index e74258b55..5ce5f38c8 100644
--- a/apps/ops/models/job.py
+++ b/apps/ops/models/job.py
@@ -113,6 +113,13 @@ class JobExecution(JMSOrgBaseModel):
     def job_type(self):
         return self.job.type
 
+    def compile_shell(self):
+        if self.job.type != 'adhoc':
+            return
+        result = "{}{}{} ".format('\'', self.job.args, '\'')
+        result += "chdir={}".format(self.job.chdir)
+        return result
+
     def get_runner(self):
         inv = self.job.inventory
         inv.write_to_file(self.inventory_path)
@@ -122,8 +129,9 @@ class JobExecution(JMSOrgBaseModel):
             extra_vars = {}
 
         if self.job.type == 'adhoc':
+            args = self.compile_shell()
             runner = AdHocRunner(
-                self.inventory_path, self.job.module, module_args=self.job.args,
+                self.inventory_path, self.job.module, module_args=args,
                 pattern="all", project_dir=self.private_dir, extra_vars=extra_vars,
             )
         elif self.job.type == 'playbook':
diff --git a/apps/ops/serializers/adhoc.py b/apps/ops/serializers/adhoc.py
index 48ddf6567..08d583be1 100644
--- a/apps/ops/serializers/adhoc.py
+++ b/apps/ops/serializers/adhoc.py
@@ -1,8 +1,6 @@
 # ~*~ coding: utf-8 ~*~
 from __future__ import unicode_literals
 
-import datetime
-
 from rest_framework import serializers
 
 from common.drf.fields import ReadableHiddenField
@@ -17,5 +15,5 @@ class AdHocSerializer(BulkOrgResourceModelSerializer, serializers.ModelSerialize
 
     class Meta:
         model = AdHoc
-        fields = ["id", "name", "module", "row_count", "size", "args", "creator", "comment", "date_created",
-                  "date_updated"]
+        read_only_field = ["id", "row_count", "size", "creator", "date_created", "date_updated"]
+        fields = read_only_field + ["id", "name", "module", "args", "comment"]
diff --git a/apps/ops/serializers/playbook.py b/apps/ops/serializers/playbook.py
index 57c7f2fe5..4ff43abb4 100644
--- a/apps/ops/serializers/playbook.py
+++ b/apps/ops/serializers/playbook.py
@@ -24,6 +24,7 @@ class PlaybookSerializer(BulkOrgResourceModelSerializer, serializers.ModelSerial
 
     class Meta:
         model = Playbook
-        fields = [
-            "id", "name", "path", "comment", "date_created", "creator", "date_updated"
+        read_only_fields = ["id", "date_created", "date_updated"]
+        fields = read_only_fields + [
+            "id", "name", "comment", "creator",
         ]