Browse Source

1. 升级底层

liukx 4 years ago
parent
commit
757bb6617b

+ 1 - 0
elab-log/src/test/java/com/elab/log/utils/CatCrossProcessTest.java

@@ -103,6 +103,7 @@ public class CatCrossProcessTest extends TestCase {
                 return null;
             });
         }).start();
+
     }
 
     private void buildRemoteMsg(Map<String, String> idMap, String text) throws Exception {

+ 10 - 5
elab-mq/pom.xml

@@ -98,10 +98,15 @@
     </build>
 
     <distributionManagement>
-        <repository>
-            <id>releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.0.11:8081/nexus/content/repositories/elab/</url>
-        </repository>
+        <!--<repository>-->
+        <!--<id>releases</id>-->
+        <!--<name>Nexus Release Repository</name>-->
+        <!--<url>http://192.168.0.11:8081/nexus/content/repositories/elab/</url>-->
+        <!--</repository>-->
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>User Project SNAPSHOTS</name>
+            <url>http://192.168.0.11:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
     </distributionManagement>
 </project>

+ 8 - 0
elab-mq/src/main/java/com/elab/mq/exception/MsgRollBackException.java

@@ -0,0 +1,8 @@
+package com.elab.mq.exception;
+
+public class MsgRollBackException extends RuntimeException{
+
+    public MsgRollBackException(String message) {
+        super(message);
+    }
+}

+ 11 - 4
elab-mq/src/main/java/com/elab/mq/listener/AbstractMessageListener.java

@@ -6,6 +6,7 @@ import com.aliyun.openservices.ons.api.Message;
 import com.aliyun.openservices.ons.api.MessageListener;
 import com.dianping.cat.message.Transaction;
 import com.elab.log.utils.CatCrossProcess;
+import com.elab.mq.exception.MsgRollBackException;
 import com.elab.mq.model.MessageModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,7 +58,8 @@ public abstract class AbstractMessageListener implements MessageListener {
         String tag = message.getTag();
         String groupName = this.getClass().getSimpleName();
 
-        Transaction t = CatCrossProcess.getCrossTransactionMsg(MQ_CONSUMER, topic + "_" + tag + "_" + getClass().getSimpleName(), null);
+        Transaction t = CatCrossProcess
+            .getCrossTransactionMsg(MQ_CONSUMER, topic + "_" + tag + "_" + getClass().getSimpleName(), null);
         MessageModel messageModel = new MessageModel(message);
 
         Action action = null;
@@ -76,12 +78,17 @@ public abstract class AbstractMessageListener implements MessageListener {
             action = consume0(messageModel, consumeContext);
 
             long time = System.currentTimeMillis() - start;
-
+            // Manual
             messageModel.setInvokeTime(time);
 
             t.setSuccessStatus();
-
-            this.consumerInterceptor.success(messageModel, groupName);
+            // 可能出现手动提交回滚状态的情况。
+            if (action == null || action == Action.ReconsumeLater) {
+                // 手动提交或者极端情况返回为null的情况
+                this.consumerInterceptor.error(messageModel, groupName, new MsgRollBackException("手动提交回滚"));
+            } else {
+                this.consumerInterceptor.success(messageModel, groupName);
+            }
         } catch (Exception e) {
             t.setStatus(e);
             logger.error("消息处理异常 : ", e);

+ 11 - 0
elab-redis/src/test/java/com/elab/redis/spring/SpringDataTest.java

@@ -128,6 +128,17 @@ public class SpringDataTest extends RedisSpringBoot {
         //        System.in.read();
     }
 
+    @Test
+    public void delKey(){
+        List<String> delKeyList = new ArrayList<>();
+        delKeyList.add("user:userId:mobile:3250634");
+        delKeyList.add("user:userId:mobile:3258428");
+        Long delete = redisTemplate.delete(delKeyList);
+        System.out.println(delete);
+    }
+
+
+
     @Test
     public void del() {