diff --git a/pom.xml b/pom.xml index 109605559..076179832 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,13 @@ ${ruoyi.version} + + + com.ruoyi + xkt + ${ruoyi.version} + + com.ruoyi @@ -251,6 +258,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + xkt pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 345ec3afb..60d5b491e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -61,6 +61,12 @@ ruoyi-generator + + + com.ruoyi + xkt + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 90eb62a95..4ee78efdb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -29,7 +29,7 @@ public class CommonController { private OSSProperties ossProperties; @ApiOperation("获取OSS临时访问凭证") - @GetMapping("/getCredentials") + @GetMapping("/oss/getCredentials") public R getCredentials() { STSCredentialsVO vo = new STSCredentialsVO(); Credentials credentials = ossClient.createStsCredentials(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/XktTestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/XktTestController.java new file mode 100644 index 000000000..a72efdadc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/XktTestController.java @@ -0,0 +1,37 @@ +package com.ruoyi.web.controller.xkt; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.web.controller.xkt.vo.TestVO; +import com.ruoyi.xkt.dto.TestDTO; +import com.ruoyi.xkt.service.ITestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author liangyq + * @date 2025-03-26 14:40 + */ +@Api(tags = "鞋库通测试") +@Slf4j +@RestController +@RequestMapping("/xkt/test") +public class XktTestController { + + @Autowired + private ITestService iTestService; + + @ApiOperation("执行测试") + @GetMapping("/execute") + public R> execute() { + List dtoList = iTestService.listTest(); + return R.ok(BeanUtil.copyToList(dtoList, TestVO.class)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/TestVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/TestVO.java new file mode 100644 index 000000000..edde741a7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/TestVO.java @@ -0,0 +1,25 @@ +package com.ruoyi.web.controller.xkt.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +/** + * @author liangyq + * @date 2025-03-26 14:46 + */ +@ApiModel +@Getter +@Setter +@ToString +public class TestVO { + + @ApiModelProperty("ID") + private String id; + + @ApiModelProperty("描述") + private String description; + +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index bac3d8025..ed303db0a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -21,6 +21,7 @@ oss: regionId: cn-beijing roleArn: acs:ram::1919425406190533:role/sts-role expiredDuration: 3600 + tempDir: E:/temp/ # 开发环境配置 server: diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index b04beffb4..15ec7edd7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -1,5 +1,9 @@ package com.ruoyi.framework.config; +import com.ruoyi.framework.config.properties.PermitAllUrlProperties; +import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; +import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; +import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,10 +20,6 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.config.properties.PermitAllUrlProperties; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 @@ -111,7 +111,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - requests.antMatchers("/login", "/register", "/captchaImage").permitAll() + requests.antMatchers("/login", "/register", "/captchaImage", "/xkt/test/execute").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java index a8a5e226f..ae59eec9a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/OSSProperties.java @@ -26,4 +26,6 @@ public class OSSProperties { private String roleArn; private Long expiredDuration; + + private String tempDir; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITestService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITestService.java deleted file mode 100644 index 634d7e3ff..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITestService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ruoyi.system.service; - -/** - * @author liangyq - * @date 2025-03-18 16:07 - */ -public interface ITestService { - - void insertTest(); - - void updateTest(); - - void listTest(); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestService.java deleted file mode 100644 index 377e65f38..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TestService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ruoyi.system.service.impl; - -import cn.hutool.core.date.DateUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.system.domain.TestDO; -import com.ruoyi.system.mapper.TestMapper; -import com.ruoyi.system.service.ITestService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * @author liangyq - * @date 2025-03-18 16:08 - */ -@Slf4j -@Service -public class TestService implements ITestService { - @Autowired - private TestMapper testMapper; - - @Transactional - @Override - public void insertTest() { - TestDO testDO = new TestDO(); - testDO.setDescription("测试插入" + DateUtil.now()); - testDO.setVersion(0L); - testMapper.insert(testDO); - log.info("插入:{}", testDO); - } - - @Transactional - @Override - public void updateTest() { - TestDO testDO = new TestDO(); - testDO.setId(1L); - testDO.setDescription("测试修改" + DateUtil.now()); - testDO.setVersion(1L); - log.info("修改:{}", testMapper.updateById(testDO)); - } - - @Override - public void listTest() { - List testDOList = testMapper.selectList(Wrappers.lambdaQuery(TestDO.class).eq(TestDO::getId, 1)); - log.info("查询:{}", testDOList); - } -} diff --git a/xkt/pom.xml b/xkt/pom.xml new file mode 100644 index 000000000..64b5d5283 --- /dev/null +++ b/xkt/pom.xml @@ -0,0 +1,26 @@ + + + + ruoyi + com.ruoyi + 3.8.9 + + 4.0.0 + + xkt + + + 鞋库通业务 + + + + + + com.ruoyi + ruoyi-framework + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TestDO.java b/xkt/src/main/java/com/ruoyi/xkt/domain/Test.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/TestDO.java rename to xkt/src/main/java/com/ruoyi/xkt/domain/Test.java index b193234b0..dfedf5eb9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TestDO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/Test.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.ruoyi.xkt.domain; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,7 +12,7 @@ import lombok.Data; */ @Data @TableName("test") -public class TestDO { +public class Test { @TableId private Long id; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/TestDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/TestDTO.java new file mode 100644 index 000000000..07040c953 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/TestDTO.java @@ -0,0 +1,16 @@ +package com.ruoyi.xkt.dto; + +import com.ruoyi.xkt.domain.Test; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author liangyq + * @date 2025-03-26 14:47 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class TestDTO extends Test { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TestMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/TestMapper.java similarity index 57% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/TestMapper.java rename to xkt/src/main/java/com/ruoyi/xkt/mapper/TestMapper.java index 67a1b6e09..9edcdf8b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TestMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/TestMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.system.domain.TestDO; +import com.ruoyi.xkt.domain.Test; import org.springframework.stereotype.Repository; /** @@ -9,5 +9,5 @@ import org.springframework.stereotype.Repository; * @date 2025-03-18 16:05 */ @Repository -public interface TestMapper extends BaseMapper { +public interface TestMapper extends BaseMapper { } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/ITestService.java b/xkt/src/main/java/com/ruoyi/xkt/service/ITestService.java new file mode 100644 index 000000000..8f0888e75 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/service/ITestService.java @@ -0,0 +1,18 @@ +package com.ruoyi.xkt.service; + +import com.ruoyi.xkt.dto.TestDTO; + +import java.util.List; + +/** + * @author liangyq + * @date 2025-03-18 16:07 + */ +public interface ITestService { + + void insertTest(TestDTO testDTO); + + void updateTest(TestDTO testDTO); + + List listTest(); +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/TestServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/TestServiceImpl.java new file mode 100644 index 000000000..8624271b1 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/TestServiceImpl.java @@ -0,0 +1,52 @@ +package com.ruoyi.xkt.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.xkt.domain.Test; +import com.ruoyi.xkt.dto.TestDTO; +import com.ruoyi.xkt.mapper.TestMapper; +import com.ruoyi.xkt.service.ITestService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author liangyq + * @date 2025-03-18 16:08 + */ +@Slf4j +@Service +public class TestServiceImpl implements ITestService { + @Autowired + private TestMapper testMapper; + + @Transactional + @Override + public void insertTest(TestDTO testDTO) { + Test test = new Test(); + test.setDescription(testDTO.getDescription()); + test.setVersion(0L); + testMapper.insert(test); + log.info("插入:{}", test); + } + + @Transactional + @Override + public void updateTest(TestDTO testDTO) { + Test test = new Test(); + test.setId(testDTO.getId()); + test.setDescription(testDTO.getDescription()); + test.setVersion(testDTO.getVersion()); + log.info("修改:{}", testMapper.updateById(test)); + } + + @Override + public List listTest() { + List testList = testMapper.selectList(Wrappers.lambdaQuery(Test.class).eq(Test::getId, 1)); + log.info("查询:{}", testList); + return BeanUtil.copyToList(testList, TestDTO.class); + } +} diff --git a/xkt/src/main/resources/mapper.xkt/TestMapper.xml b/xkt/src/main/resources/mapper.xkt/TestMapper.xml new file mode 100644 index 000000000..f6085891d --- /dev/null +++ b/xkt/src/main/resources/mapper.xkt/TestMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file