Merge branch 'feat/1.0.5/deltag' into release/1.0.5

Author: LinkinStars

docs/docs.go

@@ -7173,6 +7173,9 @@ const docTemplate = `{
                 },
                 "theme": {
                     "$ref": "#/definitions/schema.SiteThemeResp"
+                },
+                "version": {
+                    "type": "string"
                 }
             }
         },

docs/swagger.json

@@ -7161,6 +7161,9 @@
                 },
                 "theme": {
                     "$ref": "#/definitions/schema.SiteThemeResp"
+                },
+                "version": {
+                    "type": "string"
                 }
             }
         },

docs/swagger.yaml

@@ -1335,6 +1335,8 @@ definitions:
         $ref: '#/definitions/schema.SiteSeoReq'
       theme:
         $ref: '#/definitions/schema.SiteThemeResp'
+      version:
+        type: string
     type: object
   schema.SiteInterfaceReq:
     properties:

internal/base/validator/validator.go

@@ -122,7 +122,8 @@ func Sanitizer(fl validator.FieldLevel) (res bool) {
 	switch field.Kind() {
 	case reflect.String:
 		filter := bluemonday.UGCPolicy()
-		field.SetString(filter.Sanitize(field.String()))
+		content := strings.Replace(filter.Sanitize(field.String()), "&", "&", -1)
+		field.SetString(content)
 		return true
 	case reflect.Chan, reflect.Map, reflect.Slice, reflect.Array:
 		return field.Len() > 0