Life-logger · asjasj3964 · Sep 5, 2024 · Sep 6, 2024 · Sep 6, 2024 · Sep 9, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -8,6 +8,7 @@ ENV GO111MODULE=on \
 WORKDIR /app
 
 COPY ./server ./server
+COPY ./middleware ./middleware
 COPY go.mod .
 COPY go.sum .
 
@@ -28,3 +29,4 @@ COPY .env .
 EXPOSE 22250
 
 ENTRYPOINT ["/bin/sh", "-c" , "./build/server"]
+
diff --git a/db/init_db.sql b/db/init_db.sql
@@ -1,3 +1,10 @@
+CREATE TABLE Users (
+    user_id INT NOT NULL AUTO_INCREMENT, 
+    user_name VARCHAR(10) NOT NULL,
+    PRIMARY KEY (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+
+
 -- dep.ADMIN definition
 CREATE TABLE ADMIN (
     id INT NOT NULL AUTO_INCREMENT,
@@ -9,62 +16,54 @@ CREATE TABLE ADMIN (
     UNIQUE KEY ADMIN_unique (email)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
-INSERT INTO ADMIN (email,passcode,admin_type,brand_id) VALUES
-('[email protected]','$2a$12$cqXwxUhyP5bkcdoz7Tge1.6DgDeN9h4mqfTqMycCdm01K8rsKwbVG','SUPER',NULL);
+-- -- INSERT INTO ADMIN (email,passcode,admin_type,brand_id) VALUES
+-- -- ('[email protected]','$2a$12$cqXwxUhyP5bkcdoz7Tge1.6DgDeN9h4mqfTqMycCdm01K8rsKwbVG','SUPER',NULL);
 
-CREATE TABLE Users (
-    user_id SERIAL PRIMARY KEY, --SERIAL: 자동으로 증가하는 정수 타입
-    --password_hash VARCHAR(255) NOT NULL,
-    user_name VARCHAR(10) NOT NULL,
-    --preferences JSONB
-);
 
 CREATE TABLE Categories (
-    categories_id SERIAL PRIMARY KEY,
-    user_id INT REFERENCES Users(user_id),
+    id INT NOT NULL AUTO_INCREMENT,
+    user_email VARCHAR(20),
     color VARCHAR(7),
-    --start_time TIMESTAMP NOT NULL,
-    --end_time TIMESTAMP NOT NULL,
-    categories_title VARCHAR(20) NOT NULL,
-    categories_total_time INT NOT NULL DEFAULT 0,
-);
+    title VARCHAR(20) NOT NULL,
+    PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
-CREATE TABLE Blocks (
-    block_id SERIAL PRIMARY KEY,
-    start_time TIMESTAMP NOT NULL,
-    end_time TIMESTAMP NOT NULL,
-    duration time.Duration NOT NULL,
-    color VARCHAR(7) REFERENCES Categories(categories_id) ON DELETE CASCADE ON UPDATE NO ACTION,
-    background_image_url TEXT,
-    block_memo TEXT,
-    block_pin BOOLEAN NOT NULL,
-);
+-- CREATE TABLE Blocks (
+--     block_id SERIAL PRIMARY KEY,
+--     start_time TIMESTAMP NOT NULL,
+--     end_time TIMESTAMP NOT NULL,
+--     duration time.Duration NOT NULL,
+--     color VARCHAR(7) REFERENCES Categories(categories_id) ON DELETE CASCADE ON UPDATE NO ACTION,
+--     background_image_url TEXT,
+--     block_memo TEXT,
+--     block_pin BOOLEAN NOT NULL
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
 
--- CREATE TABLE CategoriesBlocks (
---     categories_id INT REFERENCES categories(categories_id),
---     block_id INT REFERENCES Blocks(block_id),
---     PRIMARY KEY(categories_id, block_id)
--- );
+-- -- CREATE TABLE CategoriesBlocks (
+-- --     categories_id INT REFERENCES categories(categories_id),
+-- --     block_id INT REFERENCES Blocks(block_id),
+-- --     PRIMARY KEY(categories_id, block_id)
+-- -- );
 
-/* CREATE TABLE Tags (
-    tag_id SERIAL PRIMARY KEY,
-    tag_name VARCHAR(100) UNIQUE NOT NULL
-);--? */
+-- /* CREATE TABLE Tags (
+--     tag_id SERIAL PRIMARY KEY,
+--     tag_name VARCHAR(100) UNIQUE NOT NULL
+-- );--? */
 
-/* CREATE TABLE CategoriesTags (
-    categories_id INT REFERENCES categories(categories_id),
-    tag_id INT REFERENCES Tags(tag_id),
-    PRIMARY KEY(categories_id, tag_id)
-); */
+-- /* CREATE TABLE CategoriesTags (
+--     categories_id INT REFERENCES categories(categories_id),
+--     tag_id INT REFERENCES Tags(tag_id),
+--     PRIMARY KEY(categories_id, tag_id)
+-- ); */
 
-CREATE TABLE Calendar (
-    date DATE PRIMARY KEY,
-    representative_block_id INT REFERENCES Blocks(block_id),
-);
+-- CREATE TABLE Calendar (
+--     date DATE PRIMARY KEY,
+--     representative_block_id INT REFERENCES Blocks(block_id)
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
--- CREATE TABLE CalendarBlocks (
---     date DATE REFERENCES Calendar(date),
---     block_id INT REFERENCES Blocks(block_id),
---     PRIMARY KEY(date, block_id)
--- );
+-- -- CREATE TABLE CalendarBlocks (
+-- --     date DATE REFERENCES Calendar(date),
+-- --     block_id INT REFERENCES Blocks(block_id),
+-- --     PRIMARY KEY(date, block_id)
+-- -- );
diff --git a/db/mysql/aria_log.00000001 b/db/mysql/aria_log.00000001
diff --git a/db/mysql/aria_log_control b/db/mysql/aria_log_control
diff --git a/db/mysql/ddl_recovery-backup.log b/db/mysql/ddl_recovery-backup.log
diff --git a/db/mysql/ib_buffer_pool b/db/mysql/ib_buffer_pool
@@ -0,0 +1,170 @@
+7,3
+7,2
+7,1
+7,0
+6,4
+6,3
+6,2
+6,1
+6,0
+5,3
+5,2
+5,1
+5,0
+4,3
+2,3
+1,3
+0,243
+0,9
+0,0
+0,1
+0,300
+0,299
+0,298
+0,297
+0,296
+0,295
+0,294
+0,293
+0,292
+0,291
+0,290
+0,289
+0,288
+0,287
+0,286
+0,285
+0,284
+0,283
+0,282
+0,281
+0,280
+0,279
+0,278
+0,277
+0,276
+0,275
+0,274
+0,273
+0,272
+0,271
+0,270
+0,269
+0,268
+0,267
+0,266
+0,265
+0,264
+0,263
+0,262
+0,261
+0,260
+0,259
+0,258
+0,257
+0,256
+0,255
+0,254
+0,253
+0,252
+0,251
+0,250
+0,249
+0,248
+0,247
+0,246
+0,245
+0,244
+0,242
+0,241
+0,240
+0,239
+0,238
+0,237
+0,236
+0,235
+0,234
+0,233
+0,232
+0,231
+0,230
+0,229
+0,228
+0,227
+0,226
+0,225
+0,224
+0,223
+0,222
+0,221
+0,220
+0,219
+0,218
+0,217
+0,216
+0,215
+0,214
+0,213
+0,212
+0,211
+0,210
+0,209
+0,208
+0,207
+0,206
+0,205
+0,204
+0,203
+0,202
+0,201
+0,200
+0,199
+0,198
+0,197
+0,196
+0,195
+0,194
+0,193
+0,192
+0,63
+0,62
+0,61
+0,60
+0,59
+0,58
+0,57
+0,56
+0,55
+0,54
+0,53
+0,52
+0,313
+0,51
+0,312
+0,50
+0,311
+0,49
+0,310
+0,48
+0,309
+0,47
+0,308
+0,46
+0,307
+0,45
+0,301
+0,6
+0,5
+0,304
+0,303
+0,306
+0,305
+0,302
+0,12
+0,10
+0,8
+0,11
+0,4
+0,2
+0,3
+0,7
diff --git a/db/mysql/ib_logfile0 b/db/mysql/ib_logfile0
diff --git a/db/mysql/ibdata1 b/db/mysql/ibdata1
diff --git a/db/mysql/multi-master.info b/db/mysql/multi-master.info
diff --git a/db/mysql/mysql/column_stats.MAD b/db/mysql/mysql/column_stats.MAD
diff --git a/db/mysql/mysql/column_stats.MAI b/db/mysql/mysql/column_stats.MAI
diff --git a/db/mysql/mysql/column_stats.frm b/db/mysql/mysql/column_stats.frm
diff --git a/db/mysql/mysql/columns_priv.MAD b/db/mysql/mysql/columns_priv.MAD
diff --git a/db/mysql/mysql/columns_priv.MAI b/db/mysql/mysql/columns_priv.MAI
diff --git a/db/mysql/mysql/columns_priv.frm b/db/mysql/mysql/columns_priv.frm
diff --git a/db/mysql/mysql/db.MAD b/db/mysql/mysql/db.MAD
diff --git a/db/mysql/mysql/db.MAI b/db/mysql/mysql/db.MAI
diff --git a/db/mysql/mysql/db.frm b/db/mysql/mysql/db.frm
diff --git a/db/mysql/mysql/db.opt b/db/mysql/mysql/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb3
+default-collation=utf8mb3_unicode_ci
diff --git a/db/mysql/mysql/event.MAD b/db/mysql/mysql/event.MAD
diff --git a/db/mysql/mysql/event.MAI b/db/mysql/mysql/event.MAI
diff --git a/db/mysql/mysql/event.frm b/db/mysql/mysql/event.frm
diff --git a/db/mysql/mysql/func.MAD b/db/mysql/mysql/func.MAD
diff --git a/db/mysql/mysql/func.MAI b/db/mysql/mysql/func.MAI
diff --git a/db/mysql/mysql/func.frm b/db/mysql/mysql/func.frm
diff --git a/db/mysql/mysql/general_log.CSM b/db/mysql/mysql/general_log.CSM
diff --git a/db/mysql/mysql/general_log.CSV b/db/mysql/mysql/general_log.CSV
diff --git a/db/mysql/mysql/general_log.frm b/db/mysql/mysql/general_log.frm
diff --git a/db/mysql/mysql/global_priv.MAD b/db/mysql/mysql/global_priv.MAD
diff --git a/db/mysql/mysql/global_priv.MAI b/db/mysql/mysql/global_priv.MAI
diff --git a/db/mysql/mysql/global_priv.frm b/db/mysql/mysql/global_priv.frm
diff --git a/db/mysql/mysql/gtid_slave_pos.frm b/db/mysql/mysql/gtid_slave_pos.frm
diff --git a/db/mysql/mysql/gtid_slave_pos.ibd b/db/mysql/mysql/gtid_slave_pos.ibd
diff --git a/db/mysql/mysql/help_category.MAD b/db/mysql/mysql/help_category.MAD
diff --git a/db/mysql/mysql/help_category.MAI b/db/mysql/mysql/help_category.MAI
diff --git a/db/mysql/mysql/help_category.frm b/db/mysql/mysql/help_category.frm
diff --git a/db/mysql/mysql/help_keyword.MAD b/db/mysql/mysql/help_keyword.MAD
diff --git a/db/mysql/mysql/help_keyword.MAI b/db/mysql/mysql/help_keyword.MAI
diff --git a/db/mysql/mysql/help_keyword.frm b/db/mysql/mysql/help_keyword.frm
diff --git a/db/mysql/mysql/help_relation.MAD b/db/mysql/mysql/help_relation.MAD
diff --git a/db/mysql/mysql/help_relation.MAI b/db/mysql/mysql/help_relation.MAI
diff --git a/db/mysql/mysql/help_relation.frm b/db/mysql/mysql/help_relation.frm
diff --git a/db/mysql/mysql/help_topic.MAD b/db/mysql/mysql/help_topic.MAD
diff --git a/db/mysql/mysql/help_topic.MAI b/db/mysql/mysql/help_topic.MAI
diff --git a/db/mysql/mysql/help_topic.frm b/db/mysql/mysql/help_topic.frm
diff --git a/db/mysql/mysql/index_stats.MAD b/db/mysql/mysql/index_stats.MAD
diff --git a/db/mysql/mysql/index_stats.MAI b/db/mysql/mysql/index_stats.MAI
diff --git a/db/mysql/mysql/index_stats.frm b/db/mysql/mysql/index_stats.frm
diff --git a/db/mysql/mysql/innodb_index_stats.frm b/db/mysql/mysql/innodb_index_stats.frm
diff --git a/db/mysql/mysql/innodb_index_stats.ibd b/db/mysql/mysql/innodb_index_stats.ibd
diff --git a/db/mysql/mysql/innodb_table_stats.frm b/db/mysql/mysql/innodb_table_stats.frm
diff --git a/db/mysql/mysql/innodb_table_stats.ibd b/db/mysql/mysql/innodb_table_stats.ibd
diff --git a/db/mysql/mysql/plugin.MAD b/db/mysql/mysql/plugin.MAD
diff --git a/db/mysql/mysql/plugin.MAI b/db/mysql/mysql/plugin.MAI
diff --git a/db/mysql/mysql/plugin.frm b/db/mysql/mysql/plugin.frm
diff --git a/db/mysql/mysql/proc.MAD b/db/mysql/mysql/proc.MAD
diff --git a/db/mysql/mysql/proc.MAI b/db/mysql/mysql/proc.MAI
diff --git a/db/mysql/mysql/proc.frm b/db/mysql/mysql/proc.frm
diff --git a/db/mysql/mysql/procs_priv.MAD b/db/mysql/mysql/procs_priv.MAD
diff --git a/db/mysql/mysql/procs_priv.MAI b/db/mysql/mysql/procs_priv.MAI
diff --git a/db/mysql/mysql/procs_priv.frm b/db/mysql/mysql/procs_priv.frm
diff --git a/db/mysql/mysql/proxies_priv.MAD b/db/mysql/mysql/proxies_priv.MAD
diff --git a/db/mysql/mysql/proxies_priv.MAI b/db/mysql/mysql/proxies_priv.MAI
diff --git a/db/mysql/mysql/proxies_priv.frm b/db/mysql/mysql/proxies_priv.frm
diff --git a/db/mysql/mysql/roles_mapping.MAD b/db/mysql/mysql/roles_mapping.MAD
diff --git a/db/mysql/mysql/roles_mapping.MAI b/db/mysql/mysql/roles_mapping.MAI
diff --git a/db/mysql/mysql/roles_mapping.frm b/db/mysql/mysql/roles_mapping.frm
diff --git a/db/mysql/mysql/servers.MAD b/db/mysql/mysql/servers.MAD
diff --git a/db/mysql/mysql/servers.MAI b/db/mysql/mysql/servers.MAI
diff --git a/db/mysql/mysql/servers.frm b/db/mysql/mysql/servers.frm
diff --git a/db/mysql/mysql/slow_log.CSM b/db/mysql/mysql/slow_log.CSM
diff --git a/db/mysql/mysql/slow_log.CSV b/db/mysql/mysql/slow_log.CSV
diff --git a/db/mysql/mysql/slow_log.frm b/db/mysql/mysql/slow_log.frm
diff --git a/db/mysql/mysql/table_stats.MAD b/db/mysql/mysql/table_stats.MAD
diff --git a/db/mysql/mysql/table_stats.MAI b/db/mysql/mysql/table_stats.MAI
diff --git a/db/mysql/mysql/table_stats.frm b/db/mysql/mysql/table_stats.frm
diff --git a/db/mysql/mysql/tables_priv.MAD b/db/mysql/mysql/tables_priv.MAD
diff --git a/db/mysql/mysql/tables_priv.MAI b/db/mysql/mysql/tables_priv.MAI
diff --git a/db/mysql/mysql/tables_priv.frm b/db/mysql/mysql/tables_priv.frm
diff --git a/db/mysql/mysql/time_zone.MAD b/db/mysql/mysql/time_zone.MAD
diff --git a/db/mysql/mysql/time_zone.MAI b/db/mysql/mysql/time_zone.MAI
diff --git a/db/mysql/mysql/time_zone.frm b/db/mysql/mysql/time_zone.frm
diff --git a/db/mysql/mysql/time_zone_leap_second.MAD b/db/mysql/mysql/time_zone_leap_second.MAD
diff --git a/db/mysql/mysql/time_zone_leap_second.MAI b/db/mysql/mysql/time_zone_leap_second.MAI
diff --git a/db/mysql/mysql/time_zone_leap_second.frm b/db/mysql/mysql/time_zone_leap_second.frm
diff --git a/db/mysql/mysql/time_zone_name.MAD b/db/mysql/mysql/time_zone_name.MAD
diff --git a/db/mysql/mysql/time_zone_name.MAI b/db/mysql/mysql/time_zone_name.MAI
diff --git a/db/mysql/mysql/time_zone_name.frm b/db/mysql/mysql/time_zone_name.frm
diff --git a/db/mysql/mysql/time_zone_transition.MAD b/db/mysql/mysql/time_zone_transition.MAD
diff --git a/db/mysql/mysql/time_zone_transition.MAI b/db/mysql/mysql/time_zone_transition.MAI
diff --git a/db/mysql/mysql/time_zone_transition.frm b/db/mysql/mysql/time_zone_transition.frm
diff --git a/db/mysql/mysql/time_zone_transition_type.MAD b/db/mysql/mysql/time_zone_transition_type.MAD
diff --git a/db/mysql/mysql/time_zone_transition_type.MAI b/db/mysql/mysql/time_zone_transition_type.MAI
diff --git a/db/mysql/mysql/time_zone_transition_type.frm b/db/mysql/mysql/time_zone_transition_type.frm
diff --git a/db/mysql/mysql/transaction_registry.frm b/db/mysql/mysql/transaction_registry.frm
diff --git a/db/mysql/mysql/transaction_registry.ibd b/db/mysql/mysql/transaction_registry.ibd
diff --git a/db/mysql/mysql/user.frm b/db/mysql/mysql/user.frm
diff --git a/db/mysql/mysql_upgrade_info b/db/mysql/mysql_upgrade_info
@@ -0,0 +1 @@
+10.6.7-MariaDB
diff --git a/db/mysql/performance_schema/db.opt b/db/mysql/performance_schema/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb3
+default-collation=utf8mb3_general_ci
diff --git a/db/mysql/sys/db.opt b/db/mysql/sys/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8mb3
+default-collation=utf8mb3_general_ci
-Original file line number
+Diff line change
@@ -0,0 +1,170 @@
+,3
+,2
+,1
+,0
+,4
+,3
+,2
+,1
+,0
+,3
+,2
+,1
+,0
+,3
+,3
+,3
+,243
+,9
+,0
+,1
+,300
+,299
+,298
+,297
+,296
+,295
+,294
+,293
+,292
+,291
+,290
+,289
+,288
+,287
+,286
+,285
+,284
+,283
+,282
+,281
+,280
+,279
+,278
+,277
+,276
+,275
+,274
+,273
+,272
+,271
+,270
+,269
+,268
+,267
+,266
+,265
+,264
+,263
+,262
+,261
+,260
+,259
+,258
+,257
+,256
+,255
+,254
+,253
+,252
+,251
+,250
+,249
+,248
+,247
+,246
+,245
+,244
+,242
+,241
+,240
+,239
+,238
+,237
+,236
+,235
+,234
+,233
+,232
+,231
+,230
+,229
+,228
+,227
+,226
+,225
+,224
+,223
+,222
+,221
+,220
+,219
+,218
+,217
+,216
+,215
+,214
+,213
+,212
+,211
+,210
+,209
+,208
+,207
+,206
+,205
+,204
+,203
+,202
+,201
+,200
+,199
+,198
+,197
+,196
+,195
+,194
+,193
+,192
+,63
+,62
+,61
+,60
+,59
+,58
+,57
+,56
+,55
+,54
+,53
+,52
+,313
+,51
+,312
+,50
+,311
+,49
+,310
+,48
+,309
+,47
+,308
+,46
+,307
+,45
+,301
+,6
+,5
+,304
+,303
+,306
+,305
+,302
+,12
+,10
+,8
+,11
+,4
+,2
+,3
+,7
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		default-character-set=utf8mb3
		default-collation=utf8mb3_unicode_ci
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		default-character-set=utf8mb3
		default-collation=utf8mb3_general_ci