From 779de17439a5504c7bcd95662df5ea8db363b2e0 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Wed, 3 Nov 2021 16:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/enter.go | 2 + server/api/v1/shiyan/enter.go | 7 ++ server/api/v1/shiyan/shiyan.go | 23 ++++++ server/api/v1/system/sys_user.go | 3 +- server/config.yaml | 115 ++++++++++++++++++++++++++++- server/config/config.go | 10 +++ server/global/global.go | 11 +++ server/initialize/gorm.go | 61 +++++++++++++++ server/initialize/router.go | 5 +- server/log/server_debug.log | 0 server/log/server_error.log | 2 + server/log/server_info.log | 97 ++++++++++++++++++++++++ server/main.go | 9 +++ server/model/testpage/answer.go | 13 ++++ server/router/enter.go | 2 + server/router/shiyan/enter.go | 5 ++ server/router/shiyan/sys_shiyan.go | 16 ++++ 17 files changed, 377 insertions(+), 4 deletions(-) create mode 100644 server/api/v1/shiyan/enter.go create mode 100644 server/api/v1/shiyan/shiyan.go create mode 100644 server/log/server_debug.log create mode 100644 server/model/testpage/answer.go create mode 100644 server/router/shiyan/enter.go create mode 100644 server/router/shiyan/sys_shiyan.go diff --git a/server/api/v1/enter.go b/server/api/v1/enter.go index 4f92934..61521f4 100644 --- a/server/api/v1/enter.go +++ b/server/api/v1/enter.go @@ -3,6 +3,7 @@ package v1 import ( "github.com/flipped-aurora/gin-vue-admin/server/api/v1/autocode" "github.com/flipped-aurora/gin-vue-admin/server/api/v1/example" + "github.com/flipped-aurora/gin-vue-admin/server/api/v1/shiyan" "github.com/flipped-aurora/gin-vue-admin/server/api/v1/system" ) @@ -10,6 +11,7 @@ type ApiGroup struct { ExampleApiGroup example.ApiGroup SystemApiGroup system.ApiGroup AutoCodeApiGroup autocode.ApiGroup + ShiyanApiGroup shiyan.ApiGroup } var ApiGroupApp = new(ApiGroup) diff --git a/server/api/v1/shiyan/enter.go b/server/api/v1/shiyan/enter.go new file mode 100644 index 0000000..dbd6e5c --- /dev/null +++ b/server/api/v1/shiyan/enter.go @@ -0,0 +1,7 @@ +package shiyan + +type ApiGroup struct { + // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT. + ShiyanApi + // Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT. +} diff --git a/server/api/v1/shiyan/shiyan.go b/server/api/v1/shiyan/shiyan.go new file mode 100644 index 0000000..824b1fd --- /dev/null +++ b/server/api/v1/shiyan/shiyan.go @@ -0,0 +1,23 @@ +package shiyan + +import ( + "fmt" + + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/testpage" + "github.com/gin-gonic/gin" +) + +type ShiyanApi struct { +} + +func (a *ShiyanApi) AddBaseMenu(c *gin.Context) { + var answerMap testpage.Answer + err := global.GVA_DB_Master.First(&answerMap) + if err != nil { + + } + fmt.Printf("%v\n", answerMap) + response.Ok(c) +} diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go index c612ba6..69490cc 100644 --- a/server/api/v1/system/sys_user.go +++ b/server/api/v1/system/sys_user.go @@ -1,6 +1,8 @@ package system import ( + "strconv" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" @@ -8,7 +10,6 @@ import ( systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" "github.com/flipped-aurora/gin-vue-admin/server/utils" - "strconv" "github.com/gin-gonic/gin" "github.com/go-redis/redis/v8" diff --git a/server/config.yaml b/server/config.yaml index 6d8dbc5..fd8a873 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -47,7 +47,7 @@ mysql: config: charset=utf8mb4&parseTime=True&loc=Local db-name: gva username: root - password: "123456" + password: "root" max-idle-conns: 0 max-open-conns: 0 log-mode: "" @@ -66,7 +66,7 @@ redis: password: "" system: env: public - addr: 8888 + addr: 8889 db-type: mysql oss-type: local use-multipoint: false @@ -98,3 +98,114 @@ zap: encode-level: LowercaseColorLevelEncoder stacktrace-key: stacktrace log-in-console: true + + +# mysql connect configuration +# 其他数据库配置 +#app主数据库 +mysqlMaster: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'hengxingaoke_tes' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#文档属性数据库 +mysqlBookDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'learn_message' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#微信员工信息表 +mysqlWatchDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'wechatuser' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#错题库 +mysqlErrorSubjectDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'wrong_question_bank' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#自我测验 +mysqlMyTestDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'selftestdatabase' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#图文信息数据库 +mysqlBooImgkDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'readdocument' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#计分明细数据库 +mysqlIntegralDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'league_table_data' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#趣味问答 +mysqlQADate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'ques_and_answers' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" + +#风云榜统计数据库 +mysqlBillboardDate: + path: '127.0.0.1:3306' + config: 'charset=utf8mb4&parseTime=True&loc=Local' + db-name: 'statisticsing' + username: 'root' + password: 'root' + max-idle-conns: 10 + max-open-conns: 100 + log-mode: false + log-zap: "" \ No newline at end of file diff --git a/server/config/config.go b/server/config/config.go index 83d256f..67dd1bc 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -12,6 +12,16 @@ type Server struct { AutoCode Autocode `mapstructure:"autoCode" json:"autoCode" yaml:"autoCode"` // gorm Mysql Mysql `mapstructure:"mysql" json:"mysql" yaml:"mysql"` + //其他数据库配置 + MysqlMaster Mysql `mapstructure:"mysqlMaster" json:"mysqlMaster" yaml:"mysqlMaster"` + MysqlBookDate Mysql `mapstructure:"mysqlBookDate" json:"mysqlBookDate" yaml:"mysqlBookDate"` + MysqlWatchDate Mysql `mapstructure:"mysqlWatchDate" json:"mysqlWatchDate" yaml:"mysqlWatchDate"` + MysqlErrorSubjectDate Mysql `mapstructure:"mysqlErrorSubjectDate" json:"mysqlErrorSubjectDate" yaml:"mysqlErrorSubjectDate"` + MysqlMyTestDate Mysql `mapstructure:"mysqlMyTestDate" json:"mysqlMyTestDate" yaml:"mysqlMyTestDate"` + MysqlBooImgkDate Mysql `mapstructure:"mysqlBooImgkDate" json:"mysqlBooImgkDate" yaml:"mysqlBooImgkDate"` + MysqlIntegralDate Mysql `mapstructure:"mysqlIntegralDate" json:"mysqlIntegralDate" yaml:"mysqlIntegralDate"` + MysqlQADate Mysql `mapstructure:"mysqlQADate" json:"mysqlQADate" yaml:"mysqlQADate"` + MysqlBillboardDate Mysql `mapstructure:"mysqlBillboardDate" json:"mysqlBillboardDate" yaml:"mysqlBillboardDate"` // oss Local Local `mapstructure:"local" json:"local" yaml:"local"` Qiniu Qiniu `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"` diff --git a/server/global/global.go b/server/global/global.go index 9093c50..d098520 100644 --- a/server/global/global.go +++ b/server/global/global.go @@ -26,4 +26,15 @@ var ( GVA_Concurrency_Control = &singleflight.Group{} BlackCache local_cache.Cache + + //其他数据库配置 + GVA_DB_Master *gorm.DB + GVA_DB_BookDate *gorm.DB + GVA_DB_WatchDate *gorm.DB + GVA_DB_ErrorSubjectDate *gorm.DB + GVA_DB_MyTestDate *gorm.DB + GVA_DB_BooImgkDate *gorm.DB + GVA_DB_IntegralDate *gorm.DB + GVA_DB_QADate *gorm.DB + GVA_DB_BillboardDate *gorm.DB ) diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go index fbbab79..af20d7a 100644 --- a/server/initialize/gorm.go +++ b/server/initialize/gorm.go @@ -116,3 +116,64 @@ func gormConfig() *gorm.Config { } return config } + +/* +*根据参数不同切换数据库 +@mysqlMaster app主数据库 +@mysqlBookDate 文档属性数据库 +@mysqlWatchDate 微信员工信息表 +@mysqlErrorSubjectDate 错题库 +@mysqlMyTestDate 自我测验 +@mysqlBooImgkDate 图文信息数据库 +@mysqlIntegralDate 计分明细数据库 +@mysqlQADate 趣味问答 +@mysqlBillboardDate 风云榜统计数据库 +*/ +func GormMysqlChange(setDataBaseName string) *gorm.DB { + m := global.GVA_CONFIG.Mysql + switch setDataBaseName { + case "mysqlMaster": + m = global.GVA_CONFIG.MysqlMaster + case "mysqlBookDate": + m = global.GVA_CONFIG.MysqlBookDate + case "mysqlWatchDate": + m = global.GVA_CONFIG.MysqlWatchDate + case "mysqlErrorSubjectDate": + m = global.GVA_CONFIG.MysqlErrorSubjectDate + case "mysqlMyTestDate": + m = global.GVA_CONFIG.MysqlMyTestDate + case "mysqlBooImgkDate": + m = global.GVA_CONFIG.MysqlBooImgkDate + case "mysqlIntegralDate": + m = global.GVA_CONFIG.MysqlIntegralDate + case "mysqlQADate": + m = global.GVA_CONFIG.MysqlQADate + case "mysqlBillboardDate": + m = global.GVA_CONFIG.MysqlQADate + default: + m = global.GVA_CONFIG.Mysql + } + if m.Dbname == "" { + return nil + } + dsn := m.Username + ":" + m.Password + "@tcp(" + m.Path + ")/" + m.Dbname + "?" + m.Config + mysqlConfig := mysql.Config{ + DSN: dsn, // DSN data source name + DefaultStringSize: 191, // string 类型字段的默认长度 + DisableDatetimePrecision: true, // 禁用 datetime 精度，MySQL 5.6 之前的数据库不支持 + DontSupportRenameIndex: true, // 重命名索引时采用删除并新建的方式，MySQL 5.7 之前的数据库和 MariaDB 不支持重命名索引 + DontSupportRenameColumn: true, // 用 `change` 重命名列，MySQL 8 之前的数据库和 MariaDB 不支持重命名列 + SkipInitializeWithVersion: false, // 根据版本自动配置 + } + if db, err := gorm.Open(mysql.New(mysqlConfig), gormConfig()); err != nil { + //global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err)) + //os.Exit(0) + //return nil + return nil + } else { + sqlDB, _ := db.DB() + sqlDB.SetMaxIdleConns(m.MaxIdleConns) + sqlDB.SetMaxOpenConns(m.MaxOpenConns) + return db + } +} diff --git a/server/initialize/router.go b/server/initialize/router.go index 0bcdef3..38ea78c 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -8,7 +8,7 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/middleware" "github.com/flipped-aurora/gin-vue-admin/server/router" "github.com/gin-gonic/gin" - "github.com/swaggo/gin-swagger" + ginSwagger "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" ) @@ -40,6 +40,7 @@ func Routers() *gin.Engine { systemRouter := router.RouterGroupApp.System exampleRouter := router.RouterGroupApp.Example autocodeRouter := router.RouterGroupApp.Autocode + shiyanRouter := router.RouterGroupApp.Shiyan PublicGroup := Router.Group("") { // 健康监测 @@ -69,6 +70,8 @@ func Routers() *gin.Engine { exampleRouter.InitExcelRouter(PrivateGroup) // 表格导入导出 exampleRouter.InitCustomerRouter(PrivateGroup) // 客户路由 + shiyanRouter.InitShiyanRouter(PrivateGroup) // 客户路由 + // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT. autocodeRouter.InitSysAutoCodeExampleRouter(PrivateGroup) // Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT. diff --git a/server/log/server_debug.log b/server/log/server_debug.log new file mode 100644 index 0000000..e69de29 diff --git a/server/log/server_error.log b/server/log/server_error.log index d7b1a9e..3ed5d06 100644 --- a/server/log/server_error.log +++ b/server/log/server_error.log @@ -1,3 +1,5 @@ [github.com/flipped-aurora/gin-vue-admin/server]2021/10/28 - 10:28:19.554 error l:/任官钰/代码/gin-vue-admin-master/gin-vue-admin-master/server/api/v1/system/sys_initdb.go:34 自动创建数据库失败! {"err": "Error 1045: Access denied for user 'root'@'localhost' (using password: YES)"} [github.com/flipped-aurora/gin-vue-admin/server]2021/10/28 - 10:28:29.736 error l:/任官钰/代码/gin-vue-admin-master/gin-vue-admin-master/server/api/v1/system/sys_initdb.go:34 自动创建数据库失败! {"err": "Error 1045: Access denied for user 'root'@'localhost' (using password: YES)"} [github.com/flipped-aurora/gin-vue-admin/server]2021/10/28 - 10:28:42.301 error l:/任官钰/代码/gin-vue-admin-master/gin-vue-admin-master/server/api/v1/system/sys_initdb.go:34 自动创建数据库失败! {"err": "Error 1045: Access denied for user 'root'@'localhost' (using password: YES)"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:15:50.055 error G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:47 listen tcp :8888: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted. +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.679 error G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:47 listen tcp :8888: bind: Only one usage of each socket address (protocol/network address/port) is normally permitted. diff --git a/server/log/server_info.log b/server/log/server_info.log index 3deaad4..a66c9ad 100644 --- a/server/log/server_info.log +++ b/server/log/server_info.log @@ -30,3 +30,100 @@ [github.com/flipped-aurora/gin-vue-admin/server]2021/11/01 - 09:24:45.899 info L:/任官钰/GitHub/SourceCode/gin-vue-admin/server/initialize/router.go:36 register swagger handler [github.com/flipped-aurora/gin-vue-admin/server]2021/11/01 - 09:24:45.907 info L:/任官钰/GitHub/SourceCode/gin-vue-admin/server/initialize/router.go:79 router register success [github.com/flipped-aurora/gin-vue-admin/server]2021/11/01 - 09:24:45.909 info L:/任官钰/GitHub/SourceCode/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:15:50.030 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:15:50.031 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:15:50.031 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:15:50.040 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:79 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:15:50.053 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:16:27.501 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:16:27.502 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:16:27.502 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:16:27.513 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:79 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:16:27.524 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8889"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:37:24.612 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:37:24.612 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:37:24.613 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:37:24.622 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:37:24.628 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8889"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:41:43.179 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:41:43.179 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:41:43.179 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:41:43.208 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:41:43.214 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:47:30.332 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:47:30.333 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:47:30.333 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:47:30.344 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:47:30.360 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:48:02.185 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:48:02.185 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:48:02.186 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:48:02.196 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:48:02.198 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:49:34.811 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:49:34.811 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:49:34.812 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:49:34.823 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:49:34.827 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:50:11.907 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:50:11.908 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:50:11.908 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:50:11.918 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:50:11.929 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:51:00.912 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:51:00.912 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:51:00.913 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:51:00.922 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:51:00.925 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:52:33.698 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:52:33.699 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:52:33.699 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:52:33.708 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:52:33.715 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:56:24.981 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:56:24.981 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:56:24.982 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:56:24.991 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 14:56:25.004 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:09:34.934 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:09:34.936 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:09:34.936 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:09:34.936 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:09:34.960 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:09:34.968 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.625 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.655 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.656 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.656 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.671 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:19.675 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:35.227 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:35.241 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:35.241 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:35.242 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:35.250 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:35.252 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:52.235 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:52.237 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:52.237 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:52.238 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:52.267 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:17:52.269 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8888"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:18:25.827 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:18:25.846 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:18:25.846 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:18:25.847 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:18:25.857 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:18:25.867 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8889"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:27:49.308 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:27:49.323 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:27:49.323 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:27:49.323 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:27:49.337 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:27:49.350 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8889"} +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:29:08.374 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/gorm.go:62 register table success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:29:08.387 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:31 use middleware logger +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:29:08.387 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:34 use middleware cors +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:29:08.388 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:36 register swagger handler +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:29:08.397 info G:/goobject/src/git_public/gin-vue-admin/server/initialize/router.go:82 router register success +[github.com/flipped-aurora/gin-vue-admin/server]2021/11/03 - 15:29:08.406 info G:/goobject/src/git_public/gin-vue-admin/server/core/server.go:37 server run success on {"address": ":8889"} diff --git a/server/main.go b/server/main.go index c82e084..a996a32 100644 --- a/server/main.go +++ b/server/main.go @@ -29,5 +29,14 @@ func main() { db, _ := global.GVA_DB.DB() defer db.Close() } + global.GVA_DB_Master = initialize.GormMysqlChange("mysqlMaster") + global.GVA_DB_BookDate = initialize.GormMysqlChange("mysqlBookDate") + global.GVA_DB_WatchDate = initialize.GormMysqlChange("mysqlWatchDate") + global.GVA_DB_ErrorSubjectDate = initialize.GormMysqlChange("mysqlErrorSubjectDate") + global.GVA_DB_MyTestDate = initialize.GormMysqlChange("mysqlMyTestDate") + global.GVA_DB_BooImgkDate = initialize.GormMysqlChange("mysqlBooImgkDate") + global.GVA_DB_IntegralDate = initialize.GormMysqlChange("mysqlIntegralDate") + global.GVA_DB_QADate = initialize.GormMysqlChange("mysqlQADate") + global.GVA_DB_BillboardDate = initialize.GormMysqlChange("mysqlBillboardDate") core.RunWindowsServer() } diff --git a/server/model/testpage/answer.go b/server/model/testpage/answer.go new file mode 100644 index 0000000..9b72bea --- /dev/null +++ b/server/model/testpage/answer.go @@ -0,0 +1,13 @@ +package testpage + +type Answer struct { + Id int64 `json:"id" gorm:"column:a_id;type:bigint(20);;primaryKey;unique;not null;autoIncrement;index"` + Text string `json:"text" gorm:"column:a_text;type:text;not null;comment:答案"` //'答案', + TrueFalse int8 `json:"truefalse" gorm:"column:a_true_false;type:tinyint(1) unsigned;default:1;not null;comment:是否为正确答案（1：正确；2：错误）"` //'是否为正确答案（1：正确；2：错误）', + Type int8 `json:"type" gorm:"column:a_type;type:tinyint(1) unsigned;default:1;not null;comment:是否为正确答案（1：正确；2：错误）"` //'类型（1：单选；2：多选；3：判断）', + Key int64 `json:"key" gorm:"column:a_key;type:bigint(50) unsigned;default:0;not null;comment:创建人"` //'唯一识别符', +} + +func (Answer *Answer) TableName() string { + return "answer" +} diff --git a/server/router/enter.go b/server/router/enter.go index 737fc5a..d22df77 100644 --- a/server/router/enter.go +++ b/server/router/enter.go @@ -3,6 +3,7 @@ package router import ( "github.com/flipped-aurora/gin-vue-admin/server/router/autocode" "github.com/flipped-aurora/gin-vue-admin/server/router/example" + "github.com/flipped-aurora/gin-vue-admin/server/router/shiyan" "github.com/flipped-aurora/gin-vue-admin/server/router/system" ) @@ -10,6 +11,7 @@ type RouterGroup struct { System system.RouterGroup Example example.RouterGroup Autocode autocode.RouterGroup + Shiyan shiyan.RouterGroup } var RouterGroupApp = new(RouterGroup) diff --git a/server/router/shiyan/enter.go b/server/router/shiyan/enter.go new file mode 100644 index 0000000..31a20e0 --- /dev/null +++ b/server/router/shiyan/enter.go @@ -0,0 +1,5 @@ +package shiyan + +type RouterGroup struct { + ShiyanRouter +} diff --git a/server/router/shiyan/sys_shiyan.go b/server/router/shiyan/sys_shiyan.go new file mode 100644 index 0000000..832db4c --- /dev/null +++ b/server/router/shiyan/sys_shiyan.go @@ -0,0 +1,16 @@ +package shiyan + +import ( + v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1" + "github.com/gin-gonic/gin" +) + +type ShiyanRouter struct{} + +func (s *ShiyanRouter) InitShiyanRouter(Router *gin.RouterGroup) { + shiyanCodeRouter := Router.Group("shiyan") + var authorityApi = v1.ApiGroupApp.ShiyanApiGroup.ShiyanApi + { + shiyanCodeRouter.POST("/", authorityApi.AddBaseMenu) // 删除回滚记录 + } +}