1.7版本发布，详情查看版本说明

eladmin-system/src/main/resources/config/application.yml

@@ -41,7 +41,7 @@ spring:
 #七牛云
 qiniu:
   # 文件大小 /M
-  max-size: 5
+  max-size: 15
 
 #验证码有效时间/分钟
 code:

eladmin-system/src/main/resources/template/generator/admin/QueryService.ftl

@@ -67,24 +67,24 @@ public class ${className}QueryService {
 
             List<Predicate> list = new ArrayList<Predicate>();
 
-    <#if queryColumns??>
-        <#list queryColumns as column>
-                if(!ObjectUtils.isEmpty(${changeClassName}.get${column.capitalColumnName}())){
-                <#if column.columnQuery = '1'>
-                    /**
-                    * 模糊
-                    */
-                    list.add(cb.like(root.get("${column.columnName}").as(${column.columnType}.class),"%"+${changeClassName}.get${column.capitalColumnName}()+"%"));
-                </#if>
-                <#if column.columnQuery = '2'>
-                    /**
-                    * 精确
-                    */
-                    list.add(cb.equal(root.get("${column.columnName}").as(${column.columnType}.class),${changeClassName}.get${column.capitalColumnName}()));
-                </#if>
-                }
-        </#list>
-    </#if>
+<#if queryColumns??>
+    <#list queryColumns as column>
+            if(!ObjectUtils.isEmpty(${changeClassName}.get${column.capitalColumnName}())){
+            <#if column.columnQuery = '1'>
+                /**
+                * 模糊
+                */
+                list.add(cb.like(root.get("${column.columnName}").as(${column.columnType}.class),"%"+${changeClassName}.get${column.capitalColumnName}()+"%"));
+            </#if>
+            <#if column.columnQuery = '2'>
+                /**
+                * 精确
+                */
+                list.add(cb.equal(root.get("${column.columnName}").as(${column.columnType}.class),${changeClassName}.get${column.capitalColumnName}()));
+            </#if>
+            }
+    </#list>
+</#if>
                 Predicate[] p = new Predicate[list.size()];
                 return cb.and(list.toArray(p));
         }

eladmin-system/src/main/resources/template/generator/front/index.ftl

@@ -3,7 +3,7 @@
   <div class="app-container">
     <eHeader :query="query"/>
     <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" border style="width: 100%;">
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <#if columns??>
           <#list columns as column>
           <#if column.columnShow = 'true'>

eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java

@@ -8,11 +8,15 @@ import me.zhengjie.service.QiNiuService;
 import me.zhengjie.service.query.QiNiuQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -87,7 +91,9 @@ public class QiniuController {
     @Log("下载文件")
     @GetMapping(value = "/qiNiuContent/download/{id}")
     public ResponseEntity download(@PathVariable Long id){
-        return new ResponseEntity(qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find()),HttpStatus.OK);
+        Map map = new HashMap();
+        map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find()));
+        return new ResponseEntity(map,HttpStatus.OK);
     }
 
     /**

eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java

@@ -39,9 +39,6 @@ public class AlipayServiceImpl implements AlipayService {
         AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppID(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType());
 
         double money = Double.parseDouble(trade.getTotalAmount());
-        if(money <= 0 || money>=5000){
-            throw new BadRequestException("测试金额过大");
-        }
 
         /**
          * 创建API对应的request(电脑网页版)

eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java

@@ -58,7 +58,7 @@ public class PictureServiceImpl implements PictureService {
         picture = JSON.parseObject(jsonObject.get("data").toString(), Picture.class);
         picture.setSize(FileUtil.getSize(Integer.valueOf(picture.getSize())));
         picture.setUsername(username);
-        picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())+FileUtil.getExtensionName(multipartFile.getOriginalFilename()));
+        picture.setFilename(FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename())+"."+FileUtil.getExtensionName(multipartFile.getOriginalFilename()));
         pictureRepository.save(picture);
         //删除临时文件
         FileUtil.deleteFile(file);

eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDate;
 import java.util.Optional;
 
 /**
@@ -84,7 +86,11 @@ public class QiNiuServiceImpl implements QiNiuService {
         Auth auth = Auth.create(qiniuConfig.getAccessKey(), qiniuConfig.getSecretKey());
         String upToken = auth.uploadToken(qiniuConfig.getBucket());
         try {
-            Response response = uploadManager.put(file.getBytes(), QiNiuUtil.getKey(file.getOriginalFilename()), upToken);
+            String key = file.getOriginalFilename();
+            if(qiniuContentRepository.findByKey(key) != null) {
+                key = QiNiuUtil.getKey(key);
+            }
+            Response response = uploadManager.put(file.getBytes(), key, upToken);
             //解析上传成功的结果
             DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class);
             //存入数据库
@@ -134,8 +140,7 @@ public class QiNiuServiceImpl implements QiNiuService {
             bucketManager.delete(content.getBucket(), content.getKey());
             qiniuContentRepository.delete(content);
         } catch (QiniuException ex) {
-            System.err.println(ex.code());
-            System.err.println(ex.response.toString());
+            qiniuContentRepository.delete(content);
         }
     }
 

eladmin-tools/src/main/java/me/zhengjie/util/QiNiuUtil.java

@@ -52,6 +52,7 @@ public class QiNiuUtil {
         StringBuffer key = new StringBuffer(FileUtil.getFileNameNoEx(file));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         Date date = new Date();
+        key.append("-");
         key.append(sdf.format(date));
         key.append(".");
         key.append(FileUtil.getExtensionName(file));

pom.xml

@@ -48,6 +48,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -97,6 +101,12 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+
         <!--监控sql日志-->
         <dependency>
             <groupId>org.bgee.log4jdbc-log4j2</groupId>