Skip to content

fix: remove duplicate code #7763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Jan 23, 2025
Merged

fix: remove duplicate code #7763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/app/repo/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func (u *BackupRepo) GetRecord(opts ...DBOption) (*model.BackupRecord, error) {

func (u *BackupRepo) SyncAll(data []model.BackupAccount) error {
tx := global.DB.Begin()
if err := tx.Where("1 = 1").Delete(&model.BackupAccount{}).Error; err != nil {
if err := tx.Where("is_public = ?", 1).Delete(&model.BackupAccount{}).Error; err != nil {
tx.Rollback()
return err
}
Expand Down
3 changes: 1 addition & 2 deletions agent/app/service/clam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,7 @@ func handleAlert(stdout, clamName string, clamId uint) {
lines := strings.Split(stdout, "\n")
for _, line := range lines {
if strings.HasPrefix(line, "Infected files: ") {
var infectedFiles = 0
infectedFiles, _ = strconv.Atoi(strings.TrimPrefix(line, "Infected files: "))
infectedFiles, _ := strconv.Atoi(strings.TrimPrefix(line, "Infected files: "))
if infectedFiles > 0 {
pushAlert := dto.PushAlert{
TaskName: clamName,
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not appear there are any known issues with this function or code snippet. However, the current version of OpenAI's GPT is limited to knowledge from 2021 which includes specific details on Alerting System architecture. If you need more detailed information about Alerts in a modern system like GPT-4, kindly refer to official documents.

As for potential optimizations:

  1. Use strings.Index instead of checking the entire line starting at index -1. It's faster since it only checks the first character but still allows searching within ranges.
  2. Instead of splitting "infected files" into multiple strings (line = strings.split(line,","), then filtering out the part that starts with "","lines[" can be used directly here).

Let me know if anything else needs clarification!

Expand Down
3 changes: 2 additions & 1 deletion agent/app/service/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ func (u *DockerService) LoadDockerConf() *dto.DaemonJsonConf {
var data dto.DaemonJsonConf
data.IPTables = true
data.Version = "-"
if cmd.Which("docker") {
if !cmd.Which("docker") {
data.IsExist = false
return &data
}
data.IsExist = true
data.IsActive = true
client, err := docker.NewDockerClient()
if err != nil {
data.IsActive = false
Expand Down
1 change: 0 additions & 1 deletion agent/init/migration/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ func InitAgentDB() {
migrations.InitImageRepo,
migrations.InitDefaultCA,
migrations.InitPHPExtensions,
migrations.InitNodePort,
migrations.InitBackup,
})
if err := m.Migrate(); err != nil {
Expand Down
14 changes: 0 additions & 14 deletions agent/init/migration/migrations/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,20 +232,6 @@ var AddTaskTable = &gormigrate.Migration{
},
}

var InitNodePort = &gormigrate.Migration{
ID: "20241226-init-node-port",
Migrate: func(tx *gorm.DB) error {
var itemPort model.Setting
_ = tx.Where("key = ?", "NodePort").First(&itemPort).Error
if itemPort.ID == 0 {
if err := tx.Create(&model.Setting{Key: "NodePort", Value: "9999"}).Error; err != nil {
return err
}
}
return nil
},
}

var InitBackup = &gormigrate.Migration{
ID: "20241226-init-backup",
Migrate: func(tx *gorm.DB) error {
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above code is for database migration. It looks like there are some differences between current and previous version that might involve changes to compatibility level with certain databases (e.g., MySQL). As I'm just an AI assistant and don't have access to real-time data, it's impossible for me to provide detailed technical feedback on whether these differences affect operations.

However, you can verify if anything changed using SQL console or tools such as Postgres Relational Database Migration Tool (pgtools), etc.

In addition, consider re-examining the overall structure of your migrations, ensuring they properly handle schema changes, transaction transactions, and ensure the use of ORM commands efficiently which might require additional understanding about its specific features or capabilities.

For optimization, one could suggest considering performance enhancements such as avoiding duplicate queries when selecting values from a table or creating indexes where applicable. This may improve read time but also add complexity if not managed carefully. Always remember consistency across all tables will help avoid potential issues especially while dealing with complex relationships among fields/tables in the future.

Expand Down
3 changes: 0 additions & 3 deletions core/init/migration/migrations/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ var InitSetting = &gormigrate.Migration{
if err := tx.Create(&model.Setting{Key: "SystemStatus", Value: "Free"}).Error; err != nil {
return err
}
if err := tx.Create(&model.Setting{Key: "MasterRequestAddr", Value: ""}).Error; err != nil {
return err
}
if err := tx.Create(&model.Setting{Key: "BindAddress", Value: "0.0.0.0"}).Error; err != nil {
return err
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/api/interface/container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ export namespace Container {
}
export interface DaemonJsonConf {
isSwarm: boolean;
status: string;
isExist: boolean;
isActive: boolean;
version: string;
registryMirrors: Array<string>;
insecureRegistries: Array<string>;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/status/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const props = defineProps({
});

const statusItem = computed(() => {
return props.status.toLowerCase() || '';
return props.status?.toLowerCase() || '';
});

const getType = (status: string) => {
Expand Down
20 changes: 8 additions & 12 deletions frontend/src/views/container/setting/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,14 @@
<div class="flex w-full flex-col gap-4 md:flex-row">
<div class="flex flex-wrap gap-4">
<el-tag class="float-left" effect="dark" type="success">Docker</el-tag>
<Status class="mt-0.5" :status="form.status" />
<Status class="mt-0.5" :status="form.isActive ? 'enable' : 'disable'" />
<el-tag>{{ $t('app.version') }}: {{ form.version }}</el-tag>
</div>
<div class="mt-0.5" v-if="form.status === 'Running'">
<el-button type="primary" @click="onOperator('stop')" link>
<div class="mt-0.5">
<el-button v-if="form.isActive" type="primary" @click="onOperator('stop')" link>
{{ $t('container.stop') }}
</el-button>
<el-divider direction="vertical" />
<el-button type="primary" @click="onOperator('restart')" link>
{{ $t('container.restart') }}
</el-button>
</div>
<div class="mt-0.5" v-if="form.status === 'Stopped'">
<el-button type="primary" @click="onOperator('start')" link>
<el-button v-if="!form.isActive" type="primary" @click="onOperator('start')" link>
{{ $t('container.start') }}
</el-button>
<el-divider direction="vertical" />
Expand Down Expand Up @@ -270,7 +264,8 @@ const sockPathRef = ref();

const form = reactive({
isSwarm: false,
status: '',
isActive: false,
isExist: false,
version: '',
mirrors: '',
registries: '',
Expand Down Expand Up @@ -480,7 +475,8 @@ const changeMode = async () => {
const search = async () => {
const res = await loadDaemonJson();
form.isSwarm = res.data.isSwarm;
form.status = res.data.status;
form.isActive = res.data.isActive;
form.isExist = res.data.isExist;
form.version = res.data.version;
form.cgroupDriver = res.data.cgroupDriver || 'cgroupfs';
form.liveRestore = res.data.liveRestore;
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In terms of programming syntax and structure, there don't seem to be any major issues.

Here's an initial response based on the current context:

No significant bugs found! The code may need minor adjustments for more complex applications.

Please feel free to ask any questions you have regarding this piece of software development if needed.

Expand Down
Loading