From f32ac241a65657c15b7703d4e0a6fb6a8e0513cd Mon Sep 17 00:00:00 2001
From: landaiqing <3517283258@qq.com>
Date: Thu, 21 Nov 2024 13:03:47 +0800
Subject: [PATCH] :art: remove xorm & add gorm gen
---
.idea/GOHCache.xml | 2861 +++++------------
app/core/api/common/constant/comment_type.go | 4 +-
app/core/api/common/constant/deleted.go | 4 +-
app/core/api/common/constant/gender.go | 2 +-
app/core/api/common/constant/mongodb.go | 5 +
app/core/api/core.api | 10 +-
.../logic/comment/submit_comment_logic.go | 31 +-
.../comment/submit_reply_comment_logic.go | 49 +-
.../logic/comment/submit_reply_reply_logic.go | 49 +-
.../logic/oauth/gitee_callback_logic.go | 63 +-
.../logic/oauth/github_callback_logic.go | 71 +-
.../internal/logic/oauth/qq_callback_logic.go | 70 +-
.../logic/oauth/wechat_callback_logic.go | 70 +-
.../logic/user/account_login_logic.go | 31 +-
.../logic/user/get_user_device_logic.go | 82 +-
.../internal/logic/user/phone_login_logic.go | 50 +-
.../logic/user/reset_password_logic.go | 23 +-
app/core/api/internal/svc/service_context.go | 15 +-
app/core/api/internal/types/comment_types.go | 2 +-
app/core/api/internal/types/session.go | 17 -
app/core/api/internal/types/types.go | 10 +-
.../repository/casbinx/{init.go => casbin.go} | 9 +-
.../idgenerator/{init.go => idgenerator.go} | 0
.../ip2region/{init.go => ip2region.go} | 0
.../mongodb/{init.go => mongodb.go} | 0
.../api/repository/mysql/generate/generate.go | 103 +
app/core/api/repository/mysql/init.go | 32 -
.../mysql/model/sca_auth_menu.gen.go | 36 +
.../repository/mysql/model/sca_auth_menu.go | 24 -
.../model/sca_auth_permission_rule.gen.go | 24 +
.../mysql/model/sca_auth_permission_rule.go | 16 -
.../mysql/model/sca_auth_role.gen.go | 29 +
.../repository/mysql/model/sca_auth_role.go | 17 -
.../mysql/model/sca_auth_user.gen.go | 40 +
.../repository/mysql/model/sca_auth_user.go | 29 -
.../mysql/model/sca_auth_user_device.gen.go | 40 +
.../mysql/model/sca_auth_user_device.go | 29 -
.../mysql/model/sca_auth_user_social.gen.go | 31 +
.../mysql/model/sca_auth_user_social.go | 20 -
.../mysql/model/sca_comment_likes.gen.go | 25 +
.../mysql/model/sca_comment_likes.go | 15 -
.../mysql/model/sca_comment_reply.gen.go | 44 +
.../mysql/model/sca_comment_reply.go | 33 -
.../mysql/model/sca_file_folder.gen.go | 32 +
.../repository/mysql/model/sca_file_folder.go | 21 -
.../mysql/model/sca_file_info.gen.go | 35 +
.../repository/mysql/model/sca_file_info.go | 24 -
.../mysql/model/sca_file_recycle.gen.go | 29 +
.../mysql/model/sca_file_recycle.go | 20 -
.../mysql/model/sca_file_type.gen.go | 30 +
.../repository/mysql/model/sca_file_type.go | 19 -
.../mysql/model/sca_message_report.gen.go | 36 +
.../mysql/model/sca_message_report.go | 25 -
.../mysql/model/sca_user_follows.gen.go | 29 +
.../mysql/model/sca_user_follows.go | 18 -
.../mysql/model/sca_user_level.gen.go | 33 +
.../repository/mysql/model/sca_user_level.go | 22 -
.../mysql/model/sca_user_message.gen.go | 32 +
.../mysql/model/sca_user_message.go | 24 -
app/core/api/repository/mysql/mysql.go | 40 +
app/core/api/repository/mysql/query/gen.go | 223 ++
.../mysql/query/sca_auth_menu.gen.go | 432 +++
.../query/sca_auth_permission_rule.gen.go | 408 +++
.../mysql/query/sca_auth_role.gen.go | 404 +++
.../mysql/query/sca_auth_user.gen.go | 448 +++
.../mysql/query/sca_auth_user_device.gen.go | 448 +++
.../mysql/query/sca_auth_user_social.gen.go | 412 +++
.../mysql/query/sca_comment_likes.gen.go | 396 +++
.../mysql/query/sca_comment_reply.gen.go | 464 +++
.../mysql/query/sca_file_folder.gen.go | 416 +++
.../mysql/query/sca_file_info.gen.go | 428 +++
.../mysql/query/sca_file_recycle.gen.go | 412 +++
.../mysql/query/sca_file_type.gen.go | 408 +++
.../mysql/query/sca_message_report.gen.go | 432 +++
.../mysql/query/sca_user_follows.gen.go | 404 +++
.../mysql/query/sca_user_level.gen.go | 420 +++
.../mysql/query/sca_user_message.gen.go | 416 +++
app/core/api/repository/mysql/sync.go | 33 -
.../{init.go => redis_session.go} | 3 -
.../repository/redisx/{init.go => redis.go} | 0
.../sensitivex/{inti.go => sensitive.go} | 0
.../wechat_official.go} | 2 +-
go.mod | 38 +-
go.sum | 710 +---
84 files changed, 8865 insertions(+), 3476 deletions(-)
create mode 100644 app/core/api/common/constant/mongodb.go
delete mode 100644 app/core/api/internal/types/session.go
rename app/core/api/repository/casbinx/{init.go => casbin.go} (71%)
rename app/core/api/repository/idgenerator/{init.go => idgenerator.go} (100%)
rename app/core/api/repository/ip2region/{init.go => ip2region.go} (100%)
rename app/core/api/repository/mongodb/{init.go => mongodb.go} (100%)
create mode 100644 app/core/api/repository/mysql/generate/generate.go
delete mode 100644 app/core/api/repository/mysql/init.go
create mode 100644 app/core/api/repository/mysql/model/sca_auth_menu.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_auth_menu.go
create mode 100644 app/core/api/repository/mysql/model/sca_auth_permission_rule.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_auth_permission_rule.go
create mode 100644 app/core/api/repository/mysql/model/sca_auth_role.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_auth_role.go
create mode 100644 app/core/api/repository/mysql/model/sca_auth_user.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_auth_user.go
create mode 100644 app/core/api/repository/mysql/model/sca_auth_user_device.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_auth_user_device.go
create mode 100644 app/core/api/repository/mysql/model/sca_auth_user_social.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_auth_user_social.go
create mode 100644 app/core/api/repository/mysql/model/sca_comment_likes.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_comment_likes.go
create mode 100644 app/core/api/repository/mysql/model/sca_comment_reply.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_comment_reply.go
create mode 100644 app/core/api/repository/mysql/model/sca_file_folder.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_file_folder.go
create mode 100644 app/core/api/repository/mysql/model/sca_file_info.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_file_info.go
create mode 100644 app/core/api/repository/mysql/model/sca_file_recycle.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_file_recycle.go
create mode 100644 app/core/api/repository/mysql/model/sca_file_type.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_file_type.go
create mode 100644 app/core/api/repository/mysql/model/sca_message_report.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_message_report.go
create mode 100644 app/core/api/repository/mysql/model/sca_user_follows.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_user_follows.go
create mode 100644 app/core/api/repository/mysql/model/sca_user_level.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_user_level.go
create mode 100644 app/core/api/repository/mysql/model/sca_user_message.gen.go
delete mode 100644 app/core/api/repository/mysql/model/sca_user_message.go
create mode 100644 app/core/api/repository/mysql/mysql.go
create mode 100644 app/core/api/repository/mysql/query/gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_auth_menu.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_auth_permission_rule.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_auth_role.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_auth_user.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_auth_user_device.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_auth_user_social.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_comment_likes.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_comment_reply.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_file_folder.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_file_info.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_file_recycle.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_file_type.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_message_report.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_user_follows.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_user_level.gen.go
create mode 100644 app/core/api/repository/mysql/query/sca_user_message.gen.go
delete mode 100644 app/core/api/repository/mysql/sync.go
rename app/core/api/repository/redis_session/{init.go => redis_session.go} (83%)
rename app/core/api/repository/redisx/{init.go => redis.go} (100%)
rename app/core/api/repository/sensitivex/{inti.go => sensitive.go} (100%)
rename app/core/api/repository/{wechat_public/init.go => wechat_official/wechat_official.go} (97%)
diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml
index 1373678..3d2d4cc 100644
--- a/.idea/GOHCache.xml
+++ b/.idea/GOHCache.xml
@@ -31,13 +31,6 @@
-
-
-
-
-
-
-
@@ -52,20 +45,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -104,7 +83,6 @@
-
@@ -123,20 +101,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -144,13 +108,6 @@
-
-
-
-
-
-
-
@@ -291,27 +248,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -389,6 +325,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,6 +412,7 @@
+
@@ -469,743 +420,69 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1213,6 +490,7 @@
+
@@ -1220,6 +498,7 @@
+
@@ -1227,6 +506,7 @@
+
@@ -1234,208 +514,41 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
@@ -1513,20 +626,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1534,59 +633,234 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1653,21 +927,28 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
@@ -2070,7 +1351,7 @@
-
+
@@ -2231,7 +1512,7 @@
-
+