From 27f7d97168785c465262636bd43968db993eecad Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Thu, 12 Oct 2023 18:08:43 +0800 Subject: [PATCH] d --- database/upgrade/zupgrade.sql | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/database/upgrade/zupgrade.sql b/database/upgrade/zupgrade.sql index c181373e..93fe92a9 100644 --- a/database/upgrade/zupgrade.sql +++ b/database/upgrade/zupgrade.sql @@ -71,8 +71,8 @@ ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`; ALTER TABLE `omc_db`.`u_auth_user` ENGINE = InnoDB; ALTER TABLE `omc_db`.`u_sub_user` ENGINE = InnoDB; -INSERT IGNORE INTO `omc_db`.`config` (`module_name`, `config_tag`, `title_json`, `value`, `value_json`, `comment`) -VALUES ('System', 'logo', '{\"cn\":\"系统LOGO\",\"en\":\"System LOGO\"}', 'logo30.png', '', ''); +INSERT IGNORE INTO `omc_db`.`config` (`id`, `module_name`, `config_tag`, `title_json`, `value`, `value_json`, `comment`) +VALUES ('37', 'System', 'logo', '{\"cn\":\"系统LOGO\",\"en\":\"System LOGO\"}', 'logo30.png', '', ''); ALTER TABLE `omc_db`.`security_log` MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT FIRST; diff --git a/makefile b/makefile index 2a0614e2..767b7107 100644 --- a/makefile +++ b/makefile @@ -48,10 +48,10 @@ ReleaseDebs = $(ReleaseDir)/debs/$(PLATFORM) CrontaskSize = 27788951 RestagentSize = 29525312 BinWriterDir = $(HOME)/bin -ifeq ($(shell cat |grep VERSION_ID /etc/os-release), VERSION_ID="22.04") +ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="22.04") DebBuildDir := $(DebBuild2204Dir) DebPkgFile := $(PROJECT)-$(VERSION)-22.04-$(Release).$(PLATFORM).deb -else ifeq ($(shell cat |grep VERSION_ID /etc/os-release), VERSION_ID="18.04") +else ifeq ($(shell grep VERSION_ID /etc/os-release), VERSION_ID="18.04") DebPkgFile := $(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb endif