:fire: remove config.migrate,content

README.md

@@ -143,12 +143,6 @@ define("Redis",[
 ```
 
 
-#### public/app/config.migrate.php
-
-复制 `<项目目录>/public/app/config.migrate.example.php` 改文件名为`config.migrate.php`
-通常这个文件无需修改。只在迁移出现问题，切换pg与sqlite的时候使用。
-
-
 #### public/app/config.js
 
 复制 `<项目目录>/public/app/config.example.js` 改文件名为`config.js`

change-logs.md

@@ -17,4 +17,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.0.1] - 2022-01-14
 - /public/app/config.sample.php 变更 移动 config.dir.php 到其他设置的下面 跟其他的 dev config 放在一起 看着比较整齐。
-
+- remove config.migrate in config.sample.php
+- remove file config.migrate.sample.php

public/app/config.migrate.sample.php

@@ -1,246 +0,0 @@
-<?php 
-
-
-/*
-前缀：
-Sqlite:  _SQLITE_
-PostgreSql:  _PG_
-*/
-//语料库数据表 pali canon db file 
-/*
-巴利语料模版表
-运行app/install/db_insert_templet.php 刷库
-*/
-
-define("_FILE_DB_PALICANON_TEMPLET_", _PG_DB_PALICANON_TEMPLET_);
-define("_TABLE_PALICANON_TEMPLET_",_PG_TABLE_PALICANON_TEMPLET_);
-
-/*
-标题资源表
-app/install/db_update_toc.php 刷库
-*/
-
-define("_FILE_DB_RESRES_INDEX_", _PG_DB_RESRES_INDEX_);
-define("_TABLE_RES_INDEX_",_PG_TABLE_RES_INDEX_);
-
-/*
-巴利语料段落表
-刷库 app/install/db_insert_palitext.php
-更新 app/install/db_update_palitext.php
-*/
-
-define("_FILE_DB_PALITEXT_", _PG_DB_PALITEXT_);
-define("_TABLE_PALI_TEXT_",_PG_TABLE_PALI_TEXT_);
-define("_TABLE_PALI_BOOK_NAME_",_PG_TABLE_PALI_BOOK_NAME_);
-
-#单词表部分
-/*
-以书为单位的单词汇总表
-填充 /app/install/db_insert_bookword_from_csv.php
-*/
-
-define("_FILE_DB_BOOK_WORD_", _PG_DB_BOOK_WORD_);
-define("_TABLE_BOOK_WORD_", _PG_TABLE_BOOK_WORD_);
-
-/*
-单词索引
-/app/install/db_insert_word_from_csv.php
-/app/admin/word_index_weight_refresh.php
-*/
-
-define("_FILE_DB_PALI_INDEX_", _PG_DB_PALI_INDEX_);
-define("_TABLE_WORD_", _PG_TABLE_WORD_);
-
-/*
-92万词
-/app/install/db_insert_wordindex_from_csv.php
-*/
-
-define("_FILE_DB_WORD_INDEX_", _PG_DB_WORD_INDEX_);
-define("_TABLE_WORD_INDEX_", _PG_TABLE_WORD_INDEX_);
-
-//单词索引=92万词+单词索引
-
-//PostgreSQL
-define("_FILE_DB_INDEX_", _PG_DB_INDEX_);
-
-//黑体字数据表
-//sqlite
-define("_FILE_DB_BOLD_", "sqlite:" . _SQLITE_DB_BOLD_);
-define("_TABLE_WORD_BOLD_", _SQLITE_TABLE_WORD_BOLD_);
-
-/*
-单词分析表
-数据迁移： php /deploy/migaration/word_statistics.php
-*/
-
-define("_FILE_DB_STATISTICS_", _PG_DB_STATISTICS_);
-define("_TABLE_WORD_STATISTICS_", _PG_TABLE_WORD_STATISTICS_);
-
-
-/*
-巴利句子表
-数据迁移： php ./deploy/migaration/20211125155700_pali_sent_org.php
-数据迁移： php ./deploy/migaration/20211125165700-pali_sent-upgrade.php
-数据迁移： php ./deploy/migaration/20211126220400-pali_sent_index-upgrade.php
-
-*/
-
-define("_FILE_DB_PALI_SENTENCE_", _SQLITE_DB_PALI_SENTENCE_);
-define("_TABLE_PALI_SENT_", _SQLITE_TABLE_PALI_SENT_);
-define("_TABLE_PALI_SENT_ORG_", _SQLITE_TABLE_PALI_SENT_ORG_);
-define("_TABLE_PALI_SENT_INDEX_", _SQLITE_TABLE_PALI_SENT_INDEX_);
-
-/*
-相似句
-数据迁移 
-php ./deploy/migaration/20211127214800_sent_sim.php
-php ./deploy/migaration/20211127214900-sent_sim_index.php
-redis: 
-php ./app/pali_sent/redis_upgrade_pali_sent.php
-*/
-
-define("_FILE_DB_PALI_SENTENCE_SIM_", _PG_DB_PALI_SENTENCE_SIM_);
-define("_TABLE_SENT_SIM_", _PG_TABLE_SENT_SIM_);
-define("_TABLE_SENT_SIM_INDEX_", _PG_TABLE_SENT_SIM_INDEX_);
-
-/*
-完成度
-数据迁移
-php ./app/upgrade/upgrade_pali_toc.php
-*/
-
-define("_FILE_DB_PALI_TOC_", _PG_DB_PALI_TOC_);
-define("_TABLE_PROGRESS_", _PG_TABLE_PROGRESS_);
-define("_TABLE_PROGRESS_CHAPTER_", _PG_TABLE_PROGRESS_CHAPTER_);
-
-
-//页码对应
-//sqlite
-define("_FILE_DB_PAGE_INDEX_", _SQLITE_DB_PAGE_INDEX_);
-define("_TABLE_PAGE_MATCH_", _SQLITE_TABLE_PAGE_MATCH_);
-define("_TABLE_BOOK_MATCH_", _SQLITE_TABLE_BOOK_MATCH_);
-define("_TABLE_CS6_PARA_", _SQLITE_TABLE_CS6_PARA_);
-define("_TABLE_MY_PAGE_", _SQLITE_TABLE_MY_PAGE_);
-define("_TABLE_PAGE_NUMBER_", _SQLITE_TABLE_PAGE_NUMBER_);
-
-
-# 字典数据表 全部存入redis
-
-
-#参考字典
-define("_FILE_DB_REF_", _SQLITE_DB_REF_);
-define("_TABLE_DICT_REF_", _SQLITE_TABLE_DICT_REF_);
-define("_TABLE_DICT_REF_NAME_", _SQLITE_TABLE_DICT_REF_NAME_);
-
-#参考字典索引
-define("_FILE_DB_REF_INDEX_", _SQLITE_DB_REF_INDEX_);
-define("_TABLE_REF_INDEX_", _SQLITE_TABLE_REF_INDEX_);
-
-
-# 用户数据表
-
-#sqlite
-define("_FILE_DB_USER_WBW_", _SQLITE_DB_USER_WBW_);
-define("_TABLE_USER_WBW_", _SQLITE_TABLE_USER_WBW_);
-define("_TABLE_USER_WBW_BLOCK_", _SQLITE_TABLE_USER_WBW_BLOCK_);
-
-
-# 译文
-#sqlite
-define("_FILE_DB_SENTENCE_", _SQLITE_DB_SENTENCE_);
-define("_TABLE_SENTENCE_", _SQLITE_TABLE_SENTENCE_);
-define("_TABLE_SENTENCE_BLOCK_", _SQLITE_TABLE_SENTENCE_BLOCK_);
-define("_TABLE_SENTENCE_PR_", _SQLITE_TABLE_SENTENCE_PR_);
-
-
-# 译文编辑历史
-#sqlite
-define("_FILE_DB_USER_SENTENCE_HISTORAY_", _SQLITE_DB_USER_SENTENCE_HISTORAY_);
-define("_TABLE_SENTENCE_HISTORAY_", _SQLITE_TABLE_SENTENCE_HISTORAY_);
-
-
-# 逐词解析字典
-# sqlite
-define("_FILE_DB_WBW_", _SQLITE_DB_WBW_);
-define("_TABLE_DICT_WBW_", _SQLITE_TABLE_DICT_WBW_);
-define("_TABLE_DICT_WBW_INDEX_", _SQLITE_TABLE_DICT_WBW_INDEX_);
-
-
-//写入频繁 读取不频繁
-# 用户行为记录
-#sqlite
-define("_FILE_DB_USER_ACTIVE_", _SQLITE_DB_USER_ACTIVE_);
-define("_TABLE_USER_OPERATION_DAILY_", _SQLITE_TABLE_USER_OPERATION_DAILY_);
-define("_TABLE_USER_OPERATION_FRAME_", _SQLITE_TABLE_USER_OPERATION_FRAME_);
-
-
-#sqlite
-define("_FILE_DB_USER_ACTIVE_LOG_", _SQLITE_DB_USER_ACTIVE_LOG_);
-define("_TABLE_USER_OPERATION_LOG_", _SQLITE_TABLE_USER_OPERATION_LOG_);
-
-
-//读取频繁 写入不频繁 
-# 用户账号
-#sqlite
-define("_FILE_DB_USERINFO_", _SQLITE_DB_USERINFO_);
-define("_TABLE_USER_INFO_", _SQLITE_TABLE_USER_INFO_);
-
-
-# 版本风格 
-#sqlite
-define("_FILE_DB_CHANNAL_", _SQLITE_DB_CHANNAL_);
-define("_TABLE_CHANNEL_", _SQLITE_TABLE_CHANNEL_);
-
-
-# 文章 文集
-
-define("_FILE_DB_USER_ARTICLE_", _SQLITE_DB_USER_ARTICLE_);
-define("_TABLE_ARTICLE_", _SQLITE_TABLE_ARTICLE_);
-define("_TABLE_COLLECTION_", _SQLITE_TABLE_COLLECTION_);
-define("_TABLE_ARTICLE_COLLECTION_", _SQLITE_TABLE_ARTICLE_COLLECTION_);
-
-
-
-# 术语
-define("_FILE_DB_TERM_", _SQLITE_DB_TERM_);
-define("_TABLE_TERM_", _SQLITE_TABLE_TERM_);
-
-# 协作
-define("_FILE_DB_USER_SHARE_", _SQLITE_DB_USER_SHARE_);
-define("_TABLE_USER_SHARE_", _SQLITE_TABLE_USER_SHARE_);
-
-# 工作组
-define("_FILE_DB_GROUP_", _SQLITE_DB_GROUP_);
-define("_TABLE_GROUP_INFO_", _SQLITE_TABLE_GROUP_INFO_);
-define("_TABLE_GROUP_MEMBER_", _SQLITE_TABLE_GROUP_MEMBER_);
-
-# 逐词解析文件索引
-define("_FILE_DB_FILEINDEX_", _SQLITE_DB_FILEINDEX_);
-define("_TABLE_FILEINDEX_", _SQLITE_TABLE_FILEINDEX_);
-define("_TABLE_FILEINDEX_POWER_", _SQLITE_TABLE_FILEINDEX_POWER_);
-
-# 课程
-define("_FILE_DB_COURSE_", _SQLITE_DB_COURSE_);
-define("_TABLE_COURSE_",_SQLITE_TABLE_COURSE_);
-define("_TABLE_LESSON_",_SQLITE_TABLE_LESSON_);
-
-# 用户自定义书
-define("_FILE_DB_USER_CUSTOM_BOOK_", _SQLITE_DB_USER_CUSTOM_BOOK_);
-define("_TABLE_CUSTOM_BOOK_", _SQLITE_TABLE_CUSTOM_BOOK_);
-define("_TABLE_CUSTOM_BOOK_SENT_", _SQLITE_TABLE_CUSTOM_BOOK_SENT_);
-
-# 逐词译和译文编辑消息 无需迁移数据
-define("_FILE_DB_MESSAGE_", _SQLITE_DB_MESSAGE_);
-define("_TABLE_MESSAGE_", _SQLITE_TABLE_MESSAGE_);
-
-#点赞
-define("_FILE_DB_LIKE_", _SQLITE_DB_LIKE_);
-define("_TABLE_LIKE_", _SQLITE_TABLE_LIKE_);
-
-
-# 用户字典统计数据 刷库 - 无需迁移数据
-define("_FILE_DB_USER_DICT_", _SQLITE_DB_USER_DICT_);
-define("_TABLE_USER_DICT_", _SQLITE_TABLE_USER_DICT_);
-
-?>

public/app/config.sample.php

@@ -59,8 +59,5 @@ require_once __DIR__."/config.dir.php";
 #表设置，此行不能更改
 require_once __DIR__."/config.table.php";
 
-#表名设置，此行不能更改
-require_once __DIR__."/config.migrate.php";
-
 
 ?>

public/app/config.table.php

@@ -433,4 +433,255 @@ define("_TABLE_PART_", "part");
 //define("_FILE_DB_COMMENTS_", _DB_ENGIN_.":host="._DB_HOST_.";port="._DB_PORT_.";dbname="._DB_NAME_.";user="._DB_USERNAME_.";password="._DB_PASSWORD_.";");
 define("_FILE_DB_COMMENTS_", "sqlite:" . __DIR__ . "/../tmp/user/comments.db3");
 
+
+
+/*
+  |--------------------
+  |实际使用的表名
+  |---------------------
+*/
+
+
+/*
+前缀：
+Sqlite:  _SQLITE_
+PostgreSql:  _PG_
+*/
+//语料库数据表 pali canon db file 
+/*
+巴利语料模版表
+运行app/install/db_insert_templet.php 刷库
+*/
+
+define("_FILE_DB_PALICANON_TEMPLET_", _PG_DB_PALICANON_TEMPLET_);
+define("_TABLE_PALICANON_TEMPLET_",_PG_TABLE_PALICANON_TEMPLET_);
+
+/*
+标题资源表
+app/install/db_update_toc.php 刷库
+*/
+
+define("_FILE_DB_RESRES_INDEX_", _PG_DB_RESRES_INDEX_);
+define("_TABLE_RES_INDEX_",_PG_TABLE_RES_INDEX_);
+
+/*
+巴利语料段落表
+刷库 app/install/db_insert_palitext.php
+更新 app/install/db_update_palitext.php
+*/
+
+define("_FILE_DB_PALITEXT_", _PG_DB_PALITEXT_);
+define("_TABLE_PALI_TEXT_",_PG_TABLE_PALI_TEXT_);
+define("_TABLE_PALI_BOOK_NAME_",_PG_TABLE_PALI_BOOK_NAME_);
+
+#单词表部分
+/*
+以书为单位的单词汇总表
+填充 /app/install/db_insert_bookword_from_csv.php
+*/
+
+define("_FILE_DB_BOOK_WORD_", _PG_DB_BOOK_WORD_);
+define("_TABLE_BOOK_WORD_", _PG_TABLE_BOOK_WORD_);
+
+/*
+单词索引
+/app/install/db_insert_word_from_csv.php
+/app/admin/word_index_weight_refresh.php
+*/
+
+define("_FILE_DB_PALI_INDEX_", _PG_DB_PALI_INDEX_);
+define("_TABLE_WORD_", _PG_TABLE_WORD_);
+
+/*
+92万词
+/app/install/db_insert_wordindex_from_csv.php
+*/
+
+define("_FILE_DB_WORD_INDEX_", _PG_DB_WORD_INDEX_);
+define("_TABLE_WORD_INDEX_", _PG_TABLE_WORD_INDEX_);
+
+//单词索引=92万词+单词索引
+
+//PostgreSQL
+define("_FILE_DB_INDEX_", _PG_DB_INDEX_);
+
+//黑体字数据表
+//sqlite
+define("_FILE_DB_BOLD_", "sqlite:" . _SQLITE_DB_BOLD_);
+define("_TABLE_WORD_BOLD_", _SQLITE_TABLE_WORD_BOLD_);
+
+/*
+单词分析表
+数据迁移： php /deploy/migaration/word_statistics.php
+*/
+
+define("_FILE_DB_STATISTICS_", _PG_DB_STATISTICS_);
+define("_TABLE_WORD_STATISTICS_", _PG_TABLE_WORD_STATISTICS_);
+
+
+/*
+巴利句子表
+数据迁移： php ./deploy/migaration/20211125155700_pali_sent_org.php
+数据迁移： php ./deploy/migaration/20211125165700-pali_sent-upgrade.php
+数据迁移： php ./deploy/migaration/20211126220400-pali_sent_index-upgrade.php
+
+*/
+
+define("_FILE_DB_PALI_SENTENCE_", _SQLITE_DB_PALI_SENTENCE_);
+define("_TABLE_PALI_SENT_", _SQLITE_TABLE_PALI_SENT_);
+define("_TABLE_PALI_SENT_ORG_", _SQLITE_TABLE_PALI_SENT_ORG_);
+define("_TABLE_PALI_SENT_INDEX_", _SQLITE_TABLE_PALI_SENT_INDEX_);
+
+/*
+相似句
+数据迁移 
+php ./deploy/migaration/20211127214800_sent_sim.php
+php ./deploy/migaration/20211127214900-sent_sim_index.php
+redis: 
+php ./app/pali_sent/redis_upgrade_pali_sent.php
+*/
+
+define("_FILE_DB_PALI_SENTENCE_SIM_", _PG_DB_PALI_SENTENCE_SIM_);
+define("_TABLE_SENT_SIM_", _PG_TABLE_SENT_SIM_);
+define("_TABLE_SENT_SIM_INDEX_", _PG_TABLE_SENT_SIM_INDEX_);
+
+/*
+完成度
+数据迁移
+php ./app/upgrade/upgrade_pali_toc.php
+*/
+
+define("_FILE_DB_PALI_TOC_", _PG_DB_PALI_TOC_);
+define("_TABLE_PROGRESS_", _PG_TABLE_PROGRESS_);
+define("_TABLE_PROGRESS_CHAPTER_", _PG_TABLE_PROGRESS_CHAPTER_);
+
+
+//页码对应
+//sqlite
+define("_FILE_DB_PAGE_INDEX_", _SQLITE_DB_PAGE_INDEX_);
+define("_TABLE_PAGE_MATCH_", _SQLITE_TABLE_PAGE_MATCH_);
+define("_TABLE_BOOK_MATCH_", _SQLITE_TABLE_BOOK_MATCH_);
+define("_TABLE_CS6_PARA_", _SQLITE_TABLE_CS6_PARA_);
+define("_TABLE_MY_PAGE_", _SQLITE_TABLE_MY_PAGE_);
+define("_TABLE_PAGE_NUMBER_", _SQLITE_TABLE_PAGE_NUMBER_);
+
+
+# 字典数据表 全部存入redis
+
+
+#参考字典
+define("_FILE_DB_REF_", _SQLITE_DB_REF_);
+define("_TABLE_DICT_REF_", _SQLITE_TABLE_DICT_REF_);
+define("_TABLE_DICT_REF_NAME_", _SQLITE_TABLE_DICT_REF_NAME_);
+
+#参考字典索引
+define("_FILE_DB_REF_INDEX_", _SQLITE_DB_REF_INDEX_);
+define("_TABLE_REF_INDEX_", _SQLITE_TABLE_REF_INDEX_);
+
+
+# 用户数据表
+
+#sqlite
+define("_FILE_DB_USER_WBW_", _SQLITE_DB_USER_WBW_);
+define("_TABLE_USER_WBW_", _SQLITE_TABLE_USER_WBW_);
+define("_TABLE_USER_WBW_BLOCK_", _SQLITE_TABLE_USER_WBW_BLOCK_);
+
+
+# 译文
+#sqlite
+define("_FILE_DB_SENTENCE_", _SQLITE_DB_SENTENCE_);
+define("_TABLE_SENTENCE_", _SQLITE_TABLE_SENTENCE_);
+define("_TABLE_SENTENCE_BLOCK_", _SQLITE_TABLE_SENTENCE_BLOCK_);
+define("_TABLE_SENTENCE_PR_", _SQLITE_TABLE_SENTENCE_PR_);
+
+
+# 译文编辑历史
+#sqlite
+define("_FILE_DB_USER_SENTENCE_HISTORAY_", _SQLITE_DB_USER_SENTENCE_HISTORAY_);
+define("_TABLE_SENTENCE_HISTORAY_", _SQLITE_TABLE_SENTENCE_HISTORAY_);
+
+
+# 逐词解析字典
+# sqlite
+define("_FILE_DB_WBW_", _SQLITE_DB_WBW_);
+define("_TABLE_DICT_WBW_", _SQLITE_TABLE_DICT_WBW_);
+define("_TABLE_DICT_WBW_INDEX_", _SQLITE_TABLE_DICT_WBW_INDEX_);
+
+
+//写入频繁 读取不频繁
+# 用户行为记录
+#sqlite
+define("_FILE_DB_USER_ACTIVE_", _SQLITE_DB_USER_ACTIVE_);
+define("_TABLE_USER_OPERATION_DAILY_", _SQLITE_TABLE_USER_OPERATION_DAILY_);
+define("_TABLE_USER_OPERATION_FRAME_", _SQLITE_TABLE_USER_OPERATION_FRAME_);
+
+
+#sqlite
+define("_FILE_DB_USER_ACTIVE_LOG_", _SQLITE_DB_USER_ACTIVE_LOG_);
+define("_TABLE_USER_OPERATION_LOG_", _SQLITE_TABLE_USER_OPERATION_LOG_);
+
+
+//读取频繁 写入不频繁 
+# 用户账号
+#sqlite
+define("_FILE_DB_USERINFO_", _SQLITE_DB_USERINFO_);
+define("_TABLE_USER_INFO_", _SQLITE_TABLE_USER_INFO_);
+
+
+# 版本风格 
+#sqlite
+define("_FILE_DB_CHANNAL_", _SQLITE_DB_CHANNAL_);
+define("_TABLE_CHANNEL_", _SQLITE_TABLE_CHANNEL_);
+
+
+# 文章 文集
+
+define("_FILE_DB_USER_ARTICLE_", _SQLITE_DB_USER_ARTICLE_);
+define("_TABLE_ARTICLE_", _SQLITE_TABLE_ARTICLE_);
+define("_TABLE_COLLECTION_", _SQLITE_TABLE_COLLECTION_);
+define("_TABLE_ARTICLE_COLLECTION_", _SQLITE_TABLE_ARTICLE_COLLECTION_);
+
+
+
+# 术语
+define("_FILE_DB_TERM_", _SQLITE_DB_TERM_);
+define("_TABLE_TERM_", _SQLITE_TABLE_TERM_);
+
+# 协作
+define("_FILE_DB_USER_SHARE_", _SQLITE_DB_USER_SHARE_);
+define("_TABLE_USER_SHARE_", _SQLITE_TABLE_USER_SHARE_);
+
+# 工作组
+define("_FILE_DB_GROUP_", _SQLITE_DB_GROUP_);
+define("_TABLE_GROUP_INFO_", _SQLITE_TABLE_GROUP_INFO_);
+define("_TABLE_GROUP_MEMBER_", _SQLITE_TABLE_GROUP_MEMBER_);
+
+# 逐词解析文件索引
+define("_FILE_DB_FILEINDEX_", _SQLITE_DB_FILEINDEX_);
+define("_TABLE_FILEINDEX_", _SQLITE_TABLE_FILEINDEX_);
+define("_TABLE_FILEINDEX_POWER_", _SQLITE_TABLE_FILEINDEX_POWER_);
+
+# 课程
+define("_FILE_DB_COURSE_", _SQLITE_DB_COURSE_);
+define("_TABLE_COURSE_",_SQLITE_TABLE_COURSE_);
+define("_TABLE_LESSON_",_SQLITE_TABLE_LESSON_);
+
+# 用户自定义书
+define("_FILE_DB_USER_CUSTOM_BOOK_", _SQLITE_DB_USER_CUSTOM_BOOK_);
+define("_TABLE_CUSTOM_BOOK_", _SQLITE_TABLE_CUSTOM_BOOK_);
+define("_TABLE_CUSTOM_BOOK_SENT_", _SQLITE_TABLE_CUSTOM_BOOK_SENT_);
+
+# 逐词译和译文编辑消息 无需迁移数据
+define("_FILE_DB_MESSAGE_", _SQLITE_DB_MESSAGE_);
+define("_TABLE_MESSAGE_", _SQLITE_TABLE_MESSAGE_);
+
+#点赞
+define("_FILE_DB_LIKE_", _SQLITE_DB_LIKE_);
+define("_TABLE_LIKE_", _SQLITE_TABLE_LIKE_);
+
+
+# 用户字典统计数据 刷库 - 无需迁移数据
+define("_FILE_DB_USER_DICT_", _SQLITE_DB_USER_DICT_);
+define("_TABLE_USER_DICT_", _SQLITE_TABLE_USER_DICT_);
+
 ?>