an example of user_check
add 'search by stock id' function
finish search_by_stock_id
Add mysql configuration file at ./db_export
search_merge master and search_by_stock_id
Merge remote-tracking branch 'origin/master' into search_by_stock_code
update branch
Merge branch 'master' of github.com:wenxuan-xia/net_info_publisher-SE_1_5
Merge branch 'master' of github.com:wenxuan-xia/net_info_publisher-SE_1_5 into search_by_stock_code
Merge branch 'user' of https://github.com/wenxuan-xia/net_info_publisher-SE_1_5

Conflicts:
	README.md
	application/config/database.php
merge
add index.php error display in linux
Merge branch 'master' of https://github.com/wenxuan-xia/net_info_publisher-SE_1_5 into temp_waiting_merge

Conflicts:
	application/config/database.php
	application/controllers/api.php
	application/models/api_model.php
	js/search.js