更新

ruoyi-auth/pom.xml

@@ -51,7 +51,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
-        
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -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;
@@ -10,6 +12,8 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
  *
  * @author ruoyi
  */
+@EnableCustomConfig
+@EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
 public class RuoYiAuthApplication

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -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
         # 共享配置

ruoyi-common/pom.xml

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

ruoyi-common/ruoyi-common-core/pom.xml

@@ -23,6 +23,10 @@
             <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>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/ProductMetadata.java

@@ -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;
+
+
+}

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -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>

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -4,6 +4,9 @@ server:
 
 # 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
         # 共享配置

ruoyi-modules/pom.xml

@@ -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>

ruoyi-ui/src/views/index.vue

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

ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -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>

sql/ry_20231130.sql

@@ -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, '若依官网地址');