Skip to content

D
dm_project
Commit 78b48b8b authored by ysongq's avatar ysongq
Browse files
Options

Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev

parents 69fa602e db427129
Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 582 deletions
jz-dm-apigateway/pom.xml
View file @ 78b48b8b
...@@ -87,6 +87,16 @@ ...@@ -87,6 +87,16 @@
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId> <artifactId>swagger-bootstrap-ui</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.jz.common</groupId>
<artifactId>jz-dm-common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/BaseObject.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/base/BaseObject.java
View file @ 78b48b8b
package com.jz.dm.models.enity; package com.jz.dm.common.base;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/enums/Format.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/enums/Format.java
View file @ 78b48b8b
package com.jz.dm.models.enums; package com.jz.dm.common.enums;
/** /**
* 数据格式 * 数据格式
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/enums/GatewayResultCode.java → jz-dm-apigateway/src/main/java/com/jz/dm/common/enums/GatewayResultCode.java
View file @ 78b48b8b
package com.jz.dm.models.enums; package com.jz.dm.common.enums;
...@@ -36,7 +36,7 @@ public enum GatewayResultCode implements ResultCode { ...@@ -36,7 +36,7 @@ public enum GatewayResultCode implements ResultCode {
ILLEGAL_TIMETEMP("ILLEGAL_TIMETEMP", "无效时间戳"), ILLEGAL_TIMETEMP("ILLEGAL_TIMETEMP", "无效时间戳"),
/** 接口未授权 */ /** 接口未授权 */
INTERFACE_NO_AUTHORITY("INTERFACE_NO_AUTHORITY", "接口未授权"), //INTERFACE_NO_AUTHORITY("INTERFACE_NO_AUTHORITY", "接口未授权"),
/** 请求超过限制 */ /** 请求超过限制 */
RATE_LIMIT_EXCEEDED("RATE_LIMIT_EXCEEDED", "请求超过限制"), RATE_LIMIT_EXCEEDED("RATE_LIMIT_EXCEEDED", "请求超过限制"),
......
jz-dm-apigateway/src/main/java/com/jz/dm/common/util/Base64.java deleted 100644 → 0
View file @ 69fa602e
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jz.dm.common.util;
import org.apache.commons.codec.BinaryDecoder;
import org.apache.commons.codec.BinaryEncoder;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
/**
* Provides Base64 encoding and decoding as defined by RFC 2045.
*
* <p>This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite>
* from RFC 2045 <cite>Multipurpose Internet Mail Extensions (MIME) Part One:
* Format of Internet Message Bodies</cite> by Freed and Borenstein.</p>
*
* @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
* @author Apache Software Foundation
* @since 1.0-dev
* @version $Id: Base64.java,v 1.20 2004/05/24 00:21:24 ggregory Exp $
*/
public class Base64 implements BinaryEncoder, BinaryDecoder {
/**
* Chunk size per RFC 2045 section 6.8.
*
* <p>The {@value} character limit does not count the trailing CRLF, but counts
* all other characters, including any equal signs.</p>
*
* @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 6.8</a>
*/
static final int CHUNK_SIZE = 76;
/**
* Chunk separator per RFC 2045 section 2.1.
*
* @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045 section 2.1</a>
*/
static final byte[] CHUNK_SEPARATOR = "\r\n".getBytes();
/**
* The base length.
*/
static final int BASELENGTH = 255;
/**
* Lookup length.
*/
static final int LOOKUPLENGTH = 64;
/**
* Used to calculate the number of bits in a byte.
*/
static final int EIGHTBIT = 8;
/**
* Used when encoding something which has fewer than 24 bits.
*/
static final int SIXTEENBIT = 16;
/**
* Used to determine how many bits data contains.
*/
static final int TWENTYFOURBITGROUP = 24;
/**
* Used to get the number of Quadruples.
*/
static final int FOURBYTE = 4;
/**
* Used to test the sign of a byte.
*/
static final int SIGN = -128;
/**
* Byte used to pad output.
*/
static final byte PAD = (byte) '=';
// Create arrays to hold the base64 characters and a
// lookup for base64 chars
private static byte[] base64Alphabet = new byte[BASELENGTH];
private static byte[] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
// Populating the lookup and character arrays
static {
for (int i = 0; i < BASELENGTH; i++) {
base64Alphabet[i] = (byte) -1;
}
for (int i = 'Z'; i >= 'A'; i--) {
base64Alphabet[i] = (byte) (i - 'A');
}
for (int i = 'z'; i >= 'a'; i--) {
base64Alphabet[i] = (byte) (i - 'a' + 26);
}
for (int i = '9'; i >= '0'; i--) {
base64Alphabet[i] = (byte) (i - '0' + 52);
}
base64Alphabet['+'] = 62;
base64Alphabet['/'] = 63;
for (int i = 0; i <= 25; i++) {
lookUpBase64Alphabet[i] = (byte) ('A' + i);
}
for (int i = 26, j = 0; i <= 51; i++, j++) {
lookUpBase64Alphabet[i] = (byte) ('a' + j);
}
for (int i = 52, j = 0; i <= 61; i++, j++) {
lookUpBase64Alphabet[i] = (byte) ('0' + j);
}
lookUpBase64Alphabet[62] = (byte) '+';
lookUpBase64Alphabet[63] = (byte) '/';
}
private static boolean isBase64(byte octect) {
if (octect == PAD) {
return true;
} else if (base64Alphabet[octect] == -1) {
return false;
} else {
return true;
}
}
/**
* Tests a given byte array to see if it contains
* only valid characters within the Base64 alphabet.
*
* @param arrayOctect byte array to test
* @return true if all bytes are valid characters in the Base64
* alphabet or if the byte array is empty; false, otherwise
*/
public static boolean isArrayByteBase64(byte[] arrayOctect) {
arrayOctect = discardWhitespace(arrayOctect);
int length = arrayOctect.length;
if (length == 0) {
// shouldn't a 0 length array be valid base64 data?
// return false;
return true;
}
for (int i = 0; i < length; i++) {
if (!isBase64(arrayOctect[i])) {
return false;
}
}
return true;
}
/**
* Encodes binary data using the base64 algorithm but
* does not chunk the output.
*
* @param binaryData binary data to encode
* @return Base64 characters
*/
public static byte[] encodeBase64(byte[] binaryData) {
return encodeBase64(binaryData, false);
}
/**
* Encodes binary data using the base64 algorithm and chunks
* the encoded output into 76 character blocks
*
* @param binaryData binary data to encode
* @return Base64 characters chunked in 76 character blocks
*/
public static byte[] encodeBase64Chunked(byte[] binaryData) {
return encodeBase64(binaryData, true);
}
/**
* Decodes an Object using the base64 algorithm. This method
* is provided in order to satisfy the requirements of the
* Decoder interface, and will throw a DecoderException if the
* supplied object is not of type byte[].
*
* @param pObject Object to decode
* @return An object (of type byte[]) containing the
* binary data which corresponds to the byte[] supplied.
* @throws DecoderException if the parameter supplied is not
* of type byte[]
*/
@Override
public Object decode(Object pObject) throws DecoderException {
if (!(pObject instanceof byte[])) {
throw new DecoderException("Parameter supplied to Base64 decode is not a byte[]");
}
return decode((byte[]) pObject);
}
/**
* Decodes a byte[] containing containing
* characters in the Base64 alphabet.
*
* @param pArray A byte array containing Base64 character data
* @return a byte array containing binary data
*/
@Override
public byte[] decode(byte[] pArray) {
return decodeBase64(pArray);
}
/**
* Encodes binary data using the base64 algorithm, optionally
* chunking the output into 76 character blocks.
*
* @param binaryData Array containing binary data to encode.
* @param isChunked if isChunked is true this encoder will chunk
* the base64 output into 76 character blocks
* @return Base64-encoded data.
*/
public static byte[] encodeBase64(byte[] binaryData, boolean isChunked) {
int lengthDataBits = binaryData.length * EIGHTBIT;
int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
byte encodedData[] = null;
int encodedDataLength = 0;
int nbrChunks = 0;
if (fewerThan24bits != 0) {
//data not divisible by 24 bit
encodedDataLength = (numberTriplets + 1) * 4;
} else {
// 16 or 8 bit
encodedDataLength = numberTriplets * 4;
}
// If the output is to be "chunked" into 76 character sections,
// for compliance with RFC 2045 MIME, then it is important to
// allow for extra length to account for the separator(s)
if (isChunked) {
nbrChunks =
(CHUNK_SEPARATOR.length == 0 ? 0 : (int) Math.ceil((float) encodedDataLength / CHUNK_SIZE));
encodedDataLength += nbrChunks * CHUNK_SEPARATOR.length;
}
encodedData = new byte[encodedDataLength];
byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
int encodedIndex = 0;
int dataIndex = 0;
int i = 0;
int nextSeparatorIndex = CHUNK_SIZE;
int chunksSoFar = 0;
//log.debug("number of triplets = " + numberTriplets);
for (i = 0; i < numberTriplets; i++) {
dataIndex = i * 3;
b1 = binaryData[dataIndex];
b2 = binaryData[dataIndex + 1];
b3 = binaryData[dataIndex + 2];
//log.debug("b1= " + b1 +", b2= " + b2 + ", b3= " + b3);
l = (byte) (b2 & 0x0f);
k = (byte) (b1 & 0x03);
byte val1 =
((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
byte val2 =
((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
byte val3 =
((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
//log.debug( "val2 = " + val2 );
//log.debug( "k4 = " + (k<<4) );
//log.debug( "vak = " + (val2 | (k<<4)) );
encodedData[encodedIndex + 1] =
lookUpBase64Alphabet[val2 | (k << 4)];
encodedData[encodedIndex + 2] =
lookUpBase64Alphabet[(l << 2) | val3];
encodedData[encodedIndex + 3] = lookUpBase64Alphabet[b3 & 0x3f];
encodedIndex += 4;
// If we are chunking, let's put a chunk separator down.
if (isChunked) {
// this assumes that CHUNK_SIZE % 4 == 0
if (encodedIndex == nextSeparatorIndex) {
System.arraycopy(
CHUNK_SEPARATOR,
0,
encodedData,
encodedIndex,
CHUNK_SEPARATOR.length);
chunksSoFar++;
nextSeparatorIndex =
(CHUNK_SIZE * (chunksSoFar + 1)) +
(chunksSoFar * CHUNK_SEPARATOR.length);
encodedIndex += CHUNK_SEPARATOR.length;
}
}
}
// form integral number of 6-bit groups
dataIndex = i * 3;
if (fewerThan24bits == EIGHTBIT) {
b1 = binaryData[dataIndex];
k = (byte) (b1 & 0x03);
//log.debug("b1=" + b1);
//log.debug("b1<<2 = " + (b1>>2) );
byte val1 =
((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
encodedData[encodedIndex + 1] = lookUpBase64Alphabet[k << 4];
encodedData[encodedIndex + 2] = PAD;
encodedData[encodedIndex + 3] = PAD;
} else if (fewerThan24bits == SIXTEENBIT) {
b1 = binaryData[dataIndex];
b2 = binaryData[dataIndex + 1];
l = (byte) (b2 & 0x0f);
k = (byte) (b1 & 0x03);
byte val1 =
((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
byte val2 =
((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
encodedData[encodedIndex + 1] =
lookUpBase64Alphabet[val2 | (k << 4)];
encodedData[encodedIndex + 2] = lookUpBase64Alphabet[l << 2];
encodedData[encodedIndex + 3] = PAD;
}
if (isChunked) {
// we also add a separator to the end of the final chunk.
if (chunksSoFar < nbrChunks) {
System.arraycopy(
CHUNK_SEPARATOR,
0,
encodedData,
encodedDataLength - CHUNK_SEPARATOR.length,
CHUNK_SEPARATOR.length);
}
}
return encodedData;
}
/**
* Decodes Base64 data into octects
*
* @param base64Data Byte array containing Base64 data
* @return Array containing decoded data.
*/
public static byte[] decodeBase64(byte[] base64Data) {
// RFC 2045 requires that we discard ALL non-Base64 characters
base64Data = discardNonBase64(base64Data);
// handle the edge case, so we don't have to worry about it later
if (base64Data.length == 0) {
return new byte[0];
}
int numberQuadruple = base64Data.length / FOURBYTE;
byte decodedData[] = null;
byte b1 = 0, b2 = 0, b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
// Throw away anything not in base64Data
int encodedIndex = 0;
int dataIndex = 0;
{
// this sizes the output array properly - rlw
int lastData = base64Data.length;
// ignore the '=' padding
while (base64Data[lastData - 1] == PAD) {
if (--lastData == 0) {
return new byte[0];
}
}
decodedData = new byte[lastData - numberQuadruple];
}
for (int i = 0; i < numberQuadruple; i++) {
dataIndex = i * 4;
marker0 = base64Data[dataIndex + 2];
marker1 = base64Data[dataIndex + 3];
b1 = base64Alphabet[base64Data[dataIndex]];
b2 = base64Alphabet[base64Data[dataIndex + 1]];
if (marker0 != PAD && marker1 != PAD) {
//No PAD e.g 3cQl
b3 = base64Alphabet[marker0];
b4 = base64Alphabet[marker1];
decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
decodedData[encodedIndex + 1] =
(byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
} else if (marker0 == PAD) {
//Two PAD e.g. 3c[Pad][Pad]
decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
} else if (marker1 == PAD) {
//One PAD e.g. 3cQ[Pad]
b3 = base64Alphabet[marker0];
decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
decodedData[encodedIndex + 1] =
(byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
}
encodedIndex += 3;
}
return decodedData;
}
/**
* Discards any whitespace from a base-64 encoded block.
*
* @param data The base-64 encoded data to discard the whitespace
* from.
* @return The data, less whitespace (see RFC 2045).
*/
static byte[] discardWhitespace(byte[] data) {
byte groomedData[] = new byte[data.length];
int bytesCopied = 0;
for (int i = 0; i < data.length; i++) {
switch (data[i]) {
case (byte) ' ' :
case (byte) '\n' :
case (byte) '\r' :
case (byte) '\t' :
break;
default:
groomedData[bytesCopied++] = data[i];
}
}
byte packedData[] = new byte[bytesCopied];
System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
return packedData;
}
/**
* Discards any characters outside of the base64 alphabet, per
* the requirements on page 25 of RFC 2045 - "Any characters
* outside of the base64 alphabet are to be ignored in base64
* encoded data."
*
* @param data The base-64 encoded data to groom
* @return The data, less non-base64 characters (see RFC 2045).
*/
static byte[] discardNonBase64(byte[] data) {
byte groomedData[] = new byte[data.length];
int bytesCopied = 0;
for (int i = 0; i < data.length; i++) {
if (isBase64(data[i])) {
groomedData[bytesCopied++] = data[i];
}
}
byte packedData[] = new byte[bytesCopied];
System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
return packedData;
}
// Implementation of the Encoder Interface
/**
* Encodes an Object using the base64 algorithm. This method
* is provided in order to satisfy the requirements of the
* Encoder interface, and will throw an EncoderException if the
* supplied object is not of type byte[].
*
* @param pObject Object to encode
* @return An object (of type byte[]) containing the
* base64 encoded data which corresponds to the byte[] supplied.
* @throws EncoderException if the parameter supplied is not
* of type byte[]
*/
@Override
public Object encode(Object pObject) throws EncoderException {
if (!(pObject instanceof byte[])) {
throw new EncoderException(
"Parameter supplied to Base64 encode is not a byte[]");
}
return encode((byte[]) pObject);
}
/**
* Encodes a byte[] containing binary data, into a byte[] containing
* characters in the Base64 alphabet.
*
* @param pArray a byte array containing binary data
* @return A byte array containing only Base64 character data
*/
@Override
public byte[] encode(byte[] pArray) {
return encodeBase64(pArray, false);
}
public static void main(String[] args) throws EncoderException, DecoderException {
// aGVsbG8gd29ybGQ=
// aGVsbG8gd29ybGQ=
System.out.println(new Base64().encode("hello world".getBytes()).getClass());
System.out.println(new String(new Base64().encode("hello world".getBytes())));
System.out.println(new String(new Base64().decode("aGVsbG8gd29ybGQ=".getBytes())));
}
}
jz-dm-apigateway/src/main/java/com/jz/dm/controller/OrganizationManageController.java
View file @ 78b48b8b
...@@ -22,4 +22,47 @@ public class OrganizationManageController { ...@@ -22,4 +22,47 @@ public class OrganizationManageController {
@Autowired @Autowired
private OrganizationManageService organizationManageService; private OrganizationManageService organizationManageService;
///**
//* @Description:组织列表查询
//* @return: 组织列表
//* @Author: Mr.zhang
//* @Date: 2020-12-24
//*/
//@ApiOperation("组织列表查询")
//@PostMapping(value = "/listOrg")
//public Mono<Result> listOrganization(@RequestBody @Valid OrganizationManageListQueryReq req) {
// return Mono.fromSupplier(() -> Result.of_success(organizationManageService.listOrganization(req)));
//}
///**
//* @Description:组织信息详情信息查询
//* @return: 组织详情
//* @Author: Mr.zhang
//* @Date: 2020-12-24
//*/
//@ApiOperation("组织详情查询")
//@PostMapping(value = "/getOrgDetail")
//public Mono<Result> getOrganizationDetail(@RequestBody @Valid OrganizationManageDetailQueryReq req) {
// return Mono.fromSupplier(() -> Result.of_success(organizationManageService.getOrganizationDetail(req)));
//}
///**
// * @Description:添加组织信息
// * @Author: Mr.zhang
// * @Date: 2020-12-24
// */
//@ApiOperation("添加组织")
//@PostMapping(value = "/add")
//public Mono<Result> add(@RequestBody @Valid OrganizationManageAddReq req) {
// return Mono.fromSupplier(() -> Result.of_success(organizationManageService.add(req)));
//}
///**
// * @Description:更新组织信息
// * @Author: Mr.zhang
// * @Date: 2020-12-24
// */
//@ApiOperation("更新组织信息")
//@PostMapping(value = "/update")
//public Mono<Result> update(@RequestBody @Valid OrganizationManageUpdateReq req) {
// return Mono.fromSupplier(() -> Result.of_success(organizationManageService.update(req)));
//}
} }
jz-dm-apigateway/src/main/java/com/jz/dm/filter/AuthFilter.java 0 → 100644
View file @ 78b48b8b
package com.jz.dm.filter;
import com.jz.dm.common.constant.Constants;
import com.jz.dm.models.enity.GatewayRequest;
import com.jz.dm.models.enity.GatewayResponse;
import org.springframework.stereotype.Component;
/**
* @author ZC
* @PACKAGE_NAME: com.jz.dm.filter
* @PROJECT_NAME: jz-dm-parent
* @NAME: AuthFilter
* @DATE: 2020-12-23/17:43
* @DAY_NAME_SHORT: 周三
* @Description: 认证过滤器
**/
@Component("authFilter")
public class AuthFilter extends AbstractFilter {
@Override
public String getFilterName() {
return "AuthFilter";
}
@Override
public int getOrder() {
return Constants.FILTER_ORDER_5;
}
@Override
protected void internalDoFilter(GatewayRequest request, GatewayResponse response, FilterChain chain) {
//TODO 主要做计费计次验证
chain.doFilter(request, response);
}
}
jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckArgsFilter.java
View file @ 78b48b8b
...@@ -6,8 +6,8 @@ import com.jz.dm.common.util.StringUtil; ...@@ -6,8 +6,8 @@ import com.jz.dm.common.util.StringUtil;
import com.jz.dm.common.constant.Constants; import com.jz.dm.common.constant.Constants;
import com.jz.dm.models.enity.GatewayRequest; import com.jz.dm.models.enity.GatewayRequest;
import com.jz.dm.models.enity.GatewayResponse; import com.jz.dm.models.enity.GatewayResponse;
import com.jz.dm.models.enums.Format; import com.jz.dm.common.enums.Format;
import com.jz.dm.models.enums.GatewayResultCode; import com.jz.dm.common.enums.GatewayResultCode;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.nio.charset.Charset; import java.nio.charset.Charset;
......
jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckPostSizeFilter.java
View file @ 78b48b8b
...@@ -5,7 +5,7 @@ import com.jz.dm.common.constant.Constants; ...@@ -5,7 +5,7 @@ import com.jz.dm.common.constant.Constants;
import com.jz.dm.models.enity.GatewayRequest; import com.jz.dm.models.enity.GatewayRequest;
import com.jz.dm.models.enity.GatewayResponse; import com.jz.dm.models.enity.GatewayResponse;
import com.jz.dm.models.enity.RequestContext; import com.jz.dm.models.enity.RequestContext;
import com.jz.dm.models.enums.GatewayResultCode; import com.jz.dm.common.enums.GatewayResultCode;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
jz-dm-apigateway/src/main/java/com/jz/dm/filter/CheckTimestampFilter.java
View file @ 78b48b8b
...@@ -4,7 +4,7 @@ import com.jz.dm.common.exception.GatewayException; ...@@ -4,7 +4,7 @@ import com.jz.dm.common.exception.GatewayException;
import com.jz.dm.common.constant.Constants; import com.jz.dm.common.constant.Constants;
import com.jz.dm.models.enity.GatewayRequest; import com.jz.dm.models.enity.GatewayRequest;
import com.jz.dm.models.enity.GatewayResponse; import com.jz.dm.models.enity.GatewayResponse;
import com.jz.dm.models.enums.GatewayResultCode; import com.jz.dm.common.enums.GatewayResultCode;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
...@@ -19,7 +19,7 @@ public class CheckTimestampFilter extends AbstractFilter { ...@@ -19,7 +19,7 @@ public class CheckTimestampFilter extends AbstractFilter {
* 时间戳超时分钟，10分钟 * 时间戳超时分钟，10分钟
*/ */
//private static final long max = 1000 * 60 * 10; //10分钟 //private static final long max = 1000 * 60 * 10; //10分钟
private static final long max = 1000 * 60 * 60*24; //10分钟 private static final long max = 1000 * 60 * 60*24; //24小时
@Override @Override
public int getOrder() { public int getOrder() {
......
jz-dm-apigateway/src/main/java/com/jz/dm/filter/FilterChainImpl.java
View file @ 78b48b8b
...@@ -5,7 +5,7 @@ import com.jz.dm.common.util.LogUtil; ...@@ -5,7 +5,7 @@ import com.jz.dm.common.util.LogUtil;
import com.jz.dm.common.util.ResultCode; import com.jz.dm.common.util.ResultCode;
import com.jz.dm.models.enity.GatewayRequest; import com.jz.dm.models.enity.GatewayRequest;
import com.jz.dm.models.enity.GatewayResponse; import com.jz.dm.models.enity.GatewayResponse;
import com.jz.dm.models.enums.GatewayResultCode; import com.jz.dm.common.enums.GatewayResultCode;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
......
jz-dm-apigateway/src/main/java/com/jz/dm/filter/InvokeRouteFilter.java
View file @ 78b48b8b
...@@ -8,8 +8,8 @@ import com.jz.dm.common.constant.Constants; ...@@ -8,8 +8,8 @@ import com.jz.dm.common.constant.Constants;
import com.jz.dm.common.constant.LoggingConstants; import com.jz.dm.common.constant.LoggingConstants;
import com.jz.dm.gateway.DefaultOpenApiDispatcher; import com.jz.dm.gateway.DefaultOpenApiDispatcher;
import com.jz.dm.models.enity.*; import com.jz.dm.models.enity.*;
import com.jz.dm.models.enums.GatewayResultCode; import com.jz.dm.common.enums.GatewayResultCode;
import com.jz.dm.models.enums.RouteType; import com.jz.dm.common.enums.RouteType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
jz-dm-apigateway/src/main/java/com/jz/dm/filter/VerifySignFilter.java
View file @ 78b48b8b
...@@ -5,7 +5,7 @@ import com.jz.dm.models.enity.GatewayRequest; ...@@ -5,7 +5,7 @@ import com.jz.dm.models.enity.GatewayRequest;
import com.jz.dm.models.enity.GatewayResponse; import com.jz.dm.models.enity.GatewayResponse;
import com.jz.dm.models.enity.OpenApi; import com.jz.dm.models.enity.OpenApi;
import com.jz.dm.models.enity.RequestContext; import com.jz.dm.models.enity.RequestContext;
import com.jz.dm.models.enums.RouteType; import com.jz.dm.common.enums.RouteType;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiAuth.java
View file @ 78b48b8b
...@@ -3,7 +3,7 @@ package com.jz.dm.models.domian; ...@@ -3,7 +3,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiInterface.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiOpenApiEsFields.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiOpenApiEsTagconfig.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiOrg.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiReqLog.java
View file @ 78b48b8b
...@@ -3,7 +3,7 @@ package com.jz.dm.models.domian; ...@@ -3,7 +3,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiSyncingDatasource.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/domian/ApiSyncingDatasourceType.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.domian;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jz.dm.models.enity.BaseObject; import com.jz.dm.common.base.BaseObject;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/BaseRequest.java deleted 100644 → 0
View file @ 69fa602e
package com.jz.dm.models.enity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author ZC
* @PACKAGE_NAME: com.jz.dm.models.enity
* @PROJECT_NAME: jz-dm-parent
* @NAME: BaseRequest
* @DATE: 2020-12-22/15:14
* @DAY_NAME_SHORT: 周二
* @Description:
**/
@Data
public class BaseRequest {
@ApiModelProperty("当前页码")
private long pageNum = 1;
@ApiModelProperty("每页条数")
private long pageSize = 20;
}
jz-dm-apigateway/src/main/java/com/jz/dm/models/enity/OpenApi.java
View file @ 78b48b8b
...@@ -2,7 +2,7 @@ package com.jz.dm.models.enity; ...@@ -2,7 +2,7 @@ package com.jz.dm.models.enity;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.jz.dm.models.enums.RouteType; import com.jz.dm.common.enums.RouteType;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
......
jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageAddReq.java 0 → 100644
View file @ 78b48b8b
package com.jz.dm.models.req;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* @author ZC
* @PACKAGE_NAME: com.jz.dm.models.req
* @PROJECT_NAME: jz-dm-parent
* @NAME: OrganizationManageListQueryReq
* @DATE: 2020-12-24/10:34
* @DAY_NAME_SHORT: 周四
* @Description:
**/
@Data
@ApiModel("组织管理详情请求体")
public class OrganizationManageAddReq implements Serializable {
//@ApiModelProperty(value = "组织编码(组织唯一标识)",required = true)
//@NotNull(message = "组织编码不能为空")
//private String orgCode;
@ApiModelProperty(value = "组织名称",required = true)
@NotNull(message = "组织名称不能为空")
private String orgName;
@ApiModelProperty(value = "组织描述",required = false)
private String orgDesc;
@ApiModelProperty(value = "组织英文名称",required = false)
private String orgCnName;
@ApiModelProperty(value = "组织邮箱",required = false)
private String orgMail;
@ApiModelProperty(value = "备注",required = false)
private String remark;
}
jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageDetailQueryReq.java 0 → 100644
View file @ 78b48b8b
package com.jz.dm.models.req;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* @author ZC
* @PACKAGE_NAME: com.jz.dm.models.req
* @PROJECT_NAME: jz-dm-parent
* @NAME: OrganizationManageListQueryReq
* @DATE: 2020-12-24/10:34
* @DAY_NAME_SHORT: 周四
* @Description:
**/
@Data
@ApiModel("组织管理详情请求体")
public class OrganizationManageDetailQueryReq implements Serializable {
@ApiModelProperty(value = "组织id",required = true)
@NotNull(message = "组织id不能为空")
private Long id;
}
jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageListQueryReq.java 0 → 100644
View file @ 78b48b8b
package com.jz.dm.models.req;
import com.jz.common.bean.BasePageBean;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.io.Serializable;
/**
* @author ZC
* @PACKAGE_NAME: com.jz.dm.models.req
* @PROJECT_NAME: jz-dm-parent
* @NAME: OrganizationManageListQueryReq
* @DATE: 2020-12-24/10:34
* @DAY_NAME_SHORT: 周四
* @Description:
**/
@Data
@ApiModel("组织管理查询请求体")
public class OrganizationManageListQueryReq extends BasePageBean implements Serializable {
}
jz-dm-apigateway/src/main/java/com/jz/dm/models/req/OrganizationManageUpdateReq.java 0 → 100644
View file @ 78b48b8b
package com.jz.dm.models.req;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* @author ZC
* @PACKAGE_NAME: com.jz.dm.models.req
* @PROJECT_NAME: jz-dm-parent
* @NAME: OrganizationManageUpdateReq
* @DATE: 2020-12-24/11:46
* @DAY_NAME_SHORT: 周四
* @Description:
**/
@Data
@ApiModel("更新组织请求体")
public class OrganizationManageUpdateReq implements Serializable {
@ApiModelProperty(value = "id",required = true)
@NotNull(message = "id不能为空")
private Long id;
@ApiModelProperty(value = "组织名称",required = true)
@NotNull(message = "组织名称不能为空")
private String orgName;
@ApiModelProperty(value = "组织描述",required = false)
private String orgDesc;
@ApiModelProperty(value = "组织英文名称",required = false)
private String orgCnName;
@ApiModelProperty(value = "组织邮箱",required = false)
private String orgMail;
@ApiModelProperty(value = "备注",required = false)
private String remark;
}
jz-dm-apigateway/src/main/java/com/jz/dm/service/OrganizationManageService.java
View file @ 78b48b8b
...@@ -10,4 +10,31 @@ package com.jz.dm.service; ...@@ -10,4 +10,31 @@ package com.jz.dm.service;
* @Description: * @Description:
**/ **/
public interface OrganizationManageService { public interface OrganizationManageService {
///**
// * 分页查询组织列表信息
// * @param req
// * @return
// */
//IPage<ApiOrg> listOrganization(OrganizationManageListQueryReq req);
//
///**
// * 查询组织详情信息
// * @param req
// * @return
// */
//Result getOrganizationDetail(OrganizationManageDetailQueryReq req);
//
///**
// * 添加组织
// * @param req
// * @return
// */
//Result add(OrganizationManageAddReq req);
//
///**
// * 更新组织信息
// * @param req
// * @return
// */
//Result update(OrganizationManageUpdateReq req);
} }
jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/OrganizationManageImpl.java
View file @ 78b48b8b
package com.jz.dm.service.impl; package com.jz.dm.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jz.common.constant.ResultMsg;
import com.jz.common.utils.Result;
import com.jz.dm.mapper.ApiOrgMapper;
import com.jz.dm.models.domian.ApiOrg;
import com.jz.dm.models.req.OrganizationManageAddReq;
import com.jz.dm.models.req.OrganizationManageDetailQueryReq;
import com.jz.dm.models.req.OrganizationManageListQueryReq;
import com.jz.dm.models.req.OrganizationManageUpdateReq;
import com.jz.dm.service.OrganizationManageService; import com.jz.dm.service.OrganizationManageService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
/** /**
* @author ZC * @author ZC
* @PACKAGE_NAME: com.jz.dm.service.impl * @PACKAGE_NAME: com.jz.dm.service.impl
...@@ -16,4 +31,78 @@ import org.springframework.stereotype.Service; ...@@ -16,4 +31,78 @@ import org.springframework.stereotype.Service;
@Service("organizationManageService") @Service("organizationManageService")
@Slf4j @Slf4j
public class OrganizationManageImpl implements OrganizationManageService { public class OrganizationManageImpl implements OrganizationManageService {
@Resource
private ApiOrgMapper apiOrgMapper;
//@Resource
//private RedisTemplate redisTemplate;
///**
// * 组织列表信息查询
// * @param req
// * @return
// */
//@Override
//public IPage<ApiOrg> listOrganization(OrganizationManageListQueryReq req) {
// IPage<ApiOrg> page = new Page<>(req.getPageNum(), req.getPageSize());
// QueryWrapper<ApiOrg> query = new QueryWrapper<>();
// query.orderByDesc("create_time");
// return apiOrgMapper.selectPage(page,query);
//}
//
///**
// * 获取组织详情
// * @param req
// * @return
// */
//@Override
//public Result getOrganizationDetail(OrganizationManageDetailQueryReq req) {
// return Result.of_success(apiOrgMapper.selectById(req.getId()));
//}
//
///**
// * 添加组织
// * @param req
// * @return
// */
//@Override
//public Result add(OrganizationManageAddReq req) {
// //SysUserDto currentUser = (SysUserDto)redisTemplate.opsForValue().get("user"+ RedisMessageConstant.SENDTYPE_LOGIN_SYS);
// //if (null == currentUser){
// // return Result.of_error(ResultMsg.USER_NOT_EXIST);
// //}
// ApiOrg apiOrg = new ApiOrg();
// BeanUtils.copyProperties(req,apiOrg);
// apiOrg.setOrgCode("1111");//组织编码需要生成
// //apiOrg.setCreateUser(currentUser.getUserName());
// if (apiOrgMapper.insert(apiOrg) > 0){
// return Result.of_success(ResultMsg.INSERT_SUCCESS);
// }
// return Result.of_error(ResultMsg.INSERT_FAIL);
//}
//
///**
// * 更新组织
// * @param req
// * @return
// */
//@Override
//public Result update(OrganizationManageUpdateReq req) {
// //SysUserDto currentUser = (SysUserDto)redisTemplate.opsForValue().get("user"+ RedisMessageConstant.SENDTYPE_LOGIN_SYS);
// //if (null == currentUser){
// // return Result.of_error(ResultMsg.USER_NOT_EXIST);
// //}
// ApiOrg apiOrg = apiOrgMapper.selectById(req.getId());
// if (null == apiOrg){
// return Result.of_error("组织信息不存在!");
// }
// ApiOrg apiOrgUpdate = new ApiOrg();
// apiOrgUpdate.setId(apiOrg.getId());
// BeanUtils.copyProperties(req,apiOrgUpdate);
// apiOrgUpdate.setUpdateDate(new Date());
// //apiOrgUpdate.setUpdateUser(currentUser.getUserName());
// if (apiOrgMapper.updateById(apiOrgUpdate) > 0){
// return Result.of_success(ResultMsg.UPDATE_SUCCESS);
// }
// return Result.of_success(ResultMsg.UPDATE_FAIL);
//}
} }
jz-dm-apigateway/src/main/resources/application-test.yml
View file @ 78b48b8b
...@@ -47,3 +47,24 @@ spring: ...@@ -47,3 +47,24 @@ spring:
# 日志用的filter:log4j # 日志用的filter:log4j
# 防御sql注入的filter:wall # 防御sql注入的filter:wall
filters: stat filters: stat
cache:
type: CAFFEINE
caffeine:
spec: maximumSize=1000,expireAfterWrite=30s
public-key: rajZdV0xpCox+2vEHFLsKq2o2XVdMaQq
redis:
#database: 0
host: 192.168.1.139
port: 6379
#timeout: 5000
# cluster:
# nodes:
# - 192.168.31.167:6379
# - 192.168.31.167:6380
# - 192.168.31.167:6381
# - 192.168.31.167:6382
# - 192.168.31.167:6383
# - 192.168.31.167:6384
#使用redis管理session设置为redis，否则none
session:
store-type: none
\ No newline at end of file
pom.xml
View file @ 78b48b8b
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<commons-lang3.version>3.8.1</commons-lang3.version> <commons-lang3.version>3.8.1</commons-lang3.version>
<springfox-swagger2.version>2.9.2</springfox-swagger2.version> <springfox-swagger2.version>2.9.2</springfox-swagger2.version>
<swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version> <swagger-bootstrap-ui.version>1.9.6</swagger-bootstrap-ui.version>
<lombok.version>1.18.16</lombok.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -204,6 +205,11 @@ ...@@ -204,6 +205,11 @@
<artifactId>swagger-bootstrap-ui</artifactId> <artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger-bootstrap-ui.version}</version> <version>${swagger-bootstrap-ui.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
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