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

王通
1 parent df793033
Showing 8 changed files with 22 additions and 32 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/DataSourceConfig.java
src/main/java/com/bsth/config/RabbitConfig.java
src/main/java/com/bsth/controller/publish/InfoPublishController.java
src/main/java/com/bsth/message/handler/RabbitMessageHandler.java
src/main/java/com/bsth/service/publish/impl/InfoPublishServiceImpl.java
src/main/resources/application-cloud.properties
src/main/resources/application.properties
@@ -23,7 +23,9 @@ import java.util.concurrent.ScheduledExecutorService;
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
 @EnableAspectJAutoProxy
 @EnableTransactionManagement
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+		org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration.class
+})
 public class Application extends SpringBootServletInitializer {
 	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
@@ -24,21 +24,9 @@ public class DataSourceConfig {
         return DataSourceBuilder.create().build();
     }
-    @Bean(name = "infoPublishDataSource")
-    @Qualifier("infoPublishDataSource")
-    @ConfigurationProperties(prefix = "spring.datasource.info-publish")
-    public DataSource infoPublishDataSource(){
-        return DataSourceBuilder.create().build();
-    }
-
     @Bean(name = "jdbcTemplate")
     @Primary
     public JdbcTemplate jdbcTemplate(@Qualifier("dataSource")DataSource dataSource){
         return new JdbcTemplate(dataSource);
     }
-
-    @Bean(name = "infoPublishJdbcTemplate")
-    public JdbcTemplate infoPublishJdbcTemplate(@Qualifier("infoPublishDataSource")DataSource dataSource){
-        return new JdbcTemplate(dataSource);
-    }
 }
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
  * @author hill
  * @date
  */
-@Configuration
+//@Configuration
 public class RabbitConfig {
     /**
@@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.*;
-@RestController
-@RequestMapping("api/info_publish")
+//@RestController
+//@RequestMapping("api/info_publish")
 public class InfoPublishController {
     private final static Logger log = LoggerFactory.getLogger(InfoPublishController.class);
@@ -22,8 +22,8 @@ import java.util.Map;
 /**
  * @author Hill
  */
-@Component
-@ConditionalOnProperty("rabbit.use")
+//@Component
+//@ConditionalOnProperty("rabbit.use")
 public class RabbitMessageHandler {
     private final static Logger log = LoggerFactory.getLogger(RabbitMessageHandler.class);
@@ -11,7 +11,7 @@ import org.springframework.util.StringUtils;
 import java.util.*;
-@Service
+//@Service
 public class InfoPublishServiceImpl implements InfoPublishService {
     @Autowired
@@ -14,7 +14,7 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
 #DATABASE control
 spring.datasource.control.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.control.jdbc-url= jdbc:mysql://10.10.2.20/control_dy?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.control.jdbc-url= jdbc:mysql://192.168.168.193/control_lzhw?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.control.username= root
 spring.datasource.control.password= root2jsp
 spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource
@@ -32,7 +32,7 @@ spring.datasource.control.register-mbeans=true
 #DATABASE info-publish
 spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.info-publish.jdbc-url= jdbc:mysql://10.10.2.20/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.info-publish.jdbc-url= jdbc:mysql://192.168.168.193/info_publish?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.info-publish.username= root
 spring.datasource.info-publish.password= root2jsp
 spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource
@@ -57,17 +57,17 @@ spring.kafka.producer.acks= all
 spring.kafka.consumer.group-id= schedule-system
 spring.kafka.consumer.auto-offset-reset= latest
-rabbit.use= true
-spring.rabbitmq.host= 10.10.2.21
-spring.rabbitmq.port= 5672
-spring.rabbitmq.username= bsth
-spring.rabbitmq.password= bsth001
-spring.rabbitmq.virtual-host= /dsm
+#rabbit.use= true
+#spring.rabbitmq.host= 10.10.2.21
+#spring.rabbitmq.port= 5672
+#spring.rabbitmq.username= bsth
+#spring.rabbitmq.password= bsth001
+#spring.rabbitmq.virtual-host= /dsm
-minio.url= http://118.113.164.50:9008
-minio.accessKey= umupRhEzO9EiVhLnJ7b9
-minio.secretKey= VzjQUTN6c8p70HyX8AryRrB6ZjEsF2K28ndctHQh
-minio.bucket= dsm
+minio.url= http://192.168.168.167:9000
+minio.accessKey= RY5KuSaAPpfZ6D6mIR3x
+minio.secretKey= BexuwVnJ2ikqV03OpO1wSKabU1x9gGtEf6NCFgpu
+minio.bucket= adas
 sso.enabled= false
 sso.systemcode = SYS0023
-spring.profiles.active = dev
+spring.profiles.active = cloud
 spring.view.suffix=.html
 server.session-timeout=-1