From dd3b323fe2f4f35b0a1831b5f8f40e9982f63187 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 16 Jan 2019 10:23:35 +0800 Subject: [PATCH] :tada: 2.0.0-RC2. --- .../auth/controller/AuthController.java | 6 +-- .../META-INF/spring-devtools.properties | 1 - .../main/resources/META-INF/spring.factories | 2 - .../src/main/resources/bootstrap.yml | 52 +++---------------- .../springblade/generate/CodeGenerator.java | 27 ++++++++-- .../system/feign/IDictClientFallback.java | 4 +- .../META-INF/spring-devtools.properties | 1 - .../main/resources/META-INF/spring.factories | 2 - pom.xml | 9 +++- 9 files changed, 43 insertions(+), 61 deletions(-) delete mode 100644 blade-common/src/main/resources/META-INF/spring-devtools.properties delete mode 100644 blade-common/src/main/resources/META-INF/spring.factories delete mode 100644 blade-service-api/blade-dict-api/src/main/resources/META-INF/spring-devtools.properties delete mode 100644 blade-service-api/blade-dict-api/src/main/resources/META-INF/spring.factories diff --git a/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java b/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java index 3b0483ee..d8e70663 100644 --- a/blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java +++ b/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 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("用户名或密码不正确"); } } diff --git a/blade-common/src/main/resources/META-INF/spring-devtools.properties b/blade-common/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index 7888b84a..00000000 --- a/blade-common/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-common=/blade-common[\\w-]+\.jar diff --git a/blade-common/src/main/resources/META-INF/spring.factories b/blade-common/src/main/resources/META-INF/spring.factories deleted file mode 100644 index be9adc54..00000000 --- a/blade-common/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.common.config.BladeCommonConfiguration diff --git a/blade-gateway/src/main/resources/bootstrap.yml b/blade-gateway/src/main/resources/bootstrap.yml index 4a2750cc..9bea6319 100644 --- a/blade-gateway/src/main/resources/bootstrap.yml +++ b/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 diff --git a/blade-ops/blade-codegen/src/main/java/org/springblade/generate/CodeGenerator.java b/blade-ops/blade-codegen/src/main/java/org/springblade/generate/CodeGenerator.java index a2ca18d0..c1383857 100644 --- a/blade-ops/blade-codegen/src/main/java/org/springblade/generate/CodeGenerator.java +++ b/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"}; /** diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java index 0f3d4ddc..19338294 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/feign/IDictClientFallback.java +++ b/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 getValue(String code, Integer dictKey) { - return R.failure("获取数据失败"); + return R.fail("获取数据失败"); } @Override public R> getList(String code) { - return R.failure("获取数据失败"); + return R.fail("获取数据失败"); } } diff --git a/blade-service-api/blade-dict-api/src/main/resources/META-INF/spring-devtools.properties b/blade-service-api/blade-dict-api/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index d9bf609c..00000000 --- a/blade-service-api/blade-dict-api/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.blade-dict-api=/blade-dict-api[\\w-]+\.jar diff --git a/blade-service-api/blade-dict-api/src/main/resources/META-INF/spring.factories b/blade-service-api/blade-dict-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 258a48a5..00000000 --- a/blade-service-api/blade-dict-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.springblade.system.config.DictFeignConfiguration diff --git a/pom.xml b/pom.xml index a20be98e..b85437ad 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ pom - 1.0.0-RC3 - 2.0.0-RC1 + 1.0.0-RC4 + 2.0.0-RC2 1.8 2.9.2 @@ -116,6 +116,11 @@ spring-boot-devtools true + + net.dreamlu + mica-auto + 0.0.1 +