记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 6dbd9fed authored by 张国柄's avatar 张国柄
Browse files
Options

包结构调整; 

错误信息类;
parent ba46c765
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 504 deletions
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/SqlMessage.java deleted 100644 → 0
View file @ ba46c765
package com.liquidnet.commons.lang.util;
import java.io.Serializable;
import java.util.LinkedList;
public class SqlMessage implements Cloneable, Serializable {
private static final long serialVersionUID = 2208924091512163151L;
private LinkedList<String> sqls;
private LinkedList<Object[]>[] args;
public SqlMessage() {
}
public SqlMessage(String json) {
SqlMessage sqlMessage = JsonUtils.fromJson(json, SqlMessage.class);
this.sqls = sqlMessage.getSqls();
this.args = sqlMessage.getArgs();
}
public LinkedList<String> getSqls() {
return sqls;
}
public void setSqls(LinkedList<String> sqls) {
this.sqls = sqls;
}
public LinkedList<Object[]>[] getArgs() {
return args;
}
public void setArgs(LinkedList<Object[]>[] args) {
this.args = args;
}
private final static SqlMessage instance = new SqlMessage();
public static SqlMessage getInstance() {
try {
return (SqlMessage) instance.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new SqlMessage();
}
}
\ No newline at end of file
liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-base/src/main/resources/errorcode.properties
View file @ 6dbd9fed
ADAM0010001=system error
ADAM0010002=param error
ADAM0010003=illegal param
ADAM0010004=Illegal operation
ADAM0010005=operation failed
ADAM0010006=Please do not submit again
ADAM0010007=Verification code expired
ADAM0010008=Verification code error
ADAM0010009=Verification code sent
ADAM0020001=password format invalid
ADAM0020002=email format invalid
ADAM0020003=company has been signed up
ADAM0020004=Email has been registered, please log in
ADAM0020005=The email has already been registered.
ADAM0020006=field 'First name' or 'Last name' lost
ADAM0020007=field 'Job title' lost
ADAM0020008=field 'email' lost
ADAM0020009=field 'password' lost
ADAM0020010=field 'company' lost
ADAM0020011=Invalid authentication address
ADAM0020012=The token is expired or broken
ADAM0020013=Email not registered yet
ADAM0020014=Email not activated
ADAM0020015=It has not passed the second verification of SMS
ADAM_USER_PW_0020016=wrong password
ADAM0020017=wrong verification code
ADAM0020018=Code is incorrect.
ADAM0020020=param error
ADAM0020021=phone number exist
ADAM0020022=illegal param
ADAM0020023=password reset reject
ADAM0020024=phone auth passed
ADAM0020025=!The email has already been registered in your company.
ADAM0020026=The mobile phone is not bound. The verification code cannot be received through the mobile phone number
ADAM0020027=You have attempted to log into your account 5 times.Your account will be locked today after 2 more failed attempts. Please be careful to key in the password.
ADAM0020028=Your account has been locked due to too many failed login attempts. You may try again tomorrow or reset your password via 'Forgot Password'.
ADAM0020029=Your account has been activated, please log in
ADAM0020030=Your account has been removed, please contact the company administrator
ADAM_COM_0030001=Company ID input error, please re-enter
ADAM_COM_0030002=Company account not activated
ADAM_COM_0030003=Currency input error, please re select
ADAM_COM_0030004=The first account opening currency can only be the currency of the selected country of registration
ADAM_COM_0030005=Company status error
ADAM_ACCOUNT_004001=account not exist
ADAM_ACCOUNT_004002=date illegal
ADAM_ACCOUNT_004003=wallet not exist
ADAM_ACCOUNT_004004=not sufficient funds
ADAM_WALLET_005001=Wallet not available
ADAM_WALLET_005002=Wallet cannot payout
ADAM_WALLET_005003=Insufficient wallet balance
ADAM_WALLET_005004=Wallet not exist
ADAM_WALLET_005005=Wallet name cannot be greater than 32 bits
ADAM_PAYOUT_006001=Payout doesn't exist
ADAM_PAYOUT_006002=execution date error
ADAM_PAYOUT_006003=The execution date has not arrived
ADAM_PAYOUT_006004=Currency error
ADAM_PAYOUT_006005=Ready to Process
ADAM_PAYOUT_006006=Payout currencycloud channel error
ADAM_PAYOUT_006007=Payout cannot be cancelled
ADAM_PAYOUT_006008=Payout cannot be edit
ADAM_PAYOUT_006009=Payout amount error
ADAM_PAYOUT_006010=Payout currency is inconsistent with beneficiary currency
ADAM_FUNDING_007001=Funding fin failed
ADAM_CONVERSION_008001=Conversion fixed side error
ADAM_CONVERSION_008002=Conversion transaction does not exist
ADAM_CONVERSION_008003=The available balance of your wallet is insufficient.
ADAM_CONVERSION_008004=The currency of from wallet is inconsistent with the currency of sell
ADAM_CONVERSION_008005=Buyer currency wallet creation failed
ADAM_CONVERSION_008006=Buyer currency wallet not selected
ADAM_TRANSACTION_008001=Invalid status, unable to notify fund account
ADAM_ADMINISTRATION_009001=Permission to save failed
ADAM_ADMINISTRATION_009002=The user is already activated and cannot be modified
ADAM_ADMINISTRATION_009003=The user has been removed, invalid operation
ADAM_ADMINISTRATION_009004=Invalid operation, personal operation is not allowed
ADAM_ADMINISTRATION_009005=Administrator permissions cannot be edited
ADAM_FEGIN_ACCOUNT_100001=Account system service exception
ADAM_FEGIN_BANK_CC_200001=Bank currencycloud system service exception
BANK_CC_001001=bank currencycloud error
liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-web/pom.xml deleted 100644 → 0
View file @ ba46c765
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>liquidnet-common-exception</artifactId>
<groupId>com.liquidnet</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-common-exception-handler-web</artifactId>
<dependencies>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-common-service-base</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-web/src/main/java/com/liquidnet/common/exception/PageControllerAdviceHandler.java deleted 100644 → 0
View file @ ba46c765
/**
* $Id: PageControllerAdviceHandler.java 13332 2016-07-06 09:15:06Z anjiabin $
* Copyright(C) 2014-2020 easegame, All Rights Reserved.
*/
package com.liquidnet.common.exception;
import com.liquidnet.common.exception.annotation.PageErrorController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
/**
* Created by Administrator on 2017/6/17.
*/
@ControllerAdvice(annotations = PageErrorController.class)
public class PageControllerAdviceHandler {
private final Logger logger = LoggerFactory.getLogger(PageControllerAdviceHandler.class);
@ExceptionHandler
public String handleException(Model model, Exception exception) {
logger.error("PageController errer:{}", exception);
model.addAttribute("msg", exception.getMessage());
if (exception instanceof LiquidnetServiceException) {
LiquidnetServiceException ex = (LiquidnetServiceException) exception;
logger.error("PageController errorCode:{} errorMsg:{}", ex.errorCode(), ex.getMessage());
}
return "500";
}
}
liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-web/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java deleted 100644 → 0
View file @ ba46c765
/**
* $Id: RestControllerAdviceHandler.java 13331 2016-07-06 09:09:33Z anjiabin $
* Copyright(C) 2014-2020 easegame, All Rights Reserved.
*/
package com.liquidnet.common.exception;
import com.alibaba.fastjson.JSON;
import com.liquidnet.common.exception.entity.Error;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.constant.GlobalConstant;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.WebRequest;
/**
* Created by Administrator on 2017/6/17.
*/
@ControllerAdvice(annotations = RestController.class)
public class RestControllerAdviceHandler {
private final Logger logger = LoggerFactory.getLogger(RestControllerAdviceHandler.class);
@ExceptionHandler(value = Exception.class)
@ResponseBody
public ResponseEntity serviceExceptionHandler(Exception rex, WebRequest request) {
logger.error("serviceExceptionHandler request : {} param:{}", request.getContextPath(), JSON.toJSONString(request.getParameterMap()));
if ( rex instanceof LiquidnetFeignException) {
LiquidnetFeignException ygex = ((LiquidnetFeignException) rex);
String errorCode = ygex.errorCode().getCode();
String message = ygex.getMessage();
message = message == null ? ygex.errorCode().getMessage() : message;
logger.error("LiquidnetServiceException errorCode:{} error : {}", errorCode, ygex.getMessage());
return new ResponseEntity<Error>(new Error(errorCode,message), HttpStatus.OK);
}
if (rex instanceof LiquidnetServiceException) {
LiquidnetServiceException ygex = ((LiquidnetServiceException) rex);
String errorCode = ygex.errorCode().getCode();
String message = ygex.getMessage();
String url = ygex.getUrl();
if(StringUtils.isNoneEmpty(url)){
return new ResponseEntity<ResponseDto>(ResponseDto.failure(errorCode,message,url), HttpStatus.OK);
}
message = message == null ? ygex.errorCode().getMessage() : message;
logger.error("LiquidnetServiceException errorCode:{} error : {}", errorCode, ygex.getMessage());
return new ResponseEntity<Error>(new Error(errorCode,message), HttpStatus.OK);
} else {
logger.error("serviceExceptionHandler error : {}", rex);
return new ResponseEntity<Error>(new Error("-1", GlobalConstant.RESPONSE_ERROE_UNKNOWN), HttpStatus.OK);
}
}
}
liquidnet-bus-common/liquidnet-common-exception/pom.xml
View file @ 6dbd9fed
......@@ -12,7 +12,6 @@
<packaging>pom</packaging>
<modules>
<module>liquidnet-common-exception-base</module>
<module>liquidnet-common-exception-handler-web</module>
<module>liquidnet-common-exception-handler-service</module>
</modules>
......
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/ResponseDto.java deleted 100644 → 0
View file @ ba46c765
package com.liquidnet.service;
import com.alibaba.fastjson.JSON;
import com.liquidnet.service.constant.GlobalConstant;
import com.liquidnet.common.exception.constant.ErrorCode;
import com.liquidnet.common.exception.constant.ServiceErrorCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* REDIRECT(-1),
* SUCCESS(0),
* FAIL(1),
* UNAUTH(2),
*/
@ApiModel()
public class ResponseDto<T> implements Serializable {
private static final long serialVersionUID = 1585289779755226637L;
@ApiModelProperty(value = "错误码,0代表成功",position = -9998)
private String code;
@ApiModelProperty(value = "错误描述",position = -9997)
private String message;
@ApiModelProperty
private T data;
public boolean isSuccess() {
return this.code.equals(ErrorCode.SUCCESS.getCode());
}
public ResponseDto() {
}
public ResponseDto(String code) {
this.code = code;
}
public ResponseDto(String code, T data) {
this.code = code;
this.data = data;
}
public ResponseDto(String code, String message) {
this.code = code;
this.message = message;
}
public ResponseDto(String code, String message, T data) {
this.code = code;
this.message = message;
this.data = data;
}
public ResponseDto(ErrorCode errorCode) {
this.code = errorCode.getCode();
this.message = errorCode.getMessage();
}
public static<Object> ResponseDto<Object> success(Object data) {
return new ResponseDto<>(ErrorCode.SUCCESS.getCode(), data);
}
public static<Object> ResponseDto<Object> success() {
return new ResponseDto<>(ErrorCode.SUCCESS.getCode());
}
public static Builder newSuccessBuilder() {
return new Builder(ErrorCode.SUCCESS);
}
public static<Object> ResponseDto<Object> failure(String code, String message) {
return new ResponseDto<>(code, message);
}
public static<Object> ResponseDto<Object> failure(String code, String message, Object data) {
return new ResponseDto<>(code, message, data);
}
public static<Object> ResponseDto<Object> failure(String message) {
return new ResponseDto<>("1", message);
}
public static<Object> ResponseDto<Object> failure(ErrorCode errorCode) {
return new ResponseDto<>(errorCode);
}
/**
* 自定义异常信息
*
* @param errorCode
* @param message
* @return ResponseDto<?>
*/
public static<Object> ResponseDto<Object> failure(ServiceErrorCode errorCode, String message) {
return new ResponseDto<>(errorCode.getCode(), message);
}
public static<Object> ResponseDto<Object> failure(ServiceErrorCode errorCode, Object data) {
return new ResponseDto<>(errorCode.getCode(), errorCode.getMessage(), data);
}
public static<Object> ResponseDto<Object> failure(ServiceErrorCode errorCode) {
return new ResponseDto<>(errorCode.getCode(), errorCode.getMessage());
}
public static<Object> ResponseDto<Object> failure() {
return new ResponseDto<>(ErrorCode.ERROR.getCode(), ErrorCode.RESPONSE_ERROE_UNKNOWN.getMessage());
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
/**
* <p>Getter for the field <code>data</code>.</p>
*
* @return a T object.
*/
public T getData() {
return data;
}
/**
* <p>Setter for the field <code>data</code>.</p>
*
* @param data a T object.
*/
public void setData(T data) {
this.data = data;
}
public <T> T getParseData(Class<T> clazz) {
try {
if (getData() != null) {
return JSON.parseObject(JSON.toJSONString(getData()), clazz);
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* <p>redirect.</p>
*
* @param path a {@link java.lang.String} object.
* @return a {@link ResponseDto} object.
*/
public static ResponseDto<Map<String, Object>> redirect(String path) {
return new Builder(ErrorCode.REDIRECT).put("url", path).build();
}
public static class Builder {
private final ResponseDto<Map<String, Object>> responseDto;
private final String code;
private final Map<String, Object> mapData;
public Builder(ErrorCode errorCode) {
responseDto = new ResponseDto<>();
this.code = errorCode.getCode();
this.mapData = new HashMap<>();
}
public Builder put(String key, Object value) {
mapData.put(key, value);
return this;
}
public ResponseDto<Map<String, Object>> build() {
responseDto.setCode(this.code);
responseDto.setData(this.mapData);
return responseDto;
}
}
}
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ErrorMapping.java 0 → 100644
View file @ 6dbd9fed
package com.liquidnet.service.base;
import org.apache.logging.log4j.util.PropertiesUtil;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
public class ErrorMapping {
private static final String errorMapDir = "errormap";
private static Map<String, Object> errorPropertiesMap = new HashMap<>();
static {
try {
URL url = PropertiesUtil.class.getClassLoader().getResource(errorMapDir);
if (null != url) {
File file = new File(url.getFile());
if (file.exists() && file.isDirectory()) {
File[] files = file.listFiles();
for (File f : files) {
if (f.isFile() && f.getName().endsWith("properties")) {
Properties props = PropertiesLoaderUtils.loadAllProperties(errorMapDir.concat("/") + f.getName());
for (Object key : props.keySet()) {
String keyStr = key.toString();
String value = props.getProperty(keyStr);
errorPropertiesMap.put(keyStr, value);
}
}
}
}
}
System.out.printf("errorPropertiesMap init count: %s\n", errorPropertiesMap.size());
} catch (IOException e) {
e.printStackTrace();
}
}
public static ErrorMessage get(String code) {
return ErrorMessage.instance.setCode(code).setMessage((String) errorPropertiesMap.get(code));
}
public static class ErrorMessage implements Cloneable, Serializable {
private static final long serialVersionUID = 2208924091512163151L;
private String code;
private String message;
public ErrorMessage() {
}
public String getCode() {
return code;
}
public String getMessage() {
return message;
}
private final static ErrorMessage instance = new ErrorMessage();
public static ErrorMessage getInstance() {
try {
return (ErrorMessage) instance.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new ErrorMessage();
}
public ErrorMessage setCode(String code) {
this.code = code;
return this;
}
public ErrorMessage setMessage(String message) {
this.message = message;
return this;
}
}
}
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/PagedResult.java → liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/PagedResult.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@
* $Id$
* Copyright(C) 2015-2020 kowlone - internet center, All Rights Reserved.
*/
package com.liquidnet.service;
package com.liquidnet.service.base;
import java.io.Serializable;
......
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/ResponseDto.java 0 → 100644
View file @ 6dbd9fed
package com.liquidnet.service.base;
import com.liquidnet.commons.lang.util.JsonUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
/**
* REDIRECT(-1),
* SUCCESS(0),
* FAIL(1),
* UNAUTH(2),
*/
@ApiModel(value = "ResponseDto<T>", description = "响应参数")
public class ResponseDto<T> implements Serializable, Cloneable {
private static final long serialVersionUID = 8377276776600901982L;
@ApiModelProperty(value = "错误码,0代表成功", position = -9998)
private String code;
@ApiModelProperty(value = "错误描述", position = -9997)
private String message;
@ApiModelProperty
private T data;
public boolean isSuccess() {
return this.code.equals("0");
}
private ResponseDto() {
}
private ResponseDto(String code) {
this.code = code;
}
private ResponseDto(String code, T data) {
this.code = code;
this.data = data;
}
private ResponseDto(String code, String message) {
this.code = code;
this.message = message;
}
private ResponseDto(String code, String message, T data) {
this.code = code;
this.message = message;
this.data = data;
}
private ResponseDto(ErrorMapping.ErrorMessage errorMessage) {
this.code = errorMessage.getCode();
this.message = errorMessage.getMessage();
}
private ResponseDto(ErrorMapping.ErrorMessage errorMessage, T data) {
this.code = errorMessage.getCode();
this.message = errorMessage.getMessage();
this.data = data;
}
public String getCode() {
return code;
}
public String getMessage() {
return message;
}
/**
* <p>Getter for the field <code>data</code>.</p>
*
* @return a T object.
*/
public T getData() {
return data;
}
public static <Object> ResponseDto<Object> success() {
return new ResponseDto<>("0");
}
public static <Object> ResponseDto<Object> success(Object data) {
return new ResponseDto<>("0", data);
}
public static <Object> ResponseDto<Object> failure() {
return new ResponseDto<>("1", "系统繁忙，请稍后再试");
}
public static <Object> ResponseDto<Object> failure(String message) {
return new ResponseDto<>("1", message);
}
public static <Object> ResponseDto<Object> failure(String code, String message) {
return new ResponseDto<>(code, message);
}
public static <Object> ResponseDto<Object> failure(String code, String message, Object data) {
return new ResponseDto<>(code, message, data);
}
public static <Object> ResponseDto<Object> failure(ErrorMapping.ErrorMessage errorMessage) {
return new ResponseDto<>(errorMessage);
}
public static <Object> ResponseDto<Object> failure(ErrorMapping.ErrorMessage errorMessage, Object data) {
return new ResponseDto<>(errorMessage, data);
}
public <T> T getParseData(Class<T> clazz) {
try {
if (getData() != null) {
return JsonUtils.fromJson(JsonUtils.toJson(getData()), clazz);
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
}
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/SqlMapping.java → liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/SqlMapping.java
View file @ 6dbd9fed
package com.liquidnet.commons.lang.util;
package com.liquidnet.service.base;
import com.liquidnet.commons.lang.util.JsonUtils;
import org.apache.logging.log4j.util.PropertiesUtil;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
import java.util.HashMap;
import java.util.LinkedList;
......@@ -44,6 +46,50 @@ public class SqlMapping {
return sqlPropertiesMap.get(sql);
}
public static class SqlMessage implements Cloneable, Serializable {
private static final long serialVersionUID = 2208924091512163151L;
private LinkedList<String> sqls;
private LinkedList<Object[]>[] args;
private SqlMessage() {
}
public SqlMessage(String json) {
SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(json, SqlMapping.SqlMessage.class);
this.sqls = sqlMessage.getSqls();
this.args = sqlMessage.getArgs();
}
public LinkedList<String> getSqls() {
return sqls;
}
public void setSqls(LinkedList<String> sqls) {
this.sqls = sqls;
}
public LinkedList<Object[]>[] getArgs() {
return args;
}
public void setArgs(LinkedList<Object[]>[] args) {
this.args = args;
}
private final static SqlMapping.SqlMessage instance = new SqlMapping.SqlMessage();
public static SqlMapping.SqlMessage getInstance() {
try {
return (SqlMapping.SqlMessage) instance.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new SqlMapping.SqlMessage();
}
}
/* ---------------------- ---------------------- ---------------------- */
public static String get(String sql, Object... params) {
LinkedList<String> sqls = new LinkedList<>();
sqls.add(sqlPropertiesMap.get(sql).toString());
......@@ -51,7 +97,7 @@ public class SqlMapping {
paramsList.add(params);
LinkedList<Object[]>[] args = new LinkedList[]{paramsList};
SqlMessage sqlMessage = SqlMessage.getInstance();
SqlMapping.SqlMessage sqlMessage = SqlMapping.SqlMessage.getInstance();
sqlMessage.setSqls(sqls);
sqlMessage.setArgs(args);
return JsonUtils.toJson(sqlMessage);
......@@ -62,7 +108,7 @@ public class SqlMapping {
sqls.add(sqlPropertiesMap.get(sql).toString());
LinkedList<Object[]>[] args = new LinkedList[]{paramsList};
SqlMessage sqlMessage = SqlMessage.getInstance();
SqlMapping.SqlMessage sqlMessage = SqlMapping.SqlMessage.getInstance();
sqlMessage.setSqls(sqls);
sqlMessage.setArgs(args);
return JsonUtils.toJson(sqlMessage);
......@@ -71,7 +117,7 @@ public class SqlMapping {
public static String get(LinkedList<String> sqls, LinkedList<Object[]> paramsList) {
LinkedList<Object[]>[] args = new LinkedList[]{paramsList};
SqlMessage sqlMessage = SqlMessage.getInstance();
SqlMapping.SqlMessage sqlMessage = SqlMapping.SqlMessage.getInstance();
sqlMessage.setSqls(sqls);
sqlMessage.setArgs(args);
return JsonUtils.toJson(sqlMessage);
......
liquidnet-bus-service/liquidnet-api-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamLoginClient.java
View file @ 6dbd9fed
package com.liquidnet.service.feign.adam.api;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
import feign.hystrix.FallbackFactory;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserInfoService.java
View file @ 6dbd9fed
......@@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IAdamUserInfoService extends IService<AdamUserInfo> {
void edit(AdamUserInfoVo userInfoVo);
void editMobile(String uid, String mobile);
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamAddressesParam;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import io.swagger.annotations.Api;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @ 6dbd9fed
......@@ -3,7 +3,7 @@ package com.liquidnet.service.adam.controller;
import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamCollectParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @ 6dbd9fed
......@@ -3,7 +3,7 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamEntersParam;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.entity.AdamEnters;
......@@ -63,7 +63,6 @@ public class AdamEntersController {
// TODO: 2021/4/29 获取登录UID
String uid = "1";
List<AdamEntersVo> voList = new ArrayList<>();
adamEntersService.list(uid).forEach(i -> {
voList.add(AdamEntersVo.getNew().copy(i));
......@@ -82,6 +81,9 @@ public class AdamEntersController {
// TODO: 2021/5/10
return ResponseDto.success();
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ 6dbd9fed
......@@ -6,10 +6,10 @@ import com.aliyuncs.dypnsapi.model.v20170525.GetMobileResponse;
import com.aliyuncs.exceptions.ClientException;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.core.JwtValidator;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.core.JwtValidator;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
......@@ -200,6 +200,7 @@ public class AdamLoginController {
if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) return ResponseDto.failure("验证码无效");
loginInfoVo.setUserInfo(adamUserService.register(parameter));
loginInfoVo.setThirdPartInfo(adamThirdPartyService.queryByUid(loginInfoVo.getUserInfo().getUid()));
}
Map<String, Object> claimsMap = new HashMap<>();
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.service.IAdamMemberService;
import io.swagger.annotations.Api;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 6dbd9fed
......@@ -2,8 +2,10 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamUserInfoParam;
import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
......@@ -14,12 +16,16 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ApiSupport(order = 10020)
@Api(tags = "用户中心")
......@@ -27,6 +33,8 @@ import java.util.List;
@RestController
@RequestMapping("user")
public class AdamUserController {
@Autowired
Environment environment;
@Autowired
IAdamUserService adamUserService;
@Autowired
......@@ -38,7 +46,7 @@ public class AdamUserController {
public ResponseDto<AdamUserInfoVo> edit(@RequestBody AdamUserInfoParam adamUserInfoParam) {
// TODO: 2021/5/10
log.info("adamUserInfoParam:{}", JsonUtils.toJson(adamUserInfoParam));
String uid = "1";
String uid = CurrentUtil.getCurrentUid();
AdamUserInfoVo userInfoVo = adamUserService.queryByUid(uid);
BeanUtils.copyProperties(adamUserInfoParam, userInfoVo);
......@@ -56,10 +64,14 @@ public class AdamUserController {
})
@PostMapping(value = {"edit/mobile"})
public ResponseDto<Object> editMobile(@RequestParam String mobile, @RequestParam String code) {
// TODO: 2021/5/10
log.info("mobile:{},code:{}", mobile, code);
// TODO: 2021/5/10
if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure("验证码无效");
String uid = CurrentUtil.getCurrentUid();
adamUserInfoService.editMobile(uid, mobile);
return ResponseDto.success();
}
......@@ -118,4 +130,31 @@ public class AdamUserController {
return ResponseDto.success(voList);
}
/* ---------------------------- Internal Method ---------------------------- */
private boolean checkSmsCode(String mobile, String code) {
if ("dev".equals(environment.getProperty("spring.profiles.active")) && "111111".equals(code)) {
return true;
}
LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
paramsMap.add("mobile", mobile);
paramsMap.add("code", code);
LinkedMultiValueMap<String, String> headersMap = new LinkedMultiValueMap<>();
headersMap.add("token", null);
try {
// TODO: 2021/5/12
String respStr = HttpUtil.get("https://service.zhengzai.tv/smsValidation", paramsMap, headersMap);
log.info("###PHP.API.RESP:{}", respStr);
Map respMap = JsonUtils.fromJson(respStr, Map.class);
return StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"));
} catch (Exception e) {
log.error("验证码验证异常[mobile:{},code:{}]", mobile, code, e);
return false;
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberAdminController.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@ package com.liquidnet.service.adam.controller.admin;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamMemberParam;
import com.liquidnet.service.adam.entity.AdamMember;
import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberPriceController.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@ package com.liquidnet.service.adam.controller.admin;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamMemberPriceParam;
import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
import com.liquidnet.service.adam.entity.AdamMemberPrice;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @ 6dbd9fed
......@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.BsonUtil;
import com.liquidnet.commons.lang.util.SqlMapping;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.entity.AdamEnters;
import com.liquidnet.service.adam.mapper.AdamEntersMapper;
import com.liquidnet.service.adam.service.IAdamEntersService;
import com.liquidnet.service.base.SqlMapping;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java
View file @ 6dbd9fed
......@@ -3,12 +3,13 @@ package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.SqlMapping;
import com.liquidnet.commons.lang.util.BsonUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamUserInfo;
import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
import com.liquidnet.service.adam.service.IAdamUserInfoService;
import com.liquidnet.service.base.SqlMapping;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
......@@ -20,6 +21,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
......@@ -69,4 +72,21 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
redisUtil.hset(AdamRedisConst.INFO_USER, userInfoVo.getUid(), userInfoVo);
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void editMobile(String uid, String mobile) {
AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
updateInfoVo.setMobile(mobile);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(updateInfoVo));
Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid)).getQueryObject(),
object, new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
);
AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
redisUtil.hset(AdamRedisConst.INFO_IDENTITY_MOBILE, beforeUserInfoVo.getMobile(), uid);
beforeUserInfoVo.setMobile(mobile);
redisUtil.hset(AdamRedisConst.INFO_USER, uid, beforeUserInfoVo);
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 6dbd9fed
......@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamUser;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import com.liquidnet.service.adam.service.IAdamUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -91,11 +92,18 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
@Override
public AdamUserInfoVo register(AdamThirdPartParam thirdPartParam) {
String uid = this.queryUidByRedis(thirdPartParam.getMobile());
LocalDateTime now = LocalDateTime.now();
AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew();
userInfoVo.setMobile(thirdPartParam.getMobile());
userInfoVo.setUid(IDGenerator.nextSnowId() + "");
userInfoVo.setCreateAt(DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss));
AdamUserInfoVo userInfoVo;
if (StringUtils.isEmpty(uid)) {
userInfoVo = AdamUserInfoVo.getNew();
userInfoVo.setMobile(thirdPartParam.getMobile());
userInfoVo.setUid(IDGenerator.nextSnowId() + "");
userInfoVo.setCreateAt(DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss));
} else {
userInfoVo = this.queryByUid(uid);
}
AdamThirdPartInfoVo thirdPartInfoVo = AdamThirdPartInfoVo.getNew();
BeanUtils.copyProperties(thirdPartParam, thirdPartInfoVo);
......
liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@ package com.liquidnet.service.consumer.service.processor;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.SqlMessage;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.consumer.service.IBaseDao;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
......@@ -34,7 +34,7 @@ public class ConsumerProcessor {
@RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
public void consumerSql(String msg) {
SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMessage.class);
SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/FieldsController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.FieldsVo;
import com.liquidnet.service.kylin.service.impl.FieldsServiceImpl;
import io.swagger.annotations.*;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.BannersVo;
import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
import io.swagger.annotations.Api;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
import io.swagger.annotations.Api;
......@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/FieldsAdminController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller.admin;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
import com.liquidnet.service.kylin.dao.FieldMisListDao;
import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
......@@ -11,12 +11,9 @@ import com.liquidnet.service.kylin.dto.vo.FieldsVo;
import com.liquidnet.service.kylin.dto.vo.PagerVo;
import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
@Api
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinBannersAdminController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller.admin;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java
View file @ 6dbd9fed
......@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.controller.admin;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinRoadShowsAdminController.java
View file @ 6dbd9fed
......@@ -2,14 +2,10 @@ package com.liquidnet.service.kylin.controller.admin;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.vo.admin.RoadShowAdminVo;
import com.liquidnet.service.kylin.service.impl.KylinRoadShowsServiceImpl;
import com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl;
import com.liquidnet.service.kylin.service.impl.admin.KylinRoadShowsAdminServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/FieldsPartnerController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller.partner;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.FieldsVo;
import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
import com.liquidnet.service.kylin.service.impl.partner.FieldsPartnerServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketTimesPartnerController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller.partner;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller.partner;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java
View file @ 6dbd9fed
package com.liquidnet.service.kylin.controller.partner;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.param.*;
import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
......
liquidnet-bus-support/liquidnet-support-config/src/main/java/com/liquidnet/support/config/SupportConfigApplication.java
View file @ 6dbd9fed
package com.liquidnet.support.config;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.config.server.EnableConfigServer;
......
liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml
View file @ 6dbd9fed
......@@ -11,8 +11,8 @@ liquidnet:
path: ./logs
name: support-config
eureka:
# host: 127.0.0.1:7001
host: 172.17.205.50:7001
host: 127.0.0.1:7001
# host: 172.17.205.50:7001
rabbitmq:
host: 127.0.0.1
port: 5672
......
liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/filter/GlobalAuthFilter.java
View file @ 6dbd9fed
package com.liquidnet.support.zuul.filter;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.core.JwtValidator;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext;
import io.jsonwebtoken.Claims;
......@@ -65,11 +66,11 @@ public class GlobalAuthFilter extends ZuulFilter {
// 解析没有异常则表示token验证通过，如有必要可根据自身需求增加验证逻辑
claims = jwtValidator.parse(token);
log.info("claims:{}", JsonUtils.toJson(claims));
// claims = jwtUtil.parseJwtToken(token);
// 对请求进行路由
requestContext.setSendZuulResponse(true);
// 请求头加入uid，传给具体的微服务
requestContext.addZuulRequestHeader("uid", claims.get("uid").toString());
// requestContext.addZuulRequestHeader("uid", claims.get("uid").toString());
requestContext.addZuulRequestHeader(CurrentUtil.uTag, JsonUtils.toJson(claims));
}
} catch (ExpiredJwtException expiredJwtEx) {
log.error("TOKEN已过期:{}", token);
......
liquidnet-bus-support/liquidnet-support-zuul/src/main/java/com/liquidnet/support/zuul/filter/GlobalLoginFilter.java
View file @ 6dbd9fed
package com.liquidnet.support.zuul.filter;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
import com.liquidnet.service.feign.adam.api.FeignAdamLoginClient;
......
liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/bootstrap-dev.yml
View file @ 6dbd9fed
......@@ -6,8 +6,8 @@ liquidnet:
username: user
password: user123
eureka:
#host: 127.0.0.1:7001
host: 172.17.205.50:7001
host: 127.0.0.1:7001
# host: 172.17.205.50:7001
# end-dev-这里是配置信息基本值
spring:
......
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