diff --git a/blade-gateway/src/main/resources/application-dev.yml b/blade-gateway/src/main/resources/application-dev.yml index ad8e58950..30d01a6b5 100644 --- a/blade-gateway/src/main/resources/application-dev.yml +++ b/blade-gateway/src/main/resources/application-dev.yml @@ -7,5 +7,5 @@ blade: #version: 3.0.0 #负载均衡优先调用的ip段 prior-ip-pattern: - - 192.168.10.* + - 192.168.2.* - 127.0.0.1 diff --git a/blade-service/logpm-basic/pom.xml b/blade-service/logpm-basic/pom.xml index 0723aad5b..e0d4b0137 100644 --- a/blade-service/logpm-basic/pom.xml +++ b/blade-service/logpm-basic/pom.xml @@ -30,6 +30,12 @@ blade-starter-excel ${bladex.project.version} + + + org.springblade + blade-core-auto + provided + org.springblade logpm-basic diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java index 6ecf408e0..72ab1c6f5 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java @@ -16,7 +16,7 @@ import org.springblade.core.launch.BladeApplication; public class BasicApplication { public static void main(String[] args) { - BladeApplication.run(LauncherConstant.APPLICATION_BASIC_NAME.concat("-lmy"), BasicApplication.class, args); + BladeApplication.run(LauncherConstant.APPLICATION_BASIC_NAME, BasicApplication.class, args); } } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/config/BasicConfiguration.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/config/BasicConfiguration.java new file mode 100644 index 000000000..0869b4579 --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/config/BasicConfiguration.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.config; + + +import com.logpm.basic.pros.BasicProperties; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * 配置feign、mybatis包名、properties + * + * @author chaos + */ +@Configuration(proxyBeanMethods = false) +@ComponentScan({"org.springblade", "com.logpm"}) +@EnableFeignClients({"org.springblade", "com.logpm"}) +@MapperScan({"org.springblade.**.mapper.**", "com.logpm.**.mapper.**"}) +@EnableConfigurationProperties(BasicProperties.class) +public class BasicConfiguration { + +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/PdaController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/PdaController.java index 7138138f2..6a447c9d4 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/PdaController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/PdaController.java @@ -75,9 +75,11 @@ public class PdaController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入BasicPda") - public R> list(@ApiIgnore @RequestParam Map BasicPda, Query query) { - IPage pages = basicPdaService.page(Condition.getPage(query), Condition.getQueryWrapper(BasicPda, BasicPdaEntity.class)); + public R> list(@ApiIgnore @RequestParam Map basicPda, Query query) { + IPage pages = basicPdaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicPda, BasicPdaEntity.class)); +// IPage pages = basicPdaService.page(Condition.getPage(query)); return R.data(pages); + } /** diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/launcher/BasicLauncherServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/launcher/BasicLauncherServiceImpl.java new file mode 100644 index 000000000..caa09d1dc --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/launcher/BasicLauncherServiceImpl.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basic.launcher; + +import org.springblade.core.auto.service.AutoService; +import org.springblade.core.launch.constant.NacosConstant; +import org.springblade.core.launch.service.LauncherService; +import org.springblade.core.launch.utils.PropsUtil; +import org.springframework.boot.builder.SpringApplicationBuilder; + +import java.util.Properties; + +/** + * 启动参数拓展 + * + * @author Chill + */ +@AutoService(LauncherService.class) +public class BasicLauncherServiceImpl implements LauncherService { + + @Override + public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) { + Properties props = System.getProperties(); + // 开启多数据源 + PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true"); + // 指定注册配置信息 + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].data-id", NacosConstant.dataId(appName, profile)); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].group", NacosConstant.NACOS_CONFIG_GROUP); + PropsUtil.setProperty(props, "spring.cloud.nacos.config.extension-configs[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH); + // 指定注册IP + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.ip", "127.0.0.1"); + // 指定注册端口 + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.port", "8200"); + // 自定义命名空间 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE); + // 自定义分组 + // PropsUtil.setProperty(props, "spring.cloud.nacos.config.group", NacosConstant.NACOS_CONFIG_GROUP); + // PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.group", NacosConstant.NACOS_CONFIG_GROUP); + } + + @Override + public int getOrder() { + return 20; + } +} diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/pros/BasicProperties.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/pros/BasicProperties.java new file mode 100644 index 000000000..379e8601f --- /dev/null +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/pros/BasicProperties.java @@ -0,0 +1,21 @@ +package com.logpm.basic.pros; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * FactoryProperties + * + * @author pref + */ +@Data +@ConfigurationProperties(prefix = "logpm") +public class BasicProperties { + /** + * 名称 + */ + private String name; + + + +} diff --git a/blade-service/logpm-basic/src/main/resources/application-dev.yml b/blade-service/logpm-basic/src/main/resources/application-dev.yml index c963cf1c4..3ff547cac 100644 --- a/blade-service/logpm-basic/src/main/resources/application-dev.yml +++ b/blade-service/logpm-basic/src/main/resources/application-dev.yml @@ -3,9 +3,43 @@ server: port: 8300 #数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} + dynamic: + druid: + #通用校验配置 + validation-query: select 1 + #启用sql日志拦截器 + proxy-filters: + - sqlLogInterceptor + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.master.url} + username: ${blade.datasource.basic.master.username} + password: ${blade.datasource.basic.master.password} + slave: + druid: + #独立校验配置 + validation-query: select 1 + #oracle校验 + #validation-query: select 1 from dual + url: ${blade.datasource.basic.slave.url} + username: ${blade.datasource.basic.slave.username} + password: ${blade.datasource.basic.slave.password} diff --git a/blade-service/logpm-basic/src/main/resources/application.yml b/blade-service/logpm-basic/src/main/resources/application.yml index 28bbf533b..00e7cfff8 100644 --- a/blade-service/logpm-basic/src/main/resources/application.yml +++ b/blade-service/logpm-basic/src/main/resources/application.yml @@ -37,14 +37,4 @@ spring: allow-circular-references: true -xxl: - job: - accessToken: '' - admin: - addresses: http://127.0.0.1:7009/xxl-job-admin - executor: - appname: logpm-factory-xxljob - ip: 127.0.0.1 - logpath: ../data/applogs/logpm-factory-xxljob/jobhandler - logretentiondays: -1 - port: 7018 +