From 9c255b6d8482904456fd7045c732f84e692281d8 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 30 May 2023 15:16:53 +0800 Subject: [PATCH] =?UTF-8?q?b=E7=AB=AF=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/mapper/EnterpriseMapper.java | 2 +- .../src/main/java/com/cool/store/http/ISVHttpRequest.java | 2 +- .../java/com/cool/store/config/TokenValidateFilter.java | 6 +++--- .../config/datasource/DynamicDataSourceServiceImpl.java | 2 ++ .../src/main/resources/application-ab.properties | 2 +- .../src/main/resources/application-dev.properties | 2 +- .../src/main/resources/application-local.properties | 2 +- .../src/main/resources/application-ab.properties | 1 + .../src/main/resources/application-dev.properties | 2 ++ .../src/main/resources/application-local.properties | 2 ++ 10 files changed, 15 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseMapper.java index 27aa1c6b3..2106df6bc 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseMapper.java @@ -28,5 +28,5 @@ public interface EnterpriseMapper { * @param enterpriseId * @return */ - EnterpriseDO getEnterpriseById(@Param("enterpriseId") String enterpriseId); + EnterpriseDO getEnterpriseById(@Param("id") String id); } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java index 95ac9483b..49524c00d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java @@ -35,7 +35,7 @@ public class ISVHttpRequest { public UserIdInfoDTO getUserIdByCode(String paramStr){ - String url = isvDomain + "/isv/user/getUserIdByCode" + paramStr; + String url = isvDomain + "/isv/user/getUserIdByCode?" + paramStr; ResponseEntity responseEntity = null; try { responseEntity = RestTemplateUtil.loadGet(url, ResultDTO.class); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java index b03b49cae..f229e4d4a 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -40,9 +40,9 @@ public class TokenValidateFilter implements Filter { private static List patternList = - Lists.newArrayList("/web/check/ok","/check/ok", "/partner/pc/doc.html","/partner/pc/v2/api-docs","/**/test/**", - "/**/swagger*/**", - "/**/webjars/**"); + Lists.newArrayList("/web/check/ok","/check/ok", + "/partner/pc/doc.html","/partner/pc/v2/api-docs","/**/test/**","/partner/pc/feiShuLogin", + "/**/swagger*/**", "/**/webjars/**"); /** diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/datasource/DynamicDataSourceServiceImpl.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/datasource/DynamicDataSourceServiceImpl.java index edde59a3d..e07b8a4a2 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/datasource/DynamicDataSourceServiceImpl.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/datasource/DynamicDataSourceServiceImpl.java @@ -4,6 +4,7 @@ import com.cool.store.constants.CommonConstants; import com.cool.store.dto.DatasourceInfoDTO; import com.cool.store.entity.EnterpriseConfigDO; import com.cool.store.service.EnterpriseConfigService; +import com.cool.store.utils.DataSourceHelper; import com.cool.store.utils.RedisUtilPool; import com.cool.store.context.DataSourceContext; import com.github.pagehelper.Page; @@ -80,6 +81,7 @@ public class DynamicDataSourceServiceImpl { PageHelper.clearPage(); } String currentDbName = DataSourceContext.getDataSourceType(); + DataSourceHelper.reset(); EnterpriseConfigDO config = enterpriseConfigService.getDbInfoByDbName(dbName); dbServerUrl = config.getDbServer(); if(StringUtils.isNotBlank(currentDbName)){ diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index cb8bbc2c6..bc43cb647 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://tstore-isv.coolcollege.cn +isv.domain = https://abstore-isv.coolstore.cn #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 74a62b60d..1828df98a 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -37,7 +37,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://dstore-isv.coolcollege.cn +isv.domain = https://abstore-isv.coolstore.cn #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index 231241b5a..17d56ec56 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -40,7 +40,7 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://tstore-isv.coolcollege.cn +isv.domain = https://abstore-isv.coolstore.cn #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index dfb8b733b..0fcca1410 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -33,6 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true +isv.domain = https://abstore-isv.coolstore.cn #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index c9a440805..1828df98a 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -37,6 +37,8 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true +isv.domain = https://abstore-isv.coolstore.cn + #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index 084d2b680..041a63bc7 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -40,6 +40,8 @@ customize_sub_table_size=10 mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true +isv.domain = https://abstore-isv.coolstore.cn + #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig