suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
苏竹红
2023-05-31 09:50:16 +08:00
parent 8a2ec92e55 48c73c9cef
commit 2d6c7c198e
10 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseMapper.java
View File

@@ -28,5 +28,5 @@ public interface EnterpriseMapper {
* @param enterpriseId
* @return
*/
EnterpriseDO getEnterpriseById(@Param("enterpriseId") String enterpriseId);
EnterpriseDO getEnterpriseById(@Param("id") String id);
}

2
coolstore-partner-service/src/main/java/com/cool/store/http/ISVHttpRequest.java
View File

@@ -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<ResultDTO> responseEntity = null;
try {
responseEntity = RestTemplateUtil.loadGet(url, ResultDTO.class);

6
coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
View File

@@ -40,9 +40,9 @@ public class TokenValidateFilter implements Filter {
private static List<String> 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/**");
/**

2
coolstore-partner-webb/src/main/java/com/cool/store/config/datasource/DynamicDataSourceServiceImpl.java
View File

@@ -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)){

2
coolstore-partner-webb/src/main/resources/application-ab.properties
View File

@@ -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

2
coolstore-partner-webb/src/main/resources/application-dev.properties
View File

@@ -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

2
coolstore-partner-webb/src/main/resources/application-local.properties
View File

@@ -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

1
coolstore-partner-webc/src/main/resources/application-ab.properties
View File

@@ -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

2
coolstore-partner-webc/src/main/resources/application-dev.properties
View File

@@ -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

2
coolstore-partner-webc/src/main/resources/application-local.properties
View File

@@ -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