Merge pull request #78 from gaohanghang/master

去除 mybatis 模板中的方括号[]、修改模板里的类注释样式(感谢@gaohanghang的PR)

generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl

@@ -7,9 +7,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @RestController
 @RequestMapping("/${classInfo.className?uncap_first}")
 public class ${classInfo.className}Controller {

generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl

@@ -4,9 +4,10 @@ import java.util.Date;
 import java.util.List;
 
 /**
-*  ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @Data
 public class ${classInfo.className} implements Serializable {
 

generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentitydto.ftl

@@ -6,8 +6,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * ${classInfo.classComment}
+ * @description ${classInfo.classComment}
- * @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
  */
 @Data
 @ApiModel("${classInfo.classComment}")

generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl

@@ -2,9 +2,10 @@
 import java.util.List;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 public interface I${classInfo.className}DAO {
 
     int add(${classInfo.className} ${classInfo.className?uncap_first});

generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl

@@ -6,9 +6,10 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @Repository
 public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao{
 

generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl

@@ -13,9 +13,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
-*  ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @Entity
 @Data
 @Table(name="${classInfo.tableName}")<#if swagger?exists && swagger==true>

generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl

@@ -15,9 +15,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @RestController
 @RequestMapping("/${classInfo.className?uncap_first}")
 public class ${classInfo.className}Controller {

generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl

@@ -14,9 +14,10 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 /**
-*  ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @Repository
 public interface ${classInfo.className}Repository extends JpaRepository<${classInfo.className},Integer> {
 

generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl

@@ -11,9 +11,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @RestController
 @RequestMapping("/${classInfo.className?uncap_first}")
 public class ${classInfo.className}Controller {

generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl

@@ -3,9 +3,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 /**
-*  ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 @Repository
 public interface ${classInfo.className}Mapper extends BaseMapper<${classInfo.className}> {
 

generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl

@@ -9,10 +9,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName}
+ * @author ${authorName}
-* @date ${.now?string('yyyy/MM/dd')}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
-*/
+ */
 @RestController
 @RequestMapping(value = "/${classInfo.className}")
 public class ${classInfo.className}Controller {
@@ -21,7 +21,7 @@ public class ${classInfo.className}Controller {
     private ${classInfo.className}Service ${classInfo.className?uncap_first}Service;
 
     /**
-    * [新增]
+    * 新增
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
@@ -31,7 +31,7 @@ public class ${classInfo.className}Controller {
     }
 
     /**
-    * [刪除]
+    * 刪除
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
@@ -41,7 +41,7 @@ public class ${classInfo.className}Controller {
     }
 
     /**
-    * [更新]
+    * 更新
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
@@ -51,7 +51,7 @@ public class ${classInfo.className}Controller {
     }
 
     /**
-    * [查询] 根据主键 id 查询
+    * 查询 根据主键 id 查询
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
@@ -61,7 +61,7 @@ public class ${classInfo.className}Controller {
     }
 
     /**
-    * [查询] 分页查询
+    * 查询 分页查询
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/

generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl

@@ -4,51 +4,51 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName}
+ * @author ${authorName}
-* @date ${.now?string('yyyy/MM/dd')}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
-*/
+ */
 @Mapper
 @Repository
 public interface ${classInfo.className}Mapper {
 
     /**
-    * [新增]
+    * 新增
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
     int insert(${classInfo.className} ${classInfo.className?uncap_first});
 
     /**
-    * [刪除]
+    * 刪除
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
     int delete(int id);
 
     /**
-    * [更新]
+    * 更新
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
     int update(${classInfo.className} ${classInfo.className?uncap_first});
 
     /**
-    * [查询] 根据主键 id 查询
+    * 查询 根据主键 id 查询
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
     ${classInfo.className} load(int id);
 
     /**
-    * [查询] 分页查询
+    * 查询 分页查询
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/
     List<${classInfo.className}> pageList(int offset,int pagesize);
 
     /**
-    * [查询] 分页查询 count
+    * 查询 分页查询 count
     * @author ${authorName}
     * @date ${.now?string('yyyy/MM/dd')}
     **/

generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl

@@ -3,9 +3,10 @@ import java.util.Date;
 import java.util.List;
 
 /**
-*  ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @author ${authorName}
-*/
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
 public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;

generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl

@@ -1,10 +1,10 @@
 import java.util.Map;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName}
+ * @author ${authorName}
-* @date ${.now?string('yyyy/MM/dd')}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
-*/
+ */
 public interface ${classInfo.className}Service {
 
     /**

generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl

@@ -7,10 +7,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
-* @author ${authorName}
+ * @author ${authorName}
-* @date ${.now?string('yyyy/MM/dd')}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
-*/
+ */
 @Service
 public class ${classInfo.className}ServiceImpl implements ${classInfo.className}Service {