Skip to content

Commit 2ed9e6a

Browse files
committed
设定索引字段长度,避免出现‘Specified key was too long’问题
1 parent c0b0589 commit 2ed9e6a

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

TODO.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
- [ ] 文档上传间隔频率控制
2727

2828

29+
## DocHub v2.2
30+
- [ ] 文档管理文档删除的错误
31+
- [x] 移除对zoneinfo.zip的依赖
32+
- [ ] calibre 文档转换优化
33+
- [ ] 解决程序不支持utf8mb4数据库字符编码问题(ERROR 1071 (42000): Specified key was too long; max key length is 767 bytes),索引字段太长导致
34+
2935

3036
## DocHub v2.2
3137
- [x] 多样化存储实现

models/CollectModel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
type CollectFolder struct {
1212
Id int `orm:"column(Id)"`
1313
Cover string `orm:"column(Cover);size(50);default()"` //文档收藏夹(专辑封面)
14-
Title string `orm:"column(Title);default(默认收藏夹)"` //会员收藏文档的存放收藏夹
14+
Title string `orm:"column(Title);size(100);default(默认收藏夹)"` //会员收藏文档的存放收藏夹
1515
Description string `orm:"column(Description);size(512);default()"` //会员创建的收藏夹的描述
1616
Uid int `orm:"column(Uid);index"` //归属于哪个会员的收藏夹
1717
TimeCreate int `orm:"column(TimeCreate)"` //收藏夹创建时间

models/Models.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ func Init() {
5959
orm.RunSyncdb("default", false, false)
6060
} else {
6161
orm.Debug = true
62-
orm.RunSyncdb("default", false, true)
62+
orm.RunSyncdb("default", true, true)
6363
}
64-
6564
//安装初始数据
6665
install()
6766
}
6867

6968
//注册数据库
7069
func RegisterDB() {
70+
helper.Logger.Info("RegisterDB Start")
7171
orm.RegisterDriver("mysql", orm.DRMySQL)
7272
models := []interface{}{
7373
NewUser(),
@@ -84,8 +84,6 @@ func RegisterDB() {
8484
NewRelate(),
8585
NewCollectFolder(),
8686
NewCollect(),
87-
NewAdPosition(),
88-
NewAd(),
8987
NewFriend(),
9088
NewSys(),
9189
NewWord(),
@@ -100,7 +98,10 @@ func RegisterDB() {
10098
NewSearchLog(),
10199
NewDocText(),
102100
NewConfig(),
101+
//NewAdPosition(),
102+
//NewAd(),
103103
}
104+
beego.Info("tables count::::", len(models))
104105
orm.RegisterModelWithPrefix(beego.AppConfig.DefaultString("db::prefix", "hc_"), models...)
105106
dbUser := beego.AppConfig.String("db::user")
106107
dbPassword := beego.AppConfig.String("db::password")
@@ -124,16 +125,14 @@ func RegisterDB() {
124125
if timezone := beego.AppConfig.String("db::timezone"); timezone != "" {
125126
loc = url.QueryEscape(timezone)
126127
}
127-
dblink := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=%s&loc=%v", dbUser, dbPassword, dbHost, dbPort, dbDatabase, dbCharset, loc)
128-
//下面两个参数后面要放到app.conf提供用户配置使用
129-
// (可选)设置最大空闲连接
128+
dbLink := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=%s&loc=%v", dbUser, dbPassword, dbHost, dbPort, dbDatabase, dbCharset, loc)
129+
helper.Logger.Debug(dbLink)
130130
maxIdle := beego.AppConfig.DefaultInt("db::maxIdle", 50)
131-
// (可选) 设置最大数据库连接 (go >= 1.2)
132131
maxConn := beego.AppConfig.DefaultInt("db::maxConn", 300)
133-
if err := orm.RegisterDataBase("default", "mysql", dblink, maxIdle, maxConn); err != nil {
132+
if err := orm.RegisterDataBase("default", "mysql", dbLink, maxIdle, maxConn); err != nil {
134133
panic(err)
135134
}
136-
135+
helper.Logger.Info("RegisterDB End")
137136
}
138137

139138
//获取带表前缀的数据表

models/SignModel.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88

99
//签到表表结构
1010
type Sign struct {
11-
Id int `orm:"column(Id);"` //主键
12-
Uid int `orm:"column(Uid)"` //用户ID
13-
Date string `orm:"column(Date)"` //签到日期,格式如20170322
11+
Id int `orm:"column(Id);"` //主键
12+
Uid int `orm:"column(Uid)"` //用户ID
13+
Date string `orm:"column(Date);size(8)"` //签到日期,格式如20170322
1414
}
1515

1616
func NewSign() *Sign {

views/Admin/default/Doc/recycle.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ <h1 class="page-header">文档管理</h1>
5050
{{end}}
5151
</td>
5252
<td>
53-
{{if (.Md5|IsIllegal)}}
54-
<span class="text-danger">非法(禁传)</span>
53+
{{if .Md5}}
54+
{{if and .Md5 (.Md5|IsIllegal)}}
55+
<span class="text-danger">非法(禁传)</span>
56+
{{else}}
57+
<span class="text-success">合法</span>
58+
{{end}}
5559
{{else}}
56-
<span class="text-success">合法</span>
60+
--
5761
{{end}}
5862
</td>
5963
<td>

0 commit comments

Comments
 (0)