瀏覽代碼

司法问答权限版提交,保持与线上环境一致。

jessie 5 年之前
父節點
當前提交
f58b23ab0a

+ 29 - 29
src/main/java/com/pavis/ai/app/judicial/common/config/JudicialConfig.java

@@ -1,29 +1,29 @@
-package com.pavis.ai.app.judicial.common.config;
-
-import com.pavis.ai.app.judicial.common.config.properties.CommonProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService;
-import org.springframework.web.client.RestTemplate;
-
-import javax.sql.DataSource;
-
-@Configuration
-@EnableConfigurationProperties({CommonProperties.class})
-public class JudicialConfig {
-
-    @Autowired
-    private DataSource dataSource;
-
-    @Bean
-    public JdbcClientDetailsService jdbcClientDetailsService() {
-        return new JdbcClientDetailsService(dataSource);
-    }
-
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-}
+// package com.pavis.ai.app.judicial.common.config;
+//
+// import com.pavis.ai.app.judicial.common.config.properties.CommonProperties;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.boot.context.properties.EnableConfigurationProperties;
+// import org.springframework.context.annotation.Bean;
+// import org.springframework.context.annotation.Configuration;
+// import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService;
+// import org.springframework.web.client.RestTemplate;
+//
+// import javax.sql.DataSource;
+//
+// @Configuration
+// @EnableConfigurationProperties({CommonProperties.class})
+// public class JudicialConfig {
+//
+//     @Autowired
+//     private DataSource dataSource;
+//
+//     @Bean
+//     public JdbcClientDetailsService jdbcClientDetailsService() {
+//         return new JdbcClientDetailsService(dataSource);
+//     }
+//
+//     @Bean
+//     public RestTemplate restTemplate() {
+//         return new RestTemplate();
+//     }
+// }

+ 24 - 24
src/main/java/com/pavis/ai/app/judicial/common/config/WebMvcConfig.java

@@ -1,24 +1,24 @@
-package com.pavis.ai.app.judicial.common.config;
-
-import com.pavis.ai.app.judicial.common.config.properties.CommonProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-
-    @Autowired
-    private CommonProperties commonProperties;
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // 对已上传的文件地址做映射访问
-        registry.addResourceHandler("/export/jqas/**").addResourceLocations("file:" + commonProperties.getDir().getUpload());
-
-    }
-
-
-}
+// package com.pavis.ai.app.judicial.common.config;
+//
+// import com.pavis.ai.app.judicial.common.config.properties.CommonProperties;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.context.annotation.Configuration;
+// import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+// import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//
+// @Configuration
+// public class WebMvcConfig implements WebMvcConfigurer {
+//
+//     @Autowired
+//     private CommonProperties commonProperties;
+//
+//     @Override
+//     public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//         // 对已上传的文件地址做映射访问
+//         registry.addResourceHandler("/export/jqas/**").addResourceLocations("file:" + commonProperties.getDir().getUpload());
+//
+//     }
+//
+//
+// }

+ 16 - 16
src/main/java/com/pavis/ai/app/judicial/common/config/properties/CommonProperties.java

@@ -1,16 +1,16 @@
-package com.pavis.ai.app.judicial.common.config.properties;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ConfigurationProperties(prefix = "judicial.common")
-public class CommonProperties {
-    private Dir dir;
-}
+// package com.pavis.ai.app.judicial.common.config.properties;
+//
+// import lombok.AllArgsConstructor;
+// import lombok.Getter;
+// import lombok.NoArgsConstructor;
+// import lombok.Setter;
+// import org.springframework.boot.context.properties.ConfigurationProperties;
+//
+// @Getter
+// @Setter
+// @NoArgsConstructor
+// @AllArgsConstructor
+// @ConfigurationProperties(prefix = "judicial.common")
+// public class CommonProperties {
+//     private Dir dir;
+// }

+ 15 - 15
src/main/java/com/pavis/ai/app/judicial/common/config/properties/Dir.java

@@ -1,15 +1,15 @@
-package com.pavis.ai.app.judicial.common.config.properties;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class Dir {
-    private String upload;
-    private String avatar;
-}
+// package com.pavis.ai.app.judicial.common.config.properties;
+//
+// import lombok.AllArgsConstructor;
+// import lombok.Getter;
+// import lombok.NoArgsConstructor;
+// import lombok.Setter;
+//
+// @Getter
+// @Setter
+// @NoArgsConstructor
+// @AllArgsConstructor
+// public class Dir {
+//     private String upload;
+//     private String avatar;
+// }

+ 0 - 7
src/main/resources/application-dev.yml

@@ -13,13 +13,6 @@ spring:
     virtual-host: jqas
     publisher-confirms: true
     publisher-returns: true
-judicial:
-  common:
-    dir:
-      # 上传文件存储文件夹
-      upload: E:/mnt/base/tmp/
-      # 用户头像存储文件夹
-      avatar: E:/mnt/base/avatar/
 security:
   oauth2:
     client:

+ 20 - 0
src/main/resources/application-prod.yml

@@ -0,0 +1,20 @@
+spring:
+  datasource:
+    url: jdbc:mysql://mysql:3306/jqas?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: jqas0227
+  rabbitmq:
+    host: 180.76.146.227
+    port: 5674
+    username: jqas
+    password: jqas0227
+    virtual-host: jqas
+    publisher-confirms: true
+    publisher-returns: true
+logging:
+  file: logs/dev.log
+  level:
+    org.springframework.cloud: debug
+    org.springframework.boot: debug
+    com.pavis.judicial.jqas.service: trace