pom优化

admin

2021-04-13 594ce0ec17a858987868cb815c44ef0b363b5010

pom优化

 pom.xml

@@ -10,7 +10,7 @@

    <properties>
        <org.hibernate.version>4.1.2</org.hibernate.version>
        <org.springframework-version>4.3.0.RELEASE</org.springframework-version>
        <org.springframework-version>4.3.23.RELEASE</org.springframework-version>
        <spring.mongodb.version>1.10.10.RELEASE</spring.mongodb.version>
        <solrj.version>5.5.5</solrj.version>
        <logback.version>1.2.3</logback.version>
@@ -36,6 +36,8 @@
                    <artifactId>log4j</artifactId>
                </exclusion>
            </exclusions>
            <scope>system</scope>
            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/utils.jar</systemPath>
        </dependency>

        <dependency>
@@ -52,7 +54,7 @@
            <artifactId>lib-common</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${basedir}/libs/lib-common.jar</systemPath>
            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/lib-common.jar</systemPath>
        </dependency>

        <dependency>
@@ -60,7 +62,7 @@
            <artifactId>facade-goldcorn</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>system</scope>
            <systemPath>${basedir}/libs/facade-goldcorn-0.0.1.jar</systemPath>
            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/facade-goldcorn-0.0.1.jar</systemPath>
        </dependency>


@@ -119,13 +121,13 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context-support</artifactId>
            <version>4.3.1.RELEASE</version>
            <version>${org.springframework-version}</version>
        </dependency>

        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-aop</artifactId>
            <version>4.3.0.RELEASE</version>
            <version>${org.springframework-version}</version>
        </dependency>

        <!-- Spring AOP -->
@@ -144,11 +146,11 @@
        </dependency>

        <!-- https://mvnrepository.com/artifact/cglib/cglib-nodep -->
        <dependency>
            <groupId>cglib</groupId>
            <artifactId>cglib-nodep</artifactId>
            <version>3.2.4</version>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>cglib</groupId>-->
            <!--<artifactId>cglib-nodep</artifactId>-->
            <!--<version>3.2.4</version>-->
        <!--</dependency>-->

        <!-- spring end -->

@@ -192,7 +194,7 @@
        <dependency>
            <groupId>cglib</groupId>
            <artifactId>cglib</artifactId>
            <version>2.2.2</version>
            <version>3.1</version>
        </dependency>

        <dependency>
@@ -285,23 +287,23 @@
        </dependency>


        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-core</artifactId>
            <version>2.3.14</version>
            <exclusions>
                <exclusion>
                    <groupId>javassist</groupId>
                    <artifactId>javassist</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.apache.struts</groupId>-->
            <!--<artifactId>struts2-core</artifactId>-->
            <!--<version>2.3.14</version>-->
            <!--<exclusions>-->
                <!--<exclusion>-->
                    <!--<groupId>javassist</groupId>-->
                    <!--<artifactId>javassist</artifactId>-->
                <!--</exclusion>-->
            <!--</exclusions>-->
        <!--</dependency>-->

        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-spring-plugin</artifactId>
            <version>2.2.3.1</version>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.apache.struts</groupId>-->
            <!--<artifactId>struts2-spring-plugin</artifactId>-->
            <!--<version>2.2.3.1</version>-->
        <!--</dependency>-->


        <dependency>
@@ -328,7 +330,7 @@
        <dependency>
            <groupId>commons-pool</groupId>
            <artifactId>commons-pool</artifactId>
            <version>1.4</version>
            <version>1.6</version>
        </dependency>

        <dependency>
@@ -345,7 +347,7 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
            <version>1.7.16</version>
            <version>1.7.22</version>
        </dependency>


@@ -418,7 +420,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid</artifactId>
            <version>1.1.6</version>
            <version>1.1.23</version>
        </dependency>

        <dependency>
@@ -660,7 +662,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>1.2.47</version>
            <version>1.2.73</version>
        </dependency>


