From 412d065591cd71821f2d07d23b64dc9fcde2554d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 10:52:49 +0800
Subject: [PATCH] 中英文
---
src/main/resources/i18n/messages_zh_CN.properties | 14 +++++++
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 19 +++++----
src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java | 5 +-
src/main/java/com/xcong/excoin/common/response/Result.java | 4 +
src/main/java/com/xcong/excoin/common/system/controller/CommonController.java | 21 +++++-----
src/main/resources/i18n/messages_en_US.properties | 18 ++++++++
src/main/java/com/xcong/excoin/common/system/service/UserDetailsServiceImpl.java | 3 +
7 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/response/Result.java b/src/main/java/com/xcong/excoin/common/response/Result.java
index f47e154..cacedd1 100644
--- a/src/main/java/com/xcong/excoin/common/response/Result.java
+++ b/src/main/java/com/xcong/excoin/common/response/Result.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.common.response;
+import com.xcong.excoin.utils.MessageSourceUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,7 +19,7 @@
private static final int SUCCESS = 0;
- private static final String SUCCESS_MSG = "success";
+ private static final String SUCCESS_MSG = MessageSourceUtils.getString("result_success_msg");
private static final int FAIL = -1;
@@ -47,6 +48,7 @@
result.data = data;
return result;
}
+
public static Result ok(Object data) {
Result result = new Result();
result.code = SUCCESS;
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
index 7ba14a0..02a2aa9 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
@@ -7,6 +7,7 @@
import com.xcong.excoin.common.system.dto.Base64UploadDto;
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.configurations.properties.AliOssProperties;
+import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.OssUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.SmsUtils;
@@ -54,7 +55,7 @@
Integer code = (int) ((Math.random() * 9 + 1) * 100000);
if (StrUtil.isNotBlank(redisUtils.getString(AppContants.VERIFY_CODE_PREFIX + account))) {
- return Result.fail("验证码已发送,请勿重复发");
+ return Result.fail(MessageSourceUtils.getString("common_verify_code_exist"));
}
// 发送手机验证码
@@ -64,22 +65,22 @@
Map<String, Object> map = new HashMap<>();
boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
map.put("code", flag);
- return Result.ok("success", map);
+ return Result.ok(MessageSourceUtils.getString("member_service_0010"), map);
}
// 发送邮件验证码
} else if (AppContants.ACCOUNT_TYPE_EMAIL.equals(type)) {
boolean flag = SubMailSend.sendMail(account, code.toString());
if (flag) {
redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
- return Result.ok("success");
+ return Result.ok(MessageSourceUtils.getString("member_service_0010"));
} else {
- return Result.fail("发送失败");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
} else {
log.info("未定义账号类型");
- return Result.fail("fail");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
- return Result.fail("fail");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
@ApiOperation(value = "验证验证码是否正确", notes = "验证验证码是否正确")
@@ -88,9 +89,9 @@
@ApiParam(name = "code", value = "验证码", required = true) @RequestParam("code") String code) {
boolean flag = commonservice.verifyCode(account, code);
if (flag) {
- return Result.ok("success");
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"));
}
- return Result.fail("验证码错误");
+ return Result.fail(MessageSourceUtils.getString("common_verify_code"));
}
@ApiOperation(value = "文件上次接口", notes = "文件上传")
@@ -101,8 +102,8 @@
boolean flag = OssUtils.uploadFileWithBase64(uploadDto.base64Str, imageName);
if (flag) {
String url = aliOssProperties.getBucketName() + "/" + imageName;
- return Result.ok("success", url);
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"), url);
}
- return Result.fail("上传失败");
+ return Result.fail(MessageSourceUtils.getString("uploadFile_controller_0001"));
}
}
diff --git a/src/main/java/com/xcong/excoin/common/system/service/UserDetailsServiceImpl.java b/src/main/java/com/xcong/excoin/common/system/service/UserDetailsServiceImpl.java
index 508dff9..d08afa0 100644
--- a/src/main/java/com/xcong/excoin/common/system/service/UserDetailsServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/common/system/service/UserDetailsServiceImpl.java
@@ -7,6 +7,7 @@
import com.xcong.excoin.common.system.bean.LoginUserBean;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.utils.MessageSourceUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -46,7 +47,7 @@
}
if (MemberEntity.ACCOUNT_STATUS_DISABLED == memberEntity.getAccountStatus()) {
- throw new GlobalException("账号已被禁用");
+ throw new GlobalException(MessageSourceUtils.getString("member_service_0092"));
}
return new LoginUserBean(memberEntity, null, null);
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
index a71f393..7d1430b 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java
@@ -6,6 +6,7 @@
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
+import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.TypeJudgeUtils;
import com.xcong.excoin.utils.api.response.Symbol;
import io.swagger.annotations.*;
@@ -34,11 +35,11 @@
@PostMapping(value = "/submitEntrustOrder")
public Result submitEntrustOrder(@RequestBody @Validated SubmitEntrustDto submitEntrustDto) {
if (StrUtil.isBlank(SymbolEnum.getNameByValue(submitEntrustDto.getSymbol()))) {
- return Result.fail("非法币种");
+ return Result.fail(MessageSourceUtils.getString("illegal_symbol"));
}
if (!TypeJudgeUtils.entrustType(submitEntrustDto.getEntrustType())) {
- return Result.fail("非法类型");
+ return Result.fail(MessageSourceUtils.getString("illegal_type"));
}
return contractEntrustOrderService.addContractEntrustOrder(submitEntrustDto);
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 2fcb1d9..69f2489 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -23,6 +23,7 @@
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CoinTypeConvert;
+import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -75,14 +76,14 @@
// 开多委托价不能大于当前价
if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
if (submitEntrustDto.getEntrustPrice().compareTo(newPrice) > -1) {
- return Result.fail("委托价不能大于当前价");
+ return Result.fail(MessageSourceUtils.getString("entrust_price_judge_more"));
}
}
// 开空委托价不能小于当前价
if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_LESS) {
if (submitEntrustDto.getEntrustPrice().compareTo(newPrice) < 1) {
- return Result.fail("委托价不能小于当前价");
+ return Result.fail(MessageSourceUtils.getString("entrust_price_judge_less"));
}
}
@@ -106,7 +107,7 @@
log.info("预付款:{}", entrustTotalAmount);
if (entrustTotalAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
- return Result.fail("可用余额不足");
+ return Result.fail(MessageSourceUtils.getString("member_service_0085"));
}
ContractEntrustOrderEntityMapper convert = ContractEntrustOrderEntityMapper.INSTANCE;
@@ -132,9 +133,9 @@
OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
- return Result.ok("委托成功");
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"));
} else {
- return Result.fail("委托失败");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
}
@@ -143,7 +144,7 @@
return Result.fail("功能暂未开放,敬请期待");
}
- return Result.fail("未知错误");
+ return Result.fail(MessageSourceUtils.getString("result_fail_msg"));
}
@Override
@@ -162,7 +163,7 @@
// 查询该委托单是否为该用户所有
ContractEntrustOrderEntity entrustOrderEntity = contractEntrustOrderDao.selectEntrustOrderByIdAndMemberId(id, memberEntity.getId());
if (entrustOrderEntity == null) {
- return Result.fail("该委托单不存在");
+ return Result.fail(MessageSourceUtils.getString("entrust_order_not_exist"));
}
MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
@@ -177,9 +178,9 @@
contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());
if (i > 0) {
- return Result.ok("撤销成功");
+ return Result.ok(MessageSourceUtils.getString("cancellation_success"));
}
- return Result.fail("撤销失败");
+ return Result.fail(MessageSourceUtils.getString("cancellation_fail"));
}
@Override
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 1ae789b..47d0eaf 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -222,4 +222,20 @@
home_service_0013=Modification succeeded, please log in
home_service_0014=The mobile number does not exist, please register and log in
-uploadFile_controller_0001=Upload failed
\ No newline at end of file
+uploadFile_controller_0001=Upload failed
+
+result_success_msg=Operation success
+result_fail_msg=Operation failed
+
+common_verify_code=Code Error Or Invalided
+common_verify_code_exist=Code existed
+
+illegal_symbol=Illegal Symbol
+illegal_type=Illegal Type
+
+entrust_price_judge_more=The entrusted open price cannot be higher than the market price
+entrust_price_judge_less=The entrusted open price cannot be lower than the market price
+entrust_order_not_exist=Order does not exist
+cancellation_success=Cancellation Success
+cancellation_fail=Cancellation Fail
+
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index c3553d9..7cabde0 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -224,3 +224,17 @@
uploadFile_controller_0001=上传失败
+result_success_msg=操作成功
+result_fail_msg=操作失败
+
+common_verify_code=验证码错误或已失效
+common_verify_code_exist=验证码已发送,请勿重复发送
+
+illegal_symbol=非法币种
+illegal_type=非法类型
+
+entrust_price_judge_more=委托价不能大于当前价
+entrust_price_judge_less=委托价不能小于当前价
+entrust_order_not_exist=委托单不存在
+cancellation_success=撤销成功
+cancellation_fail=撤销失败
--
Gitblit v1.9.1