Skip to content

C
cloud-platform
Commit 34e6f2b9 authored by 周健威's avatar 周健威
Browse files
Options

添加接口

parent 436702b8
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 155 deletions
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/interceptor/ClientTokenInterceptor.java
View file @ 34e6f2b9
......@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.auth.service.AuthClientService;
import com.github.wxiaoqi.security.common.util.ClientUtil;
import feign.RequestInterceptor;
import feign.RequestTemplate;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -16,6 +17,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
/**
* Created by ace on 2017/9/12.
*/
@Slf4j
public class ClientTokenInterceptor implements RequestInterceptor {
private Logger logger = LoggerFactory.getLogger(ClientTokenInterceptor.class);
@Autowired
......@@ -34,7 +36,7 @@ public class ClientTokenInterceptor implements RequestInterceptor {
requestTemplate.header("userHost", ClientUtil.getClientIp(requestAttributes.getRequest()));
requestTemplate.header(tokenHeader,requestAttributes.getRequest().getHeader(tokenHeader));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
}
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java
View file @ 34e6f2b9
......@@ -14,6 +14,7 @@ import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
......@@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
/**
* @author keliii
*/
@Slf4j
@Service("appAuthService")
public class AppAuthServiceImpl implements AuthService {
......@@ -135,7 +137,7 @@ public class AppAuthServiceImpl implements AuthService {
token=jwtTokenUtil.generateToken(ijwtInfo);
return ObjectRestResponse.succ(token);
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createFailedResult(10009,"token失效");
}
......@@ -159,7 +161,7 @@ public class AppAuthServiceImpl implements AuthService {
}
return objectRestResponse;
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"操作失败");
}
}
......
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java
View file @ 34e6f2b9
......@@ -12,10 +12,12 @@ import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@Slf4j
@Service("baseAuthService")
public class AuthServiceImpl implements AuthService {
......@@ -129,7 +131,7 @@ public class AuthServiceImpl implements AuthService {
token=jwtTokenUtil.generateToken(ijwtInfo);
return ObjectRestResponse.succ(token);
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createFailedResult(10009,"token失效");
}
......@@ -153,7 +155,7 @@ public class AuthServiceImpl implements AuthService {
}
return objectRestResponse;
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"操作失败");
}
}
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/context/BaseContextHandler.java
View file @ 34e6f2b9
......@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.common.context;
import com.github.wxiaoqi.security.common.constant.CommonConstants;
import com.github.wxiaoqi.security.common.util.StringHelper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
......@@ -16,6 +17,7 @@ import static org.junit.Assert.assertEquals;
/**
* Created by ace on 2017/9/8.
*/
@Slf4j
public class BaseContextHandler {
public static ThreadLocal<Map<String, Object>> threadLocal = new ThreadLocal<Map<String, Object>>();
......@@ -90,7 +92,7 @@ public class BaseContextHandler {
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
assertEquals(BaseContextHandler.get("test"), "moo");
logger.info("thread one done!");
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/IpUtil.java
View file @ 34e6f2b9
package com.github.wxiaoqi.security.common.util;
import lombok.extern.slf4j.Slf4j;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
@Slf4j
public class IpUtil {
/**
......@@ -29,7 +32,7 @@ public class IpUtil {
}
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return localIp;
}
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/ReferralCodeUtil.java
View file @ 34e6f2b9
......@@ -220,7 +220,7 @@ public class ReferralCodeUtil {
// buff.flush();
// buff.close();
// } catch (Exception e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// }
Map<String, Integer> map = new HashMap<String, Integer>();
for (int i = 0; i < 10000; i++) {
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/SystemProperty.java
View file @ 34e6f2b9
......@@ -8,13 +8,16 @@ import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
/**
* @author
* @version
*/
*/
@Slf4j
public class SystemProperty {
private static final String XML_FILE_EXTENSION = ".xml";
//读取key
......@@ -108,7 +111,7 @@ public class SystemProperty {
config = getSystemConfig(key);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return config;
}
......@@ -119,7 +122,7 @@ public class SystemProperty {
config = getResultCod(key);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return config;
}
......@@ -131,7 +134,7 @@ public class SystemProperty {
config = getScrmservice(key);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return config;
}
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/excel/Excel2007Reader.java
View file @ 34e6f2b9
package com.github.wxiaoqi.security.common.util.excel;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
......@@ -33,6 +34,7 @@ import java.util.*;
* @email 939961241@qq.com
* @date 2017年10月28日 13:11:27
*/
@Slf4j
public class Excel2007Reader extends DefaultHandler {
/**
......@@ -160,18 +162,18 @@ public class Excel2007Reader extends DefaultHandler {
throw new RuntimeException("解析EXCEL出错");
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new RuntimeException("解析EXCEL出错");
} catch (SAXException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new RuntimeException("解析EXCEL出错");
} catch (OpenXML4JException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new RuntimeException("解析EXCEL出错");
} catch (ParserConfigurationException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new RuntimeException("解析EXCEL出错");
}
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/excel/Excel2Html.java
View file @ 34e6f2b9
package com.github.wxiaoqi.security.common.util.excel;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.*;
......@@ -21,6 +22,7 @@ import java.util.Map;
* @email 939961241@qq.com
* @date 2017年10月28日 13:11:27
*/
@Slf4j
public class Excel2Html {
public static void main(String[] args) throws UnsupportedEncodingException {
......@@ -55,7 +57,7 @@ public class Excel2Html {
}
//writeFile(content, htmlFile);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} finally {
try {
is.close();
......@@ -63,7 +65,7 @@ public class Excel2Html {
//sourcefile.delete();
}
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
return content;
......
ace-gate/src/main/java/com/github/wxiaoqi/security/gate/utils/DBLog.java
View file @ 34e6f2b9
......@@ -65,7 +65,7 @@ public class DBLog extends Thread {
}
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
// 防止缓冲队列填充数据出现异常时不断刷屏
try {
Thread.sleep(1000);
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java
View file @ 34e6f2b9
......@@ -83,7 +83,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel",0);
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
example.setOrderByClause("is_default desc");
AppUserAlipay appUserAlipay = mapper.selectOneByExample(example);
......@@ -137,7 +137,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
appUserAlipay.setUserId(Integer.parseInt(username));
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if (StringUtils.isBlank(code)) {
return ObjectRestResponse.paramIsEmpty();
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java
View file @ 34e6f2b9
......@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
import com.github.wxiaoqi.security.admin.vo.AppUserVo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
......@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
* @author wanghaobin
* @create 2017-06-08 16:23
*/
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
......@@ -102,7 +104,7 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java
View file @ 34e6f2b9
......@@ -179,7 +179,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
mapper.updateByPrimaryKeySelective(appUserDetail);
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWaterBiz.java
View file @ 34e6f2b9
......@@ -116,7 +116,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
isToday = true;
}
} catch (ParseException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return isToday;
}
......@@ -179,7 +179,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
}
return ObjectRestResponse.succ(dto);
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/RelationMQHandler.java
View file @ 34e6f2b9
......@@ -59,7 +59,7 @@ public class RelationMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WalletMQHandler.java
View file @ 34e6f2b9
......@@ -56,7 +56,7 @@ public class WalletMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java
View file @ 34e6f2b9
......@@ -132,7 +132,7 @@ public class WaterMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserRelationController.java
View file @ 34e6f2b9
......@@ -12,12 +12,14 @@ import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.HashSet;
@Slf4j
@RestController
@RequestMapping("relation")
public class AppUserRelationController extends BaseController<AppUserRelationBiz,AppUserRelation> {
......@@ -50,7 +52,7 @@ public class AppUserRelationController extends BaseController<AppUserRelationBiz
return baseBiz.appBindRelation(userid,code);*/
return ObjectRestResponse.succ();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new BaseException(e);
}
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseUserMemberController.java
View file @ 34e6f2b9
......@@ -11,6 +11,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -20,6 +21,7 @@ import java.util.Objects;
* 用户会员
* @author Administrator
*/
@Slf4j
@RestController
@RequestMapping("baseUserMember")
@Api(tags = "后台获取和修改用户会员信息")
......@@ -56,7 +58,7 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
AppUserDTO user = userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
return ObjectRestResponse.succ(baseBiz.findOneByUserId(user.getUserid()));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java
View file @ 34e6f2b9
......@@ -14,6 +14,7 @@ import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
......@@ -32,6 +33,7 @@ import java.util.List;
* @description
* @data 2019/7/11 9:58
*/
@Slf4j
@RestController
@RequestMapping("/admin/member")
@Api("后台*会员管理")
......@@ -85,7 +87,7 @@ public class UserMemberAdminController {
inputStream.close();
return new ResponseEntity<>(bytes,headers,HttpStatus.OK);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
}
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java
View file @ 34e6f2b9
......@@ -209,7 +209,7 @@ public class AppPermissionService {
userRedisTemplate.expire(redisLockKey, 5, TimeUnit.MINUTES);//5分钟内过期
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
return JsonResultUtil.createSuccessResultWithObj(result);
......@@ -373,7 +373,7 @@ public class AppPermissionService {
return JsonResultUtil.createDefaultFail();
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
}
......@@ -459,7 +459,7 @@ public class AppPermissionService {
sendQueue(username,null, headimgurl, nickname, null, null, null, null, code, activityCode, userid,RegisterQueueDTO.SIGN_ACTIVATE);
}
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
}
......@@ -473,7 +473,7 @@ public class AppPermissionService {
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return requestAttributes.getRequest().getHeader("userHost");
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return null;
}
......@@ -598,7 +598,7 @@ public class AppPermissionService {
}
return JsonResultUtil.createDefaultFail();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
......@@ -627,7 +627,7 @@ public class AppPermissionService {
}
return JsonResultUtil.createSuccessResultWithObj(data);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
}
......@@ -890,7 +890,7 @@ public class AppPermissionService {
try {
return activityFeign.led(userId);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return null;
}
}
......@@ -900,7 +900,7 @@ public class AppPermissionService {
try {
activityFeign.join(userId);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return;
}
}
......@@ -1016,7 +1016,7 @@ public class AppPermissionService {
return JsonResultUtil.createDefaultFail();
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
}
......@@ -1048,7 +1048,7 @@ public class AppPermissionService {
}
return data;
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
}
......
ace-modules/ace-tool/src/main/java/com/github/wxiaoqi/search/lucene/LuceneDao.java
View file @ 34e6f2b9
......@@ -95,7 +95,7 @@ public class LuceneDao {
indexWriter.addDocument(DocumentUtil.IndexObject2Document(indexObject));
indexWriter.commit();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
try {
indexWriter.rollback();
} catch (IOException e1) {
......@@ -122,7 +122,7 @@ public class LuceneDao {
indexWriter.forceMergeDeletes();
log.info("deleted:{}",result);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
try {
indexWriter.rollback();
} catch (IOException e1) {
......@@ -150,7 +150,7 @@ public class LuceneDao {
indexWriter.updateDocument(term,DocumentUtil.IndexObject2Document(indexObject));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
try {
indexWriter.rollback();
} catch (IOException e1) {
......@@ -193,12 +193,12 @@ public class LuceneDao {
pageQuery = new TableResultResponse<>(topDocs.totalHits,searchResults);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}finally {
try {
indexReader.close();
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
return pageQuery;
......@@ -234,7 +234,7 @@ public class LuceneDao {
indexWriter = new IndexWriter(this.getDirectory(), config);
indexWriter.deleteDocuments(term);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
try {
indexWriter.rollback();
} catch (IOException e1) {
......
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityRuleBiz.java
View file @ 34e6f2b9
......@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.activity.entity.Coupon;
import com.xxfc.platform.activity.vo.ActivityRuleVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -23,6 +24,7 @@ import java.util.List;
* @email 18178966185@163.com
* @date 2019-07-16 14:04:22
*/
@Slf4j
@Service
public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
......@@ -77,7 +79,7 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
}
return ObjectRestResponse.succ(ruleVo);
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
......
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/handler/CouponMQHandler.java
View file @ 34e6f2b9
......@@ -69,7 +69,7 @@ public class CouponMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/handler/IntegralMQHandler.java
View file @ 34e6f2b9
......@@ -54,7 +54,7 @@ public class IntegralMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/handler/PopularizeMQHandler.java
View file @ 34e6f2b9
......@@ -63,7 +63,7 @@ public class PopularizeMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......@@ -99,7 +99,7 @@ public class PopularizeMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
});
......
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/UserCouponAdminController.java
View file @ 34e6f2b9
......@@ -9,6 +9,7 @@ import com.xxfc.platform.activity.dto.UserCouponFindDTO;
import com.xxfc.platform.activity.dto.UserCouponSendDTO;
import com.xxfc.platform.activity.vo.UserCouponPageVo;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......@@ -28,6 +29,7 @@ import java.util.List;
* @description
* @data 2019/7/23 16:22
*/
@Slf4j
@RestController
@RequestMapping("/admin/user_coupon")
public class UserCouponAdminController {
......@@ -72,7 +74,7 @@ public class UserCouponAdminController {
byte[] bytes = IOUtils.toByteArray(inputStream);
return ResponseEntity.ok(bytes);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
}
......
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/utils/UploadUtil.java
View file @ 34e6f2b9
......@@ -101,17 +101,17 @@
//
// }
// } catch (MalformedURLException e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// } catch (IOException e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// } catch (UnsupportedEncodingException e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// } catch (ProtocolException e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// } catch (MalformedURLException e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// } catch (IOException e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// }
//
//// }
......
xx-common/xx-common-platform-component/src/main/java/com/xxfc/platform/common/aop/NoRepeatSubmitAop.java
View file @ 34e6f2b9
......@@ -56,7 +56,7 @@ public class NoRepeatSubmitAop {
try {
result = proceedingJoinPoint.proceed();
} catch (Throwable throwable) {
throwable.printStackTrace();
log.error(throwable.getMessage(), throwable);;
} finally {
redisLock.releaseLock(lockKey, uri);
log.info("releassLock success,key=【{}】,接口地址：uri=【{}】", lockKey, uri);
......
xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/utils/AddressUtils.java
View file @ 34e6f2b9
......@@ -94,7 +94,7 @@ public class AddressUtils {
reader.close();
return buffer.toString();
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} finally {
if (connection != null) {
connection.disconnect();// 关闭连接
......
xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/utils/BeanUtil.java
View file @ 34e6f2b9
package com.xxfc.platform.im.utils;
import com.mongodb.DBObject;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@Slf4j
public class BeanUtil {
/**
* 将DBObject转换成Bean对象
......@@ -64,15 +67,15 @@ public class BeanUtil {
}
}
} catch (NoSuchMethodException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (SecurityException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (IllegalAccessException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (IllegalArgumentException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (InvocationTargetException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
}
xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/utils/DateUtil.java
View file @ 34e6f2b9
package com.xxfc.platform.im.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
import java.text.ParseException;
......@@ -8,6 +9,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.regex.Pattern;
@Slf4j
public final class DateUtil {
public static final SimpleDateFormat FORMAT_YYYY_MM;
......@@ -430,7 +432,7 @@ public final class DateUtil {
try {
return format.parse(strYYMMDD);
} catch (ParseException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return null;
}
......
xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/utils/StringUtil.java
View file @ 34e6f2b9
package com.xxfc.platform.im.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
......@@ -7,6 +8,7 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Slf4j
public final class StringUtil {
public static String trim(String s) {
......@@ -149,7 +151,7 @@ public final class StringUtil {
int r = Integer.parseInt(prop[i]);
tmp.add(r);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
return tmp;
......
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/UserBiz.java
View file @ 34e6f2b9
......@@ -188,30 +188,30 @@ public class UserBiz {
result = sbf.toString();
}
} catch (MalformedURLException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} finally {
// 关闭资源
if (null != br) {
try {
br.close();
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
if (null != os) {
try {
os.close();
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
if (null != is) {
try {
is.close();
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
// 断开与远程地址url的连接
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRentVehicleBiz.java
View file @ 34e6f2b9
......@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
import com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
......@@ -19,6 +20,7 @@ import java.util.List;
* @email nishijjo@qq.com
* @date 2019-05-16 14:36:45
*/
@Slf4j
@Service
public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, OrderRentVehicleDetail> {
......@@ -56,7 +58,7 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
}
return JsonResultUtil.createDefaultFail();
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createDefaultFail();
}
......@@ -77,7 +79,7 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
return JsonResultUtil.createDefaultFail();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return JsonResultUtil.createDefaultFail();
}
}
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java
View file @ 34e6f2b9
......@@ -63,7 +63,7 @@ public class RefundMQHandler {
} catch (IOException i) {
i.printStackTrace();
}
e.printStackTrace();
log.error(e.getMessage(), e);
}
}
});
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
View file @ 34e6f2b9
......@@ -208,7 +208,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
orderPageVO.setDetailsOfExpenses(children);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if (StringUtils.isNotBlank(orderPageVO.getCouponTickerNos())) {
......@@ -245,7 +245,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
}
} catch (Exception e) {
log.info("获取驾驶人信息失败！");
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java
View file @ 34e6f2b9
......@@ -24,6 +24,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -36,6 +37,7 @@ import java.util.List;
/**
* @author Administrator
*/
@Slf4j
@RestController
@RequestMapping("orderStatistics")
@Api(description = "每月总的订单统计")
......@@ -120,7 +122,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
}
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "参数错误!");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java
View file @ 34e6f2b9
......@@ -280,9 +280,9 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
}
}
} catch (IllegalAccessException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (InvocationTargetException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
return ObjectRestResponse.succ();
......@@ -300,7 +300,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
updateSelectiveById(TourGood);
return ObjectRestResponse.succ();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage());
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
......@@ -318,7 +318,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
updateSelectiveById(TourGood);
return ObjectRestResponse.succ();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage());
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java
View file @ 34e6f2b9
......@@ -94,7 +94,7 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
}
return ObjectRestResponse.createDefaultFail();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage());
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
......@@ -128,7 +128,7 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
}
return ObjectRestResponse.createDefaultFail();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error("---商品详情---id=====" + id + "----异常---msg===" + e.getMessage());
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
......@@ -148,7 +148,7 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
return Integer.parseInt(params);
}
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return 0;
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodSpeBiz.java
View file @ 34e6f2b9
......@@ -136,7 +136,7 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
}
return false;
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return false;
}
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodSpeController.java
View file @ 34e6f2b9
......@@ -7,6 +7,7 @@ import com.xxfc.platform.tour.biz.TourGoodSpeBiz;
import com.xxfc.platform.tour.common.TourBaseController;
import com.xxfc.platform.tour.dto.TourSpePriceDTO;
import com.xxfc.platform.tour.vo.TourSpePriceVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
......@@ -14,6 +15,7 @@ import java.util.Date;
@RestController
@RequestMapping("spe")
@IgnoreClientToken
@Slf4j
public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
......@@ -35,7 +37,7 @@ public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
try {
return baseBiz.cutStock(speId,number,type);
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"网络异常,稍后重试");
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java
View file @ 34e6f2b9
......@@ -9,6 +9,7 @@ import com.xxfc.platform.tour.common.TourBaseController;
import com.xxfc.platform.tour.entity.TourUser;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
......@@ -19,6 +20,7 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
import java.util.Arrays;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("tourUser")
public class TourUserController extends TourBaseController<TourUserBiz> {
......@@ -87,7 +89,7 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
}
return new ObjectRestResponse<TourUser>();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new BaseException(ResultCode.FAILED_CODE);
}
......@@ -110,7 +112,7 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
baseBiz.updateSelectiveById(tourUser);
return ObjectRestResponse.succ();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
throw new BaseException(ResultCode.FAILED_CODE);
}
}
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/utils/CCPRestSDK.java
View file @ 34e6f2b9
......@@ -228,11 +228,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......@@ -326,11 +326,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......@@ -472,11 +472,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......@@ -654,11 +654,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......@@ -772,11 +772,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误"+"Https请求返回码："+status);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......@@ -862,11 +862,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......@@ -953,11 +953,11 @@ public class CCPRestSDK {
EntityUtils.consume(entity);
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172001", "网络错误");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error(e.getMessage());
return getMyError("172002", "无返回");
} finally {
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPay.java
View file @ 34e6f2b9
......@@ -330,7 +330,7 @@ public class WXPay {
mweb_url += "&redirect_url="
+ URLEncoder.encode(notify_url + "&token=" + token + "&payed=1", "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
log.error("after->append mweb_url:{},isIos:{}", mweb_url);
......@@ -352,7 +352,7 @@ public class WXPay {
return node.getText();
} catch (DocumentException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return null;
}
......@@ -454,7 +454,7 @@ public class WXPay {
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return map;
}
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPrepay.java
View file @ 34e6f2b9
......@@ -86,7 +86,7 @@ public class WXPrepay {
// 释放资源
closeableHttpClient.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return prepay_id;
}
......@@ -125,13 +125,13 @@ public class WXPrepay {
try {
map = XMLUtil.doXMLParse(result);
} catch (JDOMException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
// 释放资源
closeableHttpClient.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return map;
}
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXSuppToUserPay.java
View file @ 34e6f2b9
......@@ -146,14 +146,14 @@ public class WXSuppToUserPay {
httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
return post(httpclient, uri, xml, "text/xml; charset=UTF-8", "UTF-8", null, null);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} finally {
if (httpclient != null) {
try {
httpclient.close();
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
}
}
......@@ -177,7 +177,7 @@ public class WXSuppToUserPay {
stringEntity = new StringEntity(data);
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -195,7 +195,7 @@ public class WXSuppToUserPay {
try {
httpResponse = httpclient.execute(httpPost, httContext);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -203,7 +203,7 @@ public class WXSuppToUserPay {
try {
httpEntity = httpResponse.getEntity();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -211,18 +211,18 @@ public class WXSuppToUserPay {
try {
response_body = EntityUtils.toString(httpEntity);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
try {
httpResponse.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
try {
httpclient.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return response_body;
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WxPayRefundUtils.java
View file @ 34e6f2b9
......@@ -82,7 +82,7 @@ public class WxPayRefundUtils {
stringEntity = new StringEntity(data);
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -100,7 +100,7 @@ public class WxPayRefundUtils {
try {
httpResponse = httpclient.execute(httpPost, httContext);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -108,7 +108,7 @@ public class WxPayRefundUtils {
try {
httpEntity = httpResponse.getEntity();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -116,19 +116,19 @@ public class WxPayRefundUtils {
try {
response_body = EntityUtils.toString(httpEntity, "utf-8");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
try {
httpResponse.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
try {
httpclient.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return response_body;
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/util/HTTPUtils.java
View file @ 34e6f2b9
......@@ -382,7 +382,7 @@ public class HTTPUtils{
stringEntity = new StringEntity(data);
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -400,7 +400,7 @@ public class HTTPUtils{
try {
httpResponse = httpClient.execute(httpPost, httContext);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -408,7 +408,7 @@ public class HTTPUtils{
try {
httpEntity = httpResponse.getEntity();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
......@@ -416,14 +416,14 @@ public class HTTPUtils{
try {
response_body = EntityUtils.toString(httpEntity, "utf-8");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return "failure";
}
try {
httpResponse.close();
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return response_body;
......
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/util/WeChatSignUtil.java
View file @ 34e6f2b9
package com.xxfc.platform.universal.weixin.util;
import lombok.extern.slf4j.Slf4j;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
......@@ -10,6 +12,7 @@ import java.util.Map;
/**
*
*/
@Slf4j
public class WeChatSignUtil {
/**
......@@ -60,7 +63,7 @@ public class WeChatSignUtil {
}
return new String(str);
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return null;
}
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
View file @ 34e6f2b9
......@@ -129,7 +129,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
insertSelective(orderPay);
log.error("---下单---order_no=====" + order_no + "----成功");
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.error("---下单---order_no=====" + order_no + "----异常---msg===" + e.getMessage());
return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
......@@ -272,7 +272,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
try {
return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return null;
}
......@@ -319,7 +319,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
return response.getBody();
} catch (AlipayApiException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return null;
}
......@@ -539,7 +539,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
return false;
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.info("退款失败请重试");
}
return false;
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/CertificationController.java
View file @ 34e6f2b9
......@@ -80,7 +80,7 @@ public class CertificationController {
try {
orr = userFeign.authentication(idInformation.getUserLoginId(), null,null, 0);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if (orr==null) {
return ObjectRestResponse.createFailedResult(ResultCode.GET_AUTH_INFO_FAILED_CODE,"无法识别,请重新上传");
......@@ -106,7 +106,7 @@ public class CertificationController {
return result ;
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无法识别,请重新上传");
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/OrderPayController.java
View file @ 34e6f2b9
......@@ -76,7 +76,7 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
try {
map = XMLUtil.doXMLParse(result);
} catch (JDOMException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if ("SUCCESS".equals(map.get("return_code")) && "SUCCESS".equals(map.get("result_code"))) {
try {
......@@ -86,7 +86,7 @@ public class OrderPayController extends BaseController<OrderPayBiz,OrderPay> {
log.info("---支付回调---orderno====="+orderno+"-----serialNumber====="+serialNumber);
baseBiz.notice(orderno, serialNumber);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
out.print("<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[]]></return_msg></xml>");
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/TrafficViolationsController.java
View file @ 34e6f2b9
......@@ -10,6 +10,7 @@ import com.xxfc.platform.universal.vo.TrafficViolations;
import com.xxfc.platform.universal.vo.ViolationVO;
import com.xxfc.platform.vehicle.entity.Vehicle;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -17,6 +18,7 @@ import java.util.List;
@RestController
@RequestMapping("3p/tv")
@Slf4j
public class TrafficViolationsController {
@Autowired
private VehicleFeign vehicleFeign;
......@@ -32,7 +34,7 @@ public class TrafficViolationsController {
try {
return ObjectRestResponse.succ(JSONObject.parse(tvService.getCity()));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
}
......@@ -46,7 +48,7 @@ public class TrafficViolationsController {
try {
return ObjectRestResponse.succ(JSONObject.parse(tvService.queryViolations(trafficViolations)));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
}
......@@ -60,7 +62,7 @@ public class TrafficViolationsController {
try {
return ObjectRestResponse.succ(tvService.getLicensePlateType());
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return ObjectRestResponse.createDefaultFail();
}
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
View file @ 34e6f2b9
......@@ -316,7 +316,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
}
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return RestResponse.codeAndMessage(10001, "网络异常！");
}
return RestResponse.suc();
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
View file @ 34e6f2b9
......@@ -265,7 +265,7 @@ public class VehicleActiveService {
}
} catch (Exception e) {
log.error("提前还车失败，bookVehicleVo = {}", bookVehicleVo.toString());
e.printStackTrace();
log.error(e.getMessage(), e);;
}
} else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间
vehicleBookRecord.setRemark(vehicleBookRecord.getRemark() + " 用户延期还车，实际占用日期");
......@@ -310,7 +310,7 @@ public class VehicleActiveService {
// throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
// }
// } catch ( Exception e) {
// e.printStackTrace();
// log.error(e.getMessage(), e);;
// }
} else {
throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 34e6f2b9
......@@ -595,7 +595,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
}
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
return RestResponse.codeAndMessage(1325, e.getMessage());
}
return RestResponse.codeAndMessage(1325, "取消预定失败");
......@@ -1314,9 +1314,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
try {
BeanUtilsBean.getInstance().copyProperties(vehicle, vehicleVo);
} catch (IllegalAccessException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
} catch (InvocationTargetException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
log.info("获取车辆列表转换对象失败： vehicleVo = {}", vehicleVo);
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java
View file @ 34e6f2b9
......@@ -49,7 +49,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
startDate = simpleDateFormat.parse(bookStartDate);
endDate = simpleDateFormat.parse(bookEndDate);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
//判定时间是否合法
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java
View file @ 34e6f2b9
......@@ -211,7 +211,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
return getList();
}
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
return ObjectRestResponse.createFailedResult(ResCode.FIND_VEHICLE_PLAT_FAILE.getCode(), ResCode.FIND_VEHICLE_PLAT_FAILE.getDesc());
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @ 34e6f2b9
......@@ -27,6 +27,7 @@ import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
......@@ -48,6 +49,7 @@ import java.util.List;
@RequestMapping("vehicleModel")
@Api(value = "车型controller", tags = {"车型操作接口"})
@IgnoreClientToken
@Slf4j
public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> implements UserRestInterface {
@Autowired
......@@ -187,7 +189,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
try {
uorr = userFeign.userinfoByToken(userAuthConfig.getToken(request));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
......@@ -231,7 +233,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
vehicleCataBiz.inserts(vcs);
return ObjectRestResponse.succ();
} catch (NumberFormatException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new BaseException(ResultCode.ADD_VEHICLE_FAIL);
}
......@@ -246,7 +248,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
try {
uorr = userFeign.userinfoByToken(userAuthConfig.getToken(request));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
......@@ -287,7 +289,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
}
return ObjectRestResponse.succ();
} catch (NumberFormatException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new BaseException(ResultCode.UPDATE_VEHICLE_FAIL);
......@@ -380,7 +382,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
try {
uorr = userFeign.userinfoByToken(userAuthConfig.getToken(request));
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
}
if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
......@@ -401,7 +403,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
vehicleModelBiz.updateByPrimaryKeySelective(vehicleModel);
return ObjectRestResponse.succ();
} catch (NumberFormatException e) {
e.printStackTrace();
log.error(e.getMessage(), e);;
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
throw new BaseException(ResultCode.UPDATE_VEHICLE_FAIL);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment