@@ -57,6 +57,9 @@ func (u *CronjobService) SearchWithPage(search dto.PageCronjob) (int64, interfac
5757 repo .WithByGroups (search .GroupIDs ),
5858 repo .WithByLikeName (search .Info ),
5959 repo .WithOrderRuleBy (search .OrderBy , search .Order ))
60+ if err != nil {
61+ return 0 , nil , err
62+ }
6063 var dtoCronjobs []dto.CronjobInfo
6164 for _ , cronjob := range cronjobs {
6265 var item dto.CronjobInfo
@@ -92,6 +95,9 @@ func (u *CronjobService) SearchWithPage(search dto.PageCronjob) (int64, interfac
9295
9396func (u * CronjobService ) LoadInfo (req dto.OperateByID ) (* dto.CronjobOperate , error ) {
9497 cronjob , err := cronjobRepo .Get (repo .WithByID (req .ID ))
98+ if err != nil {
99+ return nil , err
100+ }
95101 var item dto.CronjobOperate
96102 if err := copier .Copy (& item , & cronjob ); err != nil {
97103 return nil , buserr .WithDetail ("ErrStructTransform" , err .Error (), nil )
@@ -115,6 +121,7 @@ func (u *CronjobService) LoadInfo(req dto.OperateByID) (*dto.CronjobOperate, err
115121 if cronjob .Type == "cleanLog" {
116122 _ = json .Unmarshal ([]byte (cronjob .Config ), & item .CleanLogConfig )
117123 }
124+ item .URLItems , err = loadCronjobURLs (cronjob )
118125 return & item , err
119126}
120127
@@ -149,6 +156,10 @@ func (u *CronjobService) Export(req dto.OperateByIDs) (string, error) {
149156 Secret : cronjob .Secret ,
150157 Args : cronjob .Args ,
151158 }
159+ item .URLItems , err = loadCronjobURLs (cronjob )
160+ if err != nil {
161+ return "" , err
162+ }
152163 switch cronjob .Type {
153164 case "app" :
154165 if cronjob .AppID == "all" {
@@ -219,6 +230,15 @@ func (u *CronjobService) Export(req dto.OperateByIDs) (string, error) {
219230
220231func (u * CronjobService ) Import (req []dto.CronjobTrans , operator string ) error {
221232 for _ , item := range req {
233+ if item .Type == "curl" {
234+ items := item .URLItems
235+ if items == nil {
236+ items = legacyCronjobURLs (item .URL )
237+ }
238+ if err := validateCronjobURLs (items ); err != nil {
239+ return err
240+ }
241+ }
222242 advanced , err := cronJobAlertAdvancedParams (item .AlertTriggerMode )
223243 if err != nil {
224244 return err
@@ -256,6 +276,9 @@ func (u *CronjobService) Import(req []dto.CronjobTrans, operator string) error {
256276 Secret : item .Secret ,
257277 Args : item .Args ,
258278 }
279+ if err := storeCronjobURLs (& cronjob , item .URLItems ); err != nil {
280+ return err
281+ }
259282 hasNotFound := false
260283 switch item .Type {
261284 case "app" :
@@ -605,6 +628,9 @@ func (u *CronjobService) Create(req dto.CronjobOperate, operator string) error {
605628 if err := copier .Copy (& cronjob , & req ); err != nil {
606629 return buserr .WithDetail ("ErrStructTransform" , err .Error (), nil )
607630 }
631+ if err := storeCronjobURLs (& cronjob , req .URLItems ); err != nil {
632+ return err
633+ }
608634 if cronjob .Type == "snapshot" {
609635 rule , err := json .Marshal (req .SnapshotRule )
610636 if err != nil {
@@ -754,6 +780,9 @@ func (u *CronjobService) Update(id uint, req dto.CronjobOperate, operator string
754780 upMap := make (map [string ]interface {})
755781 cronjob .EntryIDs = cronModel .EntryIDs
756782 cronjob .Type = cronModel .Type
783+ if err := storeCronjobURLs (& cronjob , req .URLItems ); err != nil {
784+ return err
785+ }
757786 spec := cronjob .Spec
758787 if cronModel .Status == constant .StatusEnable {
759788 newEntryIDs , err := u .StartJob (& cronjob , true )
@@ -789,7 +818,8 @@ func (u *CronjobService) Update(id uint, req dto.CronjobOperate, operator string
789818 upMap ["exclusion_rules" ] = req .ExclusionRules
790819 upMap ["db_type" ] = req .DBType
791820 upMap ["db_name" ] = req .DBName
792- upMap ["url" ] = req .URL
821+ upMap ["url" ] = cronjob .URL
822+ upMap ["url_items" ] = cronjob .URLItemsJSON
793823 upMap ["is_dir" ] = req .IsDir
794824 upMap ["source_dir" ] = req .SourceDir
795825 upMap ["snapshot_rule" ] = cronjob .SnapshotRule
@@ -878,3 +908,75 @@ func (u *CronjobService) AddCronJob(cronjob *model.Cronjob) (int, error) {
878908 global .LOG .Infof ("start cronjob entryID: %d" , entryID )
879909 return int (entryID ), nil
880910}
911+
912+ func legacyCronjobURLs (raw string ) []dto.CronjobURL {
913+ items := make ([]dto.CronjobURL , 0 )
914+ for _ , value := range strings .Split (raw , "," ) {
915+ if value = strings .TrimSpace (value ); value != "" {
916+ items = append (items , dto.CronjobURL {URL : value })
917+ }
918+ }
919+ return items
920+ }
921+
922+ func loadCronjobURLs (job model.Cronjob ) ([]dto.CronjobURL , error ) {
923+ if job .URLItemsJSON == "" {
924+ return legacyCronjobURLs (job .URL ), nil
925+ }
926+ var items []dto.CronjobURL
927+ if err := json .Unmarshal ([]byte (job .URLItemsJSON ), & items ); err != nil {
928+ return nil , fmt .Errorf ("invalid cronjob URL configuration" )
929+ }
930+ return items , nil
931+ }
932+
933+ func validateCronjobURLs (items []dto.CronjobURL ) error {
934+ if len (items ) == 0 {
935+ return fmt .Errorf ("at least one URL is required" )
936+ }
937+ for i , item := range items {
938+ if strings .TrimSpace (item .URL ) == "" || strings .ContainsAny (item .URL , "\r \n \x00 " ) {
939+ return fmt .Errorf ("invalid URL in group %d" , i + 1 )
940+ }
941+ if strings .ContainsAny (item .Header , "\r \n \x00 " ) {
942+ return fmt .Errorf ("User-Agent in group %d must not contain line breaks or NUL" , i + 1 )
943+ }
944+ }
945+ return nil
946+ }
947+
948+ func storeCronjobURLs (job * model.Cronjob , items []dto.CronjobURL ) error {
949+ job .URLItemsJSON = ""
950+ if job .Type != "curl" {
951+ return nil
952+ }
953+ // A missing field indicates a legacy API request or import.
954+ if items == nil {
955+ items = legacyCronjobURLs (job .URL )
956+ }
957+ if err := validateCronjobURLs (items ); err != nil {
958+ return err
959+ }
960+ normalized := make ([]dto.CronjobURL , len (items ))
961+ urls := make ([]string , len (items ))
962+ for i , item := range items {
963+ item .URL = strings .TrimSpace (item .URL )
964+ normalized [i ] = item
965+ urls [i ] = item .URL
966+ }
967+ data , err := json .Marshal (normalized )
968+ if err != nil {
969+ return err
970+ }
971+ job .URLItemsJSON = string (data )
972+ job .URL = strings .Join (urls , "," )
973+ return nil
974+ }
975+
976+ func cronjobCurlArgs (item dto.CronjobURL ) []string {
977+ args := make ([]string , 0 , 4 )
978+ if item .Header != "" {
979+ args = append (args , "--user-agent" , item .Header )
980+ }
981+ return append (args , "--" , item .URL )
982+ }
0 commit comments