update login theme

Author: cg33

en/pages/login.md

@@ -9,44 +9,51 @@ More login interface components [see here](https://github.com/GoAdminGroup/compo
 package main
 
 import (
-	"github.com/GoAdminGroup/demo/ecommerce"
-	"github.com/GoAdminGroup/demo/login"
-	"github.com/GoAdminGroup/demo/pages"
-	_ "github.com/GoAdminGroup/go-admin/adapter/gin"
-	_ "github.com/GoAdminGroup/go-admin/modules/db/drivers/mysql"
-	_ "github.com/GoAdminGroup/themes/adminlte"
+	_ "github.com/GoAdminGroup/go-admin/adapter/gin"	    
+    _ "github.com/GoAdminGroup/go-admin/adapter/gin"
+    _ "github.com/GoAdminGroup/go-admin/modules/db/drivers/mysql"
+    // import the theme2 login theme, if you don`t use, don`t import
+    _ "github.com/GoAdminGroup/components/login/theme2"
+	
+	"github.com/GoAdminGroup/components/login"
 	"github.com/GoAdminGroup/go-admin/engine"
 	"github.com/GoAdminGroup/go-admin/examples/datamodel"
 	"github.com/GoAdminGroup/go-admin/plugins/admin"
-	"github.com/GoAdminGroup/go-admin/plugins/example"
-	"github.com/GoAdminGroup/go-admin/template"
-	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/gin-gonic/gin"
+	"io/ioutil"
 )
 
 func main() {
 	r := gin.Default()
 
-	eng := engine.Default()
-
-    //  Add login component
-	template.AddLoginComp(login.GetLoginComponent())
-
-	// you can custom a plugin like:
+	gin.SetMode(gin.ReleaseMode)
+	gin.DefaultWriter = ioutil.Discard
 
-	examplePlugin := example.NewExample()
-
-	rootPath := "/data/www/go-admin"
-
-	if err := eng.AddConfigFromJson(rootPath+"/config.json").
-		AddGenerators(datamodel.Generators).
-		AddGenerator("user", datamodel.GetUserTable).
-		AddPlugins(examplePlugin).
+	eng := engine.Default()
+	adminPlugin := admin.NewAdmin(datamodel.Generators)
+	adminPlugin.AddGenerator("user", datamodel.GetUserTable)
+	
+	// load the CAPTCHA driver if you use it
+	adminPlugin.SetCaptcha(map[string]string{"driver": login.CaptchaDriverKeyDefault})
+
+    // use the login theme component
+    login.Init(login.Config{
+        Theme: "theme2", // theme name
+        CaptchaDigits: 5, // Use captcha images, here on behalf of how many authentication code Numbers
+        // Use tencent verification code, need to offer appID and appSecret
+        // TencentWaterProofWallData: login.TencentWaterProofWallData{
+        //    AppID:"",
+        //    AppSecret: "",
+        // }   
+    })
+
+	if err := eng.AddConfigFromJson("./config.json").
+		AddPlugins(adminPlugin).
 		Use(r); err != nil {
 		panic(err)
 	}
 
-	r.Static("/uploads", rootPath+"/uploads")
+	r.Static("/uploads", "./uploads")
 
 	_ = r.Run(":9033")
 }

zh/pages/login.md

@@ -5,31 +5,52 @@
 
 通过组件的方式可以修改登录界面，如下例子：
 
-更多登录界面组件[看这里](https://github.com/GoAdminGroup/components/blob/master/login/README.md)；加载后引入即可。
+更多登录主题[看这里](https://github.com/GoAdminGroup/components/blob/master/login/README_CN.md)；加载后引入即可。
 
 ```go
 package main
 
 import (
-	_ "github.com/GoAdminGroup/go-admin/adapter/gin" // 适配器
-	_ "github.com/GoAdminGroup/go-admin/modules/db/drivers/mysql" // 数据库驱动
-	_ "github.com/GoAdminGroup/themes/adminlte" // 主题
-
-	"github.com/GoAdminGroup/demo/login"
+	_ "github.com/GoAdminGroup/go-admin/adapter/gin"	    
+    _ "github.com/GoAdminGroup/go-admin/adapter/gin"
+    _ "github.com/GoAdminGroup/go-admin/modules/db/drivers/mysql"
+    // 引入theme2登录页面主题，如不用，可以不导入
+    _ "github.com/GoAdminGroup/components/login/theme2"
+	
+	"github.com/GoAdminGroup/components/login"
 	"github.com/GoAdminGroup/go-admin/engine"
-	"github.com/GoAdminGroup/go-admin/template"
+	"github.com/GoAdminGroup/go-admin/examples/datamodel"
+	"github.com/GoAdminGroup/go-admin/plugins/admin"
 	"github.com/gin-gonic/gin"
+	"io/ioutil"
 )
 
 func main() {
 	r := gin.Default()
 
-	eng := engine.Default()
+	gin.SetMode(gin.ReleaseMode)
+	gin.DefaultWriter = ioutil.Discard
 
-    // 增加登录组件
-	template.AddLoginComp(login.GetLoginComponent())
+	eng := engine.Default()
+	adminPlugin := admin.NewAdmin(datamodel.Generators)
+	adminPlugin.AddGenerator("user", datamodel.GetUserTable)
+	
+	// 载入对应验证码驱动，如没使用不用载入
+	adminPlugin.SetCaptcha(map[string]string{"driver": login.CaptchaDriverKeyDefault})
+
+    // 使用登录页面组件
+    login.Init(login.Config{
+        Theme: "theme2",
+        CaptchaDigits: 5, // 使用图片验证码，这里代表多少个验证码数字
+        // 使用腾讯验证码，需提供appID与appSecret
+        // TencentWaterProofWallData: login.TencentWaterProofWallData{
+        //    AppID:"",
+        //    AppSecret: "",
+        // }   
+    })
 
 	if err := eng.AddConfigFromJson("./config.json").
+		AddPlugins(adminPlugin).
 		Use(r); err != nil {
 		panic(err)
 	}