Merge pull request #78 from gaohanghang/master

去除 mybatis 模板中的方括号[]、修改模板里的类注释样式(感谢@gaohanghang的PR)
2025-12-26 05:48:33 +08:00 · 2020-02-05 21:51:23 +08:00 · 2020-02-05 21:51:23 +08:00 · c94e0048ab
commit c94e0048ab
parent 2316fb1780 90750d420f
15 changed files with 71 additions and 60 deletions
--- a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlcontroller.ftl
@ -7,8 +7,9 @@ import java.util.List;
 import java.util.Map;

 /**
-* ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@RestController
@RequestMapping("/${classInfo.className?uncap_first}")
--- a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentity.ftl
@ -4,8 +4,9 @@ import java.util.Date;
 import java.util.List;

 /**
-*  ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@Data
 public class ${classInfo.className} implements Serializable {
--- a/generator-web/src/main/resources/templates/code-generator/beetlsql/beetlentitydto.ftl
+++ b/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}
- * @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@Data
@ApiModel("${classInfo.classComment}")
--- a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdao.ftl
@ -2,8 +2,9 @@
 import java.util.List;

 /**
-* ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
 public interface I${classInfo.className}DAO {

--- a/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jdbc-template/jtdaoimpl.ftl
@ -6,8 +6,9 @@ import org.springframework.stereotype.Repository;
 import java.util.List;

 /**
-* ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@Repository
 public class ${classInfo.className}DaoImpl implements I${classInfo.className}Dao{
--- a/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa/entity.ftl
@ -13,8 +13,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

 /**
-*  ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@Entity
@Data
--- a/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa/jpacontroller.ftl
@ -15,8 +15,9 @@ import java.util.List;
 import java.util.Map;

 /**
-* ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@RestController
@RequestMapping("/${classInfo.className?uncap_first}")
--- a/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/jpa/repository.ftl
@ -14,8 +14,9 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

 /**
-*  ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@Repository
 public interface ${classInfo.className}Repository extends JpaRepository<${classInfo.className},Integer> {
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/pluscontroller.ftl
@ -11,8 +11,9 @@ import java.util.List;
 import java.util.Map;

 /**
-* ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@RestController
@RequestMapping("/${classInfo.className?uncap_first}")
--- a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusmapper.ftl
@ -3,8 +3,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;

 /**
-*  ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@Repository
 public interface ${classInfo.className}Mapper extends BaseMapper<${classInfo.className}> {
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/controller.ftl
@ -9,9 +9,9 @@ import java.util.List;
 import java.util.Map;

 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
 * @author ${authorName}
-* @date ${.now?string('yyyy/MM/dd')}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
@RestController
@RequestMapping(value = "/${classInfo.className}")
@ -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')}
    **/
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper.ftl
+++ b/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}
-* @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')}
    **/
--- a/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/model.ftl
@ -3,8 +3,9 @@ import java.util.Date;
 import java.util.List;

 /**
-*  ${classInfo.classComment}
-* @author ${authorName} ${.now?string('yyyy-MM-dd')}
+ * @description ${classInfo.classComment}
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
 */
 public class ${classInfo.className} implements Serializable {

--- a/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service.ftl
@ -1,9 +1,9 @@
 import java.util.Map;

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

--- a/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
+++ b/generator-web/src/main/resources/templates/code-generator/mybatis/service_impl.ftl
@ -7,9 +7,9 @@ import java.util.List;
 import java.util.Map;

 /**
-* ${classInfo.classComment}
+ * @description ${classInfo.classComment}
 * @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 {