Selaa lähdekoodia

fix bug

release_toaliyun_real
xiaohanzi 4 vuotta sitten
vanhempi
commit
d2005719a8
5 muutettua tiedostoa jossa 11 lisäystä ja 6 poistoa
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/UserApplication.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  3. +2
    -0
      mallinkCallback/src/main/java/com/iformall/CallbackApplication.java
  4. +3
    -5
      mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java
  5. +2
    -0
      mallinkPosApi/src/main/java/com/iformall/PosApplication.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/UserApplication.java Näytä tiedosto

@@ -7,7 +7,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;

import springfox.documentation.swagger2.annotations.EnableSwagger2;

/**
@@ -20,6 +22,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableEncryptableProperties
@EnableAsync
@EnableRocketMQ
@EnableAspectJAutoProxy(exposeProxy = true)
public class UserApplication {

@Value("${fm.exception}")


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Näytä tiedosto

@@ -196,7 +196,7 @@ public class WxOrderController extends BaseController {
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error(e.getMessage());
logger.error(e.getMessage(),e);
return new ResultData(ErrorCode.ORDER_IS_FAIL, e.getMessage());
}
}


+ 2
- 0
mallinkCallback/src/main/java/com/iformall/CallbackApplication.java Näytä tiedosto

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;
import springfox.documentation.swagger2.annotations.EnableSwagger2;

@@ -20,6 +21,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableEncryptableProperties
@EnableAsync
@EnableRocketMQ
@EnableAspectJAutoProxy(exposeProxy = true)
public class CallbackApplication {

@Value("${fm.exception}")


+ 3
- 5
mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java Näytä tiedosto

@@ -1,18 +1,15 @@
package com.iformall;

import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg;
import com.iformall.enums.EnumMsgRecordType;
import com.iformall.service.msg.impl.FmInsideCouponVerifyMsgServiceImpl;
import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.mybatis.spring.annotation.MapperScan;
import org.rocketmq.starter.annotation.EnableRocketMQ;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;

import springfox.documentation.swagger2.annotations.EnableSwagger2;

/**
@@ -24,6 +21,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableSwagger2
@EnableRocketMQ
@EnableEncryptableProperties
@EnableAspectJAutoProxy(exposeProxy = true)
public class ConsumerApplication {

@Value("${fm.exception}")


+ 2
- 0
mallinkPosApi/src/main/java/com/iformall/PosApplication.java Näytä tiedosto

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;

/**
* @author Stormeye
@@ -16,6 +17,7 @@ import org.springframework.context.annotation.Bean;
@MapperScan(basePackages = {"com.iformall.mapper"})
@EnableEncryptableProperties
@EnableRocketMQ
@EnableAspectJAutoProxy(exposeProxy = true)
public class PosApplication {

@Value("${fm.exception}")


Ladataan…
Peruuta
Tallenna