modify

Helius

2020-06-08 db3cab89b47378ee0482ad5183f4f542d48309b8

modify

 lib/huobi-client-1.0.8-SNAPSHOT.jar

Binary files differ

 pom.xml

@@ -35,7 +35,7 @@
    </properties>

    <dependencies>

    
        <dependency>
            <groupId>ripple</groupId>
            <artifactId>ripple</artifactId>

 src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java

@@ -43,9 +43,6 @@
                .antMatchers("/swagger**/**").permitAll()
                .antMatchers("/webjars/**").permitAll()
                .antMatchers("/v2/**").permitAll()
                .antMatchers("/api/symbols/**").permitAll()
                .antMatchers("/common/**").permitAll()
                .antMatchers("/api/exchange/**").permitAll()
                .anyRequest().authenticated()
                .and().apply(securityConfiguereAdapter());
    }

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java

@@ -51,7 +51,7 @@
    private int closingType;

    @ApiModelProperty("止损价")
    private BigDecimal stopLossPrice;
    private BigDecimal stopLosePrice;

    @ApiModelProperty("止盈价")
    private BigDecimal stopProfitPrice;

 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java

@@ -92,7 +92,7 @@
            PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();

            // 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
            BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply(new BigDecimal(submitEntrustDto.getSymbolCnt())).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));
            BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));

            // 开仓手续费 建仓价*规格*手数*手续费率
            BigDecimal openFeePrice = submitEntrustDto.getEntrustPrice().multiply(lotNumber)

 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -79,6 +79,20 @@
    }

    

    /**

     *  验证账户是否存在

     * @return

     */

    @ApiOperation(value="验证账户是否存在", notes="验证账户是否存在")

    @ApiImplicitParams({

        @ApiImplicitParam(name = "account", value = "账号", required = true, dataType = "String", paramType="query"),

        @ApiImplicitParam(name = "type", value = "类型  1：手机号 2：邮箱", required = true, dataType = "int", paramType="query")

    })

    @GetMapping(value = "/getMemberAccountInfo")

    public Result  getMemberAccountInfo(String account,int type) {

        return memberService.getMemberAccountInfo(account,type);

    }

	
    /**

     * 修改密码

     * @return

     */


 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java

@@ -84,5 +84,7 @@


    public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto);



    public Result getMemberAccountInfo(String account,int type);





}


 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -878,6 +878,23 @@
        }
    }

    @Override
    public Result getMemberAccountInfo(String account, int type) {

        Map<String, Object> hashMap = new HashMap<>();
        if (type == 1) {
            hashMap.put("phone", account);
        } else {
            hashMap.put("email", account);
        }
        List<MemberEntity> member = memberDao.selectByMap(hashMap);
        if (CollUtil.isEmpty(member)) {
            return Result.fail(MessageSourceUtils.getString("home_service_0003"));
        }

        return Result.ok("");
    }

}



 src/main/resources/application-test.yml

@@ -91,7 +91,7 @@


app:
  debug: false
  debug: true
  redis_expire: 3000
  kline-update-job: false
  newest-price-update-job: true

 src/main/resources/i18n/messages_en_US.properties

@@ -80,7 +80,7 @@
member_service_0044=Please input a password

member_service_0045=Verification code is invalid, please resend

member_service_0046=The verification code entered is wrong, please re-enter

member_service_0047=The mobile number does not exist, please register and log in

member_service_0047=please register and log in

member_service_0048=Modification succeeded, please log in

member_service_0049=Verification code is invalid

member_service_0050=Verification code error


 src/main/resources/i18n/messages_zh_CN.properties

@@ -80,7 +80,7 @@
member_service_0044=请输入密码

member_service_0045=验证码已失效，请重新发送

member_service_0046=输入的验证码有误，请重新输入

member_service_0047=不存在该手机号码，请进行注册登录

member_service_0047=请进行注册登录

member_service_0048=修改成功，请登录

member_service_0049=验证码已失效

member_service_0050=验证码错误