Browse Source

add:修改pom文件

zhouzeyu 5 months ago
parent
commit
26dc6b4b07

+ 7 - 9
tr-dependencies/pom.xml

@@ -93,8 +93,6 @@
 
         <spring-boot.version>2.7.8</spring-boot.version>
 
-        <thymeleaf.version>2.5.15</thymeleaf.version>
-
         <tianai.version>1.5.1</tianai.version>
     </properties>
 
@@ -473,6 +471,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!--图片验证码模块-->
+            <dependency>
+                <groupId>cn.tr</groupId>
+                <artifactId>tr-module-tianai-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!--阿里云短信-->
             <dependency>
                 <groupId>com.aliyun</groupId>
@@ -578,13 +583,6 @@
                 </exclusions>
             </dependency>
 
-
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-thymeleaf</artifactId>
-                <version>${thymeleaf.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>cloud.tianai.captcha</groupId>
                 <artifactId>tianai-captcha-springboot-starter</artifactId>

+ 0 - 5
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/coze/config/CozeOAuthTokenConfig.java

@@ -5,12 +5,8 @@ import cn.tr.module.sys.tenant.dto.OAuthTokenAddCacheDTO;
 import cn.tr.module.sys.tenant.util.CacheUtil;
 import com.coze.openapi.client.auth.OAuthToken;
 import com.coze.openapi.service.auth.JWTOAuthClient;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
 import javax.annotation.Resource;
-import java.util.Date;
 
 /**
  * @Author zzy
@@ -19,7 +15,6 @@ import java.util.Date;
  * @Description XXX
  */
 @Configuration
-@Slf4j
 public class CozeOAuthTokenConfig {
 
     @Resource

+ 0 - 1
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/coze/config/ExampleJWTBuilder.java

@@ -6,7 +6,6 @@ import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import lombok.NoArgsConstructor;
-
 import java.security.PrivateKey;
 import java.util.Map;
 

+ 0 - 2
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/coze/controller/CozeController.java

@@ -4,7 +4,6 @@ import cn.tr.core.pojo.CommonResult;
 import cn.tr.module.smart.coze.service.CozeService;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,6 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/oauth/coze")
-@Slf4j
 @Api(tags = "识别患者图片信息")
 public class CozeController {
 

+ 0 - 1
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/coze/properties/CozeProperties.java

@@ -2,7 +2,6 @@ package cn.tr.module.smart.coze.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

+ 0 - 1
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/coze/service/impl/CozeServiceimpl.java

@@ -32,7 +32,6 @@ import java.util.Map;
  * @Description XXX
  */
 @Service
-@Slf4j
 public class CozeServiceimpl implements CozeService {
 
     @Autowired

+ 1 - 1
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizClinicRoomController.java

@@ -29,7 +29,7 @@ import cn.tr.core.pojo.TableDataInfo;
  * @author lf
  * @date  2025/06/09 10:59
  */
-@Api(tags = "诊疗室")
+@Api(tags = "")
 @RestController
 @RequestMapping("/smart/clinicRoom")
 @AllArgsConstructor

+ 1 - 18
tr-modules/tr-modules-tianAi/pom.xml

@@ -9,26 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>tr-modile-tianai</artifactId>
-    <version>${revision}</version>
+    <artifactId>tr-modules-tianai</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-
         <dependency>
             <groupId>cloud.tianai.captcha</groupId>
             <artifactId>tianai-captcha-springboot-starter</artifactId>

+ 0 - 46
tr-modules/tr-modules-tianAi/src/main/java/cn/tr/module/tianai/config/CorsPropConfiguration.java

@@ -1,46 +0,0 @@
-package cn.tr.module.tianai.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.util.pattern.PathPatternParser;
-
-import java.util.List;
-
-/**
- * 该类用于设置跨域
- */
-@Configuration
-public class CorsPropConfiguration {
-
-
-    @Bean
-    public FilterRegistrationBean coreWebFilter(CorsProperties corsProperties) {
-        CorsConfiguration config = new CorsConfiguration();
-        // * 号表示匹配任意的
-        config.setAllowedMethods(corsProperties.getControlAllowMethods());
-        config.setAllowedOrigins(corsProperties.getControlAllowOrigin());
-        config.setAllowedHeaders(corsProperties.getControlAllowHeaders());
-        PathPatternParser patternParser = new PathPatternParser();
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(patternParser);
-        // ** 代表所有
-        source.registerCorsConfiguration("/**", config);
-        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
-        bean.setOrder(0);
-        return bean;
-    }
-
-    @Data
-    @Configuration
-    @ConfigurationProperties(prefix = "cors")
-    public static class CorsProperties {
-        private List<String> controlAllowHeaders;
-        private List<String> controlAllowMethods;
-        private List<String> controlAllowOrigin;
-    }
-}

+ 3 - 5
tr-modules/tr-modules-tianAi/src/main/java/cn/tr/module/tianai/controller/CaptchaController.java

@@ -21,14 +21,13 @@ import java.util.concurrent.ThreadLocalRandom;
 
 @RestController("CaptchaController1")
 @RequestMapping("/tianai")
-@Api("测试")
+@Api("图片验证码")
 public class CaptchaController {
 
-
     @Autowired
     private ImageCaptchaApplication imageCaptchaApplication;
 
-    @RequestMapping("/gen")
+    @PostMapping("/gen")
     @ResponseBody
     @SaIgnore
     @ApiOperation(value = "生成验证码",notes = "权限: 无")
@@ -57,8 +56,7 @@ public class CaptchaController {
     @ResponseBody
     @SaIgnore
     @ApiOperation(value = "验证码校验",notes = "权限: 无")
-    public ApiResponse<?> checkCaptcha(@RequestBody Data data,
-                                    HttpServletRequest request) {
+    public ApiResponse<?> checkCaptcha(@RequestBody Data data) {
         ApiResponse<?> response = imageCaptchaApplication.matching(data.getId(), data.getData());
         if (response.isSuccess()) {
             return ApiResponse.ofSuccess(Collections.singletonMap("id", data.getId()));

+ 2 - 1
tr-test/pom.xml

@@ -89,9 +89,10 @@
 
         <dependency>
             <groupId>cn.tr</groupId>
-            <artifactId>tr-modile-tianai</artifactId>
+            <artifactId>tr-modules-tianai</artifactId>
             <version>0.0.9</version>
         </dependency>
+
     </dependencies>