Browse Source

fix:注释掉不用的代码

dist.1.2.0^2
pref_mail@163.com 5 months ago
parent
commit
3e81aa3d2a
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 26
      blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
  3. 1
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/AftersalesApplication.java
  4. 1
      blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java
  5. 2
      blade-service/logpm-basic/src/main/resources/application-dev.yml
  6. 1
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
  7. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
  8. 2
      blade-service/logpm-basicdata/src/main/resources/application-dev.yml
  9. 1
      blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java
  10. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java
  11. 2
      blade-service/logpm-distribution/src/main/resources/application-dev.yml
  12. 1
      blade-service/logpm-supervise/src/main/java/com/logpm/supervise/SuperviseApplication.java
  13. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java
  14. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java
  15. 6
      blade-service/logpm-warehouse/src/main/resources/application-dev.yml
  16. 8
      blade-service/pom.xml

2
blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@ -9,7 +9,7 @@ public interface ModuleNameConstant {
/** /**
* 如果不需要 "" * 如果不需要 ""
*/ */
public static final String DEVAUTH =""; public static final String DEVAUTH ="-pref";
/** /**
* 工厂对接服务名称 * 工厂对接服务名称

26
blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@ -43,27 +43,25 @@ public class LauncherServiceImpl implements LauncherService {
// 开启elk日志 // 开启elk日志
// PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); // PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.username","nacos");
PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.password","Nacos123123");
PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos"); PropsUtil.setProperty(props, "spring.cloud.nacos.config.username","nacos");
PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123"); PropsUtil.setProperty(props, "spring.cloud.nacos.config.password","Nacos123123");
// dubbo注册 // dubbo注册
PropsUtil.setProperty(props, "dubbo.application.name", appName); // PropsUtil.setProperty(props, "dubbo.application.name", appName);
PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false"); // PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false");
PropsUtil.setProperty(props, "dubbo.protocol.name", "dubbo"); // PropsUtil.setProperty(props, "dubbo.protocol.name", "dubbo");
PropsUtil.setProperty(props, "dubbo.registry.address", "nacos://" + LauncherConstant.nacosAddr(profile)); // PropsUtil.setProperty(props, "dubbo.registry.address", "nacos://" + LauncherConstant.nacosAddr(profile));
PropsUtil.setProperty(props, "dubbo.version", AppConstant.APPLICATION_VERSION); // PropsUtil.setProperty(props, "dubbo.version", AppConstant.APPLICATION_VERSION);
PropsUtil.setProperty(props, "dubbo.scan.base-packages", AppConstant.BASE_PACKAGES); // PropsUtil.setProperty(props, "dubbo.scan.base-packages", AppConstant.BASE_PACKAGES);
// seata注册地址 // // seata注册地址
PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile)); // PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile));
// seata注册group格式 // // seata注册group格式
PropsUtil.setProperty(props, "seata.tx-service-group", LauncherConstant.seataServiceGroup(appName)); // PropsUtil.setProperty(props, "seata.tx-service-group", LauncherConstant.seataServiceGroup(appName));
// seata配置服务group // // seata配置服务group
PropsUtil.setProperty(props, "seata.service.vgroup-mapping.".concat(LauncherConstant.seataServiceGroup(appName)), LauncherConstant.DEFAULT_MODE); // PropsUtil.setProperty(props, "seata.service.vgroup-mapping.".concat(LauncherConstant.seataServiceGroup(appName)), LauncherConstant.DEFAULT_MODE);
// seata注册模式配置 // seata注册模式配置
// PropsUtil.setProperty(props, "seata.registry.type", LauncherConstant.NACOS_MODE); // PropsUtil.setProperty(props, "seata.registry.type", LauncherConstant.NACOS_MODE);
// PropsUtil.setProperty(props, "seata.registry.nacos.server-addr", LauncherConstant.nacosAddr(profile)); // PropsUtil.setProperty(props, "seata.registry.nacos.server-addr", LauncherConstant.nacosAddr(profile));

1
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/AftersalesApplication.java

@ -19,7 +19,6 @@ package com.logpm.aftersales;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Demo启动器 * Demo启动器

1
blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java

@ -5,7 +5,6 @@ package com.logpm.basic;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Basic启动器 * Basic启动器

2
blade-service/logpm-basic/src/main/resources/application-dev.yml

@ -12,7 +12,7 @@ server:
spring: spring:
#排除DruidDataSourceAutoConfigure #排除DruidDataSourceAutoConfigure
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource: datasource:
dynamic: dynamic:
druid: druid:

1
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java

@ -4,7 +4,6 @@ package com.logpm.basicdata;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Basic启动器 * Basic启动器

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java

@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ibm.icu.impl.data.ResourceReader;
import com.itextpdf.html2pdf.ConverterProperties; import com.itextpdf.html2pdf.ConverterProperties;
import com.itextpdf.html2pdf.HtmlConverter; import com.itextpdf.html2pdf.HtmlConverter;
import com.itextpdf.kernel.geom.PageSize; import com.itextpdf.kernel.geom.PageSize;
@ -60,6 +59,7 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.data.repository.init.ResourceReader;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

2
blade-service/logpm-basicdata/src/main/resources/application-dev.yml

@ -12,7 +12,7 @@ server:
spring: spring:
#排除DruidDataSourceAutoConfigure #排除DruidDataSourceAutoConfigure
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource: datasource:
dynamic: dynamic:
druid: druid:

1
blade-service/logpm-business/src/main/java/com/logpm/business/BusinessApplication.java

@ -4,7 +4,6 @@ package com.logpm.business;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
@BladeCloudApplication @BladeCloudApplication
public class BusinessApplication { public class BusinessApplication {

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java

@ -19,7 +19,6 @@ package com.logpm.distribution;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Demo启动器 * Demo启动器

2
blade-service/logpm-distribution/src/main/resources/application-dev.yml

@ -41,7 +41,7 @@ spring:
mandatory: true mandatory: true
#排除DruidDataSourceAutoConfigure #排除DruidDataSourceAutoConfigure
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource: datasource:
dynamic: dynamic:
druid: druid:

1
blade-service/logpm-supervise/src/main/java/com/logpm/supervise/SuperviseApplication.java

@ -5,7 +5,6 @@ package com.logpm.supervise;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Basic启动器 * Basic启动器

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java

@ -19,7 +19,6 @@ package com.logpm.trunkline;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Demo启动器 * Demo启动器
@ -27,7 +26,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication;
* @author Chill * @author Chill
*/ */
@BladeCloudApplication @BladeCloudApplication
@SeataCloudApplication
public class TrunkLineApplication { public class TrunkLineApplication {
public static void main(String[] args) { public static void main(String[] args) {

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java

@ -19,7 +19,6 @@ package com.logpm.warehouse;
import org.springblade.common.constant.ModuleNameConstant; import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.BladeApplication;
import org.springblade.core.transaction.annotation.SeataCloudApplication;
/** /**
* Demo启动器 * Demo启动器

6
blade-service/logpm-warehouse/src/main/resources/application-dev.yml

@ -12,10 +12,10 @@ server:
spring: spring:
#rabbitmq配置 #rabbitmq配置
rabbitmq: rabbitmq:
host: 192.168.2.46 host: 192.168.3.100
port: 5672 port: 5672
username: admin username: admin
password: admin password: 123456
#虚拟host 可以不设置,使用server默认host #虚拟host 可以不设置,使用server默认host
virtual-host: / virtual-host: /
#确认消息已发送到队列(Queue) #确认消息已发送到队列(Queue)
@ -38,7 +38,7 @@ spring:
mandatory: true mandatory: true
#排除DruidDataSourceAutoConfigure #排除DruidDataSourceAutoConfigure
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure,com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource: datasource:
dynamic: dynamic:
druid: druid:

8
blade-service/pom.xml

@ -65,10 +65,10 @@
<artifactId>blade-starter-metrics</artifactId> <artifactId>blade-starter-metrics</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.springblade</groupId> <!-- <groupId>org.springblade</groupId>-->
<artifactId>blade-starter-transaction</artifactId> <!-- <artifactId>blade-starter-transaction</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-starter-tenant</artifactId> <artifactId>blade-starter-tenant</artifactId>

Loading…
Cancel
Save