Procházet zdrojové kódy

开放接口权限检查与依赖管理,版本不兼容

wangwl před 2 měsíci
rodič
revize
b6967f60f0

+ 12 - 3
pom.xml

@@ -125,7 +125,7 @@
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>3.5.1</version>
+                <version>3.4.0</version>
             </dependency>
 
 
@@ -148,10 +148,12 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!--        knife4j-->
+            <!-- https://mvnrepository.com/artifact/com.github.xiaoymin/knife4j-spring-boot-starter -->
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
-                <version>4.4.0</version>
+                <artifactId>knife4j-spring-boot-starter</artifactId>
+                <version>3.0.3</version>
             </dependency>
 
             <!-- io常用工具类 -->
@@ -238,6 +240,13 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <!-- 谷歌工具包-->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>30.1.1-jre</version>
+            </dependency>
+
 
         </dependencies>
     </dependencyManagement>

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/Swagger2Configuration.java

@@ -34,7 +34,7 @@ public class Swagger2Configuration {
     }
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("股权管理系统")
+                .title("股权管理系统API文档")
                 .description("股权管理系统API文档")
                 .version("1.0")
                 .build();

+ 5 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -58,7 +58,7 @@
 //                // 扫描所有有注解的api,用这种方式更灵活
 //                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
 //                // 扫描指定包中的swagger注解
-//                 .apis(RequestHandlerSelectors.basePackage("com.ruoyi.equity.controller"))
+//                .apis(RequestHandlerSelectors.basePackage("com.ruoyi.equity.controller"))
 //                // 扫描所有 .apis(RequestHandlerSelectors.any())
 //                .paths(PathSelectors.any())
 //                .build()
@@ -113,13 +113,13 @@
 //        // 用ApiInfoBuilder进行定制
 //        return new ApiInfoBuilder()
 //                // 设置标题
-//                .title("股份管理系统官方文档")
+//                .title("股权管理系统API文档")
 //                // 描述
-//                .description("描述:股份管理系统官方文档...")
+//                .description("描述:股权管理系统API文档...")
 //                // 作者信息
-//                .contact(new Contact(ruoyiConfig.getName(), null, null))
+//                .contact(new Contact("金树林", null, null))
 //                // 版本
-//                .version("版本号:" + ruoyiConfig.getVersion())
+//                .version("版本号:1.0.0")
 //                .build();
 //    }
 //}

+ 18 - 0
ruoyi-common/pom.xml

@@ -137,6 +137,24 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+<!--        lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+<!--        knife4j-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 谷歌工具包-->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

+ 0 - 12
ruoyi-equity/pom.xml

@@ -29,18 +29,6 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
         </dependency>
-        <!-- 谷歌工具包-->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>30.1.1-jre</version>
-        </dependency>
-        <!--        data插件-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
 
 
     </dependencies>

+ 2 - 2
ruoyi-equity/src/main/java/com/ruoyi/equity/controller/BecomeShareholderRecordController.java

@@ -44,7 +44,7 @@ public class BecomeShareholderRecordController extends BaseController
      * 查询股东入股记录列表
      */
     @ApiOperation("查询股东入股记录列表")
