lyxaa
/
product
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

master
lyxaa 2024-03-28 10:20:47 +08:00
parent f34e555bf6
commit 183f0ec564
13 changed files with 82 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-auth/pom.xml
View File

@ -7,53 +7,56 @@
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-auth</artifactId>
<description>
ruoyi-auth认证授权中心
</description>
<dependencies>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!-- SpringCloud Alibaba Nacos Config -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- SpringBoot Web -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- SpringBoot Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- RuoYi Common Security-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-swagger</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
@ -70,5 +73,5 @@
</plugin>
</plugins>
</build>
</project>

6
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
View File

@ -1,5 +1,7 @@
package com.ruoyi.auth;
import com.ruoyi.common.security.annotation.EnableCustomConfig;
import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@ -7,9 +9,11 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
/**
* 认证授权中心
*
*
* @author ruoyi
*/
@EnableCustomConfig
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
public class RuoYiAuthApplication

8
ruoyi-auth/src/main/resources/bootstrap.yml
View File

@ -1,9 +1,9 @@
# Tomcat
server:
server:
port: 9200
# Spring
spring:
spring:
application:
# 应用名称
name: ruoyi-auth
@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 122.51.27.196:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 122.51.27.196:8848
# 配置文件格式
file-extension: yml
# 共享配置

1
ruoyi-common/pom.xml
View File

@ -24,6 +24,7 @@
<description>
ruoyi-common通用模块
</description>
</project>

10
ruoyi-common/ruoyi-common-core/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-core</artifactId>
<description>
ruoyi-common-core核心模块
</description>
@ -22,7 +22,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- SpringCloud Loadbalancer -->
<dependency>
<groupId>org.springframework.cloud</groupId>
@ -107,12 +111,10 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<!-- Swagger -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
</dependencies>
</project>

32
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/ProductMetadata.java 100644
View File

@ -0,0 +1,32 @@
package com.ruoyi.common.core.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @ClassName ProductMeradata
* @Description 描述
* @Author YunXiang.Li
* @Date 2024/3/26 14:55
*/
@Data
@ApiModel(value = "三范式")
public class ProductMetadata {
@ApiModelProperty(value = "创建时间", example = "2024-03-26 12:00:00")
private Date createTime;
@ApiModelProperty(value = "修改时间", example = "2024-03-26 12:00:00")
private Date updateTime;
@ApiModelProperty(value = "是否删除", example = "0")
private Integer isDelete;
@ApiModelProperty(value = "创建人ID", example = "123456")
private Long createBy;
}

10
ruoyi-common/ruoyi-common-swagger/pom.xml
View File

@ -8,9 +8,9 @@
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-swagger</artifactId>
<description>
ruoyi-common-swagger系统接口
</description>
@ -30,5 +30,11 @@
<version>${swagger.fox.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
</dependencies>
</project>

9
ruoyi-gateway/src/main/resources/bootstrap.yml
View File

@ -3,7 +3,10 @@ server:
port: 8080
# Spring
spring:
spring:
mvc:
pathmatch:
matching-strategy: ant_path_matcher
application:
# 应用名称
name: ruoyi-gateway
@ -14,10 +17,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 122.51.27.196:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 122.51.27.196:8848
# 配置文件格式
file-extension: yml
# 共享配置

1
ruoyi-modules/pom.xml
View File

@ -13,6 +13,7 @@
<module>ruoyi-gen</module>
<module>ruoyi-job</module>
<module>ruoyi-file</module>
<module>ruoyi-product</module>
</modules>
<artifactId>ruoyi-modules</artifactId>

2
ruoyi-ui/.eslintignore
View File

@ -7,4 +7,4 @@ public
# 忽略当前目录下为js的文件的语法检查
*.js
# 忽略当前目录下为vue的文件的语法检查
*.vue
*.vue

2
ruoyi-ui/src/views/index.vue
View File

@ -771,7 +771,7 @@
<li>修复代码生成点击多次表修改数据不变化的问题</li>
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
<li>修复角色权限修改时已有权限未自动勾选异常</li>
<li>创建用户不允许选择系统管理员角色</li>
<li>创建用户不允许选择员角色</li>
<li>添加全局异常处理（网关异常&业务异常）</li>
<li>修复终端查询Enter键搜索时是刷新页面而不是查询列表</li>
<li>删除job重复表单参数</li>

2
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
View File

@ -85,7 +85,7 @@
<el-form-item>
<span slot="label">
上级菜单
<el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
<el-tooltip content="分配到指定菜单下，例如 " placement="top">
<i class="el-icon-question"></i>
</el-tooltip>
</span>

2
sql/ry_20231130.sql
View File

@ -159,7 +159,7 @@ create table sys_menu (
-- 初始化-菜单信息表数据
-- ----------------------------
-- 一级菜单
insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录');
insert into sys_menu values('1', '', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '目录');
insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录');
insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录');
insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址');