From 9f2b92ff70e8e84011139a27a6fb6c75080f346c Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 29 Mar 2024 11:14:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=88=A0=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 删除未完成的工厂数据模块 --- .../logpm-factory-data-mengtian/pom.xml | 20 ----- .../logpm-factory-data-oppein/pom.xml | 20 ----- .../logpm-factory-data-piano/pom.xml | 47 ------------ .../PianoFactoryDataApplication.java | 20 ----- .../src/main/resources/application-dev.yml | 73 ------------------- .../src/main/resources/application-prod.yml | 57 --------------- .../src/main/resources/application-test.yml | 59 --------------- .../src/main/resources/application.yml | 50 ------------- .../src/main/resources/logback.xml | 40 ---------- .../logpm-factory-data-snimay/pom.xml | 47 ------------ .../src/main/resources/application-dev.yml | 45 ------------ .../src/main/resources/application-prod.yml | 45 ------------ .../src/main/resources/application-test.yml | 45 ------------ .../src/main/resources/application.yml | 32 -------- .../src/main/resources/logback.xml | 40 ---------- blade-service/logpm-factory-data/pom.xml | 6 +- 16 files changed, 2 insertions(+), 644 deletions(-) delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-mengtian/pom.xml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-oppein/pom.xml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/pom.xml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/java/com/logpm/factorydata/PianoFactoryDataApplication.java delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-dev.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-prod.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-test.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/logback.xml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-snimay/pom.xml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-dev.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-prod.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-test.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application.yml delete mode 100644 blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/logback.xml diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/pom.xml b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/pom.xml deleted file mode 100644 index 2924d47a1..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - logpm-factory-data - org.springblade - 3.2.0.RELEASE - - 4.0.0 - logpm-factory-data-mengtian - ${bladex.project.version} - jar - - 8 - 8 - - - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-oppein/pom.xml b/blade-service/logpm-factory-data/logpm-factory-data-oppein/pom.xml deleted file mode 100644 index 01c8e6636..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-oppein/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - logpm-factory-data - org.springblade - 3.2.0.RELEASE - - 4.0.0 - jar - ${bladex.project.version} - logpm-factory-data-oppein - - - 8 - 8 - - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/pom.xml b/blade-service/logpm-factory-data/logpm-factory-data-piano/pom.xml deleted file mode 100644 index c6674cc75..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - logpm-factory-data - org.springblade - 3.2.0.RELEASE - - 4.0.0 - ${bladex.project.version} - logpm-factory-data-piano - jar - - 8 - 8 - - - - - org.springblade - blade-core-boot - - - org.springblade - blade-core-auto - provided - - - - - - - io.fabric8 - docker-maven-plugin - - ${docker.fabric.skip} - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/java/com/logpm/factorydata/PianoFactoryDataApplication.java b/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/java/com/logpm/factorydata/PianoFactoryDataApplication.java deleted file mode 100644 index 7c6d86087..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/java/com/logpm/factorydata/PianoFactoryDataApplication.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.logpm.factorydata; - -import org.springblade.common.constant.ModuleNameConstant; -import org.springblade.core.cloud.client.BladeCloudApplication; -import org.springblade.core.launch.BladeApplication; - -/** - * 工厂数据基础服务启动类 - * - * @Author zqb - * @Date 2024/3/14 - **/ -@BladeCloudApplication -public class PianoFactoryDataApplication { - - public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.LOGPM_FACTORY_DATA_BASE_NAME, PianoFactoryDataApplication.class, args); - } - -} diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-dev.yml deleted file mode 100644 index 457330ce2..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-dev.yml +++ /dev/null @@ -1,73 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.dev.url} -# username: ${blade.datasource.dev.username} -# password: ${blade.datasource.dev.password} - -spring: - #rabbitmq配置 - rabbitmq: - host: 192.168.2.46 - port: 5672 - username: admin - password: admin - #虚拟host 可以不设置,使用server默认host - virtual-host: / - #确认消息已发送到队列(Queue) - publisher-returns: true - publisher-confirm-type: correlated - # 手动提交消息 - listener: - simple: - acknowledge-mode: auto - default-requeue-rejected: false - retry: - enabled: true # 开启消费者失败重试 - initial-interval: 1000 # 初识的失败等待时长为1秒 - multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval - max-attempts: 3 # 最大重试次数 - stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false - direct: - acknowledge-mode: manual - template: - mandatory: true - - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - 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.factory.master.url} - username: ${blade.datasource.factory.master.username} - password: ${blade.datasource.factory.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.factory.slave.url} - username: ${blade.datasource.factory.slave.username} - password: ${blade.datasource.factory.slave.password} - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-prod.yml deleted file mode 100644 index 195d18c4c..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-prod.yml +++ /dev/null @@ -1,57 +0,0 @@ -#服务器端口 -server: - port: 8200 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.prod.url} -# username: ${blade.datasource.prod.username} -# password: ${blade.datasource.prod.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - druid: - proxy-filters: - - sqlLogInterceptor - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: ${blade.datasource.factory.master.url} - username: ${blade.datasource.factory.master.username} - password: ${blade.datasource.factory.master.password} - slave: - url: ${blade.datasource.factory.slave.url} - username: ${blade.datasource.factory.slave.username} - password: ${blade.datasource.factory.slave.password} - #rabbitmq配置 - rabbitmq: - host: 172.16.128.145 - port: 5672 - username: admin - password: Slwk@123654 - #虚拟host 可以不设置,使用server默认host - virtual-host: / - #确认消息已发送到队列(Queue) - publisher-returns: true - publisher-confirm-type: correlated - # 手动提交消息 - listener: - simple: - acknowledge-mode: auto - default-requeue-rejected: false - retry: - enabled: true # 开启消费者失败重试 - initial-interval: 1000 # 初识的失败等待时长为1秒 - multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval - max-attempts: 3 # 最大重试次数 - stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false - direct: - acknowledge-mode: manual - template: - mandatory: true diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-test.yml deleted file mode 100644 index 1481bd319..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application-test.yml +++ /dev/null @@ -1,59 +0,0 @@ -#服务器端口 -server: - port: 6004 - -#数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.test.url} -# username: ${blade.datasource.test.username} -# password: ${blade.datasource.test.password} - -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - dynamic: - druid: - proxy-filters: - - sqlLogInterceptor - #设置默认的数据源或者数据源组,默认值即为master - primary: master - datasource: - master: - url: ${blade.datasource.factory.master.url} - username: ${blade.datasource.factory.master.username} - password: ${blade.datasource.factory.master.password} - slave: - url: ${blade.datasource.factory.slave.url} - username: ${blade.datasource.factory.slave.username} - password: ${blade.datasource.factory.slave.password} - #rabbitmq配置 - rabbitmq: - host: 192.168.2.110 - port: 5672 - username: admin - password: Slwk@123654 - #虚拟host 可以不设置,使用server默认host - virtual-host: / - #确认消息已发送到队列(Queue) - publisher-returns: true - publisher-confirm-type: correlated - # 手动提交消息 - listener: - simple: - acknowledge-mode: auto - default-requeue-rejected: false - retry: - enabled: true # 开启消费者失败重试 - initial-interval: 1000 # 初识的失败等待时长为1秒 - multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval - max-attempts: 3 # 最大重试次数 - stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false - direct: - acknowledge-mode: manual - template: - mandatory: true - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application.yml b/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application.yml deleted file mode 100644 index 245dc4cfd..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/application.yml +++ /dev/null @@ -1,50 +0,0 @@ -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/logpm/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.logpm.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springblade - - com.logpm - -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://127.0.0.1:9000 - access-key: D99KGE6ZTQXSATTJWU24 - secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ - bucket-name: bladex - -#blade配置 -blade: - #本地文件上传 - file: - remote-mode: true - upload-domain: http://localhost:8999 - remote-path: /usr/share/nginx/html - -logging: - config: classpath:logback.xml - - -spring: - main: - 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 - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/logback.xml b/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/logback.xml deleted file mode 100644 index bffa45330..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-piano/src/main/resources/logback.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - logback - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - utf8 - - - - - ${log.path} - - ${log.path}.%d{yyyy-MM-dd}.zip - - - %date %level [%thread] %logger{36} [%file : %line] %msg%n - - - - - - - - - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-snimay/pom.xml b/blade-service/logpm-factory-data/logpm-factory-data-snimay/pom.xml deleted file mode 100644 index 5a0b3b814..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-snimay/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - blade-service - org.springblade - 3.2.0.RELEASE - - 4.0.0 - ${bladex.project.version} - logpm-factory-data-snimay - jar - - 8 - 8 - - - - - org.springblade - blade-core-boot - - - org.springblade - blade-core-auto - provided - - - - - - - io.fabric8 - docker-maven-plugin - - ${docker.fabric.skip} - - - - org.apache.maven.plugins - maven-antrun-plugin - - - - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-dev.yml b/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-dev.yml deleted file mode 100644 index 3db9ae091..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-dev.yml +++ /dev/null @@ -1,45 +0,0 @@ -#服务器端口 -server: - port: 8900 - -#数据源配置 -#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: - 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.report.master.url} - username: ${blade.datasource.report.master.username} - password: ${blade.datasource.report.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.report.slave.url} - username: ${blade.datasource.report.slave.username} - password: ${blade.datasource.report.slave.password} - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-prod.yml b/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-prod.yml deleted file mode 100644 index 3db9ae091..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-prod.yml +++ /dev/null @@ -1,45 +0,0 @@ -#服务器端口 -server: - port: 8900 - -#数据源配置 -#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: - 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.report.master.url} - username: ${blade.datasource.report.master.username} - password: ${blade.datasource.report.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.report.slave.url} - username: ${blade.datasource.report.slave.username} - password: ${blade.datasource.report.slave.password} - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-test.yml b/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-test.yml deleted file mode 100644 index 3db9ae091..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application-test.yml +++ /dev/null @@ -1,45 +0,0 @@ -#服务器端口 -server: - port: 8900 - -#数据源配置 -#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: - 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.report.master.url} - username: ${blade.datasource.report.master.username} - password: ${blade.datasource.report.master.password} - slave: - druid: - #独立校验配置 - validation-query: select 1 - #oracle校验 - #validation-query: select 1 from dual - url: ${blade.datasource.report.slave.url} - username: ${blade.datasource.report.slave.username} - password: ${blade.datasource.report.slave.password} - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application.yml b/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application.yml deleted file mode 100644 index e06f3357f..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/application.yml +++ /dev/null @@ -1,32 +0,0 @@ -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/logpm/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.logpm.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: - - org.springblade - - com.logpm - -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://8.137.14.82:9000 - access-key: minio - secret-key: 123123123 - bucket-name: bladex - - -logging: - config: classpath:logback.xml - - -spring: - main: - allow-circular-references: true - - diff --git a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/logback.xml b/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/logback.xml deleted file mode 100644 index 7170050de..000000000 --- a/blade-service/logpm-factory-data/logpm-factory-data-snimay/src/main/resources/logback.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - logback - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - utf8 - - - - - ${log.path} - - ${log.path}.%d{yyyy-MM-dd}.zip - - - %date %level [%thread] %logger{36} [%file : %line] %msg%n - - - - - - - - - - diff --git a/blade-service/logpm-factory-data/pom.xml b/blade-service/logpm-factory-data/pom.xml index fff28b5df..32d161303 100644 --- a/blade-service/logpm-factory-data/pom.xml +++ b/blade-service/logpm-factory-data/pom.xml @@ -12,11 +12,9 @@ pom 3.2.0.RELEASE - logpm-factory-data-mengtian - logpm-factory-data-snimay - logpm-factory-data-piano + logpm-factory-data-zbom - logpm-factory-data-oppein + logpm-factory-data-base