Skip to content

Pom #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xlorne merged 4 commits into from
Dec 26, 2017
Merged

Pom #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9496b9
update pom
xlorne Dec 25, 2017
e51589f
pom 修改
xlorne Dec 26, 2017
e422f01
netty 机制
xlorne Dec 26, 2017
af06347
修复已知bug
xlorne Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@

<groupId>com.codingapi</groupId>
<artifactId>tx-lcn</artifactId>
<version>4.0.0</version>
<version>4.0.3.M1</version>
<packaging>pom</packaging>

<name>tx-lcn</name>
<url>https://github.com/codingapi/tx-lcn</url>
<description>tx-lcn project for LCN</description>

<modules>
<module>tx-client</module>
Expand Down Expand Up @@ -77,14 +79,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -108,6 +102,8 @@
</execution>
</executions>
</plugin>


<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
Expand All @@ -132,21 +128,24 @@
</execution>
</executions>
</plugin>
<!-- 手动打包时，将下面的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>

<!--手动打包时，将下面的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>

Expand Down
2 changes: 1 addition & 1 deletion transaction-dubbo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.codingapi</groupId>
<artifactId>tx-lcn</artifactId>
<version>4.0.0</version>
<version>4.0.3.M1</version>
</parent>

<groupId>com.codingapi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion transaction-motan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.codingapi</groupId>
<artifactId>tx-lcn</artifactId>
<version>4.0.0</version>
<version>4.0.3.M1</version>
</parent>

<groupId>com.codingapi</groupId>
Expand Down
2 changes: 1 addition & 1 deletion transaction-springcloud/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi</groupId>
<artifactId>tx-lcn</artifactId>
<version>4.0.0</version>
<version>4.0.3.M1</version>
</parent>

<groupId>com.codingapi</groupId>
Expand Down
76 changes: 1 addition & 75 deletions tx-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi</groupId>
<artifactId>tx-lcn</artifactId>
<version>4.0.0</version>
<version>4.0.3.M1</version>
</parent>

<groupId>com.codingapi</groupId>
Expand Down Expand Up @@ -123,78 +123,4 @@
</dependencies>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</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>

</project>
66 changes: 36 additions & 30 deletions tx-client/src/main/java/com/codingapi/tx/aop/service/impl/TxStartTransactionServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,50 +83,56 @@ public Object execute(ProceedingJoinPoint point,final TxTransactionInfo info) th
new Thread(new HookRunnable() {
@Override
public void run0() {
if(task.isAwait()) {

int rs = txManagerService.closeTransactionGroup(groupId, resState);
while (!task.isAwait() && !Thread.currentThread().interrupted()) {
try {
Thread.sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}

int lastState = rs==-1?0:resState;
int rs = txManagerService.closeTransactionGroup(groupId, resState);

int executeConnectionError = 0;
int lastState = rs==-1?0:resState;

//控制本地事务的数据提交
final TxTask waitTask = TaskGroupManager.getInstance().getTask(groupId, type);
if(waitTask!=null){
waitTask.setState(lastState);
waitTask.signalTask();
int executeConnectionError = 0;

while (!waitTask.isRemove()){
try {
Thread.sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
//控制本地事务的数据提交
final TxTask waitTask = TaskGroupManager.getInstance().getTask(groupId, type);
if(waitTask!=null){
waitTask.setState(lastState);
waitTask.signalTask();

if(waitTask.getState()== TaskState.connectionError.getCode()){
//本地执行失败.
executeConnectionError = 1;

lastState = 0;
while (!waitTask.isRemove()){
try {
Thread.sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}

if(waitTask.getState()== TaskState.connectionError.getCode()){
//本地执行失败.
executeConnectionError = 1;

if (compensateLocal == null) {
long end = System.currentTimeMillis();
long time = end - start;
if (executeConnectionError == 1||(lastState == 1 && rs == 0)) {
//记录补偿日志
txManagerService.sendCompensateMsg(groupId, time, info,executeConnectionError);
}
lastState = 0;
}
}

task.setState(lastState);
task.signalTask();
if (compensateLocal == null) {
long end = System.currentTimeMillis();
long time = end - start;
if (executeConnectionError == 1||(lastState == 1 && rs == 0)) {
//记录补偿日志
txManagerService.sendCompensateMsg(groupId, time, info,executeConnectionError);
}
}

task.setState(lastState);
task.signalTask();
}

}).start();

task.awaitTask();
Expand Down
52 changes: 52 additions & 0 deletions tx-client/src/main/java/com/codingapi/tx/framework/utils/IpAddressUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* Copyright (c) 2017. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
* Vestibulum commodo. Ut rhoncus gravida arcu.
*/

package com.codingapi.tx.framework.utils;

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* create by lorne on 2017/12/12
*/
public class IpAddressUtils {


public static boolean isIpAddress(String ipAddress){
String ipAddressRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}:([0-9]|[1-9]\\d{1,3}|[1-5]\\d{4}|6[0-5][0-9][0-3][0-5])";
Pattern ipAddressPattern = Pattern.compile(ipAddressRegex);
Matcher matcher = ipAddressPattern.matcher(ipAddress);
return matcher.matches();
}

public static boolean isIpFormat(String ipAddress){
return ipAddress.contains(":");
}

public static String getIpByDomain(String domain){
InetAddress ip= null;
try {
ip = InetAddress.getByName(domain);
} catch (UnknownHostException e) {
return null;
}
return ip.getHostAddress();
}


public static boolean isIp(String ipString) {
String ipRegex = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
Pattern pattern = Pattern.compile(ipRegex);
Matcher matcher = pattern.matcher(ipString);
return matcher.matches();
}


}
2 changes: 1 addition & 1 deletion tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyControlServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.codingapi.tx.netty.service.MQTxManagerService;
import com.codingapi.tx.netty.service.NettyControlService;
import com.codingapi.tx.netty.service.NettyService;
import com.codingapi.tx.netty.utils.IpAddressUtils;
import com.codingapi.tx.framework.utils.IpAddressUtils;
import com.lorne.core.framework.utils.task.ConditionUtils;
import com.lorne.core.framework.utils.task.IBack;
import com.lorne.core.framework.utils.task.Task;
Expand Down
1 change: 1 addition & 0 deletions tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public void initChannel(SocketChannel ch) throws Exception {
ch.pipeline().addLast(new LengthFieldPrepender(4, false));
ch.pipeline().addLast(new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 4, 0, 4));


ch.pipeline().addLast(transactionHandler);
}
});
Expand Down
20 changes: 0 additions & 20 deletions tx-client/src/main/java/com/codingapi/tx/netty/utils/IpAddressUtils.java
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions tx-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
Loading