代码生成器优化，新增多数据字典支持，用户修改密码优化

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

@@ -3,16 +3,16 @@ package ${package}.service;
 import ${package}.domain.${className};
 import ${package}.service.dto.${className}DTO;
 import ${package}.service.dto.${className}QueryCriteria;
-import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
+//import org.springframework.cache.annotation.CacheConfig;
+//import org.springframework.cache.annotation.CacheEvict;
+//import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Pageable;
 
 /**
 * @author ${author}
 * @date ${date}
 */
-@CacheConfig(cacheNames = "${changeClassName}")
+//@CacheConfig(cacheNames = "${changeClassName}")
 public interface ${className}Service {
 
     /**
@@ -21,7 +21,7 @@ public interface ${className}Service {
     * @param pageable
     * @return
     */
-    @Cacheable(keyGenerator = "keyGenerator")
+    //@Cacheable(keyGenerator = "keyGenerator")
     Object queryAll(${className}QueryCriteria criteria, Pageable pageable);
 
     /**
@@ -29,7 +29,7 @@ public interface ${className}Service {
     * @param criteria
     * @return
     */
-    @Cacheable(keyGenerator = "keyGenerator")
+    //@Cacheable(keyGenerator = "keyGenerator")
     public Object queryAll(${className}QueryCriteria criteria);
 
     /**
@@ -37,7 +37,7 @@ public interface ${className}Service {
      * @param ${pkChangeColName}
      * @return
      */
-    @Cacheable(key = "#p0")
+    //@Cacheable(key = "#p0")
     ${className}DTO findById(${pkColumnType} ${pkChangeColName});
 
     /**
@@ -45,20 +45,20 @@ public interface ${className}Service {
      * @param resources
      * @return
      */
-    @CacheEvict(allEntries = true)
+    //@CacheEvict(allEntries = true)
     ${className}DTO create(${className} resources);
 
     /**
      * update
      * @param resources
      */
-    @CacheEvict(allEntries = true)
+    //@CacheEvict(allEntries = true)
     void update(${className} resources);
 
     /**
      * delete
      * @param ${pkChangeColName}
      */
-    @CacheEvict(allEntries = true)
+    //@CacheEvict(allEntries = true)
     void delete(${pkColumnType} ${pkChangeColName});
 }
\ No newline at end of file

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

