补偿日志，数据添加补偿数量提醒

xlorne · xlorne · commit fb6fbbffdf47 · 2017-11-22T20:52:30.000+08:00
diff --git a/transaction-motan/pom.xml b/transaction-motan/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>transaction-motan</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <name>transaction-motan</name>
     <url>https://github.com/codingapi/tx-lcn</url>
@@ -51,22 +51,22 @@
     </distributionManagement>
 
 
-
     <properties>
+        <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compile.source>1.7</maven.compile.source>
         <maven.compile.target>1.7</maven.compile.target>
         <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.7</java.version>
+
         <motan>1.0.0</motan>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.codingapi</groupId>
             <artifactId>tx-client</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
         <!-- motan config start-->
@@ -153,6 +153,20 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/filter/TransactionFilter.java b/transaction-motan/src/main/java/com/codingapi/tx/motan/filter/TransactionFilter.java
@@ -16,7 +16,7 @@
  * <p>motan拦截器</p>
  *
  * @author 张峰 zfvip_it@163.com
- * @createTime: 2017/11/17 15:38
+ *  2017/11/17 15:38
  */
 @SpiMeta(name = "transaction")
 @Activation(key = {MotanConstants.NODE_TYPE_SERVICE, MotanConstants.NODE_TYPE_REFERER})
diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/interceptor/TxManagerInterceptor.java b/transaction-motan/src/main/java/com/codingapi/tx/motan/interceptor/TxManagerInterceptor.java
@@ -11,7 +11,7 @@
  * <p>类说明</p>
  *
  * @author 张峰 zfvip_it@163.com
