From 58bbb2b9670ba18a8c4d8218297ca2ab19002905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 8 Jan 2022 21:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Filters/VerifyAttribute.cs |  2 +-
 ZR.Admin.WebApi/Framework/JwtUtil.cs       | 10 ++++++---
 ZR.CodeGenerator/CodeGenerateTemplate.cs   |  2 +-
 ZR.Service/System/SysUserService.cs        |  1 +
 ZR.Vue/src/views/tool/file/index.vue       | 26 ++++++++--------------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
index 2b4db73..8051b80 100644
--- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
+++ b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
@@ -22,7 +22,7 @@ namespace ZR.Admin.WebApi.Filters
     public class VerifyAttribute : Attribute, IAuthorizationFilter
     {
         static readonly Logger logger = LogManager.GetCurrentClassLogger();
-        IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
+        //IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
 
         //public VerifyAttribute() { }
 
diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs
index 9708e4c..4a438ec 100644
--- a/ZR.Admin.WebApi/Framework/JwtUtil.cs
+++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs
@@ -1,4 +1,5 @@
 using Infrastructure;
+using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
@@ -74,7 +75,10 @@ namespace ZR.Admin.WebApi.Framework
         {
             JwtSettings jwtSettings = new();
             ConfigUtils.Instance.Bind("JwtSettings", jwtSettings);
-
+            if (jwtSettings == null || jwtSettings.SecretKey.IsEmpty())
+            {
+                return null;
+            }
             var key = Encoding.ASCII.GetBytes(jwtSettings.SecretKey);
            
             var tokenDescriptor = new TokenValidationParameters
@@ -125,8 +129,8 @@ namespace ZR.Admin.WebApi.Framework
         {
             try
             {
-                var userId = jwtToken.FirstOrDefault(x => x.Type == "primarysid").Value;
-                var userName = jwtToken.FirstOrDefault(x => x.Type == "unique_name").Value;
+                //var userId = jwtToken.FirstOrDefault(x => x.Type == "primarysid").Value;
+                //var userName = jwtToken.FirstOrDefault(x => x.Type == "unique_name").Value;
                 var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
 
                 LoginUser loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index b3bb091..c3fc6af 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -80,7 +80,7 @@ namespace ZR.CodeGenerator
                 //时间
                 sb.AppendLine("      <el-col :lg=\"12\">");
                 sb.AppendLine($"        <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                sb.AppendLine($"           <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\"  type=\"datetimerange\"  placeholder=\"选择日期时间\"> </el-date-picker>");
+                sb.AppendLine($"           <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
                 sb.AppendLine("         </el-form-item>");
                 sb.AppendLine("     </el-col>");
             }
diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs
index e856c61..fa58abe 100644
--- a/ZR.Service/System/SysUserService.cs
+++ b/ZR.Service/System/SysUserService.cs
@@ -55,6 +55,7 @@ namespace ZR.Service
             if (user != null && user.UserId > 0)
             {
                 user.Roles = RoleService.SelectUserRoleListByUserId(userId);
+                user.RoleIds = user.Roles.Select(x => x.RoleId).ToArray();
             }
             return user;
         }
diff --git a/ZR.Vue/src/views/tool/file/index.vue b/ZR.Vue/src/views/tool/file/index.vue
index 2faffb7..8e98752 100644
--- a/ZR.Vue/src/views/tool/file/index.vue
+++ b/ZR.Vue/src/views/tool/file/index.vue
@@ -3,7 +3,8 @@
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
       <el-form-item label="上传时间">
-        <el-date-picker v-model="dateRangeCreate_time" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择上传时间"></el-date-picker>
+        <el-date-picker v-model="dateRangeCreate_time" size="small" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择上传时间"></el-date-picker>
       </el-form-item>
       <el-form-item label="存储类型" prop="storeType">
         <el-select v-model="queryParams.storeType" placeholder="请选择存储类型" size="small" clearable="">
@@ -35,7 +36,8 @@
       <el-table-column prop="fileName" label="文件名" align="center">
         <template slot-scope="scope">
           <el-popover :content="scope.row.fileUrl" placement="top-start" title="路径" trigger="hover">
-            <a slot="reference" :href="scope.row.accessUrl" class="el-link--primary" style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;" target="_blank">
+            <a slot="reference" :href="scope.row.accessUrl" class="el-link--primary"
+              style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;" target="_blank">
               {{ scope.row.fileName }}
             </a>
           </el-popover>
@@ -79,10 +81,10 @@
           <el-col :lg="24">
             <el-form-item label="存储文件夹前缀" prop="storePath">
               <span slot="label">
+                存储文件夹前缀
                 <el-tooltip content="比如存储到'/uploads' '如果不填写默认按时间存储eg：/2021/12/16(固定段)'" placement="top">
                   <i class="el-icon-question"></i>
                 </el-tooltip>
-                存储文件夹前缀
               </span>
               <el-input v-model="form.storePath" placeholder="请输入" />
             </el-form-item>
@@ -94,15 +96,14 @@
           </el-col>
           <el-col :lg="24">
             <el-form-item label="上传文件" prop="accessUrl">
-              <UploadFile v-model="form.accessUrl" :uploadUrl="uploadUrl" :fileType="[]" :limit="1" :fileSize="15" :data="{ 'fileDir' :  form.storePath, 'fileName': form.fileName}" column="accessUrl"
-                @input="handleUploadSuccess" />
+              <UploadFile v-model="form.accessUrl" :uploadUrl="uploadUrl" :fileType="[]" :limit="1" :fileSize="15"
+                :data="{ 'fileDir' :  form.storePath, 'fileName': form.fileName}" column="accessUrl" @input="handleUploadSuccess" />
             </el-form-item>
           </el-col>
 
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -144,11 +145,7 @@
   </div>
 </template>
 <script>
-import {
-  listSysfile,
-  delSysfile,
-  getSysfile,
-} from "@/api/tool/file.js";
+import { listSysfile, delSysfile, getSysfile } from "@/api/tool/file.js";
 
 export default {
   name: "sysfile",
@@ -308,7 +305,7 @@ export default {
         })
         .catch(() => {});
     },
-    /** 修改按钮操作 */
+    /**查看按钮操作 */
     handleView(row) {
       const id = row.id || this.ids;
       getSysfile(id).then((res) => {
@@ -337,11 +334,6 @@ export default {
         this.uploadUrl = "/common/UploadFileAliyun";
       }
     },
-    /** 提交按钮 */
-    submitForm: function () {
-      this.open = false;
-      this.getList();
-    },
   },
 };
 </script>
\ No newline at end of file