Skip to content

Commit db79750

Browse files
committed
feat: 回滚代码功能完善
1 parent c84ffc9 commit db79750

File tree

1 file changed

+26
-23
lines changed

1 file changed

+26
-23
lines changed

server/service/system/auto_code_history.go

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,34 +80,12 @@ func (s *autoCodeHistory) RollBack(ctx context.Context, info request.SysAutoHist
8080
if err != nil {
8181
global.GVA_LOG.Error("ClearTag DeleteApiByIds:", zap.Error(err))
8282
}
83-
localPath := path.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "resource", "lang")
84-
files, err := s.readJSONFiles(localPath)
85-
if err != nil {
86-
return err
87-
}
88-
for _, file := range files {
89-
err := s.reWriteI18nJson(file, "api", history.Package, history.StructName)
90-
if err != nil {
91-
return err
92-
}
93-
}
9483
} // 清除API表
9584
if info.DeleteMenu {
9685
err = BaseMenuServiceApp.DeleteBaseMenu(int(history.MenuID))
9786
if err != nil {
9887
return errors.Wrap(err, "删除菜单失败!")
9988
}
100-
localPath := path.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "resource", "lang")
101-
files, err := s.readJSONFiles(localPath)
102-
if err != nil {
103-
return err
104-
}
105-
for _, file := range files {
106-
err := s.reWriteI18nJson(file, "menu", history.Package, history.StructName)
107-
if err != nil {
108-
return err
109-
}
110-
}
11189
} // 清除菜单表
11290
if info.DeleteTable {
11391
err = s.DropTable(history.BusinessDB, history.Table)
@@ -197,15 +175,40 @@ func (s *autoCodeHistory) RollBack(ctx context.Context, info request.SysAutoHist
197175
return errors.Wrapf(err, "[src:%s][dst:%s]文件移动失败!", value, removePath)
198176
}
199177
} // 移动文件
178+
200179
err = global.GVA_DB.WithContext(ctx).Model(&model.SysAutoCodeHistory{}).Where("id = ?", info.ID).Update("flag", 1).Error
201180
if err != nil {
202181
return errors.Wrap(err, "更新失败!")
203182
}
204-
localPath := path.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Web, "locales")
183+
184+
localPath := path.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "resource", "lang")
205185
files, err := s.readJSONFiles(localPath)
206186
if err != nil {
207187
return err
208188
}
189+
if info.DeleteMenu {
190+
for _, file := range files {
191+
err := s.reWriteI18nJson(file, "menu", history.Package, history.StructName)
192+
if err != nil {
193+
return err
194+
}
195+
}
196+
}
197+
198+
if info.DeleteApi {
199+
for _, file := range files {
200+
err := s.reWriteI18nJson(file, "api", history.Package, history.StructName)
201+
if err != nil {
202+
return err
203+
}
204+
}
205+
}
206+
207+
localPath = path.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Web, "locales")
208+
files, err = s.readJSONFiles(localPath)
209+
if err != nil {
210+
return err
211+
}
209212
for _, file := range files {
210213
err := s.reWriteI18nJson(file, "web", history.Package, history.StructName)
211214
if err != nil {

0 commit comments

Comments
 (0)