增加了自动化视频以及修复了一些已知漏洞 (#1554)

* 解决bug：为角色添加权限时，如果有重复api权限，该角色所有权限均添加失败（包括登录）

* 支持视频上传和选用。视频首帧作为封面预览。

* 增加自动化代码视频选项

* 媒体库可上传视频
SelectImage组件增加参数file-type="image|video" 方便用户对媒体库可选内容做限制

* 自动化代码bug修复

---------

Co-authored-by: liuyahui <liuyahui@wjacloud.com>
Co-authored-by: Alan <alan.cd@qq.com>

server/resource/autocode_template/server/model.go.tpl

@@ -14,7 +14,9 @@ type {{.StructName}} struct {
       {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};"`
             {{- else if eq .FieldType "picture" }}
       {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}"`
-            {{- else if eq .FieldType "file" }}
+            {{- else if eq .FieldType "video" }}
+      {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}"`
+             {{- else if eq .FieldType "file" }}
       {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}"`
             {{- else if eq .FieldType "pictures" }}
       {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}"`

server/resource/autocode_template/web/form.vue.tpl

@@ -34,10 +34,13 @@
         </el-select>
       {{- end }}
        {{- if eq .FieldType "picture" }}
-          <SelectImage v-model="formData.{{ .FieldJson }}" />
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "video" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="video"/>
        {{- end }}
        {{- if eq .FieldType "pictures" }}
-           <SelectImage v-model="formData.{{ .FieldJson }}" multiple />
+           <SelectImage v-model="formData.{{ .FieldJson }}" multiple file-type="image"/>
        {{- end }}
        {{- if eq .FieldType "file" }}
           <SelectFile v-model="formData.{{ .FieldJson }}" />
@@ -108,6 +111,9 @@ const formData = ref({
             {{- if eq .FieldType "picture" }}
             {{.FieldJson}}: "",
             {{- end }}
+            {{- if eq .FieldType "video" }}
+            {{.FieldJson}}: "",
+            {{- end }}
             {{- if eq .FieldType "pictures" }}
             {{.FieldJson}}: [],
             {{- end }}

server/resource/autocode_template/web/table.vue.tpl

@@ -139,6 +139,18 @@
                 </div>
               </template>
            </el-table-column>
+           {{- else if eq .FieldType "video" }}
+           <el-table-column label="{{.FieldDesc}}" width="200">
+              <template #default="scope">
+               <video
+                  style="width: 100px; height: 100px"
+                  muted
+                  preload="metadata"
+                  >
+                    <source :src="getUrl(scope.row.{{.FieldJson}}) + '#t=1'">
+                  </video>
+              </template>
+           </el-table-column>
            {{- else if eq .FieldType "richtext" }}
                       <el-table-column label="{{.FieldDesc}}" width="200">
                          <template #default="scope">
@@ -215,11 +227,24 @@
                 </el-select>
           {{- end }}
           {{- if eq .FieldType "picture" }}
-                <SelectImage v-model="formData.{{ .FieldJson }}" />
+                <SelectImage
+                 v-model="formData.{{ .FieldJson }}"
+                 file-type="image"
+                />
           {{- end }}
           {{- if eq .FieldType "pictures" }}
-                <SelectImage v-model="formData.{{ .FieldJson }}" multiple />
+                <SelectImage
+                 multiple
+                 v-model="formData.{{ .FieldJson }}"
+                 file-type="image"
+                 />
           {{- end }}
+          {{- if eq .FieldType "video" }}
+                <SelectImage
+                v-model="formData.{{ .FieldJson }}"
+                file-type="video"
+                />
+           {{- end }}
           {{- if eq .FieldType "file" }}
                 <SelectFile v-model="formData.{{ .FieldJson }}" />
           {{- end }}
@@ -244,6 +269,14 @@
                         {{"{{"}} filterDict(formData.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
                 {{- else if eq .FieldType "picture" }}
                         <el-image style="width: 50px; height: 50px" :preview-src-list="ReturnArrImg(formData.{{ .FieldJson }})" :src="getUrl(formData.{{ .FieldJson }})" fit="cover" />
+                {{- else if eq .FieldType "video" }}
+                        <video
+                              style="width: 50px; height: 50px"
+                              muted
+                              preload="metadata"
+                            >
+                            <source :src="getUrl(formData.{{ .FieldJson }}) + '#t=1'">
+                        </video>
                 {{- else if eq .FieldType "pictures" }}
                         <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="ReturnArrImg(formData.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in formData.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
                 {{- else if eq .FieldType "file" }}
@@ -332,6 +365,9 @@ const formData = ref({
         {{- if eq .FieldType "picture" }}
         {{.FieldJson}}: "",
         {{- end }}
+        {{- if eq .FieldType "video" }}
+        {{.FieldJson}}: "",
+        {{- end }}
         {{- if eq .FieldType "pictures" }}
         {{.FieldJson}}: [],
         {{- end }}
@@ -341,6 +377,7 @@ const formData = ref({
         {{- end }}
         })
 
+
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}

server/service/system/sys_auto_code.go

@@ -146,6 +146,9 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru
 		if autoCode.Fields[i].FieldType == "picture" {
 			autoCode.HasPic = true
 		}
+		if autoCode.Fields[i].FieldType == "video" {
+			autoCode.HasPic = true
+		}
 		if autoCode.Fields[i].FieldType == "richtext" {
 			autoCode.HasRichText = true
 		}
@@ -250,6 +253,9 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 		if autoCode.Fields[i].FieldType == "picture" {
 			autoCode.HasPic = true
 		}
+		if autoCode.Fields[i].FieldType == "video" {
+			autoCode.HasPic = true
+		}
 		if autoCode.Fields[i].FieldType == "richtext" {
 			autoCode.HasRichText = true
 		}

server/service/system/sys_casbin.go

@@ -28,8 +28,14 @@ func (casbinService *CasbinService) UpdateCasbin(AuthorityID uint, casbinInfos [
 	authorityId := strconv.Itoa(int(AuthorityID))
 	casbinService.ClearCasbin(0, authorityId)
 	rules := [][]string{}
+	//做权限去重处理
+	deduplicateMap := make(map[string]bool)
 	for _, v := range casbinInfos {
-		rules = append(rules, []string{authorityId, v.Path, v.Method})
+		key := authorityId + v.Path + v.Method
+		if _, ok := deduplicateMap[key]; !ok {
+			deduplicateMap[key] = true
+			rules = append(rules, []string{authorityId, v.Path, v.Method})
+		}
 	}
 	e := casbinService.Casbin()
 	success, _ := e.AddPolicies(rules)