From c0bb5ddd6cae9b608b2908366a23f1850c23c789 Mon Sep 17 00:00:00 2001 From: "Liao.tencent.cloud" Date: Fri, 22 Mar 2024 15:00:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=A8table=E6=9C=AA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BB=E9=94=AE=E4=B8=94=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?NOT=20NULL=E6=97=B6=E5=86=99=E5=85=A5NULL=EF=BC=9B=E5=86=85?= =?UTF-8?q?=E7=BD=91=E7=BD=91=E6=AE=B5=E4=B8=8E=E5=AE=BF=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=9B=E5=BF=BD=E7=95=A5nginx=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6=EF=BC=9B=E4=BF=9D=E5=AD=98=E9=BB=98?= =?UTF-8?q?=E8=AE=A4config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 26 +++++++++++++------------- nginx/.gitignore | 1 + www/config.php | 18 +++++++++--------- www/install/data/install_struct.sql | 14 +++++++------- 4 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 nginx/.gitignore diff --git a/docker-compose.yaml b/docker-compose.yaml index 63a291d..7d6bbd1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -14,9 +14,9 @@ services: tty: true links: - "mysql" #链接mysql服务 - networks: - spage: - ipv4_address: 10.10.10.2 + # networks: + # spage: + # ipv4_address: 10.10.10.2 environment: - TZ=Asia/Shanghai # 设置时区 nginx: @@ -24,7 +24,7 @@ services: image: nginx:latest restart: always ports: - - "8080:80" + - "7701:80" environment: - TZ=Asia/Shanghai depends_on: @@ -36,9 +36,9 @@ services: #- ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - ./nginx/log:/var/log/nginx/ - ./www:/var/www/html - networks: - spage: - ipv4_address: 10.10.10.10 #分配ip + # networks: + # spage: + # ipv4_address: 10.10.10.10 #分配ip mysql: container_name: "spage-mysql" image: mysql:5.7 @@ -51,14 +51,14 @@ services: - TZ=Asia/Shanghai - MYSQL_ROOT_PASSWORD=123456 #MySQL root密码 - MYSQL_DATABASE=spage #MySQL 数据库名 - networks: - spage: - ipv4_address: 10.10.10.1 #MySQL ip地址 + # networks: + # spage: + # ipv4_address: 10.10.10.1 #MySQL ip地址 networks: spage: driver: bridge driver_opts: com.docker.network.enable_ipv6: "true" - ipam: - config: - - subnet: 10.10.0.0/16 + # ipam: + # config: + # - subnet: 10.10.0.0/16 diff --git a/nginx/.gitignore b/nginx/.gitignore new file mode 100644 index 0000000..ba475f6 --- /dev/null +++ b/nginx/.gitignore @@ -0,0 +1 @@ +/log \ No newline at end of file diff --git a/www/config.php b/www/config.php index 3464adb..1f59201 100644 --- a/www/config.php +++ b/www/config.php @@ -1,10 +1,10 @@ "localhost", //数据库服务器 - "port" => 3306, //数据库端口 - "user" => "", //数据库用户名 - "pwd" => "", //数据库密码 - "dbname" => "", //数据库名 -); -?> \ No newline at end of file + /*数据库配置*/ + $dbconfig=array( + "host" => "mysql", //数据库服务器 + "port" => 3306, //数据库端口 + "user" => "root", //数据库用户名 + "pwd" => "123456", //数据库密码 + "dbname" => "spage", //数据库名 + ); + ?> \ No newline at end of file diff --git a/www/install/data/install_struct.sql b/www/install/data/install_struct.sql index 263e575..eefe474 100644 --- a/www/install/data/install_struct.sql +++ b/www/install/data/install_struct.sql @@ -10,7 +10,7 @@ SET time_zone = "+00:00"; DROP TABLE IF EXISTS `lylme_apply`; CREATE TABLE `lylme_apply` ( - `apply_id` int(4) NOT NULL, + `apply_id` int(4) NOT NULL PRIMARY KEY AUTO_INCREMENT, `apply_name` varchar(20) NOT NULL, `apply_url` varchar(255) NOT NULL, `apply_group` int(2) NOT NULL, @@ -22,7 +22,7 @@ CREATE TABLE `lylme_apply` ( DROP TABLE IF EXISTS `lylme_config`; CREATE TABLE `lylme_config` ( - `id` int(11) NOT NULL COMMENT 'ID', + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT 'ID', `k` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '键', `v` text COLLATE utf8mb4_unicode_ci COMMENT '值', `description` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '描述' @@ -56,7 +56,7 @@ INSERT INTO `lylme_config` VALUES DROP TABLE IF EXISTS `lylme_groups`; CREATE TABLE `lylme_groups` ( - `group_id` int(2) NOT NULL COMMENT '分组ID', + `group_id` int(2) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT '分组ID', `group_name` varchar(10) NOT NULL COMMENT '分组名称', `group_icon` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '分组图标', `group_order` int(4) NOT NULL DEFAULT '5' COMMENT '分组排序', @@ -75,7 +75,7 @@ INSERT INTO `lylme_groups` VALUES DROP TABLE IF EXISTS `lylme_links`; CREATE TABLE `lylme_links` ( - `id` int(4) NOT NULL COMMENT '链接ID', + `id` int(4) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT '链接ID', `name` varchar(255) NOT NULL COMMENT '链接标题', `group_id` int(2) NOT NULL DEFAULT '1' COMMENT '分组名称', `url` varchar(255) NOT NULL COMMENT '链接地址', @@ -170,7 +170,7 @@ INSERT INTO `lylme_links` VALUES DROP TABLE IF EXISTS `lylme_pwd`; CREATE TABLE `lylme_pwd` ( - `pwd_id` int(2) NOT NULL COMMENT '加密组ID', + `pwd_id` int(2) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT '加密组ID', `pwd_name` varchar(20) NOT NULL COMMENT '加密组名称', `pwd_key` varchar(20) NOT NULL COMMENT '加密组密码', `pwd_ps` varchar(30) DEFAULT NULL COMMENT '加密组备注' @@ -178,7 +178,7 @@ CREATE TABLE `lylme_pwd` ( DROP TABLE IF EXISTS `lylme_sou`; CREATE TABLE `lylme_sou` ( - `sou_id` int(11) NOT NULL COMMENT '搜索引擎ID', + `sou_id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT '搜索引擎ID', `sou_alias` varchar(20) NOT NULL COMMENT '搜索引擎别名', `sou_name` varchar(20) NOT NULL COMMENT '搜索引擎名称', `sou_hint` varchar(30) NOT NULL DEFAULT '请输入搜索关键词' COMMENT '搜索引擎提示文字', @@ -202,7 +202,7 @@ INSERT INTO `lylme_sou` VALUES DROP TABLE IF EXISTS `lylme_tags`; CREATE TABLE `lylme_tags` ( - `tag_id` int(11) NOT NULL COMMENT '导航菜单ID', + `tag_id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT COMMENT '导航菜单ID', `tag_name` varchar(30) NOT NULL, `tag_link` varchar(60) NOT NULL, `tag_target` int(1) NOT NULL DEFAULT '1',