mirror of https://gitee.com/y_project/RuoYi.git
Pre Merge pull request !474 from loop/master-0910-yf
loop
Gitee
commit
ad771c93b5
|
|
@ -0,0 +1,37 @@
|
|||
package com.ruoyi.web.controller.monitor;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工具
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@RestController
|
||||
public class ToolsController extends BaseController
|
||||
{
|
||||
private String prefix = "tool";
|
||||
|
||||
|
||||
@GetMapping("/tool/getJsonString")
|
||||
public AjaxResult getJsonString(@RequestParam @NotBlank String jsonString,String filed) {
|
||||
JSONArray jsonArray = JSONArray.parseArray(jsonString);
|
||||
List<String> response = new ArrayList<>();
|
||||
for (int i = 0; i < jsonArray.size(); i++) {
|
||||
com.alibaba.fastjson.JSONObject item = jsonArray.getJSONObject(0);
|
||||
String itemStr = item.getString(filed);
|
||||
response.add(itemStr);
|
||||
}
|
||||
String join = String.join(",", response);
|
||||
return AjaxResult.success("",join);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ spring:
|
|||
master:
|
||||
url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: password
|
||||
password: 123456
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ ruoyi:
|
|||
# 开发环境配置
|
||||
server:
|
||||
# 服务器的HTTP端口，默认为80
|
||||
port: 80
|
||||
port: 8090
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /
|
||||
|
|
@ -98,7 +98,7 @@ shiro:
|
|||
# 首页地址
|
||||
indexUrl: /index
|
||||
# 验证码开关
|
||||
captchaEnabled: true
|
||||
captchaEnabled: false
|
||||
# 验证码类型 math 数字计算 char 字符验证
|
||||
captchaType: math
|
||||
cookie:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="/home/ruoyi/logs" />
|
||||
<property name="log.path" value="/Users/ruoyi/logs" />
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<h4 class="no-margins">登录：</h4>
|
||||
<p class="m-t-md">你若不离不弃，我必生死相依</p>
|
||||
<input type="text" name="username" class="form-control uname" placeholder="用户名" value="admin" />
|
||||
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123" />
|
||||
<input type="password" name="password" class="form-control pword" placeholder="密码" value="admin123.." />
|
||||
<div class="row m-t" th:if="${captchaEnabled==true}">
|
||||
<div class="col-xs-6">
|
||||
<input type="text" name="validateCode" class="form-control code" placeholder="验证码" maxlength="5" />
|
||||
|
|
|
|||
|
|
@ -78,15 +78,15 @@
|
|||
<div class="col-sm-12" th:fragment="fragment-cache-value">
|
||||
<div class="form-group">
|
||||
<label>缓存名称：</label>
|
||||
<input type="text" class="form-control" th:value="${cacheName}">
|
||||
<input id="jsonString" type="text" class="form-control" th:value="${cacheName}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>缓存键名：</label>
|
||||
<input type="text"class="form-control" th:value="${cacheKey}">
|
||||
<input id="filed" type="text"class="form-control" th:value="${cacheKey}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>缓存内容：</label>
|
||||
<textarea class="form-control" style="height: 100px">[[${cacheValue}]]</textarea>
|
||||
<textarea id="returnData" class="form-control" style="height: 100px">[[${cacheValue}]]</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -100,6 +100,7 @@
|
|||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "monitor/cache";
|
||||
var toolPrefix = ctx + "tool";
|
||||
|
||||
function getCacheNames() {
|
||||
$.ajax({
|
||||
|
|
@ -172,13 +173,26 @@ function clearCacheKey(cacheName, cacheKey) {
|
|||
}
|
||||
|
||||
function clearAll(){
|
||||
$.get(prefix + "/clearAll", function(result) {
|
||||
if (result.code == web_status.SUCCESS) {
|
||||
$.modal.msgSuccess("清理全部缓存成功")
|
||||
} else {
|
||||
$.modal.msgError(result.msg);
|
||||
// $.get(toolPrefix + "/getJsonString", function(result) {
|
||||
// if (result.code == web_status.SUCCESS) {
|
||||
// $.modal.msgSuccess("清理全部缓存成功")
|
||||
// } else {
|
||||
// $.modal.msgError(result.msg);
|
||||
// }
|
||||
// });
|
||||
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: toolPrefix + "/getJsonString",
|
||||
data: {
|
||||
"jsonString": $("#jsonString").val(),
|
||||
"filed": $("#filed").val()
|
||||
},
|
||||
success: function(data) {
|
||||
console.log(data)
|
||||
$("#returnData").html(data.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
</script>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ public class CaptchaValidateFilter extends AccessControlFilter
|
|||
/**
|
||||
* 是否开启验证码
|
||||
*/
|
||||
private boolean captchaEnabled = true;
|
||||
private boolean captchaEnabled = false;
|
||||
|
||||
/**
|
||||
* 验证码类型
|
||||
|
|
|
|||
Loading…
Reference in New Issue