fix: 在table未设置主键且字段为NOT NULL时写入NULL；内网网段与宿主机冲突；忽略nginx日志文件；保存默认config

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

nginx/.gitignore

@@ -0,0 +1 @@
+/log

www/config.php

@@ -1,10 +1,10 @@
 <?php
-/*数据库配置*/
-$dbconfig=array(
-	"host" => "localhost", //数据库服务器
-	"port" => 3306, //数据库端口
-	"user" => "", //数据库用户名
-	"pwd" => "", //数据库密码
-	"dbname" => "", //数据库名
-);
-?>
+        /*数据库配置*/
+        $dbconfig=array(
+            "host" => "mysql", //数据库服务器
+            "port" => 3306, //数据库端口
+            "user" => "root", //数据库用户名
+            "pwd" => "123456", //数据库密码
+            "dbname" => "spage", //数据库名
+        );
+        ?>

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',