From e494edd2501b08e8338fab52a5f245eeba338e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Wed, 19 Jul 2023 11:45:56 +0900 Subject: [PATCH] servermgrv2 init... --- app/Controllers/Admin/UserSNSController.php | 21 ++++++------------ app/Database/table.sql | 24 ++++++++++++--------- app/Models/HPILOModel.php | 2 +- app/Models/UserSNSModel.php | 10 +++++---- app/Views/layouts/admin/left_menu.php | 11 ++++++---- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/Controllers/Admin/UserSNSController.php b/app/Controllers/Admin/UserSNSController.php index adec7b5..01bbb53 100644 --- a/app/Controllers/Admin/UserSNSController.php +++ b/app/Controllers/Admin/UserSNSController.php @@ -18,11 +18,6 @@ class UserSNSController extends \App\Controllers\Admin\AdminController $this->_className .= '/UserSNS'; $this->_model = new UserSNSModel(); $this->_defines = [ - 'insert' => [ - 'fields' => ['site', 'user_uid', 'name', 'email', 'status'], - 'fieldFilters' => ['status'], - 'fieldRules' => [] - ], 'index' => [ 'fields' => ['site', 'user_uid', 'name', 'email', 'status', 'created_at'], 'fieldFilters' => ['user_uid', 'status'], @@ -67,38 +62,34 @@ class UserSNSController extends \App\Controllers\Admin\AdminController //Insert관련 protected function insert_process() { - //암호값 hash작업 - $this->_viewDatas['fieldDatas']['passwd'] = password_hash($this->_viewDatas['fieldDatas']['passwd'], PASSWORD_DEFAULT); - return parent::insert_process(); + // return parent::insert_process(); } //Update관련 protected function update_process($entity) { - //암호값 hash작업 - $entity->passwd = password_hash($entity->passwd, PASSWORD_DEFAULT); - return parent::update_process($entity); + // return parent::update_process($entity); } ////Action 모음 //Insert관련 final public function insert() { - return $this->insert_procedure(); + // return $this->insert_procedure(); } //Update관련 final public function update($uid) { - return $this->update_procedure($uid); + // return $this->update_procedure($uid); } //Toggle관련 final public function toggle($uid, string $field) { - return $this->toggle_procedure($uid, $field); + // return $this->toggle_procedure($uid, $field); } //Batchjob 관련 final public function batchjob() { - return $this->batchjob_procedure(); + // return $this->batchjob_procedure(); } //Delete 관련 final public function delete($uid) diff --git a/app/Database/table.sql b/app/Database/table.sql index 3f4a681..c9ffd3c 100644 --- a/app/Database/table.sql +++ b/app/Database/table.sql @@ -12,15 +12,15 @@ CREATE TABLE tw_user ( updated_at timestamp NULL DEFAULT NULL, created_at timestamp NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (uid), - UNIQUE KEY id (id), - UNIQUE KEY email (email) + UNIQUE KEY (id), + UNIQUE KEY (email) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT ='사용자 정보'; -- insert into tw_user (uid,id,passwd,name,email,role,status) select uuid(),id,passwd,name,email,role,status from cfmgr.user; DROP TABLE IF EXISTS tw_user_profile; CREATE TABLE tw_user_profile ( uid int(10) unsigned NOT NULL AUTO_INCREMENT, - user_uid varchar(36) NULL COMMENT '사용자 추가정보', + user_uid varchar(36) NULL COMMENT '사용자 정보', type varchar(10) NOT NULL COMMENT 'ICON|ADDRESS|PHONE|MOBILE|EMAIL 등등', content varchar(255) NULL, priority int(3) NOT NULL DEFAULT 1 COMMENT '표시 우선순서', @@ -31,19 +31,23 @@ CREATE TABLE tw_user_profile ( CONSTRAINT FOREIGN KEY (user_uid) REFERENCES tw_user (uid) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT ='사용자 추가정보'; -DROP TABLE IF EXISTS tw_user_auth_google; +DROP TABLE IF EXISTS tw_user_sns; -CREATE TABLE tw_user_auth_google ( - uid varchar(36) NOT NULL, +CREATE TABLE tw_user_sns ( + uid int(10) unsigned NOT NULL AUTO_INCREMENT, + user_uid varchar(36) NULL COMMENT '사용자 정보', + site varchar(20) NOT NULL COMMENT 'Site: GOOGLE,FACEBOOK 등등', id varchar(255) NOT NULL COMMENT 'sns 로그인 인중후 Return ID값', - email varchar(50) NOT NULL, name varchar(50) NOT NULL, + email varchar(50) NOT NULL, detail text NOT NULL COMMENT 'JSON형식 원본값', status varchar(10) NOT NULL DEFAULT 'use' COMMENT 'use: 사용,unuse: 사용않함', updated_at timestamp NULL DEFAULT NULL, created_at timestamp NOT NULL DEFAULT current_timestamp(), - PRIMARY KEY (uid) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT ='GOOGLE 로그인 후 정보'; + PRIMARY KEY (uid), + UNIQUE KEY (site,id), + CONSTRAINT FOREIGN KEY (user_uid) REFERENCES tw_user (uid) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT ='SNS 로그인 후 정보'; DROP TABLE IF EXISTS tw_logger; @@ -78,5 +82,5 @@ CREATE TABLE updated_at timestamp NULL DEFAULT NULL, created_at timestamp NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (uid), - UNIQUE KEY hpilokey (ip,port) + UNIQUE KEY (ip,port) ) ENGINE = MyISAM DEFAULT CHARSET = utf8 COLLATE = utf8_general_ci COMMENT = 'hpilo 정보'; \ No newline at end of file diff --git a/app/Models/HPILOModel.php b/app/Models/HPILOModel.php index 9707ab4..5e69d59 100644 --- a/app/Models/HPILOModel.php +++ b/app/Models/HPILOModel.php @@ -6,7 +6,7 @@ use App\Entities\HPILOEntity; class HPILOModel extends CommonModel { - protected $table = 'hpilo'; + protected $table = 'tw_hpilo'; // protected $primaryKey = 'uid'; // protected $useAutoIncrement = true; protected $allowedFields = ['customer', 'ip', 'port', 'id', 'passwd', 'model', 'processor', 'memory', 'health', 'power', 'detail', 'status', 'created_at']; diff --git a/app/Models/UserSNSModel.php b/app/Models/UserSNSModel.php index de577b0..b39b416 100644 --- a/app/Models/UserSNSModel.php +++ b/app/Models/UserSNSModel.php @@ -9,13 +9,15 @@ class UserSNSModel extends CommonModel protected $table = 'tw_user_sns'; // protected $primaryKey = 'uid'; protected $useAutoIncrement = false; - protected $allowedFields = ['uid', 'user_uid', 'site', 'name', 'email', 'status', 'updated_at', 'created_at']; + protected $allowedFields = ['uid', 'user_uid', 'site', 'id', 'name', 'email', 'detail', 'status', 'updated_at', 'created_at']; protected $validationRules = [ 'uid' => 'required|string', - 'user_uid' => 'required|required', + 'user_uid' => 'if_exist|regex_match[/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/]', 'site' => 'required|string', + 'id' => 'required|string', 'name' => 'required|string', 'email' => 'required|valid_email', + 'detail' => 'required|string', 'status' => 'if_exist|string', 'updated_at' => 'if_exist|valid_date', 'created_at' => 'if_exist|valid_date', @@ -32,11 +34,11 @@ class UserSNSModel extends CommonModel public function create(array $datas): UserSNSEntity { $entity = new UserSNSEntity(); - $entity->uid = $datas['id']; $entity->site = $this->getSiteName(); + $entity->id = $datas['id']; $entity->name = $datas['name']; $entity->email = $datas['email']; - $entity->status = "standby"; + $entity->detail = json_encode($datas); return $this->create_process($entity); } public function modify(UserSNSEntity $entity, array $datas): UserSNSEntity diff --git a/app/Views/layouts/admin/left_menu.php b/app/Views/layouts/admin/left_menu.php index 2614457..ccc842d 100644 --- a/app/Views/layouts/admin/left_menu.php +++ b/app/Views/layouts/admin/left_menu.php @@ -8,15 +8,18 @@

Main

-

계정관리

+

계정 관리

-

GOOGLE계정관리

+

SNS 계정 관리

-

Log관리

+

HP Server 관리

+

Log 관리

+
+