🎉 2.0.0-RC2.

blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java

@@ -55,7 +55,7 @@ public class AuthController {
 							 @ApiParam(value = "密码", required = true) @RequestParam String password) {
 
 		if (Func.hasEmpty(account, password)) {
-			return R.failure("接口调用不合法");
+			return R.fail("接口调用不合法");
 		}
 
 		R<UserInfo> res = client.userInfo(account, DigestUtil.encrypt(password));
@@ -64,11 +64,11 @@ public class AuthController {
 
 		//验证用户
 		if (user == null) {
-			return R.failure("用户名或密码不正确");
+			return R.fail("用户名或密码不正确");
 		} else {
 			String digestPassword = DigestUtil.encrypt(password);
 			if (!StringUtil.equalsIgnoreCase(Func.toStr(user.getPassword()), digestPassword)) {
-				return R.failure("用户名或密码不正确");
+				return R.fail("用户名或密码不正确");
 			}
 		}
 

blade-common/src/main/resources/META-INF/spring-devtools.properties

@@ -1 +0,0 @@
-restart.include.blade-common=/blade-common[\\w-]+\.jar

blade-common/src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.springblade.common.config.BladeCommonConfiguration

blade-gateway/src/main/resources/bootstrap.yml

@@ -43,49 +43,11 @@ spring:
     loadbalancer:
       retry:
         enabled: true
+    config:
+      label: master
+      profile: ${blade.env}
+      fail-fast: true
+      discovery:
+        enabled: true
+        service-id: blade-config-server
 
-#feign配置
-feign:
-  hystrix:
-    enabled: true
-  okhttp:
-    enabled: true
-  httpclient:
-    enabled: false
-
-#hystrix配置
-hystrix:
-  threadpool:
-    default:
-      coreSize: 300
-      maxQueueSize: 1000
-      queueSizeRejectionThreshold: 800
-  command:
-    default:
-      execution:
-        isolation:
-          thread:
-            timeoutInMilliseconds: 720000
-
-#ribbon配置
-ribbon:
-  #对当前实例的重试次数
-  MaxAutoRetries: 1
-  #切换实例的重试次数
-  MaxAutoRetriesNextServer: 2
-  #请求处理的超时时间
-  ReadTimeout: 60000
-  #请求连接的超时时间
-  ConnectTimeout: 60000
-  #对所有操作请求都进行重试
-  OkToRetryOnAllOperations: true
-
-#对外暴露端口
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: always

blade-ops/blade-codegen/src/main/java/org/springblade/generate/CodeGenerator.java

@@ -25,12 +25,33 @@ import org.springblade.support.BladeGenerator;
  */
 public class CodeGenerator {
 
-	public static String PACKAGE_NAME = "org.springblade.system";
+	/**
+	 * 代码生成的包名
+	 */
+	public static String PACKAGE_NAME = "org.springblade.demo";
+	/**
+	 * 代码生成的地址
+	 */
 	public static String PACKAGE_DIR = "/blade-ops/blade-codegen/src/main/java";
+	/**
+	 * 需要去掉的表前缀
+	 */
 	public static String[] TABLE_PREFIX = {"blade_"};
-	public static String[] INCLUDE_TABLES = {"blade_param"};
+	/**
+	 * 需要生成的表名(两者只能取其一)
+	 */
+	public static String[] INCLUDE_TABLES = {"blade_blog"};
+	/**
+	 * 需要排除的表名(两者只能取其一)
+	 */
 	public static String[] EXCLUDE_TABLES = {};
-	public static Boolean HAS_SUPER_ENTITY = Boolean.TRUE;
+	/**
+	 * 是否包含基础业务字段
+	 */
+	public static Boolean HAS_SUPER_ENTITY = Boolean.FALSE;
+	/**
+	 * 基础业务字段
+	 */
 	public static String[] SUPER_ENTITY_COLUNMS = {"id", "create_time", "create_user", "update_time", "update_user", "status", "is_deleted"};
 
 	/**

blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java

@@ -28,11 +28,11 @@ import java.util.List;
 public class IDictClientFallback implements IDictClient {
 	@Override
 	public R<String> getValue(String code, Integer dictKey) {
-		return R.failure("获取数据失败");
+		return R.fail("获取数据失败");
 	}
 
 	@Override
 	public R<List<Dict>> getList(String code) {
-		return R.failure("获取数据失败");
+		return R.fail("获取数据失败");
 	}
 }

blade-service-api/blade-dict-api/src/main/resources/META-INF/spring-devtools.properties

@@ -1 +0,0 @@
-restart.include.blade-dict-api=/blade-dict-api[\\w-]+\.jar

blade-service-api/blade-dict-api/src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.springblade.system.config.DictFeignConfiguration

pom.xml

@@ -9,8 +9,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <blade.tool.version>1.0.0-RC3</blade.tool.version>
+        <blade.tool.version>1.0.0-RC4</blade.tool.version>
-        <blade.project.version>2.0.0-RC1</blade.project.version>
+        <blade.project.version>2.0.0-RC2</blade.project.version>
 
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>
@@ -116,6 +116,11 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>net.dreamlu</groupId>
+            <artifactId>mica-auto</artifactId>
+            <version>0.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>