'配置环境'

data-agbox-java-demo/data-agbox-java-demo-api/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>usky-module-demo</artifactId>
+        <artifactId>data-agbox-java-demo</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>usky-module-demo-api</artifactId>
+    <artifactId>data-agbox-java-demo-api</artifactId>
     <!-- SpringCloud Openfeign -->
     <dependencies>
         <dependency>

data-agbox-java-demo/data-agbox-java-demo-biz/pom.xml

@@ -11,6 +11,44 @@
 
     <artifactId>data-agbox-java-demo-biz</artifactId>
     <dependencies>
+        <!--MQTT依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-integration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+        </dependency>
+        <!--redis-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>2.0.7</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-core</artifactId>
+        </dependency>
+
+
+
+
+
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>common-cloud-starter</artifactId>

data-agbox-java-demo/data-agbox-java-demo-biz/src/main/java/com/usky/demo/MybatisGenerator.java

@@ -17,7 +17,7 @@ import java.util.List;
 public class MybatisGenerator {
     public static void main(String[] args) {
 
-            shell("usky-module-demo","usky-module-demo-biz");
+            shell("data-agbox-java-demo","data-agbox-java-demo-biz");
     }
 
     private static void shell(String parentName,String model) {
@@ -42,7 +42,7 @@ public class MybatisGenerator {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.111.81.118:3306/dm?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("Yt2021");

data-agbox-java-demo/data-agbox-java-demo-biz/src/main/resources/bootstrap.yml

@@ -2,24 +2,90 @@
 server:
   port: 9887
 
-# Spring
-spring: 
+mybatis:
+  refresh:
+    delay-seconds: 10
+    enabled: true
+    sleep-seconds: 20
+mybatis-plus:
+  configuration:
+    defaultStatementTimeout: 3
+    lazy-loading-enabled: true
+    map-underscore-to-camel-case: true
+  global-config:
+    db-config:
+      id-type: auto
+    mapperRegistryCache: true
+  mapper-locations: classpath*:mapper/**/*.xml
+spring:
   application:
-    # 应用名称
     name: data-agbox-java
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 172.16.120.165:8848
-      config:
-        # 配置中心地址
-        server-addr: 172.16.120.165:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  cache:
+    ehcache:
+      config: classpath:ehcache.xml
+      enabled: false
+    redis:
+      enabled: true
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        login-password: '@dmin1234'
+        login-username: admin
+        reset-enable: true
+        url-pattern: /druid/*
+    dynamic:
+      datasource:
+        master:
+          password: password
+          url: jdbc:mysql://172.16.120.165:3306/usky-cloud?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
+          username: root
+      druid:
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        maxWait: 60000
+        timeBetweenEvictionRunsMillis: 60000
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        filters: stat,slf4j
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      primary: master
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    default-property-inclusion: always
+    deserialization:
+      fail-on-unknown-properties: false
+    parser:
+      allow-single-quotes: true
+      allow-unquoted-control-chars: true
+    serialization:
+      fail-on-empty-beans: false
+    time-zone: GMT+8
+  redis:
+    host: 172.16.120.165
+    password: 123456
+    port: 6379
+    timeout: 10000
+  tenant:
+    enable: false
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 15MB
+
+temp:
+  basedir: C:/Users/pc/Desktop/
+mqtt:
+  completionTimeout: 5000
+  enabled: true
+  keep-alive-interval: 60
+  password: public
+  sub-topics: data-collector,511-XFFJ/+/+/control
+  url: tcp://172.16.120.151:1883
+  username: admin

pom.xml

@@ -1,199 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.usky</groupId>
-  <artifactId>data-agbox-java</artifactId>
-  <packaging>pom</packaging>
-  <version>0.0.1</version>
-  
-  
-  <description>
-    data-agbox-java
-    </description>
-
-  <properties>
-    <usky.version>0.0.1</usky.version>
-    <ruoyi.version>0.0.1</ruoyi.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
-    <spring-boot.version>2.6.6</spring-boot.version>
-    <spring-cloud.version>2021.0.1</spring-cloud.version>
-    <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
-    <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
-    <spring-boot-admin.version>2.6.6</spring-boot-admin.version>
-    <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
-    <swagger.fox.version>3.0.0</swagger.fox.version>
-    <swagger.core.version>1.6.2</swagger.core.version>
-    <tobato.version>1.27.2</tobato.version>
-    <kaptcha.version>2.3.2</kaptcha.version>
-    <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
-    <druid.version>1.2.8</druid.version>
-    <dynamic-ds.version>3.5.0</dynamic-ds.version>
-    <commons.io.version>2.11.0</commons.io.version>
-    <commons.fileupload.version>1.4</commons.fileupload.version>
-    <velocity.version>2.3</velocity.version>
-    <fastjson.version>1.2.83</fastjson.version>
-    <jjwt.version>0.9.1</jjwt.version>
-    <minio.version>8.2.2</minio.version>
-    <poi.version>4.1.2</poi.version>
-    <commons-collections.version>3.2.2</commons-collections.version>
-    <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
-    <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
-    <mybatis-plus-generator.version>3.4.0</mybatis-plus-generator.version>
-    <orika-core.version>1.5.4</orika-core.version>
-    <!--        <commons-lang3.version>3.11</commons-lang3.version>-->
-    <commons-beanutils.version>1.9.4</commons-beanutils.version>
-    <guava.version>29.0-jre</guava.version>
-    <hutool.version>5.6.1</hutool.version>
-  </properties>
-  
-  <dependencies>
 
-    <!-- SpringCloud 微服务 -->
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-dependencies</artifactId>
-      <version>${spring-cloud.version}</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
+  <parent>
 
-    <!-- SpringCloud Alibaba 微服务 -->
-    <dependency>
-      <groupId>com.alibaba.cloud</groupId>
-      <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-      <version>${spring-cloud-alibaba.version}</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
 
-    <!-- SpringBoot 依赖配置 -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-dependencies</artifactId>
-      <version>${spring-boot.version}</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
 
-    <!--  SpringBoot 监控客户端 -->
-    <dependency>
-      <groupId>de.codecentric</groupId>
-      <artifactId>spring-boot-admin-starter-client</artifactId>
-      <version>${spring-boot-admin.version}</version>
-    </dependency>
+    <groupId>com.usky</groupId>
 
-    <!-- FastDFS 分布式文件系统 -->
-    <dependency>
-      <groupId>com.github.tobato</groupId>
-      <artifactId>fastdfs-client</artifactId>
-      <version>${tobato.version}</version>
-    </dependency>
 
-    <!-- Mybatis 依赖配置 -->
-    <dependency>
-      <groupId>org.mybatis.spring.boot</groupId>
-      <artifactId>mybatis-spring-boot-starter</artifactId>
-      <version>${spring-boot.mybatis}</version>
-    </dependency>
 
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-boot-starter</artifactId>
-      <version>${mybatis-plus-boot-starter.version}</version>
-    </dependency>
+    <artifactId>uskycloud</artifactId>
 
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-generator</artifactId>
-      <version>${mybatis-plus-generator.version}</version>
-    </dependency>
 
-    <!-- 代码生成使用模板 -->
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-engine-core</artifactId>
-      <version>${velocity.version}</version>
-    </dependency>
 
-    <!-- Swagger 依赖配置 -->
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-models</artifactId>
-      <version>${swagger.core.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger.core.version}</version>
-    </dependency>
+    <version>0.0.1</version>
 
-    <!-- 验证码 -->
-    <dependency>
-      <groupId>com.github.penggle</groupId>
-      <artifactId>kaptcha</artifactId>
-      <version>${kaptcha.version}</version>
-    </dependency>
 
-    <!-- pagehelper 分页插件 -->
-    <dependency>
-      <groupId>com.github.pagehelper</groupId>
-      <artifactId>pagehelper-spring-boot-starter</artifactId>
-      <version>${pagehelper.boot.version}</version>
-    </dependency>
 
-    <!-- io常用工具类 -->
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons.io.version}</version>
-    </dependency>
+  </parent>
 
-    <!-- excel工具 -->
-    <dependency>
-      <groupId>org.apache.poi</groupId>
-      <artifactId>poi-ooxml</artifactId>
-      <version>${poi.version}</version>
-    </dependency>
+  <groupId>com.usky</groupId>
+  <artifactId>data-agbox-java</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <version>0.0.1</version>
+  <name>data-agbox-java</name>
+  <packaging>pom</packaging>
+  <description>data-agbox-java</description>
 
-    <!-- 文件上传工具类 -->
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>${commons.fileupload.version}</version>
-    </dependency>
+  <modules>
 
+    <module>data-agbox-java-demo</module>
 
-    <!-- Collection 增强Java集合框架 -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>${commons-collections.version}</version>
-    </dependency>
+  </modules>
 
-    <!-- JSON 解析器和生成器 -->
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>fastjson</artifactId>
-      <version>${fastjson.version}</version>
-    </dependency>
+  <repositories>
+    <repository>
+      <id>aliyun</id>
+      <name>aliyun Repository</name>
+      <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 
-    <!-- JWT -->
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt</artifactId>
-      <version>${jjwt.version}</version>
-    </dependency>
 
-    <!-- 线程传递值 -->
+
+  <dependencies>
+    <!-- bootstrap 启动器 -->
     <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>transmittable-thread-local</artifactId>
-      <version>${transmittable-thread-local.version}</version>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-bootstrap</artifactId>
     </dependency>
-  
   </dependencies>