zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 04:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Upgrading dependencies.mybatis 3.3.0

Browse Source
This commit is contained in:
冷冷 committed 2019-12-09 13:03:15 +08:00
1 parent 616273166f
commit 208b862b2b
11 files changed
+18 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-bom/pom.xml
+3 -3
View File
@@ -18,11 +18,11 @@
<properties>
<pigx.version>3.6.0-snapshot</pigx.version>
<mybatis-plus.version>3.2.0</mybatis-plus.version>
<mybatis-plus.version>3.3.0</mybatis-plus.version>
<druid.version>1.1.21</druid.version>
<mysql.connector.version>8.0.16</mysql.connector.version>
<mysql.connector.version>8.0.18</mysql.connector.version>
<swagger.core.version>1.5.22</swagger.core.version>
<mp.weixin.version>3.3.0</mp.weixin.version>
<mp.weixin.version>3.6.0</mp.weixin.version>
</properties>
<dependencyManagement>
pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
* @param result 结果对象
*/
public void renderJson(HttpServletResponse response, Object result) {
renderJson(response, result, MediaType.APPLICATION_JSON_UTF8_VALUE);
renderJson(response, result, MediaType.APPLICATION_JSON_VALUE);
}
/**
pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/configuration/DynamicRouteAutoConfiguration.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class DynamicRouteAutoConfiguration {
// https://github.com/lettuce-io/lettuce-core/wiki/ReadFrom-Settings
LettuceClientConfiguration lettuceClientConfiguration = LettuceClientConfiguration.builder()
.readFrom(ReadFrom.SLAVE_PREFERRED)
.readFrom(ReadFrom.REPLICA_PREFERRED)
.clientOptions(clusterClientOptions).build();
return new LettuceConnectionFactory(redisClusterConfiguration, lettuceClientConfiguration);
pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/ResourceAuthExceptionEntryPoint.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class ResourceAuthExceptionEntryPoint implements AuthenticationEntryPoint
public void commence(HttpServletRequest request, HttpServletResponse response,
AuthenticationException authException) {
response.setCharacterEncoding(CommonConstants.UTF8);
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
R<String> result = new R<>();
result.setCode(CommonConstants.FAIL);
if (authException != null) {
pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/MobileLoginSuccessHandler.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class MobileLoginSuccessHandler implements AuthenticationSuccessHandler {
log.info("获取token 成功：{}", oAuth2AccessToken.getValue());
response.setCharacterEncoding(CharsetUtil.UTF_8);
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
PrintWriter printWriter = response.getWriter();
printWriter.append(objectMapper.writeValueAsString(oAuth2AccessToken));
} catch (IOException e) {
pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ValidateCodeGatewayFilter.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory {
checkCode(request);
} catch (Exception e) {
ServerHttpResponse response = exchange.getResponse();
response.getHeaders().setContentType(MediaType.APPLICATION_JSON_UTF8);
response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
response.setStatusCode(HttpStatus.PRECONDITION_REQUIRED);
try {
return response.writeWith(Mono.just(response.bufferFactory()
pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/SwaggerResourceHandler.java
+2 -2
View File
@@ -49,7 +49,7 @@ public class SwaggerResourceHandler implements HandlerFunction<ServerResponse> {
@Override
public Mono<ServerResponse> handle(ServerRequest request) {
return ServerResponse.status(HttpStatus.OK)
.contentType(MediaType.APPLICATION_JSON_UTF8)
.body(BodyInserters.fromObject(swaggerResources.get()));
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(swaggerResources.get()));
}
}
pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/SwaggerSecurityHandler.java
+2 -2
View File
@@ -52,8 +52,8 @@ public class SwaggerSecurityHandler implements HandlerFunction<ServerResponse> {
@Override
public Mono<ServerResponse> handle(ServerRequest request) {
return ServerResponse.status(HttpStatus.OK)
.contentType(MediaType.APPLICATION_JSON_UTF8)
.body(BodyInserters.fromObject(
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(
Optional.ofNullable(securityConfiguration)
.orElse(SecurityConfigurationBuilder.builder().build())));
}
pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/handler/SwaggerUiHandler.java
+2 -2
View File
@@ -52,8 +52,8 @@ public class SwaggerUiHandler implements HandlerFunction<ServerResponse> {
@Override
public Mono<ServerResponse> handle(ServerRequest request) {
return ServerResponse.status(HttpStatus.OK)
.contentType(MediaType.APPLICATION_JSON_UTF8)
.body(BodyInserters.fromObject(
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(
Optional.ofNullable(uiConfiguration)
.orElse(UiConfigurationBuilder.builder().build())));
}
pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInRedisConfigStorage.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.pig4cloud.pigx.mp.config;
import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import me.chanjar.weixin.mp.enums.TicketType;
import org.springframework.data.redis.core.RedisTemplate;
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
* <p>
* 微信SDK redis扩展
*/
public class WxMpInRedisConfigStorage extends WxMpInMemoryConfigStorage {
public class WxMpInRedisConfigStorage extends WxMpDefaultConfigImpl {
private final static String ACCESS_TOKEN_KEY = "wechat:access_token_";
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java
+2 -2
View File
@@ -19,9 +19,9 @@ import com.pig4cloud.pigx.pay.service.PayChannelService;
import com.pig4cloud.pigx.pay.utils.PayChannelNameEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.EventListener;
@@ -100,7 +100,7 @@ public class PayConfigParmaInitRunner {
WxPayApiConfigKit.putApiConfig(wx);
WxMpService wxMpService = new WxMpServiceImpl();
WxMpInMemoryConfigStorage storage = new WxMpInMemoryConfigStorage();
WxMpDefaultConfigImpl storage = new WxMpDefaultConfigImpl();
storage.setAppId(channel.getAppId());
storage.setSecret(params.getStr("secret"));
storage.setToken(params.getStr("token"));