suwako
/
076server
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

usr_users → users.

このコミットが含まれているのは:
テクニカル諏訪子 2018-02-07 14:24:41 +01:00
親 97229692a3
コミット b09bf1d8bc
7個のファイルの変更、35行の追加、35行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

2
app/Http/Controllers/Auth/RegisterController.php
ファイルの表示

@ -49,7 +49,7 @@ class RegisterController extends Controller
{
return Validator::make($data, [
'username' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:usr_users',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}

8
app/Http/Controllers/BoardController.php
ファイルの表示

@ -144,7 +144,7 @@ class BoardController extends Controller {
public function getUserPosts($top_id, $from, $to) { // /api/rpc/board/post/getuserposts/top/from/to
return DB::table('for_posts')
->join('usr_users', 'for_posts.user_id', '=', 'usr_users.id')
->join('users', 'for_posts.user_id', '=', 'users.id')
->join('usr_details', 'usr_details.user_id', '=', 'for_posts.user_id')
->join('usr_profile', 'usr_profile.user_id', '=', 'for_posts.user_id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'for_posts.user_id')
@ -155,7 +155,7 @@ class BoardController extends Controller {
->get(array(
"for_posts.id",
"top_id",
"usr_users.id",
"users.id",
"post_date",
"message",
"delete",
@ -180,7 +180,7 @@ class BoardController extends Controller {
public function getUserPost($id) { // /api/rpc/board/post/getuserpost/id
return DB::table('for_posts')
->join('usr_users', 'for_posts.user_id', '=', 'usr_users.id')
->join('users', 'for_posts.user_id', '=', 'users.id')
->join('usr_details', 'usr_details.user_id', '=', 'for_posts.user_id')
->join('usr_profile', 'usr_profile.user_id', '=', 'for_posts.user_id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'for_posts.user_id')
@ -189,7 +189,7 @@ class BoardController extends Controller {
->get(array(
"for_posts.id",
"top_id",
"usr_users.id",
"users.id",
"post_date",
"message",
"delete",

4
app/Http/Controllers/StoreController.php
ファイルの表示

@ -177,14 +177,14 @@ class StoreController extends Controller {
public function getEntry($id) { // /api/rpc/store/entry/getentry/id
return DB::table('str_owners')
->join('str_file', 'str_owners.file_id', '=', 'str_file.id')
->join('usr_users', 'str_owners.user_id', '=', 'usr_users.id')
->join('users', 'str_owners.user_id', '=', 'users.id')
->join('usr_details', 'usr_details.user_id', '=', 'str_owners.user_id')
->join('usr_profile', 'usr_profile.user_id', '=', 'str_owners.user_id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'str_owners.user_id')
->where('file_id', $id)
->get(array(
"file_id",
"usr_users.id",
"users.id",
"cat_id",
"title",
"version",

30
app/Http/Controllers/UserController.php
ファイルの表示

@ -14,22 +14,22 @@ use Tymon\JWTAuth\Exceptions\JWTException;
class UserController extends Controller {
// User
public function getUsers() { // /api/rpc/user/user/getusers
return DB::table('usr_users')
return DB::table('users')
->select('*')
->join('usr_details', 'usr_details.user_id', '=', 'usr_users.id')
->join('usr_profile', 'usr_profile.user_id', '=', 'usr_users.id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'usr_users.id')
->join('usr_details', 'usr_details.user_id', '=', 'users.id')
->join('usr_profile', 'usr_profile.user_id', '=', 'users.id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'users.id')
->get();
}
public function getUser($id) { // /api/rpc/user/user/getuser/id
return DB::table('usr_users')
->join('usr_details', 'usr_details.user_id', '=', 'usr_users.id')
->join('usr_profile', 'usr_profile.user_id', '=', 'usr_users.id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'usr_users.id')
return DB::table('users')
->join('usr_details', 'usr_details.user_id', '=', 'users.id')
->join('usr_profile', 'usr_profile.user_id', '=', 'users.id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'users.id')
->where('id', $id)
->get(array(
"usr_users.id",
"users.id",
'username',
'perm_id',
'member_title',
@ -54,7 +54,7 @@ class UserController extends Controller {
}
public function getPostStyle($id) { // /api/rpc/user/user/getpoststyle/id
return DB:: table('usr_users')
return DB:: table('users')
->select('header', 'footer')
->where('id', $id)
->get();
@ -78,7 +78,7 @@ class UserController extends Controller {
}
public function login(Request $request) { // /api/rpc/user/auth/login
$getUser = DB::table('usr_users')
$getUser = DB::table('users')
->select('id', 'username', 'password', 'remember_token')
->where('username', $request->username)
->get();
@ -151,13 +151,13 @@ class UserController extends Controller {
public function getOwnersOfEntry($file_id) { // /api/rpc/user/owner/getownersofentry/id
return DB::table('str_owners')
->join('str_file', 'str_owners.file_id', '=', 'str_file.id')
->join('usr_users', 'str_owners.user_id', '=', 'usr_users.id')
->join('users', 'str_owners.user_id', '=', 'users.id')
->join('usr_details', 'usr_details.user_id', '=', 'str_owners.user_id')
->join('usr_profile', 'usr_profile.user_id', '=', 'str_owners.user_id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'str_owners.user_id')
->where('file_id', $file_id)
->get(array(
"usr_users.id",
"users.id",
"title",
"version",
"views",
@ -183,13 +183,13 @@ class UserController extends Controller {
public function getEntriesOfOwner($user_id) { // /api/rpc/user/owner/getentriesofowner/id
return DB::table('str_owners')
->join('str_file', 'str_owners.file_id', '=', 'str_file.id')
->join('usr_users', 'str_owners.user_id', '=', 'usr_users.id')
->join('users', 'str_owners.user_id', '=', 'users.id')
->join('usr_details', 'usr_details.user_id', '=', 'str_owners.user_id')
->join('usr_profile', 'usr_profile.user_id', '=', 'str_owners.user_id')
->join('usr_perm_id', 'usr_perm_id.user_id', '=', 'str_owners.user_id')
->where('user_id', $user_id)
->get(array(
"usr_users.id",
"users.id",
"title",
"version",
"views",

16
config/auth.php
ファイルの表示

@ -15,7 +15,7 @@ return [
'defaults' => [
'guard' => 'web',
'passwords' => 'usr_users',
'passwords' => 'users',
],
/*
@ -38,12 +38,12 @@ return [
'guards' => [
'web' => [
'driver' => 'session',
'provider' => 'usr_users',
'provider' => 'users',
],
'api' => [
'driver' => 'jwt',
'provider' => 'usr_users',
'provider' => 'users',
],
],
@ -65,14 +65,14 @@ return [
*/
'providers' => [
'usr_users' => [
'users' => [
'driver' => 'eloquent',
'model' => App\User::class,
],
// 'usr_users' => [
// 'users' => [
// 'driver' => 'database',
// 'table' => 'usr_users',
// 'table' => 'users',
// ],
],
@ -92,8 +92,8 @@ return [
*/
'passwords' => [
'usr_users' => [
'provider' => 'usr_users',
'users' => [
'provider' => 'users',
'table' => 'password_resets',
'expire' => 60,
],

4
database/migrations/2014_10_12_000000_create_users_table.php
ファイルの表示

@ -13,7 +13,7 @@ class CreateUsersTable extends Migration
*/
public function up()
{
Schema::create('usr_users', function (Blueprint $table) {
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
$table->string('username');
$table->string('email')->unique();
@ -30,6 +30,6 @@ class CreateUsersTable extends Migration
*/
public function down()
{
Schema::dropIfExists('usr_users');
Schema::dropIfExists('users');
}
}

6
yb2db.sql
ファイルの表示

@ -1,7 +1,7 @@
--
-- Tables
--
CREATE TABLE IF NOT EXISTS `usr_users` (
CREATE TABLE IF NOT EXISTS `users` (
`id` int(10) NOT NULL,
`username` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
`email` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `usr_perm_id` (
--
-- Data
--
INSERT INTO `usr_users` SELECT `id`, `username`, `email`, `password`, NULL, NULL, NULL FROM `for_users`;
INSERT INTO `users` SELECT `id`, `username`, `email`, `password`, NULL, NULL, NULL FROM `for_users`;
INSERT INTO `usr_details` SELECT `id`, `total_posts`, `total_threads`, `reg_date`, `last_post_date`, `last_post_location`, `ontime`, `strikes` FROM `for_users`;
INSERT INTO `usr_profile` SELECT `id`, `gender`, `member_title`, `website_address`, `website_name`, `location`, `birthday`, `bio`, `ip_address`, `avatar`, `ostatus`, `header`, `footer`, NULL, NULL, `name_colour`, `display_name`, `yt_channel`, `country`, `curDF`, NULL, NULL, NULL FROM `for_users`;
INSERT INTO `usr_perm_id` SELECT `id`, `perm_id`, `usr_per_id`, `blg_per_id`, `for_per_id`, `sbx_per_id`, `str_per_id`, `doc_per_id`, `odb_per_id` FROM `for_users`;
@ -71,7 +71,7 @@ INSERT INTO `usr_perm_id` SELECT `id`, `perm_id`, `usr_per_id`, `blg_per_id`, `f
--
-- Indexes
--
ALTER TABLE `usr_users`
ALTER TABLE `users`
ADD PRIMARY KEY (`id`),
ADD KEY `email` (`email`);
ALTER TABLE `usr_details`