From 4feabd2ead8e4a9844ba1c37997d6e25fb61ce41 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Thu, 5 May 2022 17:42:34 +0800
Subject: [PATCH] =?UTF-8?q?common.js=E5=A2=9E=E5=8A=A0img=E8=BD=ACbase64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/application-test.yml | 4 +--
.../mybatis/mapper/claim/claim-mapper.xml | 25 +++++++++++++++++++
.../assets/layuiadmin/modules/common.js | 20 ++++++++++++++-
src/main/resources/static/route/api/list.html | 2 +-
4 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 14f446d..e583df3 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -53,11 +53,11 @@ spring:
connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
use-global-data-source-stat: true
kafka:
- bootstrap-servers: 192.168.0.151:9092
+ bootstrap-servers: 192.168.0.103:9092
producer:
# 写入失败时，重试次数。当leader节点失效，一个repli节点会替代成为leader节点，此时可能出现写入失败，
# 当retris为0时，produce不会重复。retirs重发，此时repli节点完全成为leader节点，不会产生消息丢失。
- retries: 0
+ retries: 5
#procedure要求leader在考虑完成请求之前收到的确认数，用于控制发送记录在服务端的持久化，其值可以为如下：
#acks = 0 如果设置为零，则生产者将不会等待来自服务器的任何确认，该记录将立即添加到套接字缓冲区并视为已发送。在这种情况下，无法保证服务器已收到记录，并且重试配置将不会生效（因为客户端通常不会知道任何故障），为每条记录返回的偏移量始终设置为-1。
#acks = 1 这意味着leader会将记录写入其本地日志，但无需等待所有副本服务器的完全确认即可做出回应，在这种情况下，如果leader在确认记录后立即失败，但在将数据复制到所有的副本服务器之前，则记录将会丢失。
diff --git a/src/main/resources/mybatis/mapper/claim/claim-mapper.xml b/src/main/resources/mybatis/mapper/claim/claim-mapper.xml
index b416c64..12e2948 100644
--- a/src/main/resources/mybatis/mapper/claim/claim-mapper.xml
+++ b/src/main/resources/mybatis/mapper/claim/claim-mapper.xml
@@ -221,6 +221,31 @@
AND
LEFT(t1.gmt_create, 10) #{endTime}
+
+ AND (
+ system_id IN (
+ SELECT
+ st1.system_id
+ FROM
+ api_system st1
+ WHERE
+ st1.is_delete = 0
+ AND
+ st1.name LIKE CONCAT('%', #{keywords}, '%')
+ )
+ OR
+ api_id IN (
+ SELECT
+ st1.api_id
+ FROM
+ api_api st1
+ WHERE
+ st1.is_delete = 0
+ AND
+ st1.title LIKE CONCAT('%', #{keywords}, '%')
+ )
+ )
+
AND
t1.claim_id IN
diff --git a/src/main/resources/static/assets/layuiadmin/modules/common.js b/src/main/resources/static/assets/layuiadmin/modules/common.js
index e9aebb0..2aace98 100644
--- a/src/main/resources/static/assets/layuiadmin/modules/common.js
+++ b/src/main/resources/static/assets/layuiadmin/modules/common.js
@@ -240,6 +240,23 @@ layui.define(function (exports) {
return exportColumns;
}
+ function getImgBase64(url, callback) {
+ var Img = new Image(),
+ dataURL = '';
+ Img.src = url + '?v=' + Math.random();
+ Img.setAttribute('crossOrigin', 'Anonymous');
+ Img.onload = function() {
+ var canvas = document.createElement('canvas'),
+ width = Img.width,
+ height = Img.height;
+ canvas.width = width;
+ canvas.height = height;
+ canvas.getContext('2d').drawImage(Img, 0, 0, width, height);
+ dataURL = canvas.toDataURL('image/jpeg');
+ return callback ? callback(dataURL) : null;
+ };
+ }
+
//对外暴露的接口
exports('common', {
refreshTree: refreshTree,
@@ -248,6 +265,7 @@ layui.define(function (exports) {
formatDate: formatDate,
getBrowserType: getBrowserType,
getIEBrowserVersion: getIEBrowserVersion,
- listTableExportColumns: listTableExportColumns
+ listTableExportColumns: listTableExportColumns,
+ getImgBase64: getImgBase64
});
});
\ No newline at end of file
diff --git a/src/main/resources/static/route/api/list.html b/src/main/resources/static/route/api/list.html
index 961e85c..f79d3a3 100644
--- a/src/main/resources/static/route/api/list.html
+++ b/src/main/resources/static/route/api/list.html
@@ -440,7 +440,7 @@
}
});
} else if(event === 'publishEvent') {
- top.dialog.confirm('确定发布该接口码？', function(index) {
+ top.dialog.confirm('确定发布该接口吗？', function(index) {
top.dialog.close(index);
var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/api/publish/{apiId}', [data.apiId]), {}, null, function(code, data) {