@@ -785,14 +787,14 @@
                    <artifactId>*</artifactId>
                </exclusion>


                <exclusion>
                    <groupId>cglib</groupId>
                    <artifactId>*</artifactId>
                </exclusion>

            </exclusions>
        </dependency>

        <!--<dependency>-->
        <!--<groupId>io.seata</groupId>-->
        <!--<artifactId>seata-spring-boot-starter</artifactId>-->
        <!--<version>${seata.version}</version>-->
        <!--</dependency>-->


        <dependency>
@@ -800,6 +802,15 @@
            <artifactId>jackson-databind</artifactId>
            <version>2.10.1</version>
        </dependency>


        <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
        <dependency>
            <groupId>commons-fileupload</groupId>
            <artifactId>commons-fileupload</artifactId>
            <version>1.4</version>
        </dependency>



    </dependencies>
@@ -861,6 +872,24 @@


                    <execution>
                        <id>install-utils</id>
                        <phase>clean</phase>
                        <configuration>
                            <file>${basedir}/libs/utils.jar</file>
                            <repositoryLayout>default</repositoryLayout>
                            <groupId>org.yeshi</groupId>
                            <artifactId>utils</artifactId>
                            <version>1.2-SNAPSHOT</version>
                            <packaging>jar</packaging>
                            <generatePom>true</generatePom>
                        </configuration>
                        <goals>
                            <goal>install-file</goal>
                        </goals>
                    </execution>


                    <execution>
                        <id>install-facade-goldcorn</id>
                        <phase>clean</phase>
                        <configuration>

 src/main/java/com/yeshi/buwan/interceptor/LoginInterceptor.java

@@ -1,28 +1,21 @@
package com.yeshi.buwan.interceptor;

import java.util.Map;

import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.yeshi.buwan.domain.AdminInfo;

public class LoginInterceptor extends AbstractInterceptor {
public class LoginInterceptor  {

    /**
     * 
     */
    private static final long serialVersionUID = 1L;

    @Override
    public String intercept(ActionInvocation invocation) throws Exception {
        ActionContext ctx = invocation.getInvocationContext();
        Map<String, Object> session = ctx.getSession();
        AdminInfo info = (AdminInfo) session.get("ADMIN_INFO");
        if (info == null) {
            return "login";
        } else {
            return invocation.invoke();
        }
    }
//
//    @Override
//    public String intercept(ActionInvocation invocation) throws Exception {
//        ActionContext ctx = invocation.getInvocationContext();
//        Map<String, Object> session = ctx.getSession();
//        AdminInfo info = (AdminInfo) session.get("ADMIN_INFO");
//        if (info == null) {
//            return "login";
//        } else {
//            return invocation.invoke();
//        }
//    }
}

 src/main/java/com/yeshi/buwan/service/imp/order/OrderServiceImpl.java

@@ -3,9 +3,9 @@
import com.alipay.api.AlipayApiException;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.yeshi.buwan.dao.vip.OrderRecordDao;
import com.yeshi.buwan.domain.vip.OrderRecord;
import com.yeshi.buwan.domain.vip.OrderType;
import com.yeshi.buwan.domain.vip.UserVIPInfo;
import com.yeshi.buwan.domain.vip.OrderRecord;
import com.yeshi.buwan.domain.vip.VIPPriceType;
import com.yeshi.buwan.dto.order.PayWayInfoDTO;
import com.yeshi.buwan.exception.PPTVException;
@@ -21,7 +21,6 @@
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.user.VipUtil;
import com.yeshi.buwan.util.vip.VIPOrderUtil;
import io.seata.spring.annotation.GlobalTransactional;
import org.hibernate.Query;
import org.hibernate.Session;
import org.slf4j.Logger;
@@ -84,7 +83,7 @@
    }

    @Transactional(rollbackFor = Exception.class)
    @GlobalTransactional(timeoutMills = 30000, name = "buwan-order", rollbackFor = Exception.class)
