Skip to content

U
ump
Commit f0671e22 authored by 夏韬's avatar 夏韬
Browse files
Options

修改

parent 09025ad9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1141 additions and 160 deletions
README.md
View file @ f0671e22
## 平台简介
一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适的。于是利用空闲休息时间开始自己写了一套后台系统。如此有了若依。她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
性别男，若依是给女儿取的名字（寓意：你若不离不弃，我必生死相依）
若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
* 前后端分离版本，请移步[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
* 感谢 [hplus](https://gitee.com/hplus_admin/hplus) 后台主题 UI 框架。
* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)  
* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)  
## 内置功能
1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。
......@@ -31,61 +18,3 @@
16. 缓存监控：对系统的缓存查询，删除、清空等操作。
17. 在线构建器：拖动表单元素生成相应的HTML代码。
18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。
## 在线体验
- admin/admin123
- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。
演示地址：http://ruoyi.vip
文档地址：http://doc.ruoyi.vip
## 演示图
<table>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-42e518aa72a24d228427a1261cb3679f395.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-7f20dd0edba25e5187c5c4dd3ec7d3d9797.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-2dae3d87f6a8ca05057db059cd9a411d51d.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-ea4d98423471e55fba784694e45d12bd4bb.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-7f6c6e9f5873efca09bd2870ee8468b8fce.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-c708b65f2c382a03f69fe1efa8d341e6cff.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-9ab586c47dd5c7b92bca0d727962c90e3b8.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-ef954122a2080e02013112db21754b955c6.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-088edb4d531e122415a1e2342bccb1a9691.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-f886fe19bd820c0efae82f680223cac196c.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-c7a2eb71fa65d6e660294b4bccca613d638.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-e60137fb0787defe613bd83331dc4755a70.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-7c51c1b5758f0a0f92ed3c60469b7526f9f.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-15181aed45bb2461aa97b594cbf2f86ea5f.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-83326ad52ea63f67233d126226738054d98.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-3bd6d31e913b70df00107db51d64ef81df7.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-70a2225836bc82042a6785edf6299e2586a.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-0184d6ab01fdc6667a14327fcaf8b46345d.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-64d8086dc2c02c8f71170290482f7640098.png"/></td>
<td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
</tr>
</table>
## 若依交流群
QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN) [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW) [![加入QQ群](https://img.shields.io/badge/已满-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z) [![加入QQ群](https://img.shields.io/badge/已满-1772718-blue.svg)](https://jq.qq.com/?_wv=1027&k=5g75dCU) [![加入QQ群](https://img.shields.io/badge/已满-1366522-blue.svg)](https://jq.qq.com/?_wv=1027&k=58cPoHA) [![加入QQ群](https://img.shields.io/badge/已满-1382251-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Ofd4Pb) [![加入QQ群](https://img.shields.io/badge/已满-1145125-blue.svg)](https://jq.qq.com/?_wv=1027&k=5yugASz) [![加入QQ群](https://img.shields.io/badge/已满-86752435-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Rf3d2P) [![加入QQ群](https://img.shields.io/badge/已满-134072510-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ZIjaeP) [![加入QQ群](https://img.shields.io/badge/已满-210336300-blue.svg)](https://jq.qq.com/?_wv=1027&k=5CJw1jY) [![加入QQ群](https://img.shields.io/badge/已满-339522636-blue.svg)](https://jq.qq.com/?_wv=1027&k=5omzbKc) [![加入QQ群](https://img.shields.io/badge/已满-130035985-blue.svg)](https://jq.qq.com/?_wv=1027&k=qPIKBb7s) [![加入QQ群](https://img.shields.io/badge/已满-143151071-blue.svg)](https://jq.qq.com/?_wv=1027&k=4NsjKbtU) [![加入QQ群](https://img.shields.io/badge/已满-158781320-blue.svg)](https://jq.qq.com/?_wv=1027&k=VD2pkz2G) [![加入QQ群](https://img.shields.io/badge/已满-201531282-blue.svg)](https://jq.qq.com/?_wv=1027&k=HlshFwkJ) [![加入QQ群](https://img.shields.io/badge/已满-101526938-blue.svg)](https://jq.qq.com/?_wv=1027&k=0ARRrO9V) [![加入QQ群](https://img.shields.io/badge/264355400-blue.svg)](https://jq.qq.com/?_wv=1027&k=up9k3ZXJ)
\ No newline at end of file
pom.xml
View file @ f0671e22
......@@ -216,7 +216,7 @@
</dependencyManagement>
<modules>
<module>ruoyi-admin</module>
<module>qly-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
<module>ruoyi-quartz</module>
......
ruoyi-admin/pom.xml → qly-admin/pom.xml
View file @ f0671e22
......@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId>
<artifactId>qly-admin</artifactId>
<description>
web服务入口
......@@ -74,6 +74,18 @@
<version>7.4.2</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>7.4.2</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<version>7.4.2</version>
</dependency>
</dependencies>
<build>
......
qly-admin/src/main/java/com/ruoyi/web/controller/business/IndustryController.java 0 → 100644
View file @ f0671e22
package com.ruoyi.web.controller.business;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.business.domain.Industry;
import com.ruoyi.business.service.IIndustryService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.domain.Ztree;
/**
* 行业Controller
*
* @author xiatao
* @date 2022-02-08
*/
@Controller
@RequestMapping("/business/industry")
public class IndustryController extends BaseController
{
private String prefix = "business/industry";
@Autowired
private IIndustryService industryService;
@RequiresPermissions("business:industry:view")
@GetMapping()
public String industry()
{
return prefix + "/industry";
}
/**
* 查询行业树列表
*/
@RequiresPermissions("business:industry:list")
@PostMapping("/list")
@ResponseBody
public List<Industry> list(Industry industry)
{
List<Industry> list = industryService.selectIndustryList(industry);
return list;
}
/**
* 导出行业列表
*/
@RequiresPermissions("business:industry:export")
@Log(title = "行业", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(Industry industry)
{
List<Industry> list = industryService.selectIndustryList(industry);
ExcelUtil<Industry> util = new ExcelUtil<Industry>(Industry.class);
return util.exportExcel(list, "行业数据");
}
/**
* 新增行业
*/
@GetMapping(value = { "/add/{id}", "/add/" })
public String add(@PathVariable(value = "id", required = false) Long id, ModelMap mmap)
{
if (StringUtils.isNotNull(id))
{
mmap.put("industry", industryService.selectIndustryById(id));
}
return prefix + "/add";
}
/**
* 新增保存行业
*/
@RequiresPermissions("business:industry:add")
@Log(title = "行业", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(Industry industry)
{
if(industry.getStatus() == null){
industry.setStatus(0);
}
return toAjax(industryService.insertIndustry(industry));
}
/**
* 修改行业
*/
@RequiresPermissions("business:industry:edit")
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Long id, ModelMap mmap)
{
Industry industry = industryService.selectIndustryById(id);
mmap.put("industry", industry);
return prefix + "/edit";
}
/**
* 修改保存行业
*/
@RequiresPermissions("business:industry:edit")
@Log(title = "行业", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(Industry industry)
{
if(industry.getStatus() == null){
industry.setStatus(0);
}
return toAjax(industryService.updateIndustry(industry));
}
/**
* 删除
*/
@RequiresPermissions("business:industry:remove")
@Log(title = "行业", businessType = BusinessType.DELETE)
@GetMapping("/remove/{id}")
@ResponseBody
public AjaxResult remove(@PathVariable("id") Long id)
{
return toAjax(industryService.deleteIndustryById(id));
}
/**
* 选择行业树
*/
@GetMapping(value = { "/selectIndustryTree/{id}", "/selectIndustryTree/" })
public String selectIndustryTree(@PathVariable(value = "id", required = false) Long id, ModelMap mmap)
{
if (StringUtils.isNotNull(id))
{
mmap.put("industry", industryService.selectIndustryById(id));
}
return prefix + "/tree";
}
/**
* 加载行业树列表
*/
@GetMapping("/treeData")
@ResponseBody
public List<Ztree> treeData()
{
List<Ztree> ztrees = industryService.selectIndustryTree();
return ztrees;
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java → qly-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View file @ f0671e22
package com.ruoyi.web.controller.system;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.business.service.*;
import com.ruoyi.business.service.impl.TbUserServiceImpl;
import com.ruoyi.business.service.IReRewardService;
import com.ruoyi.business.service.ITbPaymentService;
import com.ruoyi.business.service.ITbUserMemberService;
import com.ruoyi.business.service.ITbUserService;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.ShiroConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.CookieUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.web.util.EsUtil;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.core.CountRequest;
import org.elasticsearch.client.core.CountResponse;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -29,20 +37,13 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.ShiroConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.CookieUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysMenuService;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
/**
* 首页 业务处理
......@@ -165,18 +166,25 @@ public class SysIndexController extends BaseController
private IReRewardService reRewardService;
@Autowired
private RestHighLevelClient esRestClient;
private RestHighLevelClient restHighLevelClient;
// 系统介绍
@GetMapping("/system/main")
public String main(ModelMap mmap) throws IOException {
mmap.put("version", RuoYiConfig.getVersion());
return "main_v1";
}
@GetMapping("/system/main/info")
@ResponseBody
public AjaxResult mainInfo() throws IOException {
DateTime endTime = DateUtil.beginOfDay(DateUtil.date());
DateTime startTime = endTime.offsetNew(DateField.DAY_OF_YEAR,-1);
int userTotal = tbUserService.selectCount(null , null);
int userYesTodayTotal = tbUserService.selectCount(startTime, endTime);
//
int vipTotal = memberService.selectCount(null, null);
int vipYesTodayTotal = memberService.selectCount(startTime, endTime);
......@@ -215,26 +223,26 @@ public class SysIndexController extends BaseController
// 招标项目数
searchSourceBuilder.query(new BoolQueryBuilder().filter(QueryBuilders.termQuery("bidState", 0)));
CountResponse count = esRestClient.count(countRequest, RequestOptions.DEFAULT);
CountResponse count = restHighLevelClient.count(countRequest, RequestOptions.DEFAULT);
long bidCount = count.getCount();
// 中标项目数
searchSourceBuilder.query(new BoolQueryBuilder().filter(QueryBuilders.termQuery("bidState", 1)));
CountResponse winBidCountResponse = esRestClient.count(countRequest, RequestOptions.DEFAULT);
CountResponse winBidCountResponse = restHighLevelClient.count(countRequest, RequestOptions.DEFAULT);
long winBidCount = winBidCountResponse.getCount();
BoolQueryBuilder bidState = new BoolQueryBuilder()
.filter(QueryBuilders.termQuery("bidState", 0))
.filter(QueryBuilders.rangeQuery("creatTime").gte(startTime.getTime() / 1000L).lt(endTime.getTime() / 1000L));
.filter(QueryBuilders.rangeQuery("createTime").gte(startTime.getTime() / 1000L).lt(endTime.getTime() / 1000L));
searchSourceBuilder.query(bidState);
CountResponse yesTodayBidCountResponse = esRestClient.count(countRequest, RequestOptions.DEFAULT);
CountResponse yesTodayBidCountResponse = restHighLevelClient.count(countRequest, RequestOptions.DEFAULT);
long yesTodayBidCount = yesTodayBidCountResponse.getCount();
BoolQueryBuilder winBidState = new BoolQueryBuilder()
.filter(QueryBuilders.termQuery("bidState", 1))
.filter(QueryBuilders.rangeQuery("creatTime").gte(startTime.getTime() / 1000L).lt(endTime.getTime() / 1000L));
.filter(QueryBuilders.rangeQuery("createTime").gte(startTime.getTime() / 1000L).lt(endTime.getTime() / 1000L));
searchSourceBuilder.query(winBidState);
CountResponse yesTodayWinBidCountResponse = esRestClient.count(countRequest, RequestOptions.DEFAULT);
CountResponse yesTodayWinBidCountResponse = restHighLevelClient.count(countRequest, RequestOptions.DEFAULT);
long yesTodayWinBidCount = yesTodayWinBidCountResponse.getCount();
map.put("bidCount", bidCount);
......@@ -243,14 +251,12 @@ public class SysIndexController extends BaseController
map.put("winBidCount", winBidCount);
map.put("yesTodayWinBidCount", yesTodayWinBidCount);
mmap.put("statisMap", map);
System.out.println(JSONObject.toJSONString(map));
return "main_v1";
return AjaxResult.success(map);
}
// content-main class
public String contentMainClass(Boolean footer, Boolean tagsView)
{
......
qly-admin/src/main/java/com/ruoyi/web/core/config/ElasticSearchConfiguration.java 0 → 100644
View file @ f0671e22
package com.ruoyi.web.core.config;
import org.apache.http.HttpHost;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
import java.util.List;
/**
* @Deacription ElasticSearch 配置
* @Author xiatao
* @Date 2022年1月19日11:52:56
* @Version 1.0
**/
@Configuration
public class ElasticSearchConfiguration {
/** 协议 */
@Value("${elasticsearch.schema:http}")
private String schema;
/** 集群地址，如果有多个用“,”隔开 */
@Value("${elasticsearch.address}")
private String address;
/** 连接超时时间 */
@Value("${elasticsearch.connectTimeout}")
private int connectTimeout;
/** Socket 连接超时时间 */
@Value("${elasticsearch.socketTimeout}")
private int socketTimeout;
/** 获取连接的超时时间 */
@Value("${elasticsearch.connectionRequestTimeout}")
private int connectionRequestTimeout;
/** 最大连接数 */
@Value("${elasticsearch.maxConnectNum}")
private int maxConnectNum;
/** 最大路由连接数 */
@Value("${elasticsearch.maxConnectPerRoute}")
private int maxConnectPerRoute;
@Bean(name = "restHighLevelClient")
public RestHighLevelClient restHighLevelClient() {
// 拆分地址
List<HttpHost> hostLists = new ArrayList<>();
String[] hostList = address.split(",");
for (String addr : hostList) {
String host = addr.split(":")[0];
String port = addr.split(":")[1];
hostLists.add(new HttpHost(host, Integer.parseInt(port), schema));
}
// 转换成 HttpHost 数组
HttpHost[] httpHost = hostLists.toArray(new HttpHost[]{});
// 构建连接对象
RestClientBuilder builder = RestClient.builder(httpHost);
// 异步连接延时配置
builder.setRequestConfigCallback(requestConfigBuilder -> {
requestConfigBuilder.setConnectTimeout(connectTimeout);
requestConfigBuilder.setSocketTimeout(socketTimeout);
requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeout);
return requestConfigBuilder;
});
// 异步连接数配置
builder.setHttpClientConfigCallback(httpClientBuilder -> {
httpClientBuilder.setMaxConnTotal(maxConnectNum);
httpClientBuilder.setMaxConnPerRoute(maxConnectPerRoute);
return httpClientBuilder;
});
return new RestHighLevelClient(builder);
}
}
\ No newline at end of file
ruoyi-admin/src/main/resources/application.yml → qly-admin/src/main/resources/application.yml
View file @ f0671e22
......@@ -140,3 +140,13 @@ xss:
swagger:
# 是否开启swagger
enabled: true
elasticsearch:
schema: http
address: 47.116.24.235:9200
connectTimeout: 5000
socketTimeout: 5000
connectionRequestTimeout: 5000
maxConnectNum: 100
maxConnectPerRoute: 100
\ No newline at end of file
ruoyi-admin/src/main/resources/logback.xml → qly-admin/src/main/resources/logback.xml
View file @ f0671e22
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/home/ruoyi/logs" />
<property name="log.path" value="/home/admin/logs" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
......
ry.sh
View file @ f0671e22
This diff is collapsed.
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