diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index 3b93514e..24a3de30 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -36,6 +36,7 @@ public class TokenController { // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + // 获取登录token return R.ok(tokenService.createToken(userInfo)); } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index b3093c9c..d7ebfe81 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -62,6 +62,7 @@ public class TokenService Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); rspMap.put("expires_in", expireTime); + System.err.println(rspMap); return rspMap; } diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index c301179f..efef7279 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -23,6 +23,13 @@ spring-boot-starter-web + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.7 + + io.springfox diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/Knife4jConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/Knife4jConfiguration.java new file mode 100644 index 00000000..0cd20ed1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/Knife4jConfiguration.java @@ -0,0 +1,44 @@ +package com.ruoyi.common.swagger.config; + + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; +import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; + +@Configuration +@EnableSwagger2 +public class Knife4jConfiguration { + @Bean(value = "dockerBean") + public Docket dockerBean() { + //指定使用Swagger2规范 + Docket docket = new Docket(DocumentationType.SWAGGER_2) + .apiInfo(webApiInfo()) + //分组名称 + .groupName("WebApi") + .select() + //这里指定Controller扫描包路径 + .apis(RequestHandlerSelectors.basePackage("com.ruoyi")) + .paths(PathSelectors.any()) + .build(); + return docket; + } + + private ApiInfo webApiInfo() { + return new ApiInfoBuilder() + //描述字段支持Markdown语法 + .title("Weekly-API") + .contact(new Contact("木子", "https://www.muzi.net/", "muzi@muzi.com")) + .description("实训项目端") + .version("1.0") + .build(); + } +} diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java index 424e8c3c..9d61c354 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java +++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java @@ -1,6 +1,7 @@ package com.ruoyi.common.swagger.config; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -10,6 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author ruoyi */ @Configuration +@Primary public class SwaggerWebConfiguration implements WebMvcConfigurer { @Override diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index b2f6649d..01f5285a 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -16,6 +16,19 @@ + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.7 + + + + com.github.xiaoymin + knife4j-spring-ui + 2.0.7 + + org.springframework.cloud diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java index 72667305..1bfcc733 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java @@ -7,6 +7,7 @@ import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.support.NameUtils; import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; import org.springframework.web.reactive.config.ResourceHandlerRegistry; import org.springframework.web.reactive.config.WebFluxConfigurer; @@ -19,6 +20,7 @@ import springfox.documentation.swagger.web.SwaggerResourcesProvider; * @author ruoyi */ @Component +@Primary public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigurer { /** diff --git a/ruoyi-modules/ruoyi-invest/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-invest/src/main/resources/bootstrap.yml index f45744cc..4092e5ee 100644 --- a/ruoyi-modules/ruoyi-invest/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-invest/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9301 + port: 9401 # Spring spring: diff --git a/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerController.java b/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerController.java index 860685d2..633d59bd 100644 --- a/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerController.java +++ b/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerController.java @@ -30,7 +30,7 @@ import com.ruoyi.common.core.utils.poi.ExcelUtil; * @description: TODO * @date 2023/1/13 16:00 */ -@RequestMapping("/Borrower") +@RequestMapping("/borrower") @RestController @Slf4j public class BorrowerController extends BaseController { @@ -57,7 +57,7 @@ public class BorrowerController extends BaseController { return tbBorrowerService.borrowerDele(idVo); } - @RequiresPermissions("potenza:borrower:list") + @GetMapping("/list") public TableDataInfo list(TbBorrower tbBorrower) { @@ -69,7 +69,7 @@ public class BorrowerController extends BaseController { /** * 导出贷款列表 */ - @RequiresPermissions("potenza:borrower:export") + @Log(title = "贷款", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TbBorrower tbBorrower) @@ -82,8 +82,8 @@ public class BorrowerController extends BaseController { /** * 获取贷款详细信息 */ - @RequiresPermissions("potenza:borrower:query") - @GetMapping(value = "/{borrowerId}") + + @GetMapping(value = "/{borrowerById}") public AjaxResult getInfo(@PathVariable("borrowerId") Long borrowerId) { return success(tbBorrowerService.selectTbBorrowerByBorrowerId(borrowerId)); @@ -92,9 +92,9 @@ public class BorrowerController extends BaseController { /** * 新增贷款 */ - @RequiresPermissions("potenza:borrower:add") + @Log(title = "贷款", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/borrowerInsert") public AjaxResult add(@RequestBody TbBorrower tbBorrower) { return toAjax(tbBorrowerService.insertTbBorrower(tbBorrower)); @@ -103,9 +103,9 @@ public class BorrowerController extends BaseController { /** * 修改贷款 */ - @RequiresPermissions("potenza:borrower:edit") + @Log(title = "贷款", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/borrowerUpdate") public AjaxResult edit(@RequestBody TbBorrower tbBorrower) { return toAjax(tbBorrowerService.updateTbBorrower(tbBorrower)); diff --git a/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPeriodsController.java b/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPeriodsController.java index 2089a3f1..7925c981 100644 --- a/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPeriodsController.java +++ b/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPeriodsController.java @@ -52,7 +52,6 @@ public class BorrowerPeriodsController extends BaseController{ /** * 导出贷款周期列表 */ - @RequiresPermissions("potenza:periods:export") @Log(title = "贷款周期", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TbBorrowerPeriods tbBorrowerPeriods) @@ -66,7 +65,7 @@ public class BorrowerPeriodsController extends BaseController{ * 获取贷款周期详细信息 */ @RequiresPermissions("potenza:periods:query") - @GetMapping(value = "/{periodsId}") + @GetMapping(value = "/{periodsById}") public AjaxResult getInfo(@PathVariable("periodsId") Long periodsId) { return success(tbBorrowerPeriodsService.selectTbBorrowerPeriodsByPeriodsId(periodsId)); @@ -77,7 +76,7 @@ public class BorrowerPeriodsController extends BaseController{ */ @RequiresPermissions("potenza:periods:add") @Log(title = "贷款周期", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("periodsInsert") public AjaxResult add(@RequestBody TbBorrowerPeriods tbBorrowerPeriods) { return toAjax(tbBorrowerPeriodsService.insertTbBorrowerPeriods(tbBorrowerPeriods)); @@ -88,7 +87,7 @@ public class BorrowerPeriodsController extends BaseController{ */ @RequiresPermissions("potenza:periods:edit") @Log(title = "贷款周期", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("/periodsUpdate") public AjaxResult edit(@RequestBody TbBorrowerPeriods tbBorrowerPeriods) { return toAjax(tbBorrowerPeriodsService.updateTbBorrowerPeriods(tbBorrowerPeriods)); diff --git a/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPlanController.java b/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPlanController.java index e139655a..248ce36c 100644 --- a/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPlanController.java +++ b/ruoyi-modules/ruoyi-potenza/src/main/java/com/ruoyi/potenza/controller/BorrowerPlanController.java @@ -52,7 +52,6 @@ public class BorrowerPlanController extends BaseController{ /** * 导出计划列表 */ - @RequiresPermissions("potenza:plan:export") @Log(title = "计划", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TbBorrowerPlan tbBorrowerPlan) @@ -65,8 +64,7 @@ public class BorrowerPlanController extends BaseController{ /** * 获取计划详细信息 */ - @RequiresPermissions("potenza:plan:query") - @GetMapping(value = "/{planId}") + @GetMapping(value = "/{planById}") public AjaxResult getInfo(@PathVariable("planId") Long planId) { return success(tbBorrowerPlanService.selectTbBorrowerPlanByPlanId(planId)); @@ -75,9 +73,8 @@ public class BorrowerPlanController extends BaseController{ /** * 新增计划 */ - @RequiresPermissions("potenza:plan:add") @Log(title = "计划", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("planInsert") public AjaxResult add(@RequestBody TbBorrowerPlan tbBorrowerPlan) { return toAjax(tbBorrowerPlanService.insertTbBorrowerPlan(tbBorrowerPlan)); @@ -86,9 +83,8 @@ public class BorrowerPlanController extends BaseController{ /** * 修改计划 */ - @RequiresPermissions("potenza:plan:edit") @Log(title = "计划", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping("planUpdate") public AjaxResult edit(@RequestBody TbBorrowerPlan tbBorrowerPlan) { return toAjax(tbBorrowerPlanService.updateTbBorrowerPlan(tbBorrowerPlan)); @@ -97,7 +93,6 @@ public class BorrowerPlanController extends BaseController{ /** * 删除计划 */ - @RequiresPermissions("potenza:plan:remove") @Log(title = "计划", businessType = BusinessType.DELETE) @DeleteMapping("/{planIds}") public AjaxResult remove(@PathVariable Long[] planIds) diff --git a/ruoyi-ui/src/api/potenza/borrower.js b/ruoyi-ui/src/api/potenza/borrower.js new file mode 100644 index 00000000..d0ef6cb1 --- /dev/null +++ b/ruoyi-ui/src/api/potenza/borrower.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 查询贷款列表 +export function listBorrower(query) { + return request({ + url: '/potenza/borrower/list', + method: 'get', + params: query + }) +} + +// 查询贷款详细 +export function getBorrower(borrowerId) { + return request({ + url: '/potenza/borrower/borrowerById/' + borrowerId, + method: 'get' + }) +} + +// 新增贷款 +export function addBorrower(data) { + return request({ + url: '/potenza/borrower/borrowerInsert', + method: 'post', + data: data + }) +} + +// 修改贷款 +export function updateBorrower(data) { + return request({ + url: '/potenza/borrower/borrowerUpdate', + method: 'put', + data: data + }) +} + + + diff --git a/ruoyi-ui/src/api/potenza/periods.js b/ruoyi-ui/src/api/potenza/periods.js new file mode 100644 index 00000000..2367da67 --- /dev/null +++ b/ruoyi-ui/src/api/potenza/periods.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询贷款周期列表 +export function listPeriods(query) { + return request({ + url: '/potenza/periods/list', + method: 'get', + params: query + }) +} + +// 查询贷款周期详细 +export function getPeriods(periodsId) { + return request({ + url: '/potenza/periods/periodsById/' + periodsId, + method: 'get' + }) +} + +// 新增贷款周期 +export function addPeriods(data) { + return request({ + url: '/potenza/periods/periodsInsert', + method: 'post', + data: data + }) +} + +// 修改贷款周期 +export function updatePeriods(data) { + return request({ + url: '/potenza/periods/periodsUpdate', + method: 'put', + data: data + }) +} + +// 删除贷款周期 +export function delPeriods(periodsId) { + return request({ + url: '/potenza/periods/' + periodsId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/potenza/plan.js b/ruoyi-ui/src/api/potenza/plan.js new file mode 100644 index 00000000..dc129d60 --- /dev/null +++ b/ruoyi-ui/src/api/potenza/plan.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询计划列表 +export function listPlan(query) { + return request({ + url: '/potenza/plan/list', + method: 'get', + params: query + }) +} + +// 查询计划详细 +export function getPlan(planId) { + return request({ + url: '/potenza/plan/planById' + planId, + method: 'get' + }) +} + +// 新增计划 +export function addPlan(data) { + return request({ + url: '/potenza/plan/planInsert', + method: 'post', + data: data + }) +} + +// 修改计划 +export function updatePlan(data) { + return request({ + url: '/potenza/plan/planUpdate', + method: 'put', + data: data + }) +} + +// 删除计划 +export function delPlan(planId) { + return request({ + url: '/potenza/plan/planIds/' + planId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 074fecd3..0687e4f0 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -3,49 +3,29 @@