潘钊 / bsth_control · Commits

Commit 215c9fb15e5fb1d971a14619ee7af6e943426906

Authored by 王通
1 parent df793033
build: skipped

1.“路救抛锚”多页面需要加(业务部小姑娘不了解系统)

Inline Side-by-side
Showing 8 changed files with 22 additions and 32 deletions
src/main/java/com/bsth/Application.java
  View file @215c9fb
... ... @@ -23,7 +23,9 @@ import java.util.concurrent.ScheduledExecutorService;
23 23 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
24 24 @EnableAspectJAutoProxy
25 25 @EnableTransactionManagement
26   -@SpringBootApplication
  26 +@SpringBootApplication(exclude = {
  27 + org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration.class
  28 +})
27 29 public class Application extends SpringBootServletInitializer {
28 30  
29 31 public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
... ...
src/main/java/com/bsth/DataSourceConfig.java
  View file @215c9fb
... ... @@ -24,21 +24,9 @@ public class DataSourceConfig {
24 24 return DataSourceBuilder.create().build();
25 25 }
26 26  
27   - @Bean(name = "infoPublishDataSource")
28   - @Qualifier("infoPublishDataSource")
29   - @ConfigurationProperties(prefix = "spring.datasource.info-publish")
30   - public DataSource infoPublishDataSource(){
31   - return DataSourceBuilder.create().build();
32   - }
33   -
34 27 @Bean(name = "jdbcTemplate")
35 28 @Primary
36 29 public JdbcTemplate jdbcTemplate(@Qualifier("dataSource")DataSource dataSource){
37 30 return new JdbcTemplate(dataSource);
38 31 }
39   -
40   - @Bean(name = "infoPublishJdbcTemplate")
41   - public JdbcTemplate infoPublishJdbcTemplate(@Qualifier("infoPublishDataSource")DataSource dataSource){
42   - return new JdbcTemplate(dataSource);
43   - }
44 32 }
... ...
src/main/java/com/bsth/config/RabbitConfig.java
  View file @215c9fb
... ... @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
9 9 * @author hill
10 10 * @date
11 11 */
12   -@Configuration
  12 +//@Configuration
13 13 public class RabbitConfig {
14 14  
15 15 /**
... ...
src/main/java/com/bsth/controller/publish/InfoPublishController.java
  View file @215c9fb
... ... @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
15 15  
16 16 import java.util.*;
17 17  
18   -@RestController
19   -@RequestMapping("api/info_publish")
  18 +//@RestController
  19 +//@RequestMapping("api/info_publish")
20 20 public class InfoPublishController {
21 21  
22 22 private final static Logger log = LoggerFactory.getLogger(InfoPublishController.class);
... ...
src/main/java/com/bsth/message/handler/RabbitMessageHandler.java
  View file @215c9fb
... ... @@ -22,8 +22,8 @@ import java.util.Map;
22 22 /**
23 23 * @author Hill
24 24 */
25   -@Component
26   -@ConditionalOnProperty("rabbit.use")
  25 +//@Component
  26 +//@ConditionalOnProperty("rabbit.use")
27 27 public class RabbitMessageHandler {
28 28  
29 29 private final static Logger log = LoggerFactory.getLogger(RabbitMessageHandler.class);
... ...
src/main/java/com/bsth/service/publish/impl/InfoPublishServiceImpl.java
  View file @215c9fb
... ... @@ -11,7 +11,7 @@ import org.springframework.util.StringUtils;
11 11  
12 12 import java.util.*;
13 13  
14   -@Service
  14 +//@Service
15 15 public class InfoPublishServiceImpl implements InfoPublishService {
16 16  
17 17 @Autowired
... ...
src/main/resources/application-cloud.properties
  View file @215c9fb
... ... @@ -14,7 +14,7 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
14 14  
15 15 #DATABASE control
16 16 spring.datasource.control.driver-class-name= com.mysql.jdbc.Driver
17   -spring.datasource.control.jdbc-url= jdbc:mysql://10.10.2.20/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
  17 +spring.datasource.control.jdbc-url= jdbc:mysql://192.168.168.193/control_lzhw?useUnicode=true&characterEncoding=utf-8&useSSL=false
18 18 spring.datasource.control.username= root
19 19 spring.datasource.control.password= root2jsp
20 20 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
... ... @@ -32,7 +32,7 @@ spring.datasource.control.register-mbeans=true
32 32  
33 33 #DATABASE info-publish
34 34 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
35   -spring.datasource.info-publish.jdbc-url= jdbc:mysql://10.10.2.20/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
  35 +spring.datasource.info-publish.jdbc-url= jdbc:mysql://192.168.168.193/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
36 36 spring.datasource.info-publish.username= root
37 37 spring.datasource.info-publish.password= root2jsp
38 38 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource
... ... @@ -57,17 +57,17 @@ spring.kafka.producer.acks= all
57 57 spring.kafka.consumer.group-id= schedule-system
58 58 spring.kafka.consumer.auto-offset-reset= latest
59 59  
60   -rabbit.use= true
61   -spring.rabbitmq.host= 10.10.2.21
62   -spring.rabbitmq.port= 5672
63   -spring.rabbitmq.username= bsth
64   -spring.rabbitmq.password= bsth001
65   -spring.rabbitmq.virtual-host= /dsm
  60 +#rabbit.use= true
  61 +#spring.rabbitmq.host= 10.10.2.21
  62 +#spring.rabbitmq.port= 5672
  63 +#spring.rabbitmq.username= bsth
  64 +#spring.rabbitmq.password= bsth001
  65 +#spring.rabbitmq.virtual-host= /dsm
66 66  
67   -minio.url= http://118.113.164.50:9008
68   -minio.accessKey= umupRhEzO9EiVhLnJ7b9
69   -minio.secretKey= VzjQUTN6c8p70HyX8AryRrB6ZjEsF2K28ndctHQh
70   -minio.bucket= dsm
  67 +minio.url= http://192.168.168.167:9000
  68 +minio.accessKey= RY5KuSaAPpfZ6D6mIR3x
  69 +minio.secretKey= BexuwVnJ2ikqV03OpO1wSKabU1x9gGtEf6NCFgpu
  70 +minio.bucket= adas
71 71  
72 72 sso.enabled= false
73 73 sso.systemcode = SYS0023
... ...
src/main/resources/application.properties
  View file @215c9fb
1   -spring.profiles.active = dev
  1 +spring.profiles.active = cloud
2 2  
3 3 spring.view.suffix=.html
4 4 server.session-timeout=-1
... ...