Merge remote-tracking branch 'origin/master'

admin

2019-04-12 45f35a348c6d19f954888bf3e595bdf9d6016bb8

Merge remote-tracking branch 'origin/master'

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

 fanli/pom.xml

@@ -109,6 +109,15 @@
            <scope>system</scope>
            <systemPath>${basedir}/libs/ueditor-1.1.2.jar</systemPath>
        </dependency>
		
		
        <dependency>
            <groupId>jd-cps-client</groupId>
            <artifactId>jd-cps-client</artifactId>
            <version>2.2</version>
            <scope>system</scope>
            <systemPath>${basedir}/libs/jd-cps-client-2.2.jar</systemPath>
        </dependency>


    </dependencies>

 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java

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


import org.aspectj.lang.ProceedingJoinPoint;

import org.aspectj.lang.annotation.Around;

import org.aspectj.lang.annotation.Aspect;

import org.springframework.core.annotation.Order;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Component;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;



@@ -19,9 +22,9 @@
 * @author Administrator

 *

 */

//@Component

//@Aspect

//@Order(6)

@Component

@Aspect

@Order(6)

public class ActiveUserAspect {

    

    @Resource(name = "taskExecutor")


 fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java

@@ -18,8 +18,6 @@
import org.springframework.stereotype.Component;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;

import org.springframework.web.multipart.MultipartFile;

import org.springframework.web.multipart.MultipartHttpServletRequest;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.accept.AcceptData;


 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java

@@ -117,7 +117,7 @@
                if (StringUtil.isNullOrEmpty(relationId)) {

                    LogHelper.test(uid + "渠道备案失败");

                    bindInfo = false;

                } 
                }

                

                String specialId = null;

                if(bindInfo) {


 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java

@@ -363,6 +363,13 @@
                    swiperPicture.setParams("");

                }

                



                String remark = swiperPicture.getRemark();

                if (remark == null) {

                    swiperPicture.setRemark("");

                }

				
				
                JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();

                if (jumpDetail == null) {

                    // 默认未选择


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SwiperPictureServiceImpl.java

@@ -109,6 +109,11 @@
            e.printStackTrace();

        }

        

        String remark = record.getRemark();

        if (remark != null && (remark.trim().length() == 0 || remark.equalsIgnoreCase("null"))) {

            record.setRemark(null);

        }

		
        

        String picture = null;

        if (file != null) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

import com.yeshi.fanli.entity.bus.user.LoginResult;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;

import com.yeshi.fanli.entity.bus.user.UserConnectHistory;

@@ -915,25 +916,22 @@
        }

        phone = phone.replaceAll(" ", "");



        // // 苹果应用商店上线测试号码

        // if ("17316780233".equalsIgnoreCase(phone) &&

        // "258168".equalsIgnoreCase(vcode)) {

        // ;

        // } else {

        //

        // if (StringUtil.isNullOrEmpty(vcode)) {

        // throw new UserAccountException(1, "请输入验证码");

        // }

        //

        // String oldVcode = redisManager.getSMSVCode(phone,

        // SMSHistory.TYPE_LOGIN);

        // LogHelper.test("----------------------登录验证码： " + oldVcode);

        // if (StringUtil.isNullOrEmpty(oldVcode) ||

        // !oldVcode.equalsIgnoreCase(vcode)) {

        // throw new UserAccountException(1, "验证码错误，重新输入");

        // }

        // }

        // redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

        // 苹果应用商店上线测试号码

        if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {

            ;

        } else {



            if (StringUtil.isNullOrEmpty(vcode)) {

                throw new UserAccountException(1, "请输入验证码");

            }



            String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);

            LogHelper.test("----------------------登录验证码： " + oldVcode);

            if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

                throw new UserAccountException(1, "验证码错误，重新输入");

            }

        }

        redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);



        JSONObject logInfo = new JSONObject();

        logInfo.put("appId", appId);


 fanli/src/main/java/com/yeshi/fanli/util/Constant.java

@@ -13,9 +13,9 @@
public class Constant {

    public static boolean IS_TASK = false;

    // 外网环境

    public static boolean IS_OUTNET = true;

    public static boolean IS_OUTNET = false;



    public static boolean IS_TEST = false;

    public static boolean IS_TEST = true;



    public static int PAGE_SIZE = 20;

    public static int[] TASK_TYPE = { 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008// 微信任务类型编号


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -1699,6 +1699,21 @@
        }



    }

	
    public static void taoKeContent() {

        Map<String, String> map = new HashMap<>();

        map.put("method", "taobao.tbk.content.get");

        TaoKeAppInfo app = new TaoKeAppInfo();

        app.setAppKey("24838852");

        app.setAppSecret("bc8265e2bf8d8115329d652f9d3d4cd8");

        try {

            JSONObject json = TaoKeBaseUtil.baseRequest(map,app);

            System.out.println(json);

        } catch (TaoKeApiException e) {

            e.printStackTrace();

        }



    }



    // AA5ISJ




 fanli/src/main/resource/druid.properties

@@ -1,8 +1,8 @@
druid.driverClassName=com.mysql.jdbc.Driver

#本地测试

#druid.url=jdbc:mysql://192.168.1.122:3306/ec_quan

#druid.username=root

#druid.password=hexiaohui

druid.url=jdbc:mysql://192.168.1.253:3306/ec_quan

druid.username=root

druid.password=123456






@@ -18,9 +18,9 @@




#外网正式

druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

druid.username=root

druid.password=Yeshi2016@

#druid.url=jdbc:mysql://172.16.16.17:3306/ec_quan

#druid.username=root

#druid.password=Yeshi2016@



#外网本地测试

#druid.url=jdbc:mysql://gz-cdb-r13d0yi9.sql.tencentcdb.com:62929/ec_quan


 fanli/src/main/resource/redis.properties

@@ -1,8 +1,8 @@
redis.addr=172.16.16.15

#redis.addr=203.195.194.152

#redis.addr=172.16.16.15

redis.addr=192.168.1.253

redis.port=6379

redis.auth=crs-43yhgz0i:Yeshi2016@

#redis.auth=Yeshi2016@

#redis.auth=crs-43yhgz0i:Yeshi2016@

redis.auth=123456

redis.max_active=1024

redis.max_idle=200

redis.max_wait=10000


 fanli/src/test/java/org/fanli/MyBatisProduce.java

@@ -4,26 +4,22 @@
import org.yeshi.utils.mybatis.ColumnParseUtil;

import org.yeshi.utils.mybatis.MyBatisMapperUtil;



import com.yeshi.fanli.entity.bus.invite.SpreadUserImg;

import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrderTradeMap;

import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;



//@Ignore

public class MyBatisProduce {



    @Test

    public void test3() {


        MyBatisMapperUtil.createMapper(TaoBaoOrderTradeMap.class);

        MyBatisMapperUtil.createMapper(UserAccountBindingHistory.class);

        // MyBatisMapperUtil.createMapper(TaoBaoUnionAuthRecord.class);

    }



    @Test

    public void test1() {

        ColumnParseUtil.parseColumn(TaoBaoOrder.class,

                "D:/workspace/fanli/fanli-server/fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoOrderMapper.xml");


        ColumnParseUtil.parseColumn(LostOrder.class,

                "D:/workspace/fanli/fanli-server/fanli/src/main/java/com/yeshi/fanli/mapping/order/LostOrderMapper.xml");

    }



}


 fanli/src/test/java/org/fanli/TaoKeTest.java

@@ -23,7 +23,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



//@Ignore

@Ignore

public class TaoKeTest {



    public static int count = 0;