add web support

.gitignore

@@ -24,3 +24,4 @@ _testmain.go
 *.prof
 
 shortme
+donate

README.md

@@ -109,6 +109,16 @@ Currently, afaik, there are three ways to implement short url service.
             * Connection #0 to host 127.0.0.1 left intact
         ```
 
+### Web
+----
+The web interface mainly used to make url shorting service more intuitively.
+
+For **short** option, the shorted url, shorted url qr code and the 
+corresponding long page is shown.
+
+For **expand** option, the expanded url, expanded url qr code and the 
+corresponding expanded page is shown. 
+
 ### Install
 ----
 #### Dependency
@@ -322,3 +332,9 @@ For example, we can shard according to the **base integer** using **modula hash
 
 In conclusion, there are many factors to consider before we can make a
 decision which hash algorithm to use.
+
+
+### Problems
+----
+* long url may make the generated qr code unreadable. I have test this in my 
+self phone. This remains to be tested more meticulous.  

base/base.go

@@ -10,7 +10,6 @@ import (
 // Int2String converts an unsigned 64bit integer to a string.
 func Int2String(seq uint64) (shortURL string) {
 	charSeq := []rune{}
-
 	if seq != 0 {
 		for seq != 0 {
 			mod := seq % conf.Conf.Common.BaseStringLength

conf/conf.go

@@ -32,6 +32,7 @@ type common struct {
 	BaseString string `toml:"base_string"`
 	BaseStringLength uint64
 	DomainName string `toml:"domain_name"`
+	Schema string `toml:"schema"`
 }
 
 type config struct {

conf/generic.go

@@ -5,8 +5,7 @@ import (
 	"runtime"
 )
 
-
-const Version = "1.0.0"
+const Version = "1.2.0"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

config.conf

@@ -27,10 +27,13 @@ max_open_conns = 8
 
 [common]
 # short urls that will be filtered to use
-black_short_urls = ["version","health","short","expand","fuck","stupid"]
+black_short_urls = ["version","health","short","expand","css","js","fuck","stupid"]
 
 # Base string used to generate short url
 base_string = "Ds3K9ZNvWmHcakr1oPnxh4qpMEzAye8wX5IdJ2LFujUgtC07lOTb6GYBQViSfR"
 
 # Short url service domain name. This is used to filter short url loop.
-domain_name = "short.me:3030"
+domain_name = "127.0.0.1:3030"
+
+# Short url service schema: http or https.
+schema = "http"

main.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/andyxning/shortme/conf"
-	"github.com/andyxning/shortme/api"
+	"github.com/andyxning/shortme/web"
 	"github.com/andyxning/shortme/short"
 )
 
@@ -29,5 +29,5 @@ func main() {
 	short.Start()
 
 	// api
-	api.Start()
+	web.Start()
 }