更改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/Mtp3CenturyApplication.java

@@ -1,6 +1,7 @@
 package com.muchinfo.mtp3century;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -9,6 +10,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableTransactionManagement
+@EnableRabbit
 @MapperScan("com.muchinfo.mtp3interface")
 public class Mtp3CenturyApplication {
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/configuration/RabbitConfig.java

@@ -4,31 +4,15 @@ import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.core.TopicExchange;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 @Configuration
 public class RabbitConfig {
 
-    @Value("${rabbitmq.template.exchange}")
-    private String exchangeName;
-
-    /**
-    *   解决占位符
-    */
-    @Bean
-    public static PropertySourcesPlaceholderConfigurer placeholderConfigurer(){
-        PropertySourcesPlaceholderConfigurer placeholderConfigurer = new PropertySourcesPlaceholderConfigurer();
-        placeholderConfigurer.setIgnoreUnresolvablePlaceholders(true);
-        return placeholderConfigurer;
-    }
-
-
     @Bean
     TopicExchange exchange() {
-        return new TopicExchange(exchangeName);
+        return new TopicExchange("entry",false,false);
     }
 
     @Bean

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/BankQueueListener.java

@@ -15,12 +15,12 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Component
-@RabbitListener(queues = "bankQueue")
 public class BankQueueListener implements MessageListener {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Override
+    @RabbitListener(queues = "bankQueue")
     public void onMessage(Message message) {
         logger.debug("GET MESSAGE---------------BankQueueListener---------------------");
         byte[] msgBody = message.getBody();

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/ExInOutMoneyListener.java

@@ -15,11 +15,11 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Component
-@RabbitListener(queues = "exInOutMoneyQueue")
 public class ExInOutMoneyListener implements MessageListener {
 	private final static Logger logger = LoggerFactory.getLogger(ExInOutMoneyListener.class);
 	
 	@Override
+	@RabbitListener(queues = "exInOutMoneyQueue")
 	public void onMessage(Message message) {
 		logger.debug("GET MESSAGE---------------ExInOutMoneyListener---------------------");
 		byte[] msgBody = message.getBody();

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/LoginStatusMsgListener.java

@@ -15,11 +15,11 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Component
-@RabbitListener(queues = "loginStatusMsgQueue")
 public class LoginStatusMsgListener implements MessageListener {
 	private final static Logger logger = LoggerFactory.getLogger(LoginStatusMsgListener.class);
 	
 	@Override
+	@RabbitListener(queues = "loginStatusMsgQueue")
 	public void onMessage(Message message) {
 		byte[] msgBody = message.getBody();
 		//ProtoHelper

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/MoneyQueueListener.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 
 /**
- * 
+ *
  * @Title: MoneyQueueListener
  * @Company: 多元世纪
  * @author liu.bingbing
@@ -24,11 +24,11 @@ import org.springframework.stereotype.Component;
  * @Description:
  */
 @Component
-@RabbitListener(queues = "moneyQueue")
 public class MoneyQueueListener implements MessageListener {
 	private final static Logger logger = LoggerFactory.getLogger(MoneyQueueListener.class) ;
 
 	@Override
+	@RabbitListener(queues = "moneyQueue")
 	public void onMessage(Message message) {
 		byte[] msgBody = message.getBody();
 		//ProtoHelper
@@ -57,7 +57,7 @@ public class MoneyQueueListener implements MessageListener {
 			}
 			case FunCodeConstants.FunCode_Trade_AccountCommandRsp:{
 				AccountCommandRsp rsp = AccountCommandRsp.parseFrom(body);
-				logger.debug(rsp.toBuilder().build().toString()); 
+				logger.debug(rsp.toBuilder().build().toString());
 				String uuid = rsp.getHeader().getUUID();
 				if(uuid.startsWith(
 						String.valueOf(SerialNumberUtils.prefix_warehouse))){

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/OrderListener.java

@@ -15,11 +15,11 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Component
-@RabbitListener(queues = "tradeCpRspQueue")
 public class OrderListener implements MessageListener {
 	
 	private final static Logger logger = LoggerFactory.getLogger(OrderListener.class);
 	@Override
+	@RabbitListener(queues = "tradeCpRspQueue")
 	public void onMessage(Message message) {
 		logger.debug("GET MESSAGE---------------OrderListener---------------------");
 		byte[] msgBody = message.getBody();

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/TradeCpListener.java

@@ -14,12 +14,12 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Component
-@RabbitListener(queues = "tradeCpRspQueue")
 public class TradeCpListener implements MessageListener {
 
     private final static Logger logger = LoggerFactory.getLogger(TradeCpListener.class);
 
     @Override
+    @RabbitListener(queues = "tradeCpRspQueue")
     public void onMessage(Message message) {
         byte[] msgBody = message.getBody();
         int funCode = ProtoHelper.getFunCodeForNTAS(msgBody);

mtp3-century/src/main/java/com/muchinfo/mtp3century/listener/WarehouseQueueListener.java

@@ -18,11 +18,11 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
 @Component
-@RabbitListener(queues = "warehouseQueue")
 public class WarehouseQueueListener implements MessageListener {
 	private final static Logger logger = LoggerFactory.getLogger(WarehouseQueueListener.class) ;
 	
 	@Override
+	@RabbitListener(queues = "warehouseQueue")
 	public void onMessage(Message message) {
 		logger.debug("GET MESSAGE---------------WarehouseQueueListener---------------------");
 		byte[] msgBody = message.getBody();

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/TaaccountServiceImpl.java

@@ -514,8 +514,8 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.INVESTOR_ERROR_CODE_002.getCode(), request.getHeader("Accept-Language"));
         }
         //判断资金账户签约信息
-        BankAccountsign sign = iBankAccountsignMapper.selectOne(new QueryWrapper<BankAccountsign>().eq("accountcode", ta.getAccountid()));
-        if (sign != null && sign.getSignstatus() != 1 && sign.getSignstatus() != 7) {
+        List<BankAccountsign> sign = iBankAccountsignMapper.selectList(new QueryWrapper<BankAccountsign>().eq("accountcode", ta.getAccountid()));
+        if (CollectionUtils.isNotEmpty(sign) && sign.get(0).getSignstatus() != 1 && sign.get(0).getSignstatus() != 7) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.INVESTOR_ERROR_CODE_003.getCode(), request.getHeader("Accept-Language"));
         }
         //判断是否是干净账户

mtp3-century/src/main/resources/message_zh-cn.properties

@@ -117,15 +117,15 @@ pwd_error_code_005=\u65E7\u5BC6\u7801\u9519\u8BEF
 amount_error_code_001=\u91D1\u989D\u4E3A 0,\u4E0D\u505A\u5904\u7406!
 traAcc_error_code_001=\u767B\u5F55\u8D26\u6237\u91CD\u590D,\u8BF7\u70B9\u51FB\u91CD\u65B0\u751F\u5B58\u5E76\u518D\u6B21\u63D0\u4EA4!
 investor_error_code_001=\u6CA1\u6709\u627E\u5230\u8D44\u91D1\u8D26\u6237
-investor_error_code_002=\u975E\u6295\u8D44\u8005\u8D26\u6237,\u4E0D\u80FD\u9500\u6237\u5BA1\u6838.
-investor_error_code_003=\u8D44\u91D1\u8D26\u6237\u672A\u89E3\u7EA6,\u4E0D\u80FD\u9500\u6237.
-investor_error_code_004=\u8D26\u6237\u5B58\u5728\u8D44\u91D1\u3001\u6301\u4ED3\u7B49\u76F8\u5173\u4FE1\u606F,\u4E0D\u80FD\u6CE8\u9500.
-investor_error_code_005=\u8D44\u91D1\u8D26\u6237\u8BF7\u6C42\u6CA1\u6709\u56DE\u5E94.
-investor_error_code_006=\u5206\u7EC4\u540D\u91CD\u590D.
-investor_error_code_007=\u8BF7\u9009\u62E9\u6295\u8D44\u8005.
-investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7EC4.
-investor_error_code_009=\u8BF7\u5148\u79FB\u9664\u8BE5\u5206\u7EC4\u4E0B\u6240\u6709\u6295\u8D44\u8005.
-investor_error_code_010=\u8BF7\u5148\u5220\u9664\u8BE5\u5206\u7EC4\u7684\u4E2A\u6027\u5316\u8BBE\u7F6E.
+investor_error_code_002=\u975E\u6295\u8D44\u8005\u8D26\u6237,\u4E0D\u80FD\u9500\u6237\u5BA1\u6838\u3002
+investor_error_code_003=\u8D44\u91D1\u8D26\u6237\u672A\u89E3\u7EA6,\u4E0D\u80FD\u9500\u6237\u3002
+investor_error_code_004=\u8D26\u6237\u5B58\u5728\u8D44\u91D1\u3001\u6301\u4ED3\u7B49\u76F8\u5173\u4FE1\u606F,\u4E0D\u80FD\u6CE8\u9500\u3002
+investor_error_code_005=\u8D44\u91D1\u8D26\u6237\u8BF7\u6C42\u6CA1\u6709\u56DE\u5E94\u3002
+investor_error_code_006=\u5206\u7EC4\u540D\u91CD\u590D\u3002
+investor_error_code_007=\u8BF7\u9009\u62E9\u6295\u8D44\u8005\u3002
+investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7EC4\u3002
+investor_error_code_009=\u8BF7\u5148\u79FB\u9664\u8BE5\u5206\u7EC4\u4E0B\u6240\u6709\u6295\u8D44\u8005\u3002
+investor_error_code_010=\u8BF7\u5148\u5220\u9664\u8BE5\u5206\u7EC4\u7684\u4E2A\u6027\u5316\u8BBE\u7F6E\u3002
 investor_error_code_011=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u4E8E10000
 warehouse_error_code_01=\u4ED3\u5E93\u4EE3\u7801\u6700\u591A10\u4F4D
 warehouse_error_code_02=\u4ED3\u5E93\u4EE3\u7801\u91CD\u590D

mtp3-century/src/main/resources/message_zh-hk.properties

@@ -117,15 +117,15 @@ pwd_error_code_005=\u820A\u5BC6\u78BC\u932F\u8AA4
 amount_error_code_001=\u91D1\u984D\u70BA0\uFF0C\u4E0D\u505A\u8655\u7406\uFF01
 traAcc_error_code_001=\u767B\u5165\u5E33\u6236\u91CD\u8907\uFF0C\u8ACB\u9EDE\u64CA\u91CD\u65B0\u751F\u5B58\u4E26\u518D\u6B21\u63D0\u4EA4!
 investor_error_code_001=\u6C92\u6709\u627E\u5230\u8CC7\u91D1\u5E33\u6236
-investor_error_code_002=\u975E\u6295\u8CC7\u8005\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838.
-investor_error_code_003=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236.
-investor_error_code_004=\u5E33\u6236\u5B58\u5728\u8CC7\u91D1\u3001\u6301\u5009\u7B49\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u4E0D\u80FD\u8A3B\u92B7.
-investor_error_code_005=\u8CC7\u91D1\u5E33\u6236\u8ACB\u6C42\u6C92\u6709\u56DE\u61C9.
-investor_error_code_006=\u5206\u7D44\u540D\u91CD\u8907.
-investor_error_code_007=\u8ACB\u9078\u64C7\u6295\u8CC7\u8005.
-investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7D44.
-investor_error_code_009=\u8ACB\u5148\u79FB\u9664\u8A72\u5206\u7D44\u4E0B\u6240\u6709\u6295\u8CC7\u8005.
-investor_error_code_010=\u8ACB\u5148\u5220\u9664\u8A72\u5206\u7D44\u7684\u500B\u6027\u5316\u8A2D\u5B9A.
+investor_error_code_002=\u975E\u6295\u8CC7\u8005\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838\u3002
+investor_error_code_003=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236\u3002
+investor_error_code_004=\u5E33\u6236\u5B58\u5728\u8CC7\u91D1\u3001\u6301\u5009\u7B49\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u4E0D\u80FD\u8A3B\u92B7\u3002
+investor_error_code_005=\u8CC7\u91D1\u5E33\u6236\u8ACB\u6C42\u6C92\u6709\u56DE\u61C9\u3002
+investor_error_code_006=\u5206\u7D44\u540D\u91CD\u8907\u3002
+investor_error_code_007=\u8ACB\u9078\u64C7\u6295\u8CC7\u8005\u3002
+investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7D44\u3002
+investor_error_code_009=\u8ACB\u5148\u79FB\u9664\u8A72\u5206\u7D44\u4E0B\u6240\u6709\u6295\u8CC7\u8005\u3002
+investor_error_code_010=\u8ACB\u5148\u5220\u9664\u8A72\u5206\u7D44\u7684\u500B\u6027\u5316\u8A2D\u5B9A\u3002
 investor_error_code_011=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u65BC10000
 warehouse_error_code_01=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u6700\u591A10\u6BD4\u7279
 warehouse_error_code_02=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u91CD\u8907

mtp3-century/src/main/resources/message_zh-tw.properties

@@ -117,15 +117,15 @@ pwd_error_code_005=\u820A\u5BC6\u78BC\u932F\u8AA4
 amount_error_code_001=\u91D1\u984D\u70BA0\uFF0C\u4E0D\u505A\u8655\u7406\uFF01
 traAcc_error_code_001=\u767B\u5165\u5E33\u6236\u91CD\u8907\uFF0C\u8ACB\u9EDE\u64CA\u91CD\u65B0\u751F\u5B58\u4E26\u518D\u6B21\u63D0\u4EA4!
 investor_error_code_001=\u6C92\u6709\u627E\u5230\u8CC7\u91D1\u5E33\u6236
-investor_error_code_002=\u975E\u6295\u8CC7\u8005\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838.
-investor_error_code_003=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236.
-investor_error_code_004=\u5E33\u6236\u5B58\u5728\u8CC7\u91D1\u3001\u6301\u5009\u7B49\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u4E0D\u80FD\u8A3B\u92B7.
-investor_error_code_005=\u8CC7\u91D1\u5E33\u6236\u8ACB\u6C42\u6C92\u6709\u56DE\u61C9.
-investor_error_code_006=\u5206\u7D44\u540D\u91CD\u8907.
-investor_error_code_007=\u8ACB\u9078\u64C7\u6295\u8CC7\u8005.
-investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7D44.
-investor_error_code_009=\u8ACB\u5148\u79FB\u9664\u8A72\u5206\u7D44\u4E0B\u6240\u6709\u6295\u8CC7\u8005.
-investor_error_code_010=\u8ACB\u5148\u5220\u9664\u8A72\u5206\u7D44\u7684\u500B\u6027\u5316\u8A2D\u5B9A.
+investor_error_code_002=\u975E\u6295\u8CC7\u8005\u5E33\u6236\uFF0C\u4E0D\u80FD\u92B7\u6236\u7A3D\u6838\u3002
+investor_error_code_003=\u8CC7\u91D1\u5E33\u6236\u672A\u89E3\u7D04\uFF0C\u4E0D\u80FD\u92B7\u6236\u3002
+investor_error_code_004=\u5E33\u6236\u5B58\u5728\u8CC7\u91D1\u3001\u6301\u5009\u7B49\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u4E0D\u80FD\u8A3B\u92B7\u3002
+investor_error_code_005=\u8CC7\u91D1\u5E33\u6236\u8ACB\u6C42\u6C92\u6709\u56DE\u61C9\u3002
+investor_error_code_006=\u5206\u7D44\u540D\u91CD\u8907\u3002
+investor_error_code_007=\u8ACB\u9078\u64C7\u6295\u8CC7\u8005\u3002
+investor_error_code_008={0}\u5DF2\u5206\u914D\u5206\u7D44\u3002
+investor_error_code_009=\u8ACB\u5148\u79FB\u9664\u8A72\u5206\u7D44\u4E0B\u6240\u6709\u6295\u8CC7\u8005\u3002
+investor_error_code_010=\u8ACB\u5148\u5220\u9664\u8A72\u5206\u7D44\u7684\u500B\u6027\u5316\u8A2D\u5B9A\u3002
 investor_error_code_011=\u6BD4\u7387\u503C\u4E0D\u80FD\u5927\u65BC10000
 warehouse_error_code_01=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u6700\u591A10\u6BD4\u7279
 warehouse_error_code_02=\u5009\u5EAB\u7A0B\u5F0F\u78BC\u91CD\u8907