From eecaf5bb5850b52d14150c8152e53b5b09dc62d7 Mon Sep 17 00:00:00 2001 From: zlt Date: Fri, 4 Oct 2019 21:45:37 +0800 Subject: [PATCH] update to spring-boot-2.1.8.RELEASE & spring-cloud-Greenwich.SR3 --- README.md | 9 +++-- pom.xml | 36 ++++++++++++++----- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../admin/controller/IndexController.java | 8 ++--- .../admin/service/impl/IndexServiceImpl.java | 10 ++++-- .../service/impl/AggregationServiceImpl.java | 2 +- .../src/main/resources/application.yml | 5 ++- .../src/main/resources/application.yml | 2 +- .../pom.xml | 5 +++ .../common/annotation/EnableTokenStore.java | 21 ----------- .../common/config/TokenStoreConfig.java | 1 + .../main/resources/application-dev.properties | 2 +- .../resources/application-prod.properties | 2 +- .../resources/application-test.properties | 2 +- .../src/main/resources/application.properties | 6 +++- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../resources/application-master-slave.yml | 6 ++-- .../application-sharding-databases.yml | 4 +-- .../application-sharding-databases2.yml | 4 +-- .../application-sharding-databases3.yml | 6 ++-- .../resources/application-sharding-tables.yml | 2 +- .../demo/common/spring/ServiceBClient.java | 2 +- .../demo/common/spring/ServiceBFallback.java | 17 --------- .../demo/common/spring/ServiceCClient.java | 2 +- .../demo/common/spring/ServiceCFallback.java | 19 ---------- .../src/main/resources/application.yml | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/main/resources/application.yml | 4 +-- .../config/ResourceServerConfiguration.java | 2 -- .../src/main/resources/application.properties | 4 +-- .../config/AuthorizationServerConfig.java | 2 -- .../oauth/handler/OauthLogoutHandler.java | 1 - zlt-uaa/src/main/resources/application.yml | 2 +- .../static/pages/search/index_manager.html | 2 +- .../pages/search/index_manager_view.html | 2 +- 38 files changed, 93 insertions(+), 117 deletions(-) delete mode 100644 zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/annotation/EnableTokenStore.java delete mode 100644 zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBFallback.java delete mode 100644 zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCFallback.java diff --git a/README.md b/README.md index 618800c..41e4549 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,14 @@

License - Downloads - Downloads - Downloads + Downloads + Downloads + Downloads Downloads

