智能仓房添加shardingSphere + rocketMQ

pom.xml

@@ -8,7 +8,6 @@
     <artifactId>depot-intelligent</artifactId>
     <version>0.0.1</version>
     <packaging>jar</packaging>
-    <!--<packaging>war</packaging>-->
 
     <name>depot-intelligent</name>
     <description>Demo project for Spring Boot</description>
@@ -16,26 +15,38 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.2.RELEASE</version>
+        <version>2.3.12.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <distributionManagement>
-        <repository>
-            <id>nexus</id>
-            <!--名称自己定义-->
-            <name>release</name>
-            <url>http://10.10.1.25:8081/repository/host_repository/</url>
-        </repository>
-    </distributionManagement>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <skipTests>true</skipTests>
+        <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
+        <rocketmq-client.version>4.9.3</rocketmq-client.version>
+        <rocketmq-starter.version>2.2.1</rocketmq-starter.version>
     </properties>
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
+            <version>5.1.0</version>
+        </dependency>
+        <!-- MQ client -->
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-client</artifactId>
+            <version>${rocketmq-client.version}</version>
+        </dependency>
+        <!-- rocketMQ -->
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>${rocketmq-starter.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
@@ -49,18 +60,13 @@
         </dependency>
         <!--添加webservice-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web-services</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.1.6</version>
+            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+            <version>3.2.4</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.6</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web-services</artifactId>
         </dependency>
         <!--添加webservice end-->
         <dependency>
@@ -102,7 +108,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -141,20 +146,12 @@
             <artifactId>quartz</artifactId>
             <version>2.3.0</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-       
         <!--短信发送平台jar包-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -184,14 +181,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-            <!--<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>-->
         </plugins>
 
         <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->

src/main/java/com/DepotIntelligentApplication.java

@@ -3,19 +3,12 @@ package com;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.web.servlet.DispatcherServlet;
 
 @EnableEurekaClient
-@EnableDiscoveryClient
 @SpringBootApplication
-@ServletComponentScan
 @MapperScan(basePackages = {"com.chinaitop.depot.**.mapper"})
 public class DepotIntelligentApplication {
 
@@ -23,27 +16,6 @@ public class DepotIntelligentApplication {
 		SpringApplication.run(DepotIntelligentApplication.class, args);
 	}
 
-	/**
-	 * 注册一个dispatcherServlet,解决增加ws之后https接口访问不了问题
-	 */
-	@Bean
-	public ServletRegistrationBean restServlet(){
-		//注解扫描上下文
-		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
-		//base package
-		applicationContext.scan("com.unissoft");
-		//通过构造函数指定dispatcherServlet的上下文
-		DispatcherServlet rest_dispatcherServlet = new DispatcherServlet(applicationContext);
-		//用ServletRegistrationBean包装servlet
-		ServletRegistrationBean registrationBean = new ServletRegistrationBean(rest_dispatcherServlet);
-		registrationBean.setLoadOnStartup(1);
-		//指定urlmapping
-		registrationBean.addUrlMappings("/*");
-		//指定name，如果不指定默认为dispatcherServlet
-		registrationBean.setName("rest");
-		return registrationBean;
-	}
-
 	@Bean
 	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
 		return new ThreadPoolTaskScheduler();

src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/WareHouseBasicInfoMapper.xml

@@ -24,7 +24,7 @@
                 t1.cjsj AS cjsj,
                 t1.UnitID
             FROM
-            `lsreport_ts`.data_kcgl_kcsw_default AS t1
+            data_kcgl_kcsw_default AS t1
             LEFT JOIN basic_storehouse t2 ON t1.UnitID = t2.org_id
             AND t1.ch = t2.storehouse_id
             LEFT JOIN (
@@ -36,8 +36,8 @@
                     t3.ch,
                     t3.scnf scnfEnumId
                 FROM
-                `lsreport_ts`.data_kcgl_fcbgz_default t3
-                INNER JOIN `lsreport_ts`.enumitem t4 ON t3.scnf = t4.EnumItemId
+                data_kcgl_fcbgz_default t3
+                INNER JOIN enumitem t4 ON t3.scnf = t4.EnumItemId
                 AND t3.srsl > 0
                 AND t3.UnitID = #{org_id}
                 GROUP BY

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/DataKcglKcswDefaultMapper.xml

@@ -90,7 +90,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from lsreport_ts.data_kcgl_kcsw_default
+    from data_kcgl_kcsw_default
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/StorageFoodbasicinfoMapper.xml

@@ -946,7 +946,7 @@
         SELECT
             *
         FROM
-            lsreport_ts.data_kcgl_fcbgz_default fcbgz
+            data_kcgl_fcbgz_default fcbgz
         WHERE 1=1 
         <if test="houseId != null">
         AND fcbgz.ch = #{houseId} 

src/main/java/com/unissoft/serviceconfig/CxfConfig.java

@@ -14,10 +14,7 @@ import javax.xml.ws.Endpoint;
 
 @Configuration
 public class CxfConfig {
-    @Bean
-    public ServletRegistrationBean dispatcherServlet() {
-        return new ServletRegistrationBean(new CXFServlet(),"/intelligent/*");
-    }
+
     @Bean(name = Bus.DEFAULT_BUS_ID)
     public SpringBus springBus() {
         return new SpringBus();

src/main/resources/bootstrap.yml

@@ -1,47 +1,59 @@
-spring:
-  profiles:
-    active: clouda
 server:
   port: 9028
   tomcat:
     uri-encoding: utf-8
----
-# 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
-eureka:
-  client:
-    service-url:
-      defaultZone: http://eureka-depot:9001/eureka/
-    registerWithEureka: false
-    fetchRegistry: false
-  instance:
-    prefer-ip-address: true
-    ip-address: eureka-depot
-    status-page-url: http://eureka-depot:${server.port}/swagger-ui.html
-    instance-id: ${eureka.instance.ip-address}:${server.port}
-
 spring:
-  profiles: locala
   application:
     name: depot-intelligent
-  # 数据库配置
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172.16.0.5:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
-    username: root
-    password: 123456
+  shardingsphere:
+    props:
+      sql-show: true
+    mode:
+      type: Standalone
+      overwrite: true
+      repository:
+        type: File
+        props:
+          path: D:/Standalone/depot-intelligent
+    datasource:
+      names: depot-master-01,depot-slave-01
+      depot-master-01:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://172.16.0.8:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
+        username: root
+        password: 123456
+      depot-slave-01:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://172.16.0.9:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
+        username: root
+        password: 123456
+    rules:
+      readwrite-splitting:
+        data-sources:
+          depot:
+            type: Static
+            props:
+              write-data-source-name: depot-master-01
+              read-data-source-names: depot-slave-01
+            load-balancer-name: depot_algorithm
+        load-balancers:
+          depot_algorithm:
+            type: ROUND_ROBIN
   # 缓存配置
   session:
     store-type: redis
   redis:
-    database: 0
-    host: 10.10.1.25
+    database: 13
+    host: 172.16.0.2
     port: 6379
     password: 123456
-    timeout: 3000
+    timeout: 3000ms
     jedis:
       pool:
         max-active: 8
-        max-wait: -1
+        max-wait: -1ms
         max-idle: 8
         min-idle: 0
   # 静态资源配置
@@ -50,68 +62,20 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-web:
-  upload-path: D:/upload
-
-#socket地址
-#socket-url: 127.0.0.1
-#socket-port: 8999
-socket-url: localhost
-socket-port: 8999
-
-#设置全局变量判断是云端还是库端；1云端，2本地
-localOrCloud: 2
-
-# 多通道气体
-gas-org-ids: 386,177,273,280,300
-
-# 数量检测版本区分version3
-num_version3: :20013
----
 # 注册中心配置 defaultZone: http://eureka-depot:9001/eureka/
 eureka:
   client:
     service-url:
-      defaultZone: http://172.16.0.46:9511/eureka/
+      defaultZone: http://172.16.0.8:9001/eureka/
   instance:
     prefer-ip-address: true
+    ip-address: ${spring.cloud.client.ip-address}
+    # 每隔10s发送一次心跳(默认30s)
     lease-renewal-interval-in-seconds: 10
+    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     lease-expiration-duration-in-seconds: 30
-
-spring:
-  profiles: clouda
-  application:
-    name: depot-intelligent
-  # 数据库配置
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172.16.0.5:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
-    username: root
-    password: 123456
-  # 缓存配置
-  session:
-    store-type: redis
-  redis:
-    database: 1
-    host: 172.16.0.46
-    port: 6679
-    password: 123456
-    timeout: 3000
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-  # 静态资源配置
-  resources:
-    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
 web:
-  upload-path: /home
-
+  upload-path: D:/upload
 #socket地址
 #socket-url: 127.0.0.1
 #socket-port: 8999
@@ -126,3 +90,12 @@ gas-org-ids: 386,177,273,280,300
 
 # 数量检测版本区分version3
 num_version3: :20013
+cxf:
+  path: /intelligent
+# rocketMQ
+rocketmq:
+  # slave
+  name-server: 172.16.0.9:9876
+  consumer:
+    # depot_云南consumer_group
+    group: depot_ync_group