//    @GlobalTransactional(timeoutMills = 30000, name = "buwan-order", rollbackFor = Exception.class)
    @Override
    public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException {
        //TODO 影视豆支付

 src/main/java/com/yeshi/buwan/service/manager/GoldCornManager.java

@@ -21,7 +21,7 @@
    @Resource
    private SystemConfigService systemConfigService;

    @Reference(version = "1.0")
    @Reference(version = "1.0",check = false)
    private GoldCornTradeService goldCornTradeService;



 src/main/java/com/yeshi/buwan/service/manager/SeataManagerTest.java

@@ -1,47 +1,32 @@
package com.yeshi.buwan.service.manager;

import com.ks.goldcorn.exception.GoldSourceException;
import com.ks.goldcorn.pojo.DO.GoldCornGetSource;
import com.ks.goldcorn.service.remote.GoldCornGetSourceService;
import com.yeshi.buwan.dao.user.LoginUserDao;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.service.inter.LoginUserService;
import io.seata.core.context.RootContext;
import io.seata.spring.annotation.GlobalTransactional;
import org.apache.dubbo.config.annotation.Reference;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.List;

@Component
public class SeataManagerTest {

    @Resource
    private LoginUserDao loginUserDao;

    @Reference(version = "1.0")
    private GoldCornGetSourceService goldCornGetSourceService;

    @GlobalTransactional(timeoutMills = 30000, name = "buwan-order", rollbackFor = Exception.class)
    public void addGetResource() throws Exception {
        System.out.println("开始全局事务，XID = " + RootContext.getXID());
        LoginUser loginUser = new LoginUser();
        loginUser.setId("50134");
        loginUser.setName("test3");
        loginUserDao.updateSelective(loginUser);

        GoldCornGetSource get = new GoldCornGetSource();
        get.setAppId(15L);
        get.setSourceCode("test1");
        get.setSourceName("测试");
        get.setGoldCorn(1);

        goldCornGetSourceService.addSource(get);
        throw new Exception("手动报错");
    }
//
//    @Resource
//    private LoginUserDao loginUserDao;
//
//    @Reference(version = "1.0")
//    private GoldCornGetSourceService goldCornGetSourceService;
//
//    @GlobalTransactional(timeoutMills = 30000, name = "buwan-order", rollbackFor = Exception.class)
//    public void addGetResource() throws Exception {
//        System.out.println("开始全局事务，XID = " + RootContext.getXID());
//        LoginUser loginUser = new LoginUser();
//        loginUser.setId("50134");
//        loginUser.setName("test3");
//        loginUserDao.updateSelective(loginUser);
//
//        GoldCornGetSource get = new GoldCornGetSource();
//        get.setAppId(15L);
//        get.setSourceCode("test1");
//        get.setSourceName("测试");
//        get.setGoldCorn(1);
//
//        goldCornGetSourceService.addSource(get);
//        throw new Exception("手动报错");
//    }

}

 src/main/java/com/yeshi/buwan/util/SpringContext.java

@@ -1,6 +1,5 @@
package com.yeshi.buwan.util;

import com.alibaba.druid.pool.DruidDataSource;
import com.yeshi.buwan.domain.ResourceVideo;
import com.yeshi.buwan.domain.VideoInfo;
import com.yeshi.buwan.domain.VideoResource;
@@ -19,18 +18,13 @@
import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
import com.yeshi.buwan.util.mq.CMQManager;
import io.seata.rm.datasource.DataSourceProxy;
import io.seata.spring.annotation.GlobalTransactionScanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.List;


 src/main/webapp/WEB-INF/lib/facade-goldcorn-0.0.1.jar

Binary files differ

 src/main/webapp/WEB-INF/lib/lib-common.jar

Binary files differ

 src/main/webapp/WEB-INF/lib/utils.jar

Binary files differ

 src/test/java/com/hxh/spring/test/dubbo/SeataTest.java

@@ -21,7 +21,7 @@
    @Test
    public void getApp() {
        try {
            seataManagerTest.addGetResource();
//            seataManagerTest.addGetResource();
        } catch (Exception e) {
            e.printStackTrace();
        }