-//    @PreAuthorize("@ss.hasPermi('equity:become-shareholder:list')")
+    @PreAuthorize("@ss.hasPermi('equity:become-shareholder:list')")
     @GetMapping("/list")
     public TableDataInfo list(BecomeShareholderRecord becomeShareholderRecord)
     {
@@ -59,7 +59,7 @@ public class BecomeShareholderRecordController extends BaseController
      * 新增股东入股记录
      */
     @ApiOperation("新增股东入股记录")
-//    @PreAuthorize("@ss.hasPermi('equity:become-shareholder:add')")
+    @PreAuthorize("@ss.hasPermi('equity:become-shareholder:add')")
     @Log(title = "股东入股记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody @Valid BecomeShareholderRecord becomeShareholderRecord)

+ 5 - 5
ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityMessageRecordController.java

@@ -69,7 +69,7 @@ public class EquityMessageRecordController extends BaseController
      * 查询股权消息通知列表
      */
     @ApiOperation("查询股权消息通知列表")
-//    @PreAuthorize("@ss.hasPermi('equity:message:list')")
+    @PreAuthorize("@ss.hasPermi('equity:message:list')")
     @GetMapping("/list")
     public TableDataInfo list(EquityMessageRecord equityMessageRecord)
     {
@@ -83,7 +83,7 @@ public class EquityMessageRecordController extends BaseController
     /**
      * 获取股权消息通知详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('equity:message:query')")
+    @PreAuthorize("@ss.hasPermi('equity:message:query')")
     @GetMapping(value = "/{equityMessageId}")
     public AjaxResult getInfo(@PathVariable("equityMessageId") Long equityMessageId)
     {
@@ -93,7 +93,7 @@ public class EquityMessageRecordController extends BaseController
     /**
      * 新增股权消息通知
      */
-//    @PreAuthorize("@ss.hasPermi('equity:message:add')")
+    @PreAuthorize("@ss.hasPermi('equity:message:add')")
     @Log(title = "股权消息通知", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EquityMessageRecord equityMessageRecord)
@@ -104,7 +104,7 @@ public class EquityMessageRecordController extends BaseController
     /**
      * 修改股权消息通知
      */
-//    @PreAuthorize("@ss.hasPermi('equity:message:edit')")
+    @PreAuthorize("@ss.hasPermi('equity:message:edit')")
     @Log(title = "股权消息通知", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EquityMessageRecord equityMessageRecord)
@@ -116,7 +116,7 @@ public class EquityMessageRecordController extends BaseController
      * 删除股权消息通知
      */
     @ApiOperation("删除股权消息通知")
-//    @PreAuthorize("@ss.hasPermi('equity:message:remove')")
+    @PreAuthorize("@ss.hasPermi('equity:message:remove')")
     @Log(title = "股权消息通知", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{equityMessageIds}")
     public AjaxResult remove(@PathVariable Long[] equityMessageIds)

+ 6 - 6
ruoyi-equity/src/main/java/com/ruoyi/equity/controller/EquityTransferRecordController.java

@@ -43,7 +43,7 @@ public class EquityTransferRecordController extends BaseController
      * 查询股权转让记录列表
      */
     @ApiOperation("查询股权转让记录列表")
-//    @PreAuthorize("@ss.hasPermi('equity:transfer:list')")
+    @PreAuthorize("@ss.hasPermi('equity:transfer:list')")
     @GetMapping("/list")
     public TableDataInfo list(EquityTransferRecord equityTransferRecord)
     {
@@ -55,7 +55,7 @@ public class EquityTransferRecordController extends BaseController
     /**
      * 导出股权转让记录列表
      */
-//    @PreAuthorize("@ss.hasPermi('equity:transfer:export')")
+    @PreAuthorize("@ss.hasPermi('equity:transfer:export')")
     @Log(title = "股权转让记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EquityTransferRecord equityTransferRecord)
@@ -68,7 +68,7 @@ public class EquityTransferRecordController extends BaseController
     /**
      * 获取股权转让记录详细信息
      */
-//    @PreAuthorize("@ss.hasPermi('equity:transfer:query')")
+    @PreAuthorize("@ss.hasPermi('equity:transfer:query')")
     @GetMapping(value = "/{equityTransferId}")
     public AjaxResult getInfo(@PathVariable("equityTransferId") Long equityTransferId)
     {
@@ -79,7 +79,7 @@ public class EquityTransferRecordController extends BaseController
      * 新增股权转让记录
      */
     @ApiOperation("新增股权转让记录")
-//    @PreAuthorize("@ss.hasPermi('equity:transfer:add')")
+    @PreAuthorize("@ss.hasPermi('equity:transfer:add')")
     @Log(title = "股权转让记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EquityTransferRecord equityTransferRecord)
@@ -90,7 +90,7 @@ public class EquityTransferRecordController extends BaseController
     /**
      * 修改股权转让记录
      */
-//    @PreAuthorize("@ss.hasPermi('equity:transfer:edit')")
+    @PreAuthorize("@ss.hasPermi('equity:transfer:edit')")
     @Log(title = "股权转让记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EquityTransferRecord equityTransferRecord)
@@ -101,7 +101,7 @@ public class EquityTransferRecordController extends BaseController
     /**
      * 删除股权转让记录
      */
-//    @PreAuthorize("@ss.hasPermi('equity:transfer:remove')")
+    @PreAuthorize("@ss.hasPermi('equity:transfer:remove')")
     @Log(title = "股权转让记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{equityTransferIds}")
     public AjaxResult remove(@PathVariable Long[] equityTransferIds)

+ 10 - 9
ruoyi-equity/src/main/java/com/ruoyi/equity/controller/ShareholderInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.equity.domain.vo.ShareholderInfoVO;
 import com.ruoyi.equity.domain.vo.ShareholderPicVO;
 import io.swagger.annotations.Api;
@@ -55,7 +56,7 @@ public class ShareholderInfoController extends BaseController
     }
 
     /**
-     * 获取尚未入股的股东
+     * 获取股东-根据股东状态
      */
     @ApiOperation("获取股东列表,根据股东状态1未入股2已入股")
     @GetMapping("/getNotShareholderList")
@@ -90,9 +91,9 @@ public class ShareholderInfoController extends BaseController
      * 查询股东信息列表
      */
     @ApiOperation("获取股东列表")
-//    @PreAuthorize("@ss.hasPermi('equity:info:list')")
+    @PreAuthorize("@ss.hasPermi('equity:info:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ShareholderInfo shareholderInfo)
+    public TableDataInfo<ShareholderInfoVO> list(ShareholderInfo shareholderInfo)
     {
         startPage();
         List<ShareholderInfoVO> list = shareholderInfoService.selectShareholderInfoList(shareholderInfo);
@@ -105,18 +106,18 @@ public class ShareholderInfoController extends BaseController
      * 获取股东信息详细信息
      */
     @ApiOperation("获取股东详细")
-//    @PreAuthorize("@ss.hasPermi('equity:info:query')")
+    @PreAuthorize("@ss.hasPermi('equity:info:query')")
     @GetMapping(value = "/{shareholderId}")
-    public AjaxResult getInfo(@PathVariable("shareholderId") Long shareholderId)
+    public R<ShareholderInfo> getInfo(@PathVariable("shareholderId") Long shareholderId)
     {
-        return success(shareholderInfoService.selectShareholderInfoByShareholderId(shareholderId));
+        return R.ok(shareholderInfoService.selectShareholderInfoByShareholderId(shareholderId));
     }
 
     /**
      * 新增股东信息
      */
     @ApiOperation("新增股东信息")
-//    @PreAuthorize("@ss.hasPermi('equity:info:add')")
+    @PreAuthorize("@ss.hasPermi('equity:info:add')")
     @Log(title = "股东信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ShareholderInfo shareholderInfo)
@@ -129,7 +130,7 @@ public class ShareholderInfoController extends BaseController
      * 修改股东信息
      */
     @ApiOperation("修改股东信息")
-//    @PreAuthorize("@ss.hasPermi('equity:info:edit')")
+    @PreAuthorize("@ss.hasPermi('equity:info:edit')")
     @Log(title = "股东信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ShareholderInfo shareholderInfo)
@@ -141,7 +142,7 @@ public class ShareholderInfoController extends BaseController
      * 删除股东信息
      */
     @ApiOperation("删除股东信息")
-//    @PreAuthorize("@ss.hasPermi('equity:info:remove')")
+    @PreAuthorize("@ss.hasPermi('equity:info:remove')")
     @Log(title = "股东信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{shareholderIds}")
     public AjaxResult remove(@PathVariable Long[] shareholderIds)

+ 3 - 5
ruoyi-equity/src/main/java/com/ruoyi/equity/domain/ShareholderInfo.java

@@ -23,14 +23,12 @@ import org.springframework.stereotype.Component;
  * @author ruoyi
  * @date 2025-03-03
  */
-
+@Data
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "ShareholderEntity", description = "股东实体")
-@Data
 @TableName("e_shareholder_info")
-@Component
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ShareholderInfo", description = "股东实体")
 public class ShareholderInfo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

+ 0 - 4
ruoyi-framework/pom.xml

@@ -59,10 +59,6 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
-        </dependency>
 
 
     </dependencies>