diff --git a/env.template.yaml b/env.template.yaml index 4c598bb..9092056 100755 --- a/env.template.yaml +++ b/env.template.yaml @@ -7,7 +7,7 @@ env: 'production' # value: 14-digit number releaseNumber: '00000000000001' -# mysql configuration +# mysql configuration (DO NOT CHANGE mysql/db) mysql: host: localhost port: 3306 @@ -17,7 +17,7 @@ mysql: # session setting session: - domain: localhost + domain: name: codefever_community key: diff --git a/misc/create_db.sh b/misc/create_db.sh index 39540ec..8c3a529 100644 --- a/misc/create_db.sh +++ b/misc/create_db.sh @@ -14,7 +14,7 @@ DB_NAME=`cat ../env.yaml | grep db: | awk -F: '{ print $2 }' | sed 's/^\s*//'` mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" -e"CREATE DATABASE IF NOT EXISTS `$DB_NAME` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"; -echo 'Database <$DB_NAME> created!' +echo "Database <$DB_NAME> created!" mysql -h"$DB_HOST" -P"$DB_PORT" -u"$DB_USER" -p"$DB_PASS" -D"$DB_NAME" -e"source db_structure.sql"; diff --git a/misc/db_data.sql b/misc/db_data.sql index e47831f..8531735 100644 --- a/misc/db_data.sql +++ b/misc/db_data.sql @@ -1 +1 @@ -INSERT IGNORE INTO `cc_users` (`u_id`, `u_key`, `u_email`, `u_password`, `u_name`, `u_avatar`, `u_tel`, `u_calling_code`, `u_team`, `u_role`, `u_location`, `u_notification_status`, `u_register_ip`, `u_2fa`, `u_admin`, `u_created`, `u_updated`, `u_status`) VALUES(0, '00000000000000000000000000000000', 'root', '14e1b600b1fd579f47433b88e8d85291', 'root', '', '', 86, NULL, NULL, NULL, 0, '0.0.0.0', NULL, 1, '0001-01-01 00:00:00', '0001-01-01 00:00:00', 1); +INSERT IGNORE INTO `cc_users` (`u_id`, `u_key`, `u_email`, `u_password`, `u_name`, `u_avatar`, `u_tel`, `u_calling_code`, `u_team`, `u_role`, `u_location`, `u_notification_status`, `u_register_ip`, `u_2fa`, `u_admin`, `u_created`, `u_updated`, `u_status`) VALUES(1, '00000000000000000000000000000000', 'admin@root', '14e1b600b1fd579f47433b88e8d85291', 'admin', '', '', 86, NULL, NULL, NULL, 0, '0.0.0.0', NULL, 1, '0001-01-01 00:00:00', '0001-01-01 00:00:00', 1); diff --git a/misc/db_structure.sql b/misc/db_structure.sql index 0031606..c631b92 100644 --- a/misc/db_structure.sql +++ b/misc/db_structure.sql @@ -30,7 +30,7 @@ CREATE TABLE `cc_groups` ( `g_display_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '显示名称|add=text&edit=text', `g_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '名称|add=text&edit=text', `g_description` tinytext COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '描述|add=text&edit=text', - `g_avatar` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '头像|add=text&edit=text', + `g_avatar` varchar(32) COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像|add=text&edit=text', `g_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间|add=datetime&edit=datetime', `g_updated` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间|add=datetime&edit=datetime', `g_deleted` timestamp NULL DEFAULT NULL COMMENT '删除时间|add=datetime&edit=datetime', @@ -178,7 +178,7 @@ CREATE TABLE `cc_users` ( `u_email` varchar(255) NOT NULL, `u_password` varchar(100) NOT NULL, `u_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `u_avatar` varchar(255) NOT NULL COMMENT '用户头像', + `u_avatar` varchar(255) DEFAULT NULL COMMENT '用户头像', `u_tel` varchar(50) DEFAULT NULL, `u_calling_code` int(11) DEFAULT '86' COMMENT 'calling_code|add=text&edit=text', `u_team` varchar(150) DEFAULT NULL, diff --git a/misc/install.sh b/misc/install.sh index 87f0a63..cf46203 100644 --- a/misc/install.sh +++ b/misc/install.sh @@ -42,7 +42,11 @@ chmod -R 0777 ../application/logs echo 'Log directory created!' -/usr/local/php/bin/php ../application/libraries/composerlib/composer.phar install +echo 'Loading composer libraries: (Just Press Enter Key!)' + +cd ../application/libraries/composerlib/ +/usr/local/php/bin/php ./composer.phar install +cd - echo 'Composer libraries loaded!'