7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

限流改造

Browse Source
This commit is contained in:
tanghc
2019-05-21 18:49:46 +08:00
parent 8ebc0925cb
commit ae37028c61
22 changed files with 689 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/param/LimitNewAddParam.java
View File

@@ -2,6 +2,7 @@ package com.gitee.sop.adminserver.api.service.param;
import com.gitee.easyopen.doc.annotation.ApiDocField;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@@ -59,4 +60,8 @@ public class LimitNewAddParam {
@NotNull(message = "orderIndex不能为空")
@Min(value = 0, message = "orderIndex必须大于等于0")
private Integer orderIndex;
@ApiDocField(description = "备注")
@Length(max = 128, message = "备注不能超过128")
private String remark;
}

6
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/param/LimitNewParam.java
View File

@@ -3,6 +3,7 @@ package com.gitee.sop.adminserver.api.service.param;
import com.gitee.easyopen.doc.annotation.ApiDocField;
import com.gitee.fastmybatis.core.query.Operator;
import com.gitee.fastmybatis.core.query.annotation.Condition;
import com.gitee.fastmybatis.core.query.param.PageParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +12,10 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class LimitNewParam extends ServiceSearchParam {
public class LimitNewParam extends PageParam {
@ApiDocField(description = "服务名serviceId")
private String serviceId;
@ApiDocField(description = "路由id")
@Condition(operator = Operator.like)
private String routeId;

5
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/param/LimitNewUpdateParam.java
View File

@@ -2,6 +2,7 @@ package com.gitee.sop.adminserver.api.service.param;
import com.gitee.easyopen.doc.annotation.ApiDocField;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@@ -64,4 +65,8 @@ public class LimitNewUpdateParam {
@NotNull(message = "orderIndex不能为空")
@Min(value = 0, message = "orderIndex必须大于等于0")
private Integer orderIndex;
@ApiDocField(description = "备注")
@Length(max = 128, message = "备注不能超过128")
private String remark;
}

3
sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/entity/ConfigLimit.java
View File

@@ -58,6 +58,9 @@ public class ConfigLimit {
/** 顺序，值小的优先执行, 数据库字段：order_index */
private Integer orderIndex;
/** 备注, 数据库字段：remark */
private String remark;
/** 数据库字段：gmt_create */
private Date gmtCreate;

10
sop-admin/sop-admin-vue/src/views/isv/index.vue
View File

@@ -94,9 +94,9 @@
<el-pagination
background
style="margin-top: 5px"
:current-page="pageInfo.pageIndex"
:current-page="searchFormData.pageIndex"
:page-size="searchFormData.pageSize"
:page-sizes="[5, 10, 20, 40]"
:page-size="pageInfo.pageSize"
:total="pageInfo.total"
layout="total, sizes, prev, pager, next"
@size-change="onSizeChange"
@@ -181,12 +181,12 @@ export default {
}
return {
searchFormData: {
appKey: ''
appKey: '',
pageIndex: 1,
pageSize: 10
},
pageInfo: {
list: [],
pageIndex: 1,
pageSize: 10,
total: 0
},
roles: [],

36
sop-admin/sop-admin-vue/src/views/service/limit/index2.vue
View File

@@ -92,6 +92,12 @@
label="排序"
width="80"
/>
<el-table-column
prop="remark"
label="备注"
width="150"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="gmtCreate"
label="创建时间"
@@ -115,9 +121,9 @@
<el-pagination
background
style="margin-top: 5px"
:current-page="pageInfo.pageIndex"
:current-page="searchFormData.pageIndex"
:page-size="searchFormData.pageSize"
:page-sizes="[5, 10, 20, 40]"
:page-size="pageInfo.pageSize"
:total="pageInfo.total"
layout="total, sizes, prev, pager, next"
@size-change="onSizeChange"
@@ -198,6 +204,9 @@
<el-form-item v-show="isTokenType()" label="令牌桶容量" prop="tokenBucketCount" :rules="isTokenType() ? rulesLimit.tokenBucketCount : []">
<el-input-number v-model="limitDialogFormData.tokenBucketCount" controls-position="right" :min="1" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="limitDialogFormData.remark" type="textarea" :rows="2" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="limitDialogVisible = false">取 消</el-button>
@@ -217,11 +226,12 @@ export default {
treeData: [],
tableData: [],
serviceId: '',
searchFormData: {},
searchFormData: {
pageIndex: 1,
pageSize: 5
},
pageInfo: {
list: [],
pageIndex: 1,
pageSize: 10,
total: 0
},
routeList: [],
@@ -245,6 +255,7 @@ export default {
limitStatus: 0, // 0: 停用，1：启用
limitType: 1,
orderIndex: 0,
remark: '',
typeKey: []
},
rulesLimit: {
@@ -281,6 +292,9 @@ export default {
],
orderIndex: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
remark: [
{ max: 128, message: '长度不能超过128字符', trigger: 'blur' }
]
}
@@ -459,21 +473,19 @@ export default {
limitRender: function(row) {
const html = []
const val = []
html.push('(')
if (row.routeId) {
val.push(row.routeId)
html.push('路由ID')
}
if (row.appKey) {
val.push(' + ' + row.appKey)
html.push(' + AppKey')
val.push(row.appKey)
html.push('AppKey')
}
if (row.limitIp) {
val.push(' + ' + row.limitIp)
html.push(' + IP')
val.push(row.limitIp)
html.push('IP')
}
html.push(')')
return val.join('') + '<br>' + html.join('')
return val.join(' + ') + '<br>(' + html.join(' + ') + ')'
}
}
}