From 552417c161a5b6115de6d7313c73ba84bc4d6149 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Thu, 26 Nov 2020 19:36:45 +0800
Subject: [PATCH 01/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Aupdate=20eladmin.sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/532
---
 sql/eladmin.sql | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sql/eladmin.sql b/sql/eladmin.sql
index 51d44404..601cfc95 100644
--- a/sql/eladmin.sql
+++ b/sql/eladmin.sql
@@ -510,7 +510,7 @@ CREATE TABLE `sys_role` (
 -- ----------------------------
 BEGIN;
 INSERT INTO `sys_role` VALUES (1, '超级管理员', 1, '-', '全部', NULL, 'admin', '2018-11-23 11:04:37', '2020-08-06 16:10:24');
-INSERT INTO `sys_role` VALUES (2, '普通用户', 2, '-', '自定义', NULL, 'admin', '2018-11-23 13:09:06', '2020-09-05 10:45:12');
+INSERT INTO `sys_role` VALUES (2, '普通用户', 2, '-', '本级', NULL, 'admin', '2018-11-23 13:09:06', '2020-09-05 10:45:12');
 COMMIT;
 
 -- ----------------------------
@@ -524,13 +524,6 @@ CREATE TABLE `sys_roles_depts` (
   KEY `FK7qg6itn5ajdoa9h9o78v9ksur` (`dept_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='角色部门关联';
 
--- ----------------------------
--- Records of sys_roles_depts
--- ----------------------------
-BEGIN;
-INSERT INTO `sys_roles_depts` VALUES (2, 6);
-COMMIT;
-
 -- ----------------------------
 -- Table structure for sys_roles_menus
 -- ----------------------------
@@ -829,4 +822,4 @@ CREATE TABLE `tool_qiniu_content` (
 BEGIN;
 COMMIT;
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file

From eb3519036ffe31ad787ed9f7f1464d232e4615a8 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 21:05:42 +0800
Subject: [PATCH 02/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Abug=20fix=20close=20https://github.com/elunez/eladm?=
 =?UTF-8?q?in/issues/504?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/generator/front/index.ftl       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl
index 9307821a..f16209f2 100644
--- a/eladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -97,7 +97,7 @@
             </#if>
             </#list>
         </#if>
-        <el-table-column v-permission="['admin','${changeClassName}:edit','${changeClassName}:del']" label="操作" width="150px" align="center">
+        <el-table-column v-if="checkPer['admin','${changeClassName}:edit','${changeClassName}:del']" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"

From a60661ed1cc3d83c89c3ee80d5277c239f40875c Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 21:25:44 +0800
Subject: [PATCH 03/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Abug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/514
---
 .../me/zhengjie/config/ConfigurerAdapter.java | 35 +++++++++++++++++++
 .../template/generator/front/index.ftl        |  8 +----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
index 962a9932..3f9a98ed 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
+++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
@@ -15,8 +15,13 @@
  */
 package me.zhengjie.config;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -24,6 +29,11 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * WebMvcConfigurer
  *
@@ -62,4 +72,29 @@ public class ConfigurerAdapter implements WebMvcConfigurer {
         registry.addResourceHandler("/file/**").addResourceLocations(pathUtl).setCachePeriod(0);
         registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0);
     }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+        List<MediaType> supportMediaTypeList = new ArrayList<>();
+        supportMediaTypeList.add(MediaType.APPLICATION_JSON_UTF8);
+        FastJsonConfig config = new FastJsonConfig();
+        config.setDateFormat("yyyy-MM-dd HH:mm:ss");
+        config.setSerializerFeatures(
+                SerializerFeature.DisableCircularReferenceDetect,
+                //保留空的字段
+                SerializerFeature.WriteMapNullValue,
+                //String null -> ""
+                SerializerFeature.WriteNullStringAsEmpty,
+                //Number null -> 0
+                SerializerFeature.WriteNullNumberAsZero,
+                //List null-> []
+                SerializerFeature.WriteNullListAsEmpty,
+                //Boolean null -> false
+                SerializerFeature.WriteNullBooleanAsFalse);
+        converter.setFastJsonConfig(config);
+        converter.setSupportedMediaTypes(supportMediaTypeList);
+        converter.setDefaultCharset(StandardCharsets.UTF_8);
+        converters.add(converter);
+    }
 }
diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl
index f16209f2..0041afeb 100644
--- a/eladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -85,14 +85,8 @@
             {{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }}
           </template>
         </el-table-column>
-          <#elseif column.columnType != 'Timestamp'>
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" />
                 <#else>
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.${column.changeColumnName}) }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" />
                 </#if>
             </#if>
             </#list>

From 264b3cb79d65899fe92e273d148d53589c9dc25f Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 21:25:56 +0800
Subject: [PATCH 04/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Abug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/514
---
 .../src/main/java/me/zhengjie/config/ConfigurerAdapter.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
index 3f9a98ed..643b75df 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
+++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
@@ -28,8 +28,6 @@ import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;

From 76b600eeccc40a561d1a9278134ab9a806f2f9e3 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 22:54:07 +0800
Subject: [PATCH 05/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=20excel=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/531
---
 eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index 05bf2bb4..ee0a66b6 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -248,7 +248,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
                     SXSSFCell currentCell = currentRow.getCell(columnNum);
                     if (currentCell.getCellTypeEnum() == CellType.STRING) {
                         int length = currentCell.getStringCellValue().getBytes().length;
-                        if (columnWidth < length) {
+                        // 如果长度大于最大值 65280，那就取 length
+                        if (columnWidth < length || (columnWidth * 256 > 65280)) {
                             columnWidth = length;
                         }
                     }

From 112c7b3e4dc3887625749096746644764a8568e3 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 23:04:39 +0800
Subject: [PATCH 06/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Aupdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/generator/front/index.ftl       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl
index 0041afeb..cd4d17c9 100644
--- a/eladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -91,7 +91,7 @@
             </#if>
             </#list>
         </#if>
-        <el-table-column v-if="checkPer['admin','${changeClassName}:edit','${changeClassName}:del']" label="操作" width="150px" align="center">
+        <el-table-column v-if="checkPer(['admin','${changeClassName}:edit','${changeClassName}:del'])" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"

From cbaa49fbdfda6b931ef74a9e8705e557bda1d03c Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sun, 13 Dec 2020 12:19:35 +0800
Subject: [PATCH 07/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9A=E5=BA=8F=E5=88=97=E5=8C=96=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8CExcel=20=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/zhengjie/utils/FileUtil.java | 34 -------------------
 .../me/zhengjie/config/ConfigurerAdapter.java | 10 +-----
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index ee0a66b6..10ccd712 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -20,15 +20,11 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
 import me.zhengjie.exception.BadRequestException;
-import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFCell;
-import org.apache.poi.xssf.streaming.SXSSFRow;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -217,8 +213,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         sheet.trackAllColumnsForAutoSizing();
         //列宽自适应
         writer.autoSizeColumnAll();
-        //列宽自适应支持中文单元格
-        sizeChineseColumn(sheet, writer);
         //response为HttpServletResponse对象
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
         //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
@@ -231,34 +225,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         IoUtil.close(out);
     }
 
-    /**
-     * 自适应宽度(中文支持)
-     */
-    private static void sizeChineseColumn(SXSSFSheet sheet, BigExcelWriter writer) {
-        for (int columnNum = 0; columnNum < writer.getColumnCount(); columnNum++) {
-            int columnWidth = sheet.getColumnWidth(columnNum) / 256;
-            for (int rowNum = 0; rowNum < sheet.getLastRowNum(); rowNum++) {
-                SXSSFRow currentRow;
-                if (sheet.getRow(rowNum) == null) {
-                    currentRow = sheet.createRow(rowNum);
-                } else {
-                    currentRow = sheet.getRow(rowNum);
-                }
-                if (currentRow.getCell(columnNum) != null) {
-                    SXSSFCell currentCell = currentRow.getCell(columnNum);
-                    if (currentCell.getCellTypeEnum() == CellType.STRING) {
-                        int length = currentCell.getStringCellValue().getBytes().length;
-                        // 如果长度大于最大值 65280，那就取 length
-                        if (columnWidth < length || (columnWidth * 256 > 65280)) {
-                            columnWidth = length;
-                        }
-                    }
-                }
-            }
-            sheet.setColumnWidth(columnNum, columnWidth * 256);
-        }
-    }
-
     public static String getFileType(String type) {
         String documents = "txt doc pdf ppt pps xlsx xls docx";
         String music = "mp3 wav wma mpa ram ra aac aif m4a";
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
index 643b75df..4a47cb67 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
+++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
@@ -81,15 +81,7 @@ public class ConfigurerAdapter implements WebMvcConfigurer {
         config.setSerializerFeatures(
                 SerializerFeature.DisableCircularReferenceDetect,
                 //保留空的字段
-                SerializerFeature.WriteMapNullValue,
-                //String null -> ""
-                SerializerFeature.WriteNullStringAsEmpty,
-                //Number null -> 0
-                SerializerFeature.WriteNullNumberAsZero,
-                //List null-> []
-                SerializerFeature.WriteNullListAsEmpty,
-                //Boolean null -> false
-                SerializerFeature.WriteNullBooleanAsFalse);
+                SerializerFeature.WriteMapNullValue);
         converter.setFastJsonConfig(config);
         converter.setSupportedMediaTypes(supportMediaTypeList);
         converter.setDefaultCharset(StandardCharsets.UTF_8);

From a97fb6ba790cbb090be3c4c23cd54e0d79a9da8b Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sun, 13 Dec 2020 14:35:16 +0800
Subject: [PATCH 08/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9A=E5=BA=8F=E5=88=97=E5=8C=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/me/zhengjie/config/ConfigurerAdapter.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
index 4a47cb67..3a338d71 100644
--- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
+++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java
@@ -78,10 +78,7 @@ public class ConfigurerAdapter implements WebMvcConfigurer {
         supportMediaTypeList.add(MediaType.APPLICATION_JSON_UTF8);
         FastJsonConfig config = new FastJsonConfig();
         config.setDateFormat("yyyy-MM-dd HH:mm:ss");
-        config.setSerializerFeatures(
-                SerializerFeature.DisableCircularReferenceDetect,
-                //保留空的字段
-                SerializerFeature.WriteMapNullValue);
+        config.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect);
         converter.setFastJsonConfig(config);
         converter.setSupportedMediaTypes(supportMediaTypeList);
         converter.setDefaultCharset(StandardCharsets.UTF_8);

From 35b821d7a25b194b4c65e61bbb7054fbf52aebdc Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sun, 13 Dec 2020 18:43:56 +0800
Subject: [PATCH 09/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Abug=20fix=20close=20https://github.com/elunez/eladm?=
 =?UTF-8?q?in/issues/540?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 20 -------------------
 .../template/generator/front/index.ftl        |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/README.md b/README.md
index f7d592f9..26a795e4 100644
--- a/README.md
+++ b/README.md
@@ -84,26 +84,6 @@
 - eladmin-tools 系统第三方工具模块
 - eladmin-generator 系统代码生成模块
 ```
-    
-#### 系统预览
-<table>
-    <tr>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/image.png" alt="image.png" border="0" /></td>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/image1fdb6befae2368c8.png" alt="image1fdb6befae2368c8.png" border="0" /></td>
-    </tr>
-    <tr>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/image80b090dc27faea86.png" alt="image80b090dc27faea86.png" border="0" /></td>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/imagec7e0a6b8701cd890.png" alt="imagec7e0a6b8701cd890.png" border="0" /></td>
-    </tr>
-    <tr>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/imageff0d9e4ab8d3674c.png" alt="imageff0d9e4ab8d3674c.png" border="0" /></td>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/image923ef574ace41404.png" alt="image923ef574ace41404.png" border="0" /></td>
-    </tr>
-    <tr>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/imagef37b559927af1a10.png" alt="imagef37b559927af1a10.png" border="0" /></td>
-        <td><img src="https://img.el-admin.vip/images/2020/09/05/imageabafc6a7f0522967.png" alt="imageabafc6a7f0522967.png" border="0" /></td>
-    </tr>
-</table>
 
 #### 特别鸣谢
 
diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl
index cd4d17c9..4b9111a9 100644
--- a/eladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -70,7 +70,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->

From e1aadae494eea7afefb67fdf846a76da7b4865d1 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sun, 13 Dec 2020 18:50:04 +0800
Subject: [PATCH 10/10] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2?=
 =?UTF-8?q?.6)=EF=BC=9Abug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/544
---
 .../me/zhengjie/modules/security/security/TokenProvider.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
index e13491bc..db98fba4 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java
@@ -43,7 +43,7 @@ public class TokenProvider implements InitializingBean {
 
     private final SecurityProperties properties;
     private final RedisUtils redisUtils;
-    public static final String AUTHORITIES_KEY = "auth";
+    public static final String AUTHORITIES_KEY = "user";
     private JwtParser jwtParser;
     private JwtBuilder jwtBuilder;
 
@@ -74,6 +74,7 @@ public class TokenProvider implements InitializingBean {
         return jwtBuilder
                 // 加入ID确保生成的 Token 都不一致
                 .setId(IdUtil.simpleUUID())
+                .claim(AUTHORITIES_KEY, authentication.getName())
                 .setSubject(authentication.getName())
                 .compact();
     }