Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
eb5a3bbe49
10 changed files with 137 additions and 21 deletions
  1. +17
    -0
      mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java
  2. +17
    -0
      mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java
  3. +17
    -0
      mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java
  4. +17
    -0
      mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java
  5. +17
    -0
      mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java
  6. +17
    -0
      mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java
  7. +1
    -7
      mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
  8. +0
    -14
      mallinkService/src/main/java/com/iformall/service/pay/service/share/neupos/NeuPosPayShareService.java
  9. +17
    -0
      mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java
  10. +17
    -0
      mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java

+ 17
- 0
mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -212,4 +212,21 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

}

+ 17
- 0
mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -175,6 +175,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("stringValueOperations")
public ValueOperations<String, String> getStringValueOperations(RedisConnectionFactory connectionFactory) {
StringRedisTemplate template = new StringRedisTemplate();


+ 17
- 0
mallinkCallback/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -142,6 +142,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("mallRedisTemplate")
public RedisTemplate<String, WxMall> getMallRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxMall> template = new RedisTemplate<String, WxMall>();


+ 17
- 0
mallinkMQConsumer/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -127,6 +127,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("mallRedisTemplate")
public RedisTemplate<String, WxMall> getMallRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxMall> template = new RedisTemplate<String, WxMall>();


+ 17
- 0
mallinkPosApi/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -105,6 +105,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("mallRedisTemplate")
public RedisTemplate<String, WxMall> getMallRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxMall> template = new RedisTemplate<String, WxMall>();


+ 17
- 0
mallinkSchedule/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -127,6 +127,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("mallRedisTemplate")
public RedisTemplate<String, WxMall> getMallRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxMall> template = new RedisTemplate<String, WxMall>();


+ 1
- 7
mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java View File

@@ -6,11 +6,8 @@ import java.util.concurrent.ConcurrentHashMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.iformall.common.ErrorCode;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxPayOrderService;
import com.iformall.service.pay.service.pay.CDrivingPayService;
import com.iformall.service.pay.service.pay.CPassivePayService;
import com.iformall.service.pay.service.pay.PayAdapterService;
@@ -20,7 +17,6 @@ import com.iformall.service.pay.service.pay.wx.miniApp.maPay.WxMiniMaPayAdapterS
import com.iformall.service.pay.service.refund.RefundPayAdapterService;
import com.iformall.service.pay.service.refund.wx.WxRefundAdapterService;
import com.iformall.service.pay.service.share.PayShareAdapterService;
import com.iformall.service.pay.service.share.neupos.NeuPosPayShareService;
import com.iformall.service.pay.service.share.wx.WxPayShareService;

/**
@@ -44,8 +40,6 @@ public class PayServiceFactory {
@Autowired
WxPayShareService wxShareService;
@Autowired
NeuPosPayShareService neuPosPayShareService;
@Autowired
@@ -68,7 +62,7 @@ public class PayServiceFactory {
shareMap = new ConcurrentHashMap<Integer, PayShareAdapterService>();
shareMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), neuPosPayShareService);
shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), wxShareService);
}
return shareMap;
}


+ 0
- 14
mallinkService/src/main/java/com/iformall/service/pay/service/share/neupos/NeuPosPayShareService.java View File

@@ -1,14 +0,0 @@
package com.iformall.service.pay.service.share.neupos;

import org.springframework.stereotype.Service;

import com.iformall.service.pay.service.share.wx.WxPayShareService;

/**
* 东软pos分账,实际走的是微信的一套
* @author alascor
*/
@Service
public class NeuPosPayShareService extends WxPayShareService{

}

+ 17
- 0
mallinkSysAdmin/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -142,6 +142,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("mallRedisTemplate")
public RedisTemplate<String, WxMall> getMallRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxMall> template = new RedisTemplate<String, WxMall>();


+ 17
- 0
mallinkWebSocketServer/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -127,6 +127,23 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}

@Bean("cUserBasicInfoRedisTemplate")
public RedisTemplate<String, WxCUserBasicInfo> getCUserBasicInfoRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxCUserBasicInfo> template = new RedisTemplate<String, WxCUserBasicInfo>();

Jackson2JsonRedisSerializer<WxCUserBasicInfo> j = new Jackson2JsonRedisSerializer<WxCUserBasicInfo>(WxCUserBasicInfo.class);
// value值的序列化
template.setValueSerializer(j);
template.setHashKeySerializer(j);

// key的序列化
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());

template.setConnectionFactory(connectionFactory);
return template;
}

@Bean("mallRedisTemplate")
public RedisTemplate<String, WxMall> getMallRedisTemplate(RedisConnectionFactory connectionFactory) {
RedisTemplate<String, WxMall> template = new RedisTemplate<String, WxMall>();


Loading…
Cancel
Save