+ ## 如果您觉得有帮助，请点右上角 "Star" 支持一下谢谢 [TOC] @@ -37,8 +38,6 @@ * 注重代码规范，严格控制包依赖，每个工程基本都是最小依赖 * 非常适合学习和企业中使用 -> 重构于开源项目OCP&cp：https://gitee.com/owenwangwen/open-capacity-platform -   ## 2. 项目总体架构图 diff --git a/pom.xml b/pom.xml index 7805591..3e3d22a 100644 --- a/pom.xml +++ b/pom.xml @@ -41,11 +41,15 @@ 1.21 2.11.0 5.1.8.RELEASE - 1.0.2 - Cairo-SR3 - 2.0.0.RELEASE - 2.0.9.RELEASE - Finchley.SR4 + 1.0.2 + 1.9.4 + 1.1.6.RELEASE + 2.6 + 4.0.1 + + 2.1.0.RELEASE + 2.1.8.RELEASE + Greenwich.SR3 2.1.1.RELEASE 1.2.0 zlt-job/**/*, zlt-register/**/*, zlt-web/**/* @@ -69,6 +73,7 @@ commons-beanutils commons-beanutils + ${commons-beanutils.version} com.alibaba @@ -313,7 +318,22 @@ com.nepxion banner - ${banner.versio} + ${banner.version} + + + org.springframework.social + spring-social-security + ${spring-social-security.version} + + + commons-io + commons-io + ${commons-io.version} + + + javax.servlet + javax.servlet-api + ${servlet-api.version} @@ -323,13 +343,13 @@ pom import - + org.springframework.cloud spring-cloud-dependencies diff --git a/zlt-business/code-generator/src/main/resources/application.yml b/zlt-business/code-generator/src/main/resources/application.yml index f1d1c1c..02a6567 100644 --- a/zlt-business/code-generator/src/main/resources/application.yml +++ b/zlt-business/code-generator/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://${zlt.datasource.ip}:3306/user-center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver mybatis-plus: mapper-locations: classpath:/mapper/*Mapper.xml diff --git a/zlt-business/file-center/src/main/resources/application.yml b/zlt-business/file-center/src/main/resources/application.yml index fe69f3e..579dc56 100644 --- a/zlt-business/file-center/src/main/resources/application.yml +++ b/zlt-business/file-center/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://${zlt.datasource.ip}:3306/file_center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver mybatis-plus: mapper-locations: classpath:/mapper/*Mapper.xml diff --git a/zlt-business/search-center/search-server/src/main/java/com/central/admin/controller/IndexController.java b/zlt-business/search-center/search-server/src/main/java/com/central/admin/controller/IndexController.java index e2df2af..c55e0d5 100644 --- a/zlt-business/search-center/search-server/src/main/java/com/central/admin/controller/IndexController.java +++ b/zlt-business/search-center/search-server/src/main/java/com/central/admin/controller/IndexController.java @@ -52,8 +52,8 @@ public class IndexController { /** * 索引明细 */ - @GetMapping("/index/{indexName}") - public Result> showIndex(@PathVariable String indexName) { + @GetMapping("/index") + public Result> showIndex(String indexName) { Map result = indexService.show(indexName); return Result.succeed(result); } @@ -61,8 +61,8 @@ public class IndexController { /** * 删除索引 */ - @DeleteMapping("/index/{indexName}") - public Result deleteIndex(@PathVariable String indexName) { + @DeleteMapping("/index") + public Result deleteIndex(String indexName) { indexService.delete(indexName); return Result.succeed("操作成功"); } diff --git a/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java b/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java index 7521a12..43afe5d 100644 --- a/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java +++ b/zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java @@ -1,6 +1,7 @@ package com.central.admin.service.impl; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.central.admin.model.IndexDto; import com.central.admin.model.IndexVo; @@ -115,7 +116,12 @@ public class IndexServiceImpl implements IIndexService { IndexMetaData indexMetaData = stat.get(indexName); //获取settings数据 - Map settMap = indexMetaData.getSettings().getAsMap(); + String settingsStr = indexMetaData.getSettings().toString(); + Object settingsObj = null; + if (StrUtil.isNotEmpty(settingsStr)) { + settingsObj = JSONObject.parse(settingsStr); + } + ImmutableOpenMap mappOpenMap = indexMetaData.getMappings(); ImmutableOpenMap aliasesOpenMap = indexMetaData.getAliases(); Map result = new HashMap<>(1); @@ -123,7 +129,7 @@ public class IndexServiceImpl implements IIndexService { Map mappMap = new HashMap<>(mappOpenMap.size()); Map aliasesMap = new HashMap<>(aliasesOpenMap.size()); indexMap.put("aliases", aliasesMap); - indexMap.put("settings", settMap); + indexMap.put("settings", settingsObj); indexMap.put("mappings", mappMap); result.put(indexName, indexMap); //获取mappings数据 diff --git a/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java b/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java index 7b67535..12b1a9c 100644 --- a/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java +++ b/zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java @@ -9,7 +9,7 @@ import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.aggregations.bucket.histogram.ExtendedBounds; import org.elasticsearch.search.aggregations.bucket.histogram.InternalDateHistogram; -import org.elasticsearch.search.aggregations.bucket.range.date.InternalDateRange; +import org.elasticsearch.search.aggregations.bucket.range.InternalDateRange; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.cardinality.Cardinality; import org.joda.time.DateTime; diff --git a/zlt-business/search-center/search-server/src/main/resources/application.yml b/zlt-business/search-center/search-server/src/main/resources/application.yml index 1dc0a49..7931d12 100644 --- a/zlt-business/search-center/search-server/src/main/resources/application.yml +++ b/zlt-business/search-center/search-server/src/main/resources/application.yml @@ -2,7 +2,10 @@ spring: data: elasticsearch: cluster-name: ${zlt.elasticsearch.cluster-name} - cluster-nodes: ${zlt.elasticsearch.cluster-nodes} + cluster-nodes: ${zlt.elasticsearch.cluster-nodes}:9300 + elasticsearch: + rest: + uris: ${zlt.elasticsearch.cluster-nodes}:9200 zlt: indices: diff --git a/zlt-business/user-center/src/main/resources/application.yml b/zlt-business/user-center/src/main/resources/application.yml index 8ee59ae..abc8242 100644 --- a/zlt-business/user-center/src/main/resources/application.yml +++ b/zlt-business/user-center/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://${zlt.datasource.ip}:3306/user-center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver mybatis-plus: mapper-locations: classpath:/mapper/*Mapper.xml diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml b/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml index 4550dcb..f69e103 100644 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml @@ -40,5 +40,10 @@ spring-boot-configuration-processor true + + javax.servlet + javax.servlet-api + provided + diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/annotation/EnableTokenStore.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/annotation/EnableTokenStore.java deleted file mode 100644 index 453a9d2..0000000 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/annotation/EnableTokenStore.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.central.oauth2.common.annotation; - -import com.central.oauth2.common.config.TokenStoreConfig; -import org.springframework.context.annotation.Import; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 开启token存储认证配置化 - * - * @author zlt - * @date 2019/7/7 - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Import(TokenStoreConfig.class) -public @interface EnableTokenStore { -} diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/config/TokenStoreConfig.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/config/TokenStoreConfig.java index 5fc87b2..29fdc61 100644 --- a/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/config/TokenStoreConfig.java +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/config/TokenStoreConfig.java @@ -10,6 +10,7 @@ import org.springframework.context.annotation.Import; * * @author zlt */ +@Configuration public class TokenStoreConfig { @Configuration @ConditionalOnProperty(prefix = "zlt.oauth2.token.store", name = "type", havingValue = "db") diff --git a/zlt-config/src/main/resources/application-dev.properties b/zlt-config/src/main/resources/application-dev.properties index e184944..2fafecf 100644 --- a/zlt-config/src/main/resources/application-dev.properties +++ b/zlt-config/src/main/resources/application-dev.properties @@ -11,7 +11,7 @@ spring.redis.timeout=5000 ##### elasticsearch配置 zlt.elasticsearch.cluster-name=my-es -zlt.elasticsearch.cluster-nodes=192.168.28.130:9300 +zlt.elasticsearch.cluster-nodes=119.3.105.180 ##### sentinel配置 zlt.sentinel.dashboard=192.168.28.130:6999 diff --git a/zlt-config/src/main/resources/application-prod.properties b/zlt-config/src/main/resources/application-prod.properties index de948da..fd9e69e 100644 --- a/zlt-config/src/main/resources/application-prod.properties +++ b/zlt-config/src/main/resources/application-prod.properties @@ -11,7 +11,7 @@ spring.redis.password=1q2w3e4r ##### elasticsearch配置 zlt.elasticsearch.cluster-name=my-es -zlt.elasticsearch.cluster-nodes=192.168.28.130:9300 +zlt.elasticsearch.cluster-nodes=192.168.28.130 ##### sentinel配置 zlt.sentinel.dashboard=192.168.28.130:6999 diff --git a/zlt-config/src/main/resources/application-test.properties b/zlt-config/src/main/resources/application-test.properties index c0e15c2..34ed9b9 100644 --- a/zlt-config/src/main/resources/application-test.properties +++ b/zlt-config/src/main/resources/application-test.properties @@ -11,7 +11,7 @@ spring.redis.timeout=5000 ##### elasticsearch配置 zlt.elasticsearch.cluster-name=my-es -zlt.elasticsearch.cluster-nodes=192.168.28.130:9300 +zlt.elasticsearch.cluster-nodes=192.168.28.130 ##### sentinel配置 zlt.sentinel.dashboard=192.168.28.130:6999 diff --git a/zlt-config/src/main/resources/application.properties b/zlt-config/src/main/resources/application.properties index 2a33691..f242512 100644 --- a/zlt-config/src/main/resources/application.properties +++ b/zlt-config/src/main/resources/application.properties @@ -102,4 +102,8 @@ spring.redis.lettuce.pool.max-wait=-1 # 连接池中的最大空闲连接 spring.redis.lettuce.pool.max-idle=8 # 连接池中的最小空闲连接 -spring.redis.lettuce.pool.min-idle=0 \ No newline at end of file +spring.redis.lettuce.pool.min-idle=0 + + +##### 允许bean覆盖 +spring.main.allow-bean-definition-overriding=true \ No newline at end of file diff --git a/zlt-demo/seata-demo/account-service/src/main/resources/application.yml b/zlt-demo/seata-demo/account-service/src/main/resources/application.yml index 6a60ee6..9e1eaef 100644 --- a/zlt-demo/seata-demo/account-service/src/main/resources/application.yml +++ b/zlt-demo/seata-demo/account-service/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://192.168.28.130:3306/seata-demo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: 1q2w3e4r - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver cloud: alibaba: seata: diff --git a/zlt-demo/seata-demo/order-service/src/main/resources/application.yml b/zlt-demo/seata-demo/order-service/src/main/resources/application.yml index 9693dc0..857eb80 100644 --- a/zlt-demo/seata-demo/order-service/src/main/resources/application.yml +++ b/zlt-demo/seata-demo/order-service/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://192.168.28.130:3306/seata-demo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: 1q2w3e4r - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver cloud: alibaba: seata: diff --git a/zlt-demo/seata-demo/storage-service/src/main/resources/application.yml b/zlt-demo/seata-demo/storage-service/src/main/resources/application.yml index 06d16c5..ec28768 100644 --- a/zlt-demo/seata-demo/storage-service/src/main/resources/application.yml +++ b/zlt-demo/seata-demo/storage-service/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://192.168.28.130:3306/seata-demo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: 1q2w3e4r - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver cloud: alibaba: seata: diff --git a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-master-slave.yml b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-master-slave.yml index 3e70220..f02a402 100644 --- a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-master-slave.yml +++ b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-master-slave.yml @@ -4,19 +4,19 @@ sharding: names: ds-master,ds-slave-0,ds-slave-1 ds-master: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_master?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} ds-slave-0: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_slave_0?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} ds-slave-1: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_slave_1?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} diff --git a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases.yml b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases.yml index dd8f222..bfd6f39 100644 --- a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases.yml +++ b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases.yml @@ -4,13 +4,13 @@ sharding: names: ds-0,ds-1 ds-0: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_0?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} ds-1: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_1?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} diff --git a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases2.yml b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases2.yml index 7cdddd6..86dc248 100644 --- a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases2.yml +++ b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases2.yml @@ -4,13 +4,13 @@ sharding: names: ds-alibaba,ds-baidu ds-alibaba: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_alibaba?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} ds-baidu: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_baidu?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} diff --git a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases3.yml b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases3.yml index 4f4fc44..1f8aabf 100644 --- a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases3.yml +++ b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-databases3.yml @@ -4,19 +4,19 @@ sharding: names: ds,ds-0,ds-1 ds: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} ds-0: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_0?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} ds-1: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds_1?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} diff --git a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-tables.yml b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-tables.yml index f609a58..9db0eb2 100644 --- a/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-tables.yml +++ b/zlt-demo/sharding-jdbc-demo/src/main/resources/application-sharding-tables.yml @@ -4,7 +4,7 @@ sharding: names: ds ds: type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/demo_ds?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} diff --git a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBClient.java b/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBClient.java index 6600eb4..bee9263 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBClient.java +++ b/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBClient.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam; * * @author ujued */ -@FeignClient(value = "txlcn-demo-spring-service-b", fallback = ServiceBFallback.class) +@FeignClient(value = "txlcn-demo-spring-service-b") public interface ServiceBClient { @GetMapping("/rpc") diff --git a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBFallback.java b/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBFallback.java deleted file mode 100644 index e12b9bc..0000000 --- a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceBFallback.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.txlcn.demo.common.spring; - -import org.springframework.stereotype.Component; - -/** - * Description: - * Date: 19-2-19 下午1:53 - * - * @author ujued - */ -@Component -public class ServiceBFallback implements ServiceBClient { - @Override - public String rpc(String name) { - return "fallback"; - } -} diff --git a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCClient.java b/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCClient.java index 9d838af..7c9cb02 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCClient.java +++ b/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCClient.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam; * * @author ujued */ -@FeignClient(value = "txlcn-demo-spring-service-c", fallback = ServiceCFallback.class) +@FeignClient(value = "txlcn-demo-spring-service-c") public interface ServiceCClient { @GetMapping("/rpc") diff --git a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCFallback.java b/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCFallback.java deleted file mode 100644 index c67b4cd..0000000 --- a/zlt-demo/txlcn-demo/txlcn-demo-common/src/main/java/org/txlcn/demo/common/spring/ServiceCFallback.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.txlcn.demo.common.spring; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * Description: - * Date: 19-2-19 下午1:53 - * - * @author ujued - */ -@Component -@Slf4j -public class ServiceCFallback implements ServiceCClient { - @Override - public String rpc(String name) { - return "fallback"; - } -} diff --git a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/src/main/resources/application.yml b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/src/main/resources/application.yml index 3d8e197..cd40204 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/src/main/resources/application.yml +++ b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-a/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: datasource: - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/txlcn-demo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} @@ -13,7 +13,7 @@ tx-lcn: enabled: true logger: enabled: true - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver jdbc-url: jdbc:mysql://${zlt.datasource.ip}:3306/tx_logger?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} \ No newline at end of file diff --git a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/src/main/resources/application.yml b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/src/main/resources/application.yml index 3d8e197..cd40204 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/src/main/resources/application.yml +++ b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: datasource: - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/txlcn-demo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} @@ -13,7 +13,7 @@ tx-lcn: enabled: true logger: enabled: true - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver jdbc-url: jdbc:mysql://${zlt.datasource.ip}:3306/tx_logger?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} \ No newline at end of file diff --git a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/src/main/resources/application.yml b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/src/main/resources/application.yml index 3d8e197..cd40204 100644 --- a/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/src/main/resources/application.yml +++ b/zlt-demo/txlcn-demo/txlcn-demo-spring-service-c/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: datasource: - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://${zlt.datasource.ip}:3306/txlcn-demo?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} @@ -13,7 +13,7 @@ tx-lcn: enabled: true logger: enabled: true - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver jdbc-url: jdbc:mysql://${zlt.datasource.ip}:3306/tx_logger?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} \ No newline at end of file diff --git a/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/config/ResourceServerConfiguration.java b/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/config/ResourceServerConfiguration.java index 6963420..6284fe3 100644 --- a/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/config/ResourceServerConfiguration.java +++ b/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/config/ResourceServerConfiguration.java @@ -1,7 +1,6 @@ package com.central.gateway.config; import com.central.common.config.DefaultPasswordConfig; -import com.central.oauth2.common.annotation.EnableTokenStore; import com.central.oauth2.common.config.DefaultResourceServerConf; import com.central.oauth2.common.properties.SecurityProperties; import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +18,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.E @Configuration @EnableResourceServer @EnableConfigurationProperties(SecurityProperties.class) -@EnableTokenStore @Import({DefaultPasswordConfig.class}) public class ResourceServerConfiguration extends DefaultResourceServerConf { @Autowired diff --git a/zlt-transaction/txlcn-tm/src/main/resources/application.properties b/zlt-transaction/txlcn-tm/src/main/resources/application.properties index 1f0656f..888cb75 100644 --- a/zlt-transaction/txlcn-tm/src/main/resources/application.properties +++ b/zlt-transaction/txlcn-tm/src/main/resources/application.properties @@ -3,7 +3,7 @@ ################# spring.profiles.active=dev -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://${zlt.datasource.ip}:3306/tx-manager?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull spring.datasource.username=${zlt.datasource.username} spring.datasource.password=${zlt.datasource.password} @@ -11,7 +11,7 @@ spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect spring.jpa.hibernate.ddl-auto=update tx-lcn.logger.enabled=true -tx-lcn.logger.driver-class-name=com.mysql.jdbc.Driver +tx-lcn.logger.driver-class-name=com.mysql.cj.jdbc.Driver tx-lcn.logger.jdbc-url=jdbc:mysql://${zlt.datasource.ip}:3306/tx_logger?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull tx-lcn.logger.username=${zlt.datasource.username} tx-lcn.logger.password=${zlt.datasource.password} diff --git a/zlt-uaa/src/main/java/com/central/oauth/config/AuthorizationServerConfig.java b/zlt-uaa/src/main/java/com/central/oauth/config/AuthorizationServerConfig.java index 105c9cf..55f3b87 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/config/AuthorizationServerConfig.java +++ b/zlt-uaa/src/main/java/com/central/oauth/config/AuthorizationServerConfig.java @@ -1,7 +1,6 @@ package com.central.oauth.config; import com.central.oauth.service.impl.RedisClientDetailsService; -import com.central.oauth2.common.annotation.EnableTokenStore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Configuration; @@ -30,7 +29,6 @@ import java.util.Arrays; */ @Configuration @EnableAuthorizationServer -@EnableTokenStore @AutoConfigureAfter(AuthorizationServerEndpointsConfigurer.class) public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { /** diff --git a/zlt-uaa/src/main/java/com/central/oauth/handler/OauthLogoutHandler.java b/zlt-uaa/src/main/java/com/central/oauth/handler/OauthLogoutHandler.java index 575b6a2..41083f1 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/handler/OauthLogoutHandler.java +++ b/zlt-uaa/src/main/java/com/central/oauth/handler/OauthLogoutHandler.java @@ -3,7 +3,6 @@ package com.central.oauth.handler; import cn.hutool.core.util.StrUtil; import com.central.oauth2.common.util.AuthUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.common.OAuth2AccessToken; diff --git a/zlt-uaa/src/main/resources/application.yml b/zlt-uaa/src/main/resources/application.yml index b839986..6747d85 100644 --- a/zlt-uaa/src/main/resources/application.yml +++ b/zlt-uaa/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: url: jdbc:mysql://${zlt.datasource.ip}:3306/oauth-center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull username: ${zlt.datasource.username} password: ${zlt.datasource.password} - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver mybatis-plus: mapper-locations: classpath:/mapper/*Mapper.xml diff --git a/zlt-web/back-web/src/main/resources/static/pages/search/index_manager.html b/zlt-web/back-web/src/main/resources/static/pages/search/index_manager.html index d28b65f..e69759c 100644 --- a/zlt-web/back-web/src/main/resources/static/pages/search/index_manager.html +++ b/zlt-web/back-web/src/main/resources/static/pages/search/index_manager.html @@ -99,7 +99,7 @@ layer.confirm('确定要删除吗？', function (i) { layer.close(i); layer.load(2); - admin.req('api-search/admin/index/' + obj.data.indexName, {}, function (data) { + admin.req('api-search/admin/index?indexName='+obj.data.indexName, {}, function (data) { layer.closeAll('loading'); if (data.resp_code == 0) { layer.msg(data.resp_msg, {icon: 1, time: 500}); diff --git a/zlt-web/back-web/src/main/resources/static/pages/search/index_manager_view.html b/zlt-web/back-web/src/main/resources/static/pages/search/index_manager_view.html index 6729965..aff0216 100644 --- a/zlt-web/back-web/src/main/resources/static/pages/search/index_manager_view.html +++ b/zlt-web/back-web/src/main/resources/static/pages/search/index_manager_view.html @@ -21,7 +21,7 @@ // 回显user数据 let indexName = admin.getTempData('indexName'); if (indexName) { - admin.req('api-search/admin/index/'+indexName, {}, function (data) { + admin.req('api-search/admin/index', {'indexName':indexName}, function (data) { layer.closeAll('loading'); if (0 == data.resp_code) { $('#data').html(syntaxHighlight(data.datas)); -- GitLab