From af338e94a0ca743333a853ea6683c6b0c90b7784 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 24 Mar 2023 09:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/sale/ApiAdminApplication.java | 1 + .../com/glxp/sale/admin/annotation/Log.java | 14 +++++++++++++ .../admin/config/MasterDataSourceConfig.java | 3 +-- .../com/glxp/sale/admin/thread/HeartTask.java | 6 ++---- .../main/resources/application-pro.properties | 8 +++---- .../resources/mybatis/mapper/idc/DbMapper.xml | 21 +++++++++++++++++++ 6 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/annotation/Log.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/idc/DbMapper.xml diff --git a/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java b/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java index aa929b2..45f47a8 100644 --- a/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java +++ b/api-admin/src/main/java/com/glxp/sale/ApiAdminApplication.java @@ -1,5 +1,6 @@ package com.glxp.sale; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/annotation/Log.java b/api-admin/src/main/java/com/glxp/sale/admin/annotation/Log.java new file mode 100644 index 0000000..6ce773b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/annotation/Log.java @@ -0,0 +1,14 @@ +package com.glxp.sale.admin.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Log { + String value() default ""; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java b/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java index 7dc2e52..b3bf77d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java @@ -16,11 +16,10 @@ import javax.sql.DataSource; @Configuration // 扫描 Mapper 接口并容器管理 -@MapperScan(basePackages = MasterDataSourceConfig.PACKAGE, sqlSessionFactoryRef = "masterSqlSessionFactory") +@MapperScan(basePackages = {"com.glxp.sale.admin.dao","com.glxp.sale.admin.*.dao"}, sqlSessionFactoryRef = "masterSqlSessionFactory") public class MasterDataSourceConfig {//TODO Mapper // 精确到 master 目录，以便跟其他数据源隔离 - static final String PACKAGE = "com.glxp.sale.admin.dao"; static final String MAPPER_LOCATION = "classpath:mybatis/mapper/*/*.xml"; @Bean(name = "masterDataSource") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java index 13aceff..ef1f01f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/HeartTask.java @@ -22,8 +22,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; -@Component -@EnableScheduling public class HeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(HeartTask.class); @@ -68,12 +66,12 @@ public class HeartTask implements SchedulingConfigurer { //定时从上游下载数据 private void dlData() { SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable"); - if (upConnect.getParamValue().equals("1")) { + if (upConnect!=null&&upConnect.getParamValue().equals("1")) { dlAllData(); scanUpload(); } SystemParamConfigEntity donwConnect = systemParamConfigService.selectByParamKey("sync_downstream_enable"); - if (donwConnect.getParamValue().equals("1")) { + if (donwConnect!=null&&donwConnect.getParamValue().equals("1")) { scanDonwload(); } diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index c173545..daf7148 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -1,12 +1,12 @@ # \u751F\u4EA7\u73AF\u5883 -server.port=9989 +server.port=10001 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udispsync?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3316/udispsync?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root #spring.datasource.password=root -spring.datasource.password=123456 +spring.datasource.password=xiamenswan #server.servlet.context-path= -logging.level.com.glxp.sale.admin.dao=debug +logging.level.com.glxp.sale.admin=debug # \u8DE8\u57DF\u8BBE\u7F6E cors.allowed-origins=* cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN diff --git a/api-admin/src/main/resources/mybatis/mapper/idc/DbMapper.xml b/api-admin/src/main/resources/mybatis/mapper/idc/DbMapper.xml new file mode 100644 index 0000000..55c97f4 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/idc/DbMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file