➕ 代码生成增加element和feign模版

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java

@@ -123,7 +123,7 @@ public class CodeController extends BladeController {
 	@PostMapping("/gen-code")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "代码生成", notes = "传入ids")
-	public R genCode(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @RequestParam(defaultValue = "sword") String system) {
+	public R genCode(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		Collection<Code> codes = codeService.listByIds(Func.toLongList(ids));
 		codes.forEach(code -> {
 			BladeCodeGenerator generator = new BladeCodeGenerator();
@@ -134,7 +134,7 @@ public class CodeController extends BladeController {
 			generator.setUsername(datasource.getUsername());
 			generator.setPassword(datasource.getPassword());
 			// 设置基础配置
-			generator.setSystemName(system);
+			generator.setCodeStyle(code.getCodeStyle());
 			generator.setCodeName(code.getCodeName());
 			generator.setServiceName(code.getServiceName());
 			generator.setPackageName(code.getPackageName());
@@ -146,6 +146,8 @@ public class CodeController extends BladeController {
 			generator.setHasSuperEntity(code.getBaseMode() == 2);
 			// 设置是否开启包装器模式
 			generator.setHasWrapper(code.getWrapMode() == 2);
+			// 设置是否开启远程调用模式
+			generator.setHasFeign(code.getFeignMode() == 2);
 			generator.run();
 		});
 		return R.success("代码生成成功");

blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/Code.java

@@ -97,6 +97,18 @@ public class Code implements Serializable {
 	@ApiModelProperty(value = "包装器模式")
 	private Integer wrapMode;
 
+	/**
+	 * 远程调用模式
+	 */
+	@ApiModelProperty(value = "远程调用模式")
+	private Integer feignMode;
+
+	/**
+	 * 代码风格
+	 */
+	@ApiModelProperty(value = "代码风格")
+	private String codeStyle;
+
 	/**
 	 * 后端包名
 	 */

blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGenerator.java

@@ -17,6 +17,7 @@
 package org.springblade.test;
 
 
+import org.springblade.develop.constant.DevelopConstant;
 import org.springblade.develop.support.BladeCodeGenerator;
 
 /**
@@ -39,9 +40,9 @@ public class CodeGenerator {
 	 */
 	public static String PACKAGE_NAME = "org.springblade.develop";
 	/**
-	 * 前端代码生成所属系统
+	 * 前端代码生成风格
 	 */
-	public static String SYSTEM_NAME = "saber";
+	public static String CODE_STYLE = DevelopConstant.SABER_NAME;
 	/**
 	 * 前端代码生成地址
 	 */
@@ -62,6 +63,10 @@ public class CodeGenerator {
 	 * 是否包含基础业务字段
 	 */
 	public static Boolean HAS_SUPER_ENTITY = Boolean.TRUE;
+	/**
+	 * 是否包含远程调用
+	 */
+	private static Boolean HAS_FEIGN = Boolean.TRUE;
 	/**
 	 * 基础业务字段
 	 */
@@ -75,13 +80,14 @@ public class CodeGenerator {
 		BladeCodeGenerator generator = new BladeCodeGenerator();
 		generator.setCodeName(CODE_NAME);
 		generator.setServiceName(SERVICE_NAME);
-		generator.setSystemName(SYSTEM_NAME);
+		generator.setCodeStyle(CODE_STYLE);
 		generator.setPackageName(PACKAGE_NAME);
 		generator.setPackageWebDir(PACKAGE_WEB_DIR);
 		generator.setTablePrefix(TABLE_PREFIX);
 		generator.setIncludeTables(INCLUDE_TABLES);
 		generator.setExcludeTables(EXCLUDE_TABLES);
 		generator.setHasSuperEntity(HAS_SUPER_ENTITY);
+		generator.setHasFeign(HAS_FEIGN);
 		generator.setSuperEntityColumns(SUPER_ENTITY_COLUMNS);
 		generator.run();
 	}