@@ -92,7 +92,6 @@ public class ${className}ServiceImpl implements ${className}Service {
     public void update(${className} resources) {
         Optional<${className}> optional${className} = ${changeClassName}Repository.findById(resources.get${pkCapitalColName}());
         ValidationUtil.isNull( optional${className},"${className}","id",resources.get${pkCapitalColName}());
-
         ${className} ${changeClassName} = optional${className}.get();
 <#if columns??>
     <#list columns as column>
@@ -107,9 +106,8 @@ public class ${className}ServiceImpl implements ${className}Service {
         </#if>
     </#list>
 </#if>
-        // 此处需自己修改
-        resources.set${pkCapitalColName}(${changeClassName}.get${pkCapitalColName}());
-        ${changeClassName}Repository.save(resources);
+        ${changeClassName}.copy(resources);
+        ${changeClassName}Repository.save(${changeClassName});
     }
 
     @Override

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

@@ -25,10 +25,6 @@ export default {
     isAdd: {
       type: Boolean,
       required: true
-    },
-    sup_this: {
-      type: Object,
-      default: null
     }
   },
   data() {
@@ -71,7 +67,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.$parent.$parent.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)
@@ -86,7 +82,7 @@ export default {
           duration: 2500
         })
         this.loading = false
-        this.sup_this.init()
+        this.$parent.init()
       }).catch(err => {
         this.loading = false
         console.log(err.response.data.message)

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

-<template>
-  <div>
-    <el-button size="mini" type="primary" icon="el-icon-edit" @click="to"/>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
-  </div>
-</template>
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    data: {
-      type: Object,
-      required: true
-    },
-    sup_this: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    to() {
-      const _this = this.$refs.form
-      _this.form = {
-<#if columns??>
-  <#list columns as column>
-        ${column.changeColumnName}: this.data.${column.changeColumnName}<#if column_has_next>,</#if>
-  </#list>
-</#if>
-      }
-      _this.dialog = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  div{
-    display: inline-block;
-    margin-right: 3px;
-  }
-</style>

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

-<template>
-  <div class="head-container">
-<#if hasQuery>
-    <!-- 搜索 -->
-    <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-      <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-</#if>
-    <!-- 新增 -->
-    <div style="display: inline-block;margin: 0px 2px;">
-      <el-button
-        v-permission="['ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_CREATE']"
-        class="filter-item"
-        size="mini"
-        type="primary"
-        icon="el-icon-plus"
-        @click="$refs.form.dialog = true">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import eForm from './form'
-export default {
-  components: { eForm },
-  props: {
-    query: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-     <#if hasQuery>
-      queryTypeOptions: [
-    <#if queryColumns??>
-      <#list queryColumns as column>
-        { key: '${column.changeColumnName}', display_name: '<#if column.columnComment != ''>${column.columnComment}<#else>${column.changeColumnName}</#if>' }<#if column_has_next>,</#if>
-      </#list>
-    </#if>
-      ]
-      </#if>
-    }
-  },
-  methods: {
-<#if hasQuery>
-    toQuery() {
-      this.$parent.page = 0
-      this.$parent.init()
-    }</#if>
-  }
-}
-</script>

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

 <#--noinspection ALL-->
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <!--工具栏-->
+    <div class="head-container">
+    <#if hasQuery>
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+    </#if>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_CREATE']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <#if columns??>
@@ -21,7 +43,7 @@
       </#if>
       <el-table-column v-if="checkPermission(['ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_EDIT','${upperCaseClassName}_DELETE'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <edit v-permission="['ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_EDIT']" :data="scope.row" :sup_this="sup_this"/>
+          <el-button v-permission="['ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
           <el-popover
             v-permission="['ADMIN','${upperCaseClassName}_ALL','${upperCaseClassName}_DELETE']"
             :ref="scope.row.${pkChangeColName}"
@@ -41,6 +63,7 @@
     <el-pagination
       :total="total"
       style="margin-top: 8px;"
+      :current-page="page + 1"
       layout="total, prev, pager, next, sizes"
       @size-change="sizeChange"
       @current-change="pageChange"/>
@@ -54,14 +77,22 @@ import { del } from '@/api/${changeClassName}'
 <#if hasTimestamp>
 import { parseTime } from '@/utils/index'
 </#if>
-import eHeader from './module/header'
-import edit from './module/edit'
+import eForm from './form'
 export default {
-  components: { eHeader, edit },
+  components: { eForm },
   mixins: [initData],
   data() {
     return {
-      delLoading: false, sup_this: this
+      delLoading: false,
+      <#if hasQuery>
+      queryTypeOptions: [
+        <#if queryColumns??>
+        <#list queryColumns as column>
+        { key: '${column.changeColumnName}', display_name: '<#if column.columnComment != ''>${column.columnComment}<#else>${column.changeColumnName}</#if>' }<#if column_has_next>,</#if>
+        </#list>
+        </#if>
+      ]
+      </#if>
     }
   },
   created() {
@@ -91,6 +122,7 @@ export default {
       del(${pkChangeColName}).then(res => {
         this.delLoading = false
         this.$refs[${pkChangeColName}].doClose()
+        this.dleChangePage()
         this.init()
         this.$notify({
           title: '删除成功',
@@ -102,6 +134,22 @@ export default {
         this.$refs[${pkChangeColName}].doClose()
         console.log(err.response.data.message)
       })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        <#if columns??>
+        <#list columns as column>
+        ${column.changeColumnName}: data.${column.changeColumnName}<#if column_has_next>,</#if>
+        </#list>
+        </#if>
+      }
+      _this.dialog = true
     }
   }
 }

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

@@ -34,8 +34,8 @@ public class AliPayController {
     private AlipayService alipayService;
 
     @GetMapping(value = "/aliPay")
-    public ResponseEntity get(){
-        return new ResponseEntity(alipayService.find(),HttpStatus.OK);
+    public ResponseEntity<AlipayConfig> get(){
+        return new ResponseEntity<>(alipayService.find(),HttpStatus.OK);
     }
 
     @Log("配置支付宝")
@@ -49,8 +49,7 @@ public class AliPayController {
     @Log("支付宝PC网页支付")
     @ApiOperation(value = "PC网页支付")
     @PostMapping(value = "/aliPay/toPayAsPC")
-    public ResponseEntity toPayAsPC(@Validated@RequestBody TradeVo trade) throws Exception{
-        log.warn("REST request to toPayAsPC Trade : {}" +trade);
+    public ResponseEntity<String> toPayAsPC(@Validated@RequestBody TradeVo trade) throws Exception{
         AlipayConfig alipay = alipayService.find();
         trade.setOutTradeNo(alipayUtils.getOrderCode());
         String payUrl = alipayService.toPayAsPC(alipay,trade);
@@ -60,8 +59,7 @@ public class AliPayController {
     @Log("支付宝手机网页支付")
     @ApiOperation(value = "手机网页支付")
     @PostMapping(value = "/aliPay/toPayAsWeb")
-    public ResponseEntity toPayAsWeb(@Validated @RequestBody TradeVo trade) throws Exception{
-        log.warn("REST request to toPayAsWeb Trade : {}" +trade);
+    public ResponseEntity<String> toPayAsWeb(@Validated @RequestBody TradeVo trade) throws Exception{
         AlipayConfig alipay = alipayService.find();
         trade.setOutTradeNo(alipayUtils.getOrderCode());
         String payUrl = alipayService.toPayAsWeb(alipay,trade);
@@ -71,7 +69,7 @@ public class AliPayController {
     @ApiIgnore
     @GetMapping("/aliPay/return")
     @ApiOperation(value = "支付之后跳转的链接")
-    public ResponseEntity returnPage(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public ResponseEntity<String> returnPage(HttpServletRequest request, HttpServletResponse response) throws Exception {
         AlipayConfig alipay = alipayService.find();
         response.setContentType("text/html;charset=" + alipay.getCharset());
         //内容验签，防止黑客篡改参数
@@ -85,12 +83,12 @@ public class AliPayController {
             /**
              * 根据业务需要返回数据，这里统一返回OK
              */
-            return new ResponseEntity("payment successful",HttpStatus.OK);
+            return new ResponseEntity<>("payment successful",HttpStatus.OK);
         }else{
             /**
              * 根据业务需要返回数据
              */
-            return new ResponseEntity(HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }
 

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

@@ -45,7 +45,7 @@ public class PictureController {
     public ResponseEntity upload(@RequestParam MultipartFile file){
         String userName = SecurityUtils.getUsername();
         Picture picture = pictureService.upload(file,userName);
-        Map map = new HashMap();
+        Map map = new HashMap(3);
         map.put("errno",0);
         map.put("id",picture.getId());
         map.put("data",new String[]{picture.getUrl()});

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

@@ -56,7 +56,7 @@ public class QiniuController {
     @PostMapping(value = "/qiNiuContent")
     public ResponseEntity upload(@RequestParam MultipartFile file){
         QiniuContent qiniuContent = qiNiuService.upload(file,qiNiuService.find());
-        Map map = new HashMap();
+        Map map = new HashMap(3);
         map.put("id",qiniuContent.getId());
         map.put("errno",0);
         map.put("data",new String[]{qiniuContent.getUrl()});
@@ -84,7 +84,7 @@ public class QiniuController {
     @Log("下载文件")
     @GetMapping(value = "/qiNiuContent/download/{id}")
     public ResponseEntity download(@PathVariable Long id){
-        Map map = new HashMap();
+        Map map = new HashMap(1);
         map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find()));
         return new ResponseEntity(map,HttpStatus.OK);
     }

eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java

@@ -45,6 +45,7 @@ public interface QiNiuService {
      * 上传文件
      * @param file
      * @param qiniuConfig
+     * @return
      */
     @CacheEvict(allEntries = true)
     QiniuContent upload(MultipartFile file, QiniuConfig qiniuConfig);
@@ -84,7 +85,7 @@ public interface QiNiuService {
     /**
      * 删除文件
      * @param ids
-     * @return
+     * @param config
      */
     @CacheEvict(allEntries = true)
     void deleteAll(Long[] ids, QiniuConfig config);

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

@@ -83,7 +83,8 @@ public class EmailServiceImpl implements EmailService {
                     .setTitle(emailVo.getSubject())
                     .setContent(content)
                     .setHtml(true)
-                    .setUseGlobalSession(false)//关闭session
+                    //关闭session
+                    .setUseGlobalSession(false)
                     .send();
         }catch (Exception e){
             throw new BadRequestException(e.getMessage());

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

@@ -49,7 +49,7 @@ public class PictureServiceImpl implements PictureService {
     public Picture upload(MultipartFile multipartFile, String username) {
         File file = FileUtil.toFile(multipartFile);
 
-        HashMap<String, Object> paramMap = new HashMap<>();
+        HashMap<String, Object> paramMap = new HashMap<>(1);
 
         paramMap.put("smfile", file);
         String result= HttpUtil.post(ElAdminConstant.Url.SM_MS_URL, paramMap);