Merge remote-tracking branch 'origin/master'

xuxinhua · xuxinhua · commit 389029010c1f · 2015-04-04T20:22:50.000+08:00
diff --git a/websites/code/studygolang/install.bat b/websites/code/studygolang/install.bat
@@ -23,7 +23,7 @@ set VERSION=%VERNAME%-%VERCODE%
 gofmt -w src
 
 :: -tags "debug" 表示测试
-go install -tags "debug" -ldflags "-X util.Version "%VERSION%" -X util.Date "%date:~3,10%T%time%"" ./...
+go install -tags "debug" -ldflags "-X util.version.Version "%VERSION%" -X util.Date "%date:~3,10%T%time%"" ./...
 
 set GOPATH=%OLDGOPATH%
 
diff --git a/websites/databases/studygolang_db.sql b/websites/databases/studygolang_db.sql
@@ -292,7 +292,8 @@ CREATE TABLE `resource` (
   `catid` int unsigned NOT NULL COMMENT '所属类别',
   `ctime` timestamp NOT NULL DEFAULT 0,
   `mtime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY (`url`)
 ) COMMENT '资源' ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 /*---------------------------------------------------------------------------*
@@ -470,4 +471,34 @@ CREATE TABLE `morning_reading` (
   `username` varchar(20) NOT NULL DEFAULT '' COMMENT '发布人',
   `ctime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`)
-)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '技术晨读表';
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '技术晨读表';
+
+
+/*---------------------------------------------------------------------------*
+  NAME: advertisement
+  用途: 广告表
+*---------------------------------------------------------------------------*/
+DROP TABLE IF EXISTS `advertisement`;
+CREATE TABLE `advertisement` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(20) NOT NULL DEFAULT '' COMMENT '广告名称',
+  `code` varchar(255) NOT NULL DEFAULT '' COMMENT '广告内容代码(html、js等)',
+  `source` varchar(20) NOT NULL DEFAULT '' COMMENT '广告来源，如 baidu_union，shiyanlou',
+  `ctime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '广告表';
+
+/*---------------------------------------------------------------------------*
+  NAME: page_ad
+  用途: 页面广告管理表
+*---------------------------------------------------------------------------*/
+DROP TABLE IF EXISTS `page_ad`;
+CREATE TABLE `page_ad` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `ad_id` varchar(20) NOT NULL DEFAULT '' COMMENT '广告名称',
+  `ad_id` varchar(20) NOT NULL DEFAULT '' COMMENT '广告名称',
+  `code` varchar(255) NOT NULL DEFAULT '' COMMENT '广告内容代码(html、js等)',
+  `source` varchar(20) NOT NULL DEFAULT '' COMMENT '广告来源，如 baidu_union，shiyanlou',
+  `ctime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT '页面广告管理表';