- * @createTime: 2017/11/17 15:42
+ * 2017/11/17 15:42
  */
 @Component
 public class TxManagerInterceptor {
diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/ModelNameServiceImpl.java b/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/ModelNameServiceImpl.java
@@ -15,7 +15,7 @@
  * <p>类说明</p>
  *
  * @author 张峰 zfvip_it@163.com
- * @createTime: 2017/11/17 13:30
+ * 2017/11/17 13:30
  */
 @Service
 public class ModelNameServiceImpl implements ModelNameService {
@@ -64,7 +64,7 @@ private String getPort() {
     /**
      * 超时时间
      *
-     * @return
+     * @return  超时时间
      */
     public String getTimeOut() {
         return basicServiceConfigBean.getRequestTimeout().toString();
diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/TimeOutServiceImpl.java b/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/TimeOutServiceImpl.java
@@ -10,7 +10,7 @@
  * <p>类说明</p>
  *
  * @author 张峰 zfvip_it@163.com
- * @createTime: 2017/11/17 13:30
+ *  2017/11/17 13:30
  */
 @Service
 public class TimeOutServiceImpl implements TimeOutService {
diff --git a/tx-manager/src/main/java/com/codingapi/tm/api/controller/AdminController.java b/tx-manager/src/main/java/com/codingapi/tm/api/controller/AdminController.java
@@ -4,6 +4,7 @@
 import com.codingapi.tm.api.service.ApiModelService;
 import com.codingapi.tm.compensate.model.TxModel;
 import com.codingapi.tm.model.ModelInfo;
+import com.codingapi.tm.model.ModelName;
 import com.codingapi.tm.model.TxState;
 import com.lorne.core.framework.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@ public String json() {
     }
 
     @RequestMapping(value = "/modelList", method = RequestMethod.GET)
-    public List<String> modelList() {
+    public List<ModelName> modelList() {
         return apiAdminService.modelList();
     }
 
diff --git a/tx-manager/src/main/java/com/codingapi/tm/api/service/ApiAdminService.java b/tx-manager/src/main/java/com/codingapi/tm/api/service/ApiAdminService.java
@@ -1,6 +1,7 @@
 package com.codingapi.tm.api.service;
 
 import com.codingapi.tm.compensate.model.TxModel;
+import com.codingapi.tm.model.ModelName;
 import com.codingapi.tm.model.TxState;
 import com.lorne.core.framework.exception.ServiceException;
 
@@ -15,7 +16,7 @@ public interface ApiAdminService {
 
     String loadNotifyJson();
 
-    List<String> modelList();
+    List<ModelName> modelList();
 
 
     List<String> modelTimes(String model);
diff --git a/tx-manager/src/main/java/com/codingapi/tm/api/service/impl/ApiAdminServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/api/service/impl/ApiAdminServiceImpl.java
@@ -4,6 +4,7 @@
 import com.codingapi.tm.compensate.model.TxModel;
 import com.codingapi.tm.compensate.service.CompensateService;
 import com.codingapi.tm.manager.service.EurekaService;
+import com.codingapi.tm.model.ModelName;
 import com.codingapi.tm.model.TxState;
 import com.codingapi.tm.redis.service.RedisServerService;
 import com.lorne.core.framework.exception.ServiceException;
@@ -39,7 +40,7 @@ public String loadNotifyJson() {
     }
 
     @Override
-    public List<String> modelList() {
+    public List<ModelName> modelList() {
         return compensateService.loadModelList();
     }
 
diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/CompensateDao.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/CompensateDao.java
@@ -1,7 +1,6 @@
 package com.codingapi.tm.compensate.dao;
 
 import com.codingapi.tm.compensate.model.TransactionCompensateMsg;
-import com.codingapi.tm.netty.model.TxGroup;
 
 import java.util.List;
 
@@ -12,7 +11,7 @@ public interface CompensateDao {
 
     String saveCompensateMsg(TransactionCompensateMsg transactionCompensateMsg);
 
-    List<String> loadModelList();
+    List<String> loadCompensateKeys();
 
     List<String> loadCompensateTimes(String model);
 
diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/dao/impl/CompensateDaoImpl.java
@@ -40,17 +40,9 @@ public String saveCompensateMsg(TransactionCompensateMsg transactionCompensateMs
 
 
     @Override
-    public List<String> loadModelList() {
+    public List<String> loadCompensateKeys() {
         String key = configReader.getKeyPrefixCompensate() + "*";
-        List<String> keys = redisServerService.getKeys(key);
-        List<String> models = new ArrayList<>();
-        for (String k : keys) {
-            String name = k.split("_")[1];
-            if (!models.contains(name)) {
-                models.add(name);
-            }
-        }
-        return models;
+        return redisServerService.getKeys(key);
     }
 
 
@@ -67,9 +59,11 @@ public List<String> loadCompensateTimes(String model) {
         List<String> keys = redisServerService.getKeys(key);
         List<String> times = new ArrayList<>();
         for (String k : keys) {
-            String time = k.split("_")[2];
-            if (!times.contains(time)) {
-                times.add(time);
+            if(k.length()>36) {
+                String time = k.substring(k.length() - 24, k.length() - 14);
+                if (!times.contains(time)) {
+                    times.add(time);
+                }
             }
         }
         return times;
diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/service/CompensateService.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/service/CompensateService.java
@@ -2,6 +2,7 @@
 
 import com.codingapi.tm.compensate.model.TransactionCompensateMsg;
 import com.codingapi.tm.compensate.model.TxModel;
+import com.codingapi.tm.model.ModelName;
 import com.codingapi.tm.netty.model.TxGroup;
 import com.lorne.core.framework.exception.ServiceException;
 
@@ -14,7 +15,7 @@ public interface CompensateService {
 
     boolean saveCompensateMsg(TransactionCompensateMsg transactionCompensateMsg);
 
-    List<String> loadModelList();
+    List<ModelName> loadModelList();
 
     List<String> loadCompensateTimes(String model);
 
diff --git a/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/compensate/service/impl/CompensateServiceImpl.java
@@ -10,6 +10,7 @@
 import com.codingapi.tm.manager.ModelInfoManager;
 import com.codingapi.tm.manager.service.TxManagerSenderService;
 import com.codingapi.tm.model.ModelInfo;
+import com.codingapi.tm.model.ModelName;
 import com.codingapi.tm.netty.model.TxGroup;
 import com.codingapi.tm.netty.model.TxInfo;
 import com.codingapi.tm.redis.service.RedisServerService;
@@ -59,45 +60,49 @@ public boolean saveCompensateMsg(TransactionCompensateMsg transactionCompensateM
             key = configReader.getKeyPrefixNotify() + transactionCompensateMsg.getGroupId();
             txGroup = redisServerService.getTxGroupByKey(key);
         }
-        redisServerService.deleteKey(key);
-
-        transactionCompensateMsg.setTxGroup(txGroup);
-
-        final String json = JSON.toJSONString(transactionCompensateMsg);
-
-        logger.info("补偿->" + json);
-
-        final String compensateKey = compensateDao.saveCompensateMsg(transactionCompensateMsg);
-
-        //调整自动补偿机制，若开启了自动补偿，需要通知业务返回success，方可执行自动补偿
-        threadPool.execute(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    String groupId = transactionCompensateMsg.getGroupId();
-                    JSONObject requestJson = new JSONObject();
-                    requestJson.put("action","compensate");
-                    requestJson.put("groupId",groupId);
-                    requestJson.put("json",json);
-
-                    String url = configReader.getCompensateNotifyUrl();
-                    logger.error("补偿回调地址->" + url);
-                    String res = HttpUtils.postJson(url, requestJson.toJSONString());
-                    logger.error("补偿回调结果->" + res);
-                    if (configReader.isCompensateAuto()) {
-                        //自动补偿,是否自动执行补偿
-                        if("success".equalsIgnoreCase(res)) {
-                            //自动补偿
-                            autoCompensate(compensateKey, transactionCompensateMsg);
+        if(txGroup!=null) {
+            redisServerService.deleteKey(key);
+
+            transactionCompensateMsg.setTxGroup(txGroup);
+
+            final String json = JSON.toJSONString(transactionCompensateMsg);
+
+            logger.info("补偿->" + json);
+
+            final String compensateKey = compensateDao.saveCompensateMsg(transactionCompensateMsg);
+
+            //调整自动补偿机制，若开启了自动补偿，需要通知业务返回success，方可执行自动补偿
+            threadPool.execute(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        String groupId = transactionCompensateMsg.getGroupId();
+                        JSONObject requestJson = new JSONObject();
+                        requestJson.put("action", "compensate");
+                        requestJson.put("groupId", groupId);
+                        requestJson.put("json", json);
+
+                        String url = configReader.getCompensateNotifyUrl();
+                        logger.error("补偿回调地址->" + url);
+                        String res = HttpUtils.postJson(url, requestJson.toJSONString());
+                        logger.error("补偿回调结果->" + res);
+                        if (configReader.isCompensateAuto()) {
+                            //自动补偿,是否自动执行补偿
+                            if ("success".equalsIgnoreCase(res)) {
+                                //自动补偿
+                                autoCompensate(compensateKey, transactionCompensateMsg);
+                            }
                         }
+                    } catch (Exception e) {
+                        logger.error("补偿回调失败->" + e.getMessage());
                     }
-                } catch (Exception e) {
-                    logger.error("补偿回调失败->" + e.getMessage());
                 }
-            }
-        });
+            });
 
-        return StringUtils.isNotEmpty(compensateKey);
+            return StringUtils.isNotEmpty(compensateKey);
+        }else {
+            return false;
+        }
 
     }
 
@@ -153,9 +158,33 @@ public void autoCompensate(final String compensateKey, TransactionCompensateMsg
     }
 
 
+
     @Override
-    public List<String> loadModelList() {
-        return compensateDao.loadModelList();
+    public List<ModelName> loadModelList() {
+        List<String> keys =  compensateDao.loadCompensateKeys();
+
+        Map<String,Integer> models = new HashMap<>();
+
+        for(String key:keys){
+            if(key.length()>36){
+                String name =  key.substring(11,key.length()-25);
+                int v = 1;
+                if(models.containsKey(name)){
+                    v =  models.get(name)+1;
+                }
+                models.put(name,v);
+            }
+        }
+        List<ModelName> names = new ArrayList<>();
+
+        for(String key:models.keySet()){
+            int v = models.get(key);
+            ModelName modelName = new ModelName();
+            modelName.setName(key);
+            modelName.setCount(v);
+            names.add(modelName);
+        }
+        return names;
     }
 
     @Override
diff --git a/tx-manager/src/main/java/com/codingapi/tm/model/ModelName.java b/tx-manager/src/main/java/com/codingapi/tm/model/ModelName.java
@@ -0,0 +1,28 @@
+
+
+package com.codingapi.tm.model;
+
+/**
+ * create by lorne on 2017/11/22
+ */
+public class ModelName {
+
+    private String name;
+    private int count;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/tx-manager/src/main/resources/static/log.html b/tx-manager/src/main/resources/static/log.html
@@ -54,11 +54,13 @@
                     <thead>
                     <tr>
                         <th>模块名称</th>
+                        <th>补偿数量</th>
                     </tr>
                     </thead>
                     <tbody id="list">
                     <tr>
                         <td><span></span></td>
+                        <td><span></span></td>
                     </tr>
                     </tbody>
                 </table>
diff --git a/tx-manager/src/main/resources/static/static/log.js b/tx-manager/src/main/resources/static/static/log.js
diff --git a/tx-plugins-nodb/src/main/java/com/codingapi/tx/datasource/nodb/LCNNoTransactionDataSource.java b/tx-plugins-nodb/src/main/java/com/codingapi/tx/datasource/nodb/LCNNoTransactionDataSource.java

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* <p>motan拦截器</p>`
`17`	`17`	`*`
`18`	`18`	`* @author 张峰 zfvip_it@163.com`
`19`		`- * @createTime: 2017/11/17 15:38`
	`19`	`+ * 2017/11/17 15:38`
`20`	`20`	`*/`
`21`	`21`	`@SpiMeta(name = "transaction")`
`22`	`22`	`@Activation(key = {MotanConstants.NODE_TYPE_SERVICE, MotanConstants.NODE_TYPE_REFERER})`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* <p>类说明</p>`
`12`	`12`	`*`
`13`	`13`	`* @author 张峰 zfvip_it@163.com`
`14`		`- * @createTime: 2017/11/17 15:42`
	`14`	`+ * 2017/11/17 15:42`
`15`	`15`	`*/`
`16`	`16`	`@Component`
`17`	`17`	`public class TxManagerInterceptor {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* <p>类说明</p>`
`11`	`11`	`*`
`12`	`12`	`* @author 张峰 zfvip_it@163.com`
`13`		`- * @createTime: 2017/11/17 13:30`
	`13`	`+ * 2017/11/17 13:30`
`14`	`14`	`*/`
`15`	`15`	`@Service`
`16`	`16`	`public class TimeOutServiceImpl implements TimeOutService {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.codingapi.tm.api.service.ApiModelService;`
`5`	`5`	`import com.codingapi.tm.compensate.model.TxModel;`
`6`	`6`	`import com.codingapi.tm.model.ModelInfo;`
	`7`	`+import com.codingapi.tm.model.ModelName;`
`7`	`8`	`import com.codingapi.tm.model.TxState;`
`8`	`9`	`import com.lorne.core.framework.exception.ServiceException;`
`9`	`10`	`import org.springframework.beans.factory.annotation.Autowired;`
`@@ -45,7 +46,7 @@ public String json() {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`@RequestMapping(value = "/modelList", method = RequestMethod.GET)`
`48`		`- public List<String> modelList() {`
	`49`	`+ public List<ModelName> modelList() {`
`49`	`50`	`return apiAdminService.modelList();`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.codingapi.tm.compensate.model.TxModel;`
`5`	`5`	`import com.codingapi.tm.compensate.service.CompensateService;`
`6`	`6`	`import com.codingapi.tm.manager.service.EurekaService;`
	`7`	`+import com.codingapi.tm.model.ModelName;`
`7`	`8`	`import com.codingapi.tm.model.TxState;`
`8`	`9`	`import com.codingapi.tm.redis.service.RedisServerService;`
`9`	`10`	`import com.lorne.core.framework.exception.ServiceException;`
`@@ -39,7 +40,7 @@ public String loadNotifyJson() {`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`@Override`
`42`		`- public List<String> modelList() {`
	`43`	`+ public List<ModelName> modelList() {`
`43`	`44`	`return compensateService.loadModelList();`
`44`	`45`	`}`
`45`	`46`