upgrade iris

README.md

@@ -92,15 +92,14 @@ $ go run main.go
 
 ### 后台
 * web框架: iris
-* 路由: httprouter
 * 持久层框架: gorm
 * 数据库: mysql 
 
 ### go依赖的第三方库
 
 | 库 | 说明              |
 |:---------|:-----------------------|
-| gopkg.in/kataras/iris.v6   | iris web框架   |
+| gopkg.in/kataras/iris.v12   | iris web框架   |
 | github.com/jinzhu/gorm     | gorm 持久层框架 |
 | github.com/satori/go.uuid  | uuid生成工具    |
 
@@ -127,4 +126,4 @@ qq群: 32550512
 
 ## License
 [GPL](https://github.com/shen100/wemall/blob/master/LICENSE "")      
-Copyright (c) 2013-present, shen100
+Copyright (c) 2013-present, shen100

config/config.go

@@ -1,45 +1,45 @@
 package config
 
 import (
-    "strings"
-    "encoding/json"
-    "fmt"
-    "io/ioutil"
-    "regexp"
-    "wemall/utils"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"regexp"
+	"strings"
+	"wemall/utils"
 )
 
 var jsonData map[string]interface{}
 
 func initJSON() {
-    bytes, err := ioutil.ReadFile("./configuration.json")
-    if err != nil {
-        fmt.Println("ReadFile: ", err.Error())
-    }
+	bytes, err := ioutil.ReadFile("./configuration.json")
+	if err != nil {
+		fmt.Println("ReadFile: ", err.Error())
+	}
 
 	configStr := string(bytes[:])
-	reg       := regexp.MustCompile(`/\*.*\*/`)
+	reg := regexp.MustCompile(`/\*.*\*/`)
 
-	configStr  = reg.ReplaceAllString(configStr, "")
-	bytes      = []byte(configStr)
+	configStr = reg.ReplaceAllString(configStr, "")
+	bytes = []byte(configStr)
 
-    if err := json.Unmarshal(bytes, &jsonData); err != nil {
-        fmt.Println("invalid config: ", err.Error())
-    }
+	if err := json.Unmarshal(bytes, &jsonData); err != nil {
+		fmt.Println("invalid config: ", err.Error())
+	}
 }
 
 type dBConfig struct {
-	Dialect       string
-	Database      string
-	User          string
-	Password      string
-	Charset       string
-	Host          string
-	Port          int
-	SQLLog        bool
-	URL           string
-	MaxIdleConns  int    
-	MaxOpenConns  int 
+	Dialect      string
+	Database     string
+	User         string
+	Password     string
+	Charset      string
+	Host         string
+	Port         int
+	SQLLog       bool
+	URL          string
+	MaxIdleConns int
+	MaxOpenConns int
 }
 
 // DBConfig 数据库相关配置
@@ -49,12 +49,12 @@ func initDB() {
 	utils.SetStructByJSON(&DBConfig, jsonData["database"].(map[string]interface{}))
 	portStr := fmt.Sprintf("%d", DBConfig.Port)
 	url := "{user}:{password}@tcp({host}:{port})/{database}?charset={charset}&parseTime=True&loc=Local"
-	url  = strings.Replace(url, "{database}", DBConfig.Database, -1)
-	url  = strings.Replace(url, "{user}",     DBConfig.User,     -1)
-	url  = strings.Replace(url, "{password}", DBConfig.Password, -1)
-	url  = strings.Replace(url, "{host}",     DBConfig.Host,     -1)
-	url  = strings.Replace(url, "{port}",     portStr,           -1)
-	url  = strings.Replace(url, "{charset}",  DBConfig.Charset,  -1)
+	url = strings.Replace(url, "{database}", DBConfig.Database, -1)
+	url = strings.Replace(url, "{user}", DBConfig.User, -1)
+	url = strings.Replace(url, "{password}", DBConfig.Password, -1)
+	url = strings.Replace(url, "{host}", DBConfig.Host, -1)
+	url = strings.Replace(url, "{port}", portStr, -1)
+	url = strings.Replace(url, "{charset}", DBConfig.Charset, -1)
 	fmt.Println(url)
 	DBConfig.URL = url
 }
@@ -98,8 +98,8 @@ func initWeAppConfig() {
 }
 
 type apiConfig struct {
-	Prefix   string
-	URL      string
+	Prefix string
+	URL    string
 }
 
 // APIConfig api相关配置
@@ -115,4 +115,4 @@ func init() {
 	initServer()
 	initWeAppConfig()
 	initAPI()
-}
+}

controller/admin/admin.go

@@ -1,13 +1,12 @@
 package admin
 
 import (
-	"gopkg.in/kataras/iris.v6"
+	"github.com/kataras/iris/v12"
 )
 
 // Authentication 授权
-func Authentication(ctx *iris.Context) {
+func Authentication(ctx iris.Context) {
 	if true {
 		ctx.Next()
 	}
 }
-

controller/cart/cart.go

@@ -1,13 +1,14 @@
 package cart
 
 import (
-	"gopkg.in/kataras/iris.v6"
-	"wemall/model"
+	"github.com/kataras/iris/v12"
+	"github.com/kataras/iris/v12/sessions"
 	"wemall/controller/common"
+	"wemall/model"
 )
 
 // Create 购物车中添加商品
-func Create(ctx *iris.Context) {
+func Create(ctx iris.Context) {
 	SendErrJSON := common.SendErrJSON
 	var cart model.Cart
 
@@ -27,8 +28,8 @@ func Create(ctx *iris.Context) {
 		return
 	}
 
-	session := ctx.Session()
-	openID  := session.GetString("weAppOpenID")
+	session := sessions.Get(ctx)
+	openID := session.GetString("weAppOpenID")
 
 	if openID == "" {
 		SendErrJSON("登录超时", ctx)
@@ -40,13 +41,12 @@ func Create(ctx *iris.Context) {
 		SendErrJSON("error", ctx)
 		return
 	}
-	ctx.JSON(iris.StatusOK, iris.Map{
-		"errNo" : model.ErrorCode.SUCCESS,
-		"msg"   : "success",
-		"data"  : iris.Map{
+	ctx.JSON(iris.Map{
+		"errNo": model.ErrorCode.SUCCESS,
+		"msg":   "success",
+		"data": iris.Map{
 			"id": cart.ID,
 		},
 	})
 	return
 }
-