From c36faea6997c3c7153915950b93550067aa6019a Mon Sep 17 00:00:00 2001
From: lifei6671 <longfei6671@163.com>
Date: Mon, 1 May 2017 20:08:03 +0800
Subject: [PATCH] *

---
 commands/command.go | 21 +++++++++------------
 models/options.go   |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/commands/command.go b/commands/command.go
index acd6c933..b375d581 100644
--- a/commands/command.go
+++ b/commands/command.go
@@ -52,18 +52,15 @@ func RegisterModel()  {
 
 func Initialization()  {
 
-	(&models.Option{
-		OptionName: "ENABLED_CAPTCHA", OptionValue: "false", OptionTitle:"是否启用验证码",
-	}).InsertOrUpdate()
-	(&models.Option{
-		OptionName: "ENABLED_REGISTER",OptionValue:"false",OptionTitle:"是否启用注册",
-	}).InsertOrUpdate()
-	(&models.Option{
-		OptionName: "ENABLE_ANONYMOUS" , OptionValue:"false", OptionTitle:"启用匿名访问",
-	}).InsertOrUpdate()
-	(&models.Option{
-		OptionName: "SITE_NAME", OptionValue:"MinDoc", OptionTitle: "站点名称",
-	}).InsertOrUpdate()
+	options := []models.Option {
+		{ OptionName: "ENABLED_CAPTCHA", OptionValue: "false", OptionTitle:"是否启用验证码"},
+		{ OptionName: "ENABLED_REGISTER",OptionValue:"false",OptionTitle:"是否启用注册"},
+		{ OptionName: "ENABLE_ANONYMOUS" , OptionValue:"false", OptionTitle:"启用匿名访问"},
+		{ OptionName: "SITE_NAME", OptionValue:"MinDoc", OptionTitle: "站点名称"},
+	}
+
+
+	models.NewOption().InsertMulti(options...)
 
 	member := models.NewMember()
 	member.Account = "admin"
diff --git a/models/options.go b/models/options.go
index bfc6ff0d..eefe648d 100644
--- a/models/options.go
+++ b/models/options.go
@@ -8,7 +8,7 @@ import (
 
 // Option struct .
 type Option struct {
-	OptionId int		`orm:"pk;auto;unique;column(option_id)" json:"option_id"`
+	OptionId int		`orm:"column(option_id);pk;auto;unique;" json:"option_id"`
 	OptionTitle string	`orm:"column(option_title);size(500)" json:"option_title"`
 	OptionName string	`orm:"column(option_name);unique;size(80)" json:"option_name"`
 	OptionValue string	`orm:"column(option_value);type(text);null" json:"option_value"`