1、重新整理目录

env_files/properties/dev.properties

@@ -15,7 +15,7 @@ mvn.spring.rabbitmq.host=smart-house-rabbitmq
 mvn.spring.rabbitmq.port=5672
 mvn.spring.rabbitmq.username=guest
 mvn.spring.rabbitmq.password=guest
-mvn.spring.rabbitmq.virtual-host=smart-house-dev
+mvn.spring.rabbitmq.virtual-host=wuye
 
 #亲邻接口
 mvn.qinlin.api.host=https://test-gateway.qinlinkeji.com

pom.xml

@@ -4,26 +4,26 @@
          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.sptg</groupId>
-    <artifactId>smart-house</artifactId>
+    <groupId>com.cyzh</groupId>
+    <artifactId>yinchuan-wuye</artifactId>
     <packaging>pom</packaging>
     <version>1.0</version>
     <modules>
-        <module>sptg-eureka</module>
-        <module>sptg-api-gateway</module>
-        <module>sptg-config</module>
-        <module>sptg-common</module>
-        <module>sptg-gateway</module>
-        <module>sptg-pay</module>
-        <module>sptg-permissions</module>
-        <module>sptg-device</module>
-        <module>sptg-estate</module>
-        <module>sptg-ad</module>
-        <module>sptg-statistics</module>
-        <module>sptg-tx-manager</module>
-        <module>sptg-iot</module>
-        <module>sptg-video-cloud</module>
-        <module>sptg-third</module>
+        <module>wuye-eureka</module>
+        <module>wuye-api-gateway</module>
+        <module>wuye-config</module>
+        <module>wuye-common</module>
+        <module>wuye-gateway</module>
+        <module>wuye-pay</module>
+        <module>wuye-permissions</module>
+        <module>wuye-device</module>
+        <module>wuye-estate</module>
+        <module>wuye-ad</module>
+        <module>wuye-statistics</module>
+        <module>wuye-lcn</module>
+        <module>wuye-iot</module>
+        <module>wuye-video-cloud</module>
+        <module>wuye-third</module>
     </modules>
 
     <properties>
@@ -212,8 +212,8 @@
             </snapshots>
         </repository>
     </repositories>
-    <profiles>
-	    <!-- 开发环境，默认激活 -->
+    <!--<profiles>
+	    &lt;!&ndash; 开发环境，默认激活 &ndash;&gt;
 	    <profile>
 	        <id>dev</id>
 	        <properties>
@@ -238,7 +238,7 @@
                 <config-url>http://smart-house-config:4001</config-url>
             </properties>
         </profile>
-    </profiles>
+    </profiles>-->
     <build>
         <finalName>${project.artifactId}</finalName>
 		<resources>
@@ -280,21 +280,21 @@
         <!-- 公共插件 -->
         <plugins>
             <!-- Maven 打包时跳过测试用例 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M3</version>
-                <configuration>
-                    <!-- <skip>true</skip> -->
-                    <skipTests>true</skipTests>
-                    <systemProperties>
-                        <property>
-                            <name>env</name>
-                            <value>${env}</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-surefire-plugin</artifactId>-->
+<!--                <version>3.0.0-M3</version>-->
+<!--                <configuration>-->
+<!--                    &lt;!&ndash; <skip>true</skip> &ndash;&gt;-->
+<!--                    <skipTests>true</skipTests>-->
+<!--                    <systemProperties>-->
+<!--                        <property>-->
+<!--                            <name>env</name>-->
+<!--                            <value>${env}</value>-->
+<!--                        </property>-->
+<!--                    </systemProperties>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
     </build>
 </project>

sptg-common/sptg-common-core/src/main/resources/META-INF/spring.factories

@@ -1,7 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.sptg.common.core.cfgbeans.ConfigBean,\
-  com.sptg.common.core.cfgbeans.GlobalConfigBean,\
-  com.sptg.common.core.cfgbeans.RestTemplateConfigBean,\
-  com.sptg.common.core.cfgbeans.RedisTemplateConfigBean,\
-  com.sptg.common.core.cfgbeans.AopTypeDtxConfigBean,\
-  com.sptg.common.core.feign.FeignAutoConfiguration

sptg-common/sptg-common-security/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.sptg.common.security.cfgbeans.SecurityConfigBean,\
-  com.sptg.common.security.cfgbeans.SecurityMvcConfigBean

sptg-config/pom.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>smart-house</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-config</artifactId>
-    <packaging>jar</packaging>
-    <description>配置中心</description>
-
-
-    <dependencies>
-        <!-- ===================================== Spring Cloud JAR ===================================== -->
-        <!--配置中心-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-config-server</artifactId>
-        </dependency>
-        <!-- eureka-client -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <filters> 
-		  <filter>../env_files/properties/${env}.properties</filter> 
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

sptg-config/src/main/resources/bootstrap.yml

@@ -1,59 +0,0 @@
-server:
-  port: 4001
-# http://139.9.178.34:14001/config/application.yml
-spring:
-  application:
-    name: smart-house-config
-  profiles:
-    active: native
-  cloud:
-    config:
-      #label: master 分支，默认是master
-      server:
-        native:
-          search-locations: classpath:/conf/
-
-# Eureka 客户端配置 https://www.iteye.com/blog/glf2002lucky-2428874
-eureka:
-  client:
-    service-url:
-      defaultZone: http://smart-house-eureka:7001/eureka
-      register-with-eureka: true
-      fetch-registry: true
-  instance:
-    prefer-ip-address: true
-    #定义服务续约任务（心跳）的调用间隔，单位：秒
-    #lease-renewal-interval-in-seconds: 5
-
-
-#---
-##local
-#spring:
-#  application:
-#    name: smart-house-config-local
-#  profiles:
-#    active: local
-#
-#---
-##dev
-#spring:
-#  application:
-#    name: smart-house-config-dev
-#  profiles:
-#    active: dev
-#
-#---
-##test
-#spring:
-#  application:
-#    name: smart-house-config
-#  profiles:
-#    active: test
-#
-#---
-##prod
-#spring:
-#  application:
-#    name: smart-house-config
-#  profiles:
-#    active: prod

sptg-config/src/main/resources/conf/smart-house-ad.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.ad}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-device.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.device}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-estate.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.estate}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-iot.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.iot}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-lcn.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.lcn}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-pay.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.pay}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-permissions.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.permissions}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-statistics.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.statistics}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-third.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.third}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-config/src/main/resources/conf/smart-house-video-cloud.yml

@@ -1,4 +0,0 @@
-spring:
-  # 数据源
-  datasource:
-    url: jdbc:mysql://${mvn.spring.datasource.host}:${mvn.spring.datasource.port}/${mysql.database.video-cloud}?characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8

sptg-device/sptg-device-biz/pom.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>sptg-device</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-device-biz</artifactId>
-    <description>设备模块业务实现</description>
-
-    <dependencies>
-        <!-- ===================================== Or JAR ===================================== -->
-        <!-- MySql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <!-- druid 数据源 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- ===================================== Modular JAR ===================================== -->
-        <!-- 设备服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-device-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 权限模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-permissions-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 统计模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-statistics-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物业模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-estate-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 广告模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-ad-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 第三方模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-third-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- ===================================== Spring Boot JAR ===================================== -->
-        <!-- 测试用例 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-        <!-- mybatis-plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <filters>
-		  <filter>../../env_files/properties/${env}.properties</filter>
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>

sptg-device/sptg-device-biz/src/main/java/com/sptg/device/biz/mapper/DeviceOptionsMapper.java

@@ -1,8 +0,0 @@
-package com.sptg.device.biz.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.device.api.entity.DeviceOptions;
-import com.sptg.device.api.entity.DeviceTemplate;
-
-public interface DeviceOptionsMapper extends BaseMapper<DeviceOptions> {
-}

sptg-estate/sptg-estate-biz/pom.xml

@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>sptg-estate</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-estate-biz</artifactId>
-    <description>物业业务实现模块</description>
-
-    <dependencies>
-
-        <!-- ===================================== Or JAR ===================================== -->
-        <!-- MySql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <!-- druid 数据源 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <!-- ===================================== Modular JAR ===================================== -->
-        <!-- 物业服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-estate-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 支付服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-pay-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- ===================================== Spring Boot JAR ===================================== -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <!-- 测试用例 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-        <!-- mybatis-plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <!-- Swagger核心包 start -->
-        <!--<dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-        &lt;!&ndash; Swagger核心包 end &ndash;&gt;
-        &lt;!&ndash;导出到markdown文件的依赖 &ndash;&gt;
-        <dependency>
-            <groupId>io.github.swagger2markup</groupId>
-            <artifactId>swagger2markup</artifactId>
-            <version>1.3.3</version>
-        </dependency>
-
-        &lt;!&ndash; https://mvnrepository.com/artifact/io.swagger/swagger-core &ndash;&gt;
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-core</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        &lt;!&ndash; https://mvnrepository.com/artifact/io.swagger/swagger-models &ndash;&gt;
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.sptg</groupId>-->
-<!--            <artifactId>sptg-common-security</artifactId>-->
-<!--            <version>1.0</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-
-    </dependencies>
-
-    <build>
-        <filters>
-		  <filter>../../env_files/properties/${env}.properties</filter>
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>1.5.7</version>
-                <configuration>
-                    <sourceDirectory>./docs/asciidoc/generated</sourceDirectory>
-                    <outputDirectory>./docs/asciidoc/html</outputDirectory>
-                    <headerFooter>true</headerFooter>
-                    <doctype>book</doctype>
-                    <backend>html</backend>
-                    <sourceHighlighter>coderay</sourceHighlighter>
-                    <attributes>
-                        <!--菜单栏在左边-->
-                        <toc>left</toc>
-                        <!--多标题排列-->
-                        <toclevels>3</toclevels>
-                        <!--自动打数字序号-->
-                        <sectnums>true</sectnums>
-                    </attributes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

sptg-eureka/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>smart-house</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-eureka</artifactId>
-    <packaging>jar</packaging>
-    <description>注册中心</description>
-
-    <dependencies>
-        <!-- ===================================== Spring Cloud JAR ===================================== -->
-        <!-- eureka-server -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <filters> 
-		  <filter>../env_files/properties/${env}.properties</filter> 
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

sptg-gateway/sptg-app-gateway/pom.xml

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>sptg-gateway</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-app-gateway</artifactId>
-    <packaging>jar</packaging>
-
-    <!--依赖-->
-    <dependencies>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <!-- FastDfs 客户端 -->
-        <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
-        </dependency>
-        <!-- Apache工具组件  -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <!-- ===================================== Spring Boot JAR ===================================== -->
-        <!-- 测试用例 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <!-- ===================================== Modular JAR ===================================== -->
-        <!-- core  Spring Cloud JAR -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-common-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 权限校验模块 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-common-security</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <!-- 权限服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-permissions-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物业服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-estate-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物业服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-pay-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 统计服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-statistics-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 广告服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-ad-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 第三方服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-third-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- ===================================== 阿里云短信 JAR ===================================== -->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>4.0.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.4.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!--jwt鉴权工具-->
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.7.0</version>
-        </dependency>
-
-    </dependencies>
-
-
-    <build>
-        <filters>
-		  <filter>../../env_files/properties/${env}.properties</filter>
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

sptg-gateway/sptg-device-gateway/pom.xml

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>sptg-gateway</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-device-gateway</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <!-- FastDfs 客户端 -->
-        <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
-        </dependency>
-        <!-- Apache工具组件  -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <!-- ===================================== Spring Boot JAR ===================================== -->
-        <!-- 测试用例 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <!-- ===================================== Modular JAR ===================================== -->
-        <!-- core -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-common-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 权限组件 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-common-security</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 设备模块 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-device-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 统计模块 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-statistics-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 广告模块 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-ad-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物业模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-estate-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- Iot物联网模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-iot-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- Iot物联网模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-third-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 视频云模块接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-video-cloud-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <filters>
-		  <filter>../../env_files/properties/${env}.properties</filter>
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>

sptg-gateway/sptg-housekeeper-gateway/src/main/java/com/sptg/gateway/controller/permissions/ThirdAuthenticationController.java

@@ -1,291 +0,0 @@
-package com.sptg.gateway.controller.permissions;
-
-import com.alibaba.fastjson.JSONObject;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.HttpConstant;
-import com.sptg.common.core.constant.SysLogConstant;
-import com.sptg.common.core.util.CookieUtils;
-import com.sptg.common.core.util.WebUtils;
-import com.sptg.common.security.annotation.Security;
-import com.sptg.common.security.service.SecurityServiceInterface;
-import com.sptg.permissions.api.dto.AccountOauthDto;
-import com.sptg.permissions.api.dto.LoginDto;
-import com.sptg.permissions.api.entity.Account;
-import com.sptg.permissions.api.entity.AccountOauth;
-import com.sptg.permissions.api.feigns.AccountAuthenticationFeign;
-import com.sptg.permissions.api.feigns.AccountFeign;
-import com.sptg.permissions.api.feigns.AccountOauthFeign;
-import com.sptg.permissions.api.thirdauth.constants.CtwingAuthConstants;
-import com.sptg.permissions.api.thirdauth.enums.AuthCustomizeSource;
-import com.sptg.permissions.api.thirdauth.request.AuthCtwingRequest;
-import com.sptg.permissions.api.thirdauth.util.ByteFormat;
-import com.sptg.permissions.api.thirdauth.util.StringUtil;
-import com.sptg.permissions.api.thirdauth.util.XXTeaUtil;
-import com.sptg.statistics.api.entity.SysOperationLog;
-import com.sptg.statistics.api.feigns.SysOperationLogFeign;
-import com.xkcoding.http.util.MapUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import me.zhyd.oauth.model.AuthCallback;
-import me.zhyd.oauth.model.AuthResponse;
-import me.zhyd.oauth.model.AuthToken;
-import me.zhyd.oauth.model.AuthUser;
-import me.zhyd.oauth.request.AuthRequest;
-import me.zhyd.oauth.utils.AuthStateUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.sptg.permissions.api.thirdauth.util.AuthRequestUtil.getAuthRequest;
-
-/**
- * title: AuthenticationController
- * package: com.sptg.gateway.controller.permissions
- * description: 用户认证-控制器
- *
- *                  
- *                 
- */
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/permissions/third/authentication")
-public class ThirdAuthenticationController {
-
-    /* -------------------------------------------------- 接口注入 -------------------------------------------------- */
-
-    private final AccountAuthenticationFeign accountAuthenticationFeign;
-    private final SecurityServiceInterface<Account> securityServiceInterface;
-    private final SysOperationLogFeign sysOperationLogFeign;
-    private final AccountFeign accountFeign;
-    private final AccountOauthFeign accountOauthFeign;
-    /* --------------------------------------------------- 控制器 --------------------------------------------------- */
-
-    /**
-     * 功能描述: 访问授权
-     * @return ResultBean
-     *                  
-     *                       
-     */
-    @RequestMapping(value = "/render/{source}")
-    @ResponseBody
-    public void renderAuth(@PathVariable("source") String source, HttpServletResponse response) throws IOException {
-        log.warn("进入render：" + source);
-        AuthRequest authRequest = getAuthRequest(source);
-        String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
-        log.warn(authorizeUrl);
-        response.sendRedirect(authorizeUrl);
-    }
-
-    /**
-     * oauth平台中配置的授权回调地址，以本项目为例，在创建github授权应用时的回调地址应为：http://127.0.0.1:8443/oauth/callback/github
-     */
-    @RequestMapping("/callback/{source}")
-    public ModelAndView login(@PathVariable("source") String source, AuthCallback callback, HttpServletRequest request) {
-        AuthRequest authRequest = getAuthRequest(source);
-        callback = this.getAuthCallback(source, callback, request);
-        AuthResponse<AuthUser> response = authRequest.login(callback);
-        log.warn(JSONObject.toJSONString(response));
-
-        if (response.ok()) {
-            AuthUser data = response.getData();
-            AccountOauthDto accountOauthDto = new AccountOauthDto();
-            accountOauthDto.setMobile(data.getUsername());
-            accountOauthDto.setUuId(data.getUuid());
-            accountOauthDto.setSource(source);
-            ResultBean<AccountOauth> dbOauth = this.accountOauthFeign.getByUuIdAndSource(accountOauthDto);
-            Account dbAccount = this.accountFeign.getByUserMobile(accountOauthDto.getMobile());
-            if(dbOauth.getData() == null){
-                if(dbAccount == null){
-                    return new ModelAndView("common/guest-error");
-                }else{
-                    //自动绑定用户账号
-                    accountOauthDto.setAccountId(dbAccount.getId());
-                    ResultBean<Boolean> resultBean = this.accountOauthFeign.bindUser(accountOauthDto);
-                    if(!resultBean.getData()){
-                        return new ModelAndView("common/guest-error");
-                    }
-                }
-            }else{
-                this.accountOauthFeign.bindUser(accountOauthDto);
-            }
-            LoginDto loginDto = new LoginDto();
-            loginDto.setLoginName(dbAccount.getLoginName());
-            ResultBean<Account> resultBean = this.accountAuthenticationFeign.oauthLogin(loginDto);
-
-            //  用户信息
-            Account account = resultBean.getData();
-            //  创建用户令牌
-            String token = this.securityServiceInterface.createUserToken(account);
-            //  生成cookie
-            CookieUtils.setCookie(HttpConstant.ACCESS_TOKEN,token);
-            //  登录日志
-            SysOperationLog sysOperationLog = new SysOperationLog(SysLogConstant.LOGIN_EVENT,WebUtils.getIp(),account);
-            account.setLastLoginDate(new Date());
-            account.setLastLoginIp(WebUtils.getIp());
-            accountFeign.updateById(account);
-            sysOperationLogFeign.info(sysOperationLog);
-            return new ModelAndView("redirect:/");
-        }
-
-        Map<String, Object> map = new HashMap<>(1);
-        map.put("errorMsg", "登录异常，请重新登录");
-
-        return new ModelAndView("error", map);
-    }
-
-    @RequestMapping("/mini/login/{source}")
-    public ResultBean miniLogin(@PathVariable("source") String source, @RequestBody Map<String, String> requestMap) {
-        AuthToken authToken = null;
-        Map<String, Object> errorMap = new HashMap<>(1);
-        errorMap.put("errorMsg", "登录异常，请重新登录");
-        if("CTWING".equals(source)){
-            try {
-                // XXTea解密非公共加密参数
-                String decValue = new String(XXTeaUtil.decrypt(ByteFormat.hexToBytes(requestMap.get("paras")), CtwingAuthConstants.APP_SECRET.getBytes(CtwingAuthConstants.DEFAULT_CHARSET)));
-                Map<String, String> resultMap = MapUtil.parseStringToMap(decValue, false);
-                if(0 == Integer.valueOf(resultMap.get("result"))){
-                    authToken = new AuthToken();
-                    authToken.setAccessToken(resultMap.get("accessToken"));
-                    authToken.setUid(resultMap.get("openId"));
-                    AuthCtwingRequest authRequest = (AuthCtwingRequest)getAuthRequest(source);
-                    AuthUser data = authRequest.getUserInfo(authToken);
-                    AccountOauthDto accountOauthDto = new AccountOauthDto();
-                    accountOauthDto.setMobile(data.getUsername());
-                    accountOauthDto.setUuId(data.getUuid());
-                    accountOauthDto.setSource(source);
-                    ResultBean<AccountOauth> dbOauth = this.accountOauthFeign.getByUuIdAndSource(accountOauthDto);
-                    Account dbAccount = this.accountFeign.getByUserMobile(accountOauthDto.getMobile());
-                    if(dbOauth.getData() == null){
-                        if(dbAccount == null){
-                            return new ResultBean<>(ResultEnum.OAUTH_FAIL);
-                        }else{
-                            //自动绑定用户账号
-                            accountOauthDto.setAccountId(dbAccount.getId());
-                            ResultBean<Boolean> resultBean = this.accountOauthFeign.bindUser(accountOauthDto);
-                            if(!resultBean.getData()){
-                                return new ResultBean<>(ResultEnum.OAUTH_FAIL);
-                            }
-                        }
-                    }else{
-                        this.accountOauthFeign.bindUser(accountOauthDto);
-                    }
-                    LoginDto loginDto = new LoginDto();
-                    loginDto.setLoginName(dbAccount.getLoginName());
-                    ResultBean<Account> resultBean = this.accountAuthenticationFeign.oauthLogin(loginDto);
-
-                    //  用户信息
-                    Account account = resultBean.getData();
-                    //  创建用户令牌
-                    String token = this.securityServiceInterface.createUserToken(account);
-                    //  生成cookie
-                    CookieUtils.setCookie(HttpConstant.ACCESS_TOKEN,token);
-                    //  登录日志
-                    SysOperationLog sysOperationLog = new SysOperationLog(SysLogConstant.LOGIN_EVENT,WebUtils.getIp(),account);
-                    account.setLastLoginDate(new Date());
-                    account.setLastLoginIp(WebUtils.getIp());
-                    accountFeign.updateById(account);
-                    sysOperationLogFeign.info(sysOperationLog);
-                    return new ResultBean<>(ResultEnum.SUCCESS, token);
-                }else{
-                    return new ResultBean<>(ResultEnum.OAUTH_FAIL);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                return new ResultBean<>(ResultEnum.OAUTH_FAIL);
-            }
-        }else{
-            return new ResultBean<>(ResultEnum.OAUTH_FAIL);
-        }
-    }
-
-    private AuthCallback getAuthCallback(String source, AuthCallback authCallback, HttpServletRequest request){
-        if("CTWING".equals(source)){
-            String paras = request.getParameter("paras");
-            try {
-                // XXTea解密非公共加密参数
-                String decValue = new String(XXTeaUtil.decrypt(ByteFormat.hexToBytes(paras), CtwingAuthConstants.APP_SECRET.getBytes(CtwingAuthConstants.DEFAULT_CHARSET)));
-                Map<String, String> resultMap = MapUtil.parseStringToMap(decValue, false);
-                if(0 == Integer.valueOf(resultMap.get("result"))){
-                    authCallback.setCode(resultMap.get("code"));
-                    authCallback.setState(resultMap.get("state"));
-                }
-                log.warn(decValue);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return authCallback;
-    }
-
-    private AuthToken decryptParas(String source, String paras) throws Exception{
-        AuthToken authToken = null;
-        if("CTWING".equals(source)){
-            try {
-                // XXTea解密非公共加密参数
-                String decValue = new String(XXTeaUtil.decrypt(ByteFormat.hexToBytes(paras), CtwingAuthConstants.APP_SECRET.getBytes(CtwingAuthConstants.DEFAULT_CHARSET)));
-                Map<String, String> resultMap = MapUtil.parseStringToMap(decValue, false);
-                if(0 == Integer.valueOf(resultMap.get("result"))){
-                    authToken = new AuthToken();
-                    authToken.setAccessToken(resultMap.get("accessToken"));
-                    authToken.setUid(resultMap.get("openId"));
-                }
-                return authToken;
-            } catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
-        }else{
-            throw new Exception("未知解密数据");
-        }
-    }
-
-    @RequestMapping("/test/bindUser")
-    public ModelAndView test(AccountOauthDto accountOauthDto) {
-        //{"code":2000,"data":{"avatar":"http://avatar.e.189.cn/avatar/default/default_middle.jpg","email":"","nickname":"","source":"CTWING","token":{"accessToken":"5826e7983c5b423cb8f5ae83975d59bd","expireIn":7716616,"refreshToken":"218418f61c5f4758b75045578f0b3839","refreshTokenExpireIn":0},"username":"15622205184","uuid":"657f5c8dd9b819562fdcc672d218f4d2"}}
-        accountOauthDto.setSource("CTWING");
-        ResultBean<AccountOauth> dbOauth = this.accountOauthFeign.getByUuIdAndSource(accountOauthDto);
-        Account dbAccount = this.accountFeign.getByUserMobile(accountOauthDto.getMobile());
-        if(dbOauth.getData() == null){
-            if(dbAccount == null){
-                return new ModelAndView("common/guest-error");
-            }else{
-                //自动绑定用户账号
-                accountOauthDto.setAccountId(dbAccount.getId());
-                ResultBean<Boolean> resultBean = this.accountOauthFeign.bindUser(accountOauthDto);
-                if(!resultBean.getData()){
-                    return new ModelAndView("common/guest-error");
-                }
-            }
-        }else{
-            this.accountOauthFeign.bindUser(accountOauthDto);
-        }
-        LoginDto loginDto = new LoginDto();
-        loginDto.setLoginName(dbAccount.getLoginName());
-        ResultBean<Account> resultBean = this.accountAuthenticationFeign.oauthLogin(loginDto);
-
-        //  用户信息
-        Account account = resultBean.getData();
-        //  创建用户令牌
-        String token = this.securityServiceInterface.createUserToken(account);
-        //  生成cookie
-        CookieUtils.setCookie(HttpConstant.ACCESS_TOKEN,token);
-        //  登录日志
-        SysOperationLog sysOperationLog = new SysOperationLog(SysLogConstant.LOGIN_EVENT,WebUtils.getIp(),account);
-        account.setLastLoginDate(new Date());
-        account.setLastLoginIp(WebUtils.getIp());
-        accountFeign.updateById(account);
-        sysOperationLogFeign.info(sysOperationLog);
-        return new ModelAndView("redirect:/");
-    }
-
-}

sptg-permissions/sptg-permissions-api/src/main/java/com/sptg/permissions/api/feigns/AccountOauthFeign.java

@@ -1,65 +0,0 @@
-package com.sptg.permissions.api.feigns;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.permissions.api.dto.AccountDto;
-import com.sptg.permissions.api.dto.AccountOauthDto;
-import com.sptg.permissions.api.entity.Account;
-import com.sptg.permissions.api.entity.AccountOauth;
-import com.sptg.permissions.api.feigns.fallback.AccountOauthFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- * title: AccountOauthFeign
- * package: com.sptg.permissions.api.feigns
- * description: 账号角色对外服务接口
- *
- *                  
- *                 
- */
-@FeignClient(value = "smart-house-permissions",fallbackFactory = AccountOauthFeignFallbackFactory.class)
-public interface AccountOauthFeign {
-
-    /**
-     * 功能描述: 根据角色Id查询，分页绑定的账号列表
-     * @param pageBean 查询条件{ roleId，当前登陆用户,分页条件为必填 }
-     * @return ResultBean<Page>
-     *                  
-     *                       
-     */
-    @PostMapping(value = "/account/oauth/pagingQuery")
-    ResultBean<Page> pagingQuery(PageBean<AccountOauth, AccountOauthDto> pageBean);
-
-    /**
-     * 功能描述: 获取单个授权用户
-     * @param dto { accountId:必填,roleId:必填 }
-     * @return ResultBean<Boolean>
-     *
-     *
-     */
-    @PostMapping(value = "/account/oauth/getByUuIdAndSource")
-    ResultBean<AccountOauth> getByUuIdAndSource(AccountOauthDto dto);
-
-
-    /**
-     * 功能描述: 绑定用户
-     * @param dto { accountId:必填,roleId:必填 }
-     * @return ResultBean<Boolean>
-     *                  
-     *                       
-     */
-    @PostMapping(value = "/account/oauth/bind")
-    ResultBean<Boolean> bindUser(AccountOauthDto dto);
-
-    /**
-     * 功能描述: 解除用户绑定
-     * @param dto { accountId:必填,accountIds:必填 }
-     * @return ResultBean<Boolean>
-     *                  
-     *                       
-     */
-    @PostMapping(value = "/account/oauth/untie")
-    ResultBean<Boolean> untieUser(AccountOauthDto dto);
-}

sptg-permissions/sptg-permissions-api/src/main/java/com/sptg/permissions/api/feigns/FaceVerifyFeign.java

@@ -1,33 +0,0 @@
-package com.sptg.permissions.api.feigns;
-
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.permissions.api.entity.CustInfoVerify;
-import com.sptg.permissions.api.feigns.fallback.CusInfoVerifyFeignFallbackFactory;
-import com.sptg.permissions.api.feigns.fallback.FaceVerifyFeignFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * title: CustInfoVerifyFeign
- * package: com.sptg.permissions.api.feigns
- * description: 身份证验证接口
- *
- *
- *
- */
-@FeignClient(value = "smart-house-permissions",fallbackFactory = FaceVerifyFeignFallbackFactory.class)
-public interface FaceVerifyFeign {
-
-    /**
-     * 功能描述: 获取文件服务器地址
-     * @return String
-     *
-     *
-     */
-    @GetMapping(value = "/faceVerify/verify")
-    ResultBean verify(@RequestParam(value = "faceUrl") String faceUrl);
-}

sptg-permissions/sptg-permissions-api/src/main/java/com/sptg/permissions/api/thirdauth/officedemo/CtwingUnifyAccountLoginDemo.java

@@ -1,109 +0,0 @@
-package com.sptg.permissions.api.thirdauth.officedemo;
-
-import com.sptg.permissions.api.thirdauth.constants.CtwingAuthConstants;
-import com.sptg.permissions.api.thirdauth.util.ByteFormat;
-import com.sptg.permissions.api.thirdauth.util.HmacSha1Util;
-import com.sptg.permissions.api.thirdauth.util.XXTeaUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author lizhb
- * @date 2022/07/27
- */
-@Slf4j
-public class CtwingUnifyAccountLoginDemo {
-
-    public static void main(String[] args) {
-        try {
-            // 注意：运行demo前请将天翼账号开放平台申请获取的应用ID(appId)、应用秘钥(appSecret)填写至Constants类中。
-            // 运行前请在Constants类中填写或修改请求所需参数
-
-            // 公共请求参数
-            // 开发者在天翼账号开放平台申请获取的应用ID
-            String appId = CtwingAuthConstants.APP_ID;
-            // 统一为：20100
-            String clientType = CtwingAuthConstants.clientType;
-            // 统一为：redirect（用于重定向接口的显示说明）
-            String format = CtwingAuthConstants.format;
-            // 调用的接口版本号：v2.1
-            String version = CtwingAuthConstants.version;
-            // 加密参数
-            String paras = getParas();
-
-            // 签名所需参数map
-            Map<String, String> signMap = new HashMap<>();
-            signMap.put("appId", appId);
-            signMap.put("clientType", clientType);
-            signMap.put("format", format);
-            signMap.put("version", version);
-            signMap.put("paras", paras);
-
-            // 签名
-            String sign = getSign(signMap);
-
-            // 拼接wap登录框链接（GET请求）
-            String webLoginBxUrl = CtwingAuthConstants.UNIFY_ACCOUNT_LOGIN_URL + "?" + "appId=" + appId + "&clientType=" + clientType
-                    + "&format=" + format + "&version=" + version + "&paras=" + paras + "&sign=" + sign;
-
-            log.info("generate loginbox web url unifyAccountLogin success.");
-            log.info("unifyAccountLogin url : " + webLoginBxUrl);
-
-            // ps: 将生成的链接wapLoginBxUrl复制到浏览器中访问
-            // 链接返回wap登录框界面，登录成功后重定向到指定的URL
-            // 如http://returnURL?appId=123&paras=123&sign=123。returnURL按照本接口规范定义的参数处理方式接收和处理。
-
-        } catch (Exception e){
-            log.error("unifyAccountLogin demo error:",e);
-        }
-    }
-
-
-    /**
-     * 生成paras参数方法
-     * @return
-     */
-    private static String getParas() throws Exception {
-        // 非公共请求参数
-        Map<String, String> businessMap = new HashMap<>();
-        // 时间戳
-        businessMap.put("timeStamp", String.valueOf(System.currentTimeMillis()));
-        // 回调地址
-        businessMap.put("returnURL", CtwingAuthConstants.returnURL);
-        // 页面Key
-        businessMap.put("pageKey", CtwingAuthConstants.pageKey);
-        // 登录类型
-        businessMap.put("regReturnUrl", CtwingAuthConstants.regReturnUrl);
-        // 状态参数
-        businessMap.put("state", CtwingAuthConstants.state);
-
-        // 拼接非公共请求参数（无顺序要求）
-        StringBuffer sb = new StringBuffer();
-        for(Map.Entry<String, String> entry : businessMap.entrySet()) {
-            sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
-        }
-
-        // XXTea加密非公共加密参数
-        byte[] encValue = XXTeaUtil.encrypt(sb.toString().getBytes(CtwingAuthConstants.DEFAULT_CHARSET)
-                , CtwingAuthConstants.APP_SECRET.getBytes(CtwingAuthConstants.DEFAULT_CHARSET));
-        return ByteFormat.bytesToHexString(encValue);
-    }
-
-    /**
-     * 获取签名参数方法
-     * @param signMap
-     * @return
-     */
-    private static String getSign(Map<String, String> signMap) throws Exception {
-        // 生成签名加密串（拼接顺序为：appId+clientType+format+version+paras）
-        String signValue = signMap.get("appId") + signMap.get("clientType") + signMap.get("format")
-                + signMap.get("version") + signMap.get("paras");
-
-        // HMAC-SHA1签名
-        byte[] encValue = HmacSha1Util.getHmacSHA1(signValue, CtwingAuthConstants.APP_SECRET);
-        return ByteFormat.bytesToHexString(encValue);
-    }
-
-}

sptg-permissions/sptg-permissions-biz/pom.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>sptg-permissions</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-permissions-biz</artifactId>
-    <packaging>jar</packaging>
-    <description>权限业务模块</description>
-
-    <dependencies>
-
-        <!-- ===================================== Or JAR ===================================== -->
-        <!-- MySql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <!-- druid 数据源 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-
-        <!-- ===================================== Modular JAR ===================================== -->
-        <!-- 权限服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-permissions-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 设备服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-device-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物业服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-estate-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 第三方对接服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-third-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- ===================================== Spring Boot JAR ===================================== -->
-        <!-- 测试用例 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-        <!-- mybatis-plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <filters>
-		  <filter>../../env_files/properties/${env}.properties</filter>
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

sptg-permissions/sptg-permissions-biz/src/main/java/com/sptg/permissions/biz/controller/AccountOauthController.java

@@ -1,72 +0,0 @@
-package com.sptg.permissions.biz.controller;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
-import com.sptg.common.core.constant.CommonConstant;
-import com.sptg.common.core.util.CommonUtil;
-import com.sptg.permissions.api.dto.AccountDto;
-import com.sptg.permissions.api.dto.AccountOauthDto;
-import com.sptg.permissions.api.entity.Account;
-import com.sptg.permissions.api.entity.AccountOauth;
-import com.sptg.permissions.api.entity.Role;
-import com.sptg.permissions.api.feigns.AccountOauthFeign;
-import com.sptg.permissions.api.feigns.AccountOauthFeign;
-import com.sptg.permissions.biz.service.AccountOauthServiceInterface;
-import com.sptg.permissions.biz.service.AccountServiceInterface;
-import com.sptg.permissions.biz.service.RoleServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * title: AccountOauthController
- * package: com.sptg.permissions.biz.controller
- * description: 账号授权-控制器
- *
- *
- *
- */
-@RestController
-@RequiredArgsConstructor
-public class AccountOauthController implements AccountOauthFeign {
-
-    private final AccountOauthServiceInterface accountOauthServiceInterface;
-    private final AccountServiceInterface accountServiceInterface;
-
-    @Override
-    @PostMapping(value = "/account/oauth/pagingQuery")
-    public ResultBean<Page> pagingQuery(@RequestBody PageBean<AccountOauth,AccountOauthDto> pageBean) {
-        Page<AccountOauth> page = this.accountOauthServiceInterface.pagingQuery(pageBean);
-        return new ResultBean<>(ResultEnum.SUCCESS,page);
-    }
-
-    @Override
-    @PostMapping(value = "/account/oauth/getByUuIdAndSource")
-    public ResultBean<AccountOauth> getByUuIdAndSource(@RequestBody AccountOauthDto dto) {
-        AccountOauth oauth = this.accountOauthServiceInterface.selectByUuIdAndSource(dto.getUuId(), dto.getSource());
-        return new ResultBean<>(ResultEnum.SUCCESS,oauth);
-    }
-
-    @Override
-    @PostMapping(value = "/account/oauth/bind")
-    public ResultBean<Boolean> bindUser(@RequestBody AccountOauthDto dto) {
-        //  获取账号信息
-        Boolean result = this.accountOauthServiceInterface.bindUser(dto);
-        return new ResultBean<>(ResultEnum.SUCCESS,result);
-    }
-
-    @Override
-    @PostMapping(value = "/account/oauth/untie")
-    public ResultBean<Boolean> untieUser(@RequestBody AccountOauthDto dto) {
-        Boolean result = this.accountOauthServiceInterface.untieUser(dto);
-        return new ResultBean<>(ResultEnum.SUCCESS,result);
-    }
-
-}

sptg-permissions/sptg-permissions-biz/src/main/java/com/sptg/permissions/biz/service/impl/SysApiLogServiceImpl.java

@@ -1,32 +0,0 @@
-package com.sptg.permissions.biz.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.sptg.common.core.util.JsonUtils;
-import com.sptg.permissions.api.entity.ApiLog;
-import com.sptg.permissions.api.entity.Conf;
-import com.sptg.permissions.biz.mapper.ConfMapper;
-import com.sptg.permissions.biz.mapper.SysApiLogMapper;
-import com.sptg.permissions.biz.service.ConfServiceInterface;
-import com.sptg.permissions.biz.service.SysApiLogServiceInterface;
-import lombok.RequiredArgsConstructor;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-/**
- * title: SysApiLogServiceImpl
- * package: com.sptg.permissions.biz.security.impl
- * description:
- *
- *                  
- *                
- */
-@Service
-@RequiredArgsConstructor
-public class SysApiLogServiceImpl extends ServiceImpl<SysApiLogMapper, ApiLog> implements SysApiLogServiceInterface {
-
-
-}

sptg-repeater/pom.xml

@@ -2,7 +2,7 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <groupId>com.sptg</groupId>
+    <groupId>com.cyzh</groupId>
     <artifactId>sptg-repeater</artifactId>
     <version>1.0</version>
     <modelVersion>4.0.0</modelVersion>

sptg-repeater/src/main/java/com/sptg/repeater/RepeaterApplication.java

@@ -1,10 +1,10 @@
-package com.sptg.repeater;
+package com.cyzh.repeater;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.sptg.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.CommonValues;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;

sptg-repeater/src/main/java/com/sptg/repeater/ServletInitializer.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater;
+package com.cyzh.repeater;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

sptg-repeater/src/main/java/com/sptg/repeater/controller/DHCallbackController.java

@@ -1,13 +1,13 @@
-package com.sptg.repeater.controller;
+package com.cyzh.repeater.controller;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.sptg.repeater.dh.DHExecute;
-import com.sptg.repeater.dh.PageData;
-import com.sptg.repeater.utils.HttpUti;
-import com.sptg.repeater.vo.CommonValues;
-import com.sptg.repeater.vo.Response;
+import com.cyzh.repeater.dh.DHExecute;
+import com.cyzh.repeater.dh.PageData;
+import com.cyzh.repeater.utils.HttpUti;
+import com.cyzh.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.Response;
 import org.apache.log4j.Logger;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;

sptg-repeater/src/main/java/com/sptg/repeater/controller/SendRabbitmqController.java

@@ -1,9 +1,9 @@
-package com.sptg.repeater.controller;
+package com.cyzh.repeater.controller;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.sptg.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.CommonValues;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

sptg-repeater/src/main/java/com/sptg/repeater/dh/DHExecute.java

@@ -1,14 +1,14 @@
-package com.sptg.repeater.dh;
+package com.cyzh.repeater.dh;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.sptg.repeater.utils.DateUti;
-import com.sptg.repeater.utils.HttpUti;
-import com.sptg.repeater.vo.CommonValues;
-import com.sptg.repeater.vo.Response;
+import com.cyzh.repeater.utils.DateUti;
+import com.cyzh.repeater.utils.HttpUti;
+import com.cyzh.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.Response;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

sptg-repeater/src/main/java/com/sptg/repeater/dh/PageData.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.dh;
+package com.cyzh.repeater.dh;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;

sptg-repeater/src/main/java/com/sptg/repeater/rabbitmq/consumer/TopicDHConsumer.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.rabbitmq.consumer;
+package com.cyzh.repeater.rabbitmq.consumer;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.sptg.repeater.dh.DHExecute;
-import com.sptg.repeater.utils.HttpUti;
-import com.sptg.repeater.vo.CommonValues;
-import com.sptg.repeater.vo.Response;
+import com.cyzh.repeater.dh.DHExecute;
+import com.cyzh.repeater.utils.HttpUti;
+import com.cyzh.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.Response;
 import org.apache.log4j.Logger;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;

sptg-repeater/src/main/java/com/sptg/repeater/rabbitmq/provider/TopicDHProvider.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.rabbitmq.provider;
+package com.cyzh.repeater.rabbitmq.provider;
 
 
 import org.springframework.amqp.core.*;

sptg-repeater/src/main/java/com/sptg/repeater/utils/DateUti.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.utils;
+package com.cyzh.repeater.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;

sptg-repeater/src/main/java/com/sptg/repeater/utils/HttpUti.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.utils;
+package com.cyzh.repeater.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
@@ -7,8 +7,8 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.sptg.repeater.vo.CommonValues;
-import com.sptg.repeater.vo.Response;
+import com.cyzh.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.Response;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

sptg-repeater/src/main/java/com/sptg/repeater/vo/CommonValues.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.vo;
+package com.cyzh.repeater.vo;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

sptg-repeater/src/main/java/com/sptg/repeater/vo/ErrorCodeEn.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.vo;
+package com.cyzh.repeater.vo;
 
 
 /**

sptg-repeater/src/main/java/com/sptg/repeater/vo/Response.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater.vo;
+package com.cyzh.repeater.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sptg-repeater/src/test/java/com/sptg/repeater/RepeaterApplicationTests.java

@@ -1,6 +1,6 @@
-package com.sptg.repeater;
+package com.cyzh.repeater;
 
-import com.sptg.repeater.vo.CommonValues;
+import com.cyzh.repeater.vo.CommonValues;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

sptg-repeater/src/test/java/com/sptg/repeater/Test.java

@@ -1,4 +1,4 @@
-package com.sptg.repeater;
+package com.cyzh.repeater;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONArray;

sptg-statistics/sptg-statistics-biz/src/main/resources/bootstrap.yml

@@ -1,17 +0,0 @@
-spring:
-  application:
-    name: smart-house-statistics
-  # 配置中心
-  cloud:
-    config:
-      uri: ${config-url}
-
-# Eureka 客户端配置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://smart-house-eureka:7001/eureka
-      register-with-eureka: true
-      fetch-registry: true
-  instance:
-    prefer-ip-address: true

sptg-third/sptg-third-biz/pom.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>sptg-third</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-
-    <artifactId>sptg-third-biz</artifactId>
-    <description>第三方接口推送业务实现模块</description>
-
-    <dependencies>
-        <!-- ===================================== Or JAR ===================================== -->
-        <!-- MySql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <!-- druid 数据源 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <!-- ===================================== Modular JAR ===================================== -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-third-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物业服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-estate-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 物联网服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-iot-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- 视频云服务接口 -->
-        <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-video-cloud-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- ===================================== Spring Boot JAR ===================================== -->
-        <!-- mybatis-plus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <filters>
-            <filter>../../env_files/properties/${env}.properties</filter>
-        </filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>

sptg-third/sptg-third-biz/src/main/java/com/sptg/third/biz/mapper/qinlin/QLinLoginAccountMapper.java

@@ -1,13 +0,0 @@
-package com.sptg.third.biz.mapper.qinlin;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.sptg.third.api.entity.qinlin.QLinApiLog;
-import com.sptg.third.api.entity.qinlin.QLinLoginAccount;
-import com.sptg.third.api.entity.qinlin.QLinUser;
-
-/**
- * @author zwx
- * @create 2020/11/29 16:48
- */
-public interface QLinLoginAccountMapper extends BaseMapper<QLinLoginAccount> {
-}

sptg-tx-manager/pom.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <parent>
-        <artifactId>smart-house</artifactId>
-        <groupId>com.sptg</groupId>
-        <version>1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>sptg-tx-manager</artifactId>
-
-    <dependencies>
-
-        <!-- LCN 分布式事务服务端 -->
-        <dependency>
-            <groupId>com.codingapi.txlcn</groupId>
-            <artifactId>txlcn-tm</artifactId>
-        </dependency>
-
-        <!-- eureka-client -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-        <!-- conf client -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
-        </dependency>
-        <!-- hystrix -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-    <build>
-        <filters>
-		  <filter>../env_files/properties/${env}.properties</filter>
-		</filters>
-        <plugins>
-            <!-- Spring Boot 打包插件( 非“Web模块”请勿引入) -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

sptg-tx-manager/src/main/resources/bootstrap.yml

@@ -1,49 +0,0 @@
-spring:
-  application:
-    name: smart-house-lcn
-  # 配置中心
-  cloud:
-    config:
-      uri: ${config-url}
-
-# Eureka 客户端配置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://smart-house-eureka:7001/eureka
-      register-with-eureka: true
-      fetch-registry: true
-  instance:
-    prefer-ip-address: true
-
-#---
-##local
-#spring:
-#  # 配置中心
-#  cloud:
-#    config:
-#      uri: http://smart-house-config:4001
-#
-#---
-##dev
-#spring:
-#  # 配置中心
-#  cloud:
-#    config:
-#      uri: http://smart-house-config-dev:4001
-#
-#---
-##test
-#spring:
-#  # 配置中心
-#  cloud:
-#    config:
-#      uri: http://smart-house-config:4001
-#
-#---
-##prod
-#spring:
-#  # 配置中心
-#  cloud:
-#    config:
-#      uri: http://smart-house-config:4001

sptg-video-cloud/sptg-video-cloud-biz/src/main/resources/bootstrap.yml

@@ -1,17 +0,0 @@
-spring:
-  application:
-    name: smart-house-video-cloud
-  # 配置中心
-  cloud:
-    config:
-      uri: ${config-url}
-
-# Eureka 客户端配置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://smart-house-eureka:7001/eureka
-      register-with-eureka: true
-      fetch-registry: true
-  instance:
-    prefer-ip-address: true

wuye-ad/Dockerfile

@@ -0,0 +1,19 @@
+# 继承 OpenJDK8
+FROM openjdk:8
+# 设置容器时区
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+&& echo 'Asia/Shanghai' >/etc/timezone
+# 创建程序目录
+RUN mkdir -p /opt/app-server
+# 切换到工作目录
+WORKDIR /opt/app-server
+#复制依赖jar
+COPY ./lib ./lib/
+#复制配置文件
+COPY ./resources ./resources/
+#复制项目jar
+COPY wuye-ad.jar ./wuye-ad.jar
+# 暴露端口
+EXPOSE 7001
+# 运行JAR程序脚本
+CMD java -Dloader.path=./resources/,./lib/ -jar ./wuye-ad.jar

wuye-ad/docker-compose.yaml

@@ -0,0 +1,16 @@
+version: '3'
+networks:
+  default:
+    external:
+      name: wuye
+services:
+  wuye-ad:
+    restart: always
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    volumes:
+      - /etc/hosts:/etc/hosts
+    hostname: wuye-ad
+    container_name: wuye-ad
+    image: wuye-ad

sptg-ad/pom.xml → wuye-ad/pom.xml

@@ -3,19 +3,19 @@
          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>smart-house</artifactId>
-        <groupId>com.sptg</groupId>
+        <artifactId>wuye</artifactId>
+        <groupId>com.cyzh</groupId>
         <version>1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sptg-ad</artifactId>
+    <artifactId>wuye-ad</artifactId>
     <packaging>pom</packaging>
     <description>广告聚合模块</description>
     <modules>
-        <module>sptg-ad-api</module>
-        <module>sptg-ad-biz</module>
+        <module>wuye-ad-api</module>
+        <module>wuye-ad-biz</module>
     </modules>
 
 </project>

sptg-ad/sptg-ad-api/pom.xml → wuye-ad/wuye-ad-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>sptg-ad</artifactId>
-        <groupId>com.sptg</groupId>
+        <artifactId>wuye-ad</artifactId>
+        <groupId>com.cyzh</groupId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sptg-ad-api</artifactId>
+    <artifactId>wuye-ad-api</artifactId>
     <packaging>jar</packaging>
     <description>广告接口模块</description>
 
@@ -17,8 +17,8 @@
 
         <!-- ===================================== Modular JAR ===================================== -->
         <dependency>
-            <groupId>com.sptg</groupId>
-            <artifactId>sptg-common-core</artifactId>
+            <groupId>com.cyzh</groupId>
+            <artifactId>wuye-common-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/constant/AdSecurityToken.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/constant/AdSecurityToken.java

@@ -1,8 +1,8 @@
-package com.sptg.ad.api.constant;
+package com.cyzh.ad.api.constant;
 
 /**
  * title: AdSecurityToken
- * package: com.sptg.ad.api.constant
+ * package: com.cyzh.ad.api.constant
  * description: 广告权限标识
  */
 public interface AdSecurityToken {

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdAdsenseDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdAdsenseDto.java

@@ -1,10 +1,9 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdAdsense;
+import com.cyzh.ad.api.entity.AdAdsense;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.List;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdContentDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdContentDto.java

@@ -1,17 +1,16 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdContent;
+import com.cyzh.ad.api.entity.AdContent;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.List;
 
 /**
  * title: AdContentDto
- * package: com.sptg.ad.api.dto
+ * package: com.cyzh.ad.api.dto
  * description: 广告类容数据传输对象
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdMaterialDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdMaterialDto.java

@@ -1,9 +1,8 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdAdsense;
-import com.sptg.ad.api.entity.AdMaterial;
+import com.cyzh.ad.api.entity.AdMaterial;
 import lombok.Getter;
 import lombok.Setter;
 

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdOfflinePushRecordDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdOfflinePushRecordDto.java

@@ -1,15 +1,14 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdOfflinePushRecord;
-import com.sptg.ad.api.entity.AdPushTask;
+import com.cyzh.ad.api.entity.AdOfflinePushRecord;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * title: AdOfflinePushRecordDto
- * package: com.sptg.ad.api.dto
+ * package: com.cyzh.ad.api.dto
  * description: 线下广告发布记录传输对象
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdPushAppDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdPushAppDto.java

@@ -1,9 +1,9 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sptg.ad.api.entity.AdPushApp;
+import com.cyzh.ad.api.entity.AdPushApp;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * title: AdPushAppDto
- * package: com.sptg.estate.biz.service
+ * package: com.cyzh.estate.biz.service
  * description: 移动端广告
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdPushDeviceDetailsDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdPushDeviceDetailsDto.java

@@ -1,14 +1,14 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdPushDeviceDetails;
+import com.cyzh.ad.api.entity.AdPushDeviceDetails;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * title: AdPushDeviceDetails
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布任务详情表（记录广告下发给哪些设备）
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdPushTaskDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdPushTaskDto.java

@@ -1,14 +1,14 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdPushTask;
+import com.cyzh.ad.api.entity.AdPushTask;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * title: AdPushTaskDto
- * package: com.sptg.ad.api.dto
+ * package: com.cyzh.ad.api.dto
  * description: 广告发布任务传输对象
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/dto/AdTypeDto.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/dto/AdTypeDto.java

@@ -1,8 +1,8 @@
-package com.sptg.ad.api.dto;
+package com.cyzh.ad.api.dto;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.AdType;
+import com.cyzh.ad.api.entity.AdType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * title: AdTypeDto
- * package: com.sptg.gateway.controller.ad
+ * package: com.cyzh.gateway.controller.ad
  * description: 广告类型数据传输对象
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdAdsense.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdAdsense.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdContent.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdContent.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * title: AdContent
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告-内容
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdContentImg.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdContentImg.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -9,7 +9,7 @@ import lombok.Setter;
 
 /**
  * title: AdContentImg
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告图片
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdMaterial.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdMaterial.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdOfflinePushRecord.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdOfflinePushRecord.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * title: AdOfflinePushRecord
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 线下广告发布记录表
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushApp.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushApp.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * title: AdPushApp
- * package: com.sptg.estate.biz.service
+ * package: com.cyzh.estate.biz.service
  * description: 移动端广告发布任务的广告类容
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushContent.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushContent.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * title: AdPushContent
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布任务的广告类容
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushContentImg.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushContentImg.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -9,7 +9,7 @@ import lombok.Setter;
 
 /**
  * title: AdPushContentImg
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布任务图片--广告内容是可以修改的，所有生成任务的时候要单独保存图片记录
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushDeviceDetails.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushDeviceDetails.java

@@ -1,13 +1,13 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.sptg.common.core.entity.PublishTaskResult;
+import com.cyzh.common.core.entity.PublishTaskResult;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * title: AdPushDeviceDetails
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布任务详情表（记录广告下发给哪些设备）
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushTask.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushTask.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * title: AdPushTask
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布任务表
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushTaskDetails.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushTaskDetails.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -9,7 +9,7 @@ import lombok.Setter;
 
 /**
  * title: AdPushTaskDetails
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布任务详情表（记录广告下发到哪些位置）
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdPushThresholdValue.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdPushThresholdValue.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -9,7 +9,7 @@ import lombok.Setter;
 
 /**
  * title: AdPushThresholdValue
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告发布阈值
  *
  *                

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/AdType.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/AdType.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * title: AdType
- * package: com.sptg.ad.api.entity
+ * package: com.cyzh.ad.api.entity
  * description: 广告类型  -- 总部管理分类，下级没有修改和删除权限
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/DeviceAdvert.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/DeviceAdvert.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/DeviceAdvertStatistics.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/DeviceAdvertStatistics.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/EarlyWarning.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/EarlyWarning.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/entity/ThresholdConfig.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/entity/ThresholdConfig.java

@@ -1,4 +1,4 @@
-package com.sptg.ad.api.entity;
+package com.cyzh.ad.api.entity;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdAdsenseFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdAdsenseFeign.java

@@ -1,11 +1,10 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdAdsenseDto;
-import com.sptg.ad.api.entity.AdAdsense;
-import com.sptg.ad.api.feigns.fallback.AdAdsenseFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
-import io.protostuff.Request;
+import com.cyzh.ad.api.dto.AdAdsenseDto;
+import com.cyzh.ad.api.entity.AdAdsense;
+import com.cyzh.ad.api.feigns.fallback.AdAdsenseFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * title: AdAdsenseFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 广告位-对外接口类
  *
  *
  *
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdAdsenseFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdAdsenseFeignFallbackFactory.class)
 public interface AdAdsenseFeign {
 
 

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdContentFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdContentFeign.java

@@ -1,23 +1,23 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdContentDto;
-import com.sptg.ad.api.entity.AdContent;
-import com.sptg.ad.api.feigns.fallback.AdContentFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdContentDto;
+import com.cyzh.ad.api.entity.AdContent;
+import com.cyzh.ad.api.feigns.fallback.AdContentFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * title: AdContentFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 广告内容-对外接口类
  *
  *               
  *                 
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdContentFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdContentFeignFallbackFactory.class)
 public interface AdContentFeign {
 
 

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdMaterialFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdMaterialFeign.java

@@ -1,16 +1,15 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdMaterialDto;
-import com.sptg.ad.api.entity.AdContent;
-import com.sptg.ad.api.entity.AdMaterial;
-import com.sptg.ad.api.feigns.fallback.AdMaterialFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdMaterialDto;
+import com.cyzh.ad.api.entity.AdMaterial;
+import com.cyzh.ad.api.feigns.fallback.AdMaterialFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdMaterialFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdMaterialFeignFallbackFactory.class)
 public interface AdMaterialFeign {
 
     /**

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdOfflinePushRecordFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdOfflinePushRecordFeign.java

@@ -1,26 +1,22 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdOfflinePushRecordDto;
-import com.sptg.ad.api.dto.AdPushTaskDto;
-import com.sptg.ad.api.entity.*;
-import com.sptg.ad.api.feigns.fallback.AdOfflinePushRecordFeignFallbackFactory;
-import com.sptg.ad.api.feigns.fallback.AdPushTaskFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdOfflinePushRecordDto;
+import com.cyzh.ad.api.entity.*;
+import com.cyzh.ad.api.feigns.fallback.AdOfflinePushRecordFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * title: AdPushTaskFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 线下广告发布-对外接口类
  *
  *
  *
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdOfflinePushRecordFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdOfflinePushRecordFeignFallbackFactory.class)
 public interface AdOfflinePushRecordFeign {
 
     /**

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdPushAppFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdPushAppFeign.java

@@ -1,23 +1,23 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdPushAppDto;
-import com.sptg.ad.api.entity.AdPushApp;
-import com.sptg.ad.api.feigns.fallback.AdPushAppFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdPushAppDto;
+import com.cyzh.ad.api.entity.AdPushApp;
+import com.cyzh.ad.api.feigns.fallback.AdPushAppFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * title: AdTypeFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 移动端广告-对外接口
  *
  *               
  *               
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdPushAppFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdPushAppFeignFallbackFactory.class)
 public interface AdPushAppFeign {
 
      /**

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdPushDeviceDetailsFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdPushDeviceDetailsFeign.java

@@ -1,23 +1,23 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdPushDeviceDetailsDto;
-import com.sptg.ad.api.entity.AdPushDeviceDetails;
-import com.sptg.ad.api.feigns.fallback.AdPushDeviceDetailsFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdPushDeviceDetailsDto;
+import com.cyzh.ad.api.entity.AdPushDeviceDetails;
+import com.cyzh.ad.api.feigns.fallback.AdPushDeviceDetailsFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * title: AdPushDeviceDetailsFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 广告发布到设备详情-对外接口类
  *
  *               
  *                 
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdPushDeviceDetailsFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdPushDeviceDetailsFallbackFactory.class)
 public interface AdPushDeviceDetailsFeign {
     /**
      * 功能描述:分页查询

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdPushTaskFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdPushTaskFeign.java

@@ -1,13 +1,13 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdPushTaskDto;
-import com.sptg.ad.api.entity.AdPushContent;
-import com.sptg.ad.api.entity.AdPushTask;
-import com.sptg.ad.api.entity.AdPushTaskDetails;
-import com.sptg.ad.api.entity.AdPushThresholdValue;
-import com.sptg.ad.api.feigns.fallback.AdPushTaskFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdPushTaskDto;
+import com.cyzh.ad.api.entity.AdPushContent;
+import com.cyzh.ad.api.entity.AdPushTask;
+import com.cyzh.ad.api.entity.AdPushTaskDetails;
+import com.cyzh.ad.api.entity.AdPushThresholdValue;
+import com.cyzh.ad.api.feigns.fallback.AdPushTaskFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -18,13 +18,13 @@ import java.util.List;
 
 /**
  * title: AdPushTaskFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 广告内容-对外接口类
  *
  *               
  *                 
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdPushTaskFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdPushTaskFeignFallbackFactory.class)
 public interface AdPushTaskFeign {
 
     /**
@@ -138,7 +138,7 @@ public interface AdPushTaskFeign {
     /**
      * 功能描述:获取当前设备发布的有效广告数量
      * @param deviceId
-     * @return com.sptg.common.core.beans.ResultBean<java.lang.Integer>
+     * @return com.cyzh.common.core.beans.ResultBean<java.lang.Integer>
      *                
      *                     
      */

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/AdTypeFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/AdTypeFeign.java

@@ -1,23 +1,23 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdTypeDto;
-import com.sptg.ad.api.entity.AdType;
-import com.sptg.ad.api.feigns.fallback.AdTypeFeignFallbackFactory;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.dto.AdTypeDto;
+import com.cyzh.ad.api.entity.AdType;
+import com.cyzh.ad.api.feigns.fallback.AdTypeFeignFallbackFactory;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * title: AdTypeFeign
- * package: com.sptg.ad.api.feigns
+ * package: com.cyzh.ad.api.feigns
  * description: 广告类型-对外接口
  *
  *               
  *                 
  */
-@FeignClient(value = "smart-house-ad",fallbackFactory = AdTypeFeignFallbackFactory.class)
+@FeignClient(value = "wuye-ad",fallbackFactory = AdTypeFeignFallbackFactory.class)
 public interface AdTypeFeign {
 
     /**

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/DeviceAdvertFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/DeviceAdvertFeign.java

@@ -1,10 +1,10 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.DeviceAdvert;
-import com.sptg.ad.api.entity.DeviceAdvertStatistics;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.entity.DeviceAdvert;
+import com.cyzh.ad.api.entity.DeviceAdvertStatistics;
+import com.cyzh.common.core.beans.PageBean;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  *               
  * description:
  */
-@FeignClient(value = "smart-house-ad")
+@FeignClient(value = "wuye-ad")
 public interface DeviceAdvertFeign {
 
     /**

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/EarlyWarningFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/EarlyWarningFeign.java

@@ -1,9 +1,9 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.EarlyWarning;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.entity.EarlyWarning;
+import com.cyzh.common.core.beans.PageBean;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  *                
  * description:
  */
-@FeignClient(value = "smart-house-ad")
+@FeignClient(value = "wuye-ad")
 public interface EarlyWarningFeign {
 
     /**

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/ThresholdConfigFeign.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/ThresholdConfigFeign.java

@@ -1,9 +1,9 @@
-package com.sptg.ad.api.feigns;
+package com.cyzh.ad.api.feigns;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.entity.ThresholdConfig;
-import com.sptg.common.core.beans.PageBean;
-import com.sptg.common.core.beans.ResultBean;
+import com.cyzh.ad.api.entity.ThresholdConfig;
+import com.cyzh.common.core.beans.PageBean;
+import com.cyzh.common.core.beans.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  *               
  * description:
  */
-@FeignClient(value = "smart-house-ad")
+@FeignClient(value = "wuye-ad")
 public interface ThresholdConfigFeign {
 
 

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdAdsenseFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdAdsenseFeignFallbackFactory.java

@@ -1,21 +1,18 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdAdsenseDto;
-import com.sptg.ad.api.dto.AdContentDto;
-import com.sptg.ad.api.entity.AdAdsense;
-import com.sptg.ad.api.entity.AdContent;
-import com.sptg.ad.api.feigns.AdAdsenseFeign;
-import com.sptg.ad.api.feigns.AdContentFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdAdsenseDto;
+import com.cyzh.ad.api.entity.AdAdsense;
+import com.cyzh.ad.api.feigns.AdAdsenseFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * title: AdAdsenseFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 广告位接口容错处理
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdContentFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdContentFeignFallbackFactory.java

@@ -1,18 +1,18 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdContentDto;
-import com.sptg.ad.api.entity.AdContent;
-import com.sptg.ad.api.feigns.AdContentFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdContentDto;
+import com.cyzh.ad.api.entity.AdContent;
+import com.cyzh.ad.api.feigns.AdContentFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * title: AdContentFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 广告类容接口容错处理
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdMaterialFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdMaterialFeignFallbackFactory.java

@@ -1,19 +1,18 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdMaterialDto;
-import com.sptg.ad.api.entity.AdMaterial;
-import com.sptg.ad.api.feigns.AdMaterialFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdMaterialDto;
+import com.cyzh.ad.api.entity.AdMaterial;
+import com.cyzh.ad.api.feigns.AdMaterialFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
-import javafx.scene.paint.Material;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * title: AdMaterialFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 广告素材接口容错处理
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdOfflinePushRecordFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdOfflinePushRecordFeignFallbackFactory.java

@@ -1,11 +1,11 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdOfflinePushRecordDto;
-import com.sptg.ad.api.entity.AdOfflinePushRecord;
-import com.sptg.ad.api.feigns.AdOfflinePushRecordFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdOfflinePushRecordDto;
+import com.cyzh.ad.api.entity.AdOfflinePushRecord;
+import com.cyzh.ad.api.feigns.AdOfflinePushRecordFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * title: AdOfflinePushRecordFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 线下广告发布记录接口容错处理
  *
  *

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdPushAppFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdPushAppFeignFallbackFactory.java

@@ -1,19 +1,18 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdPushAppDto;
-import com.sptg.ad.api.entity.AdPushApp;
-import com.sptg.ad.api.feigns.AdPushAppFeign;
-import com.sptg.ad.api.feigns.AdTypeFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdPushAppDto;
+import com.cyzh.ad.api.entity.AdPushApp;
+import com.cyzh.ad.api.feigns.AdPushAppFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * title: AdTypeFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 移动端广告接口容错处理
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdPushDeviceDetailsFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdPushDeviceDetailsFallbackFactory.java

@@ -1,18 +1,18 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdPushDeviceDetailsDto;
-import com.sptg.ad.api.entity.AdPushDeviceDetails;
-import com.sptg.ad.api.feigns.AdPushDeviceDetailsFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdPushDeviceDetailsDto;
+import com.cyzh.ad.api.entity.AdPushDeviceDetails;
+import com.cyzh.ad.api.feigns.AdPushDeviceDetailsFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 /**
  * title: AdPushTaskFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 广告发布到设备详情接口容错处理
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdPushTaskFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdPushTaskFeignFallbackFactory.java

@@ -1,14 +1,14 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdPushTaskDto;
-import com.sptg.ad.api.entity.AdPushContent;
-import com.sptg.ad.api.entity.AdPushTask;
-import com.sptg.ad.api.entity.AdPushTaskDetails;
-import com.sptg.ad.api.entity.AdPushThresholdValue;
-import com.sptg.ad.api.feigns.AdPushTaskFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdPushTaskDto;
+import com.cyzh.ad.api.entity.AdPushContent;
+import com.cyzh.ad.api.entity.AdPushTask;
+import com.cyzh.ad.api.entity.AdPushTaskDetails;
+import com.cyzh.ad.api.entity.AdPushThresholdValue;
+import com.cyzh.ad.api.feigns.AdPushTaskFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * title: AdPushTaskFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 广告类容接口容错处理
  *
  *               

sptg-ad/sptg-ad-api/src/main/java/com/sptg/ad/api/feigns/fallback/AdTypeFeignFallbackFactory.java → wuye-ad/wuye-ad-api/src/main/java/com/cyzh/ad/api/feigns/fallback/AdTypeFeignFallbackFactory.java

@@ -1,20 +1,18 @@
-package com.sptg.ad.api.feigns.fallback;
+package com.cyzh.ad.api.feigns.fallback;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.sptg.ad.api.dto.AdTypeDto;
-import com.sptg.ad.api.entity.AdType;
-import com.sptg.ad.api.feigns.AdTypeFeign;
-import com.sptg.common.core.beans.ResultBean;
-import com.sptg.common.core.beans.ResultEnum;
+import com.cyzh.ad.api.dto.AdTypeDto;
+import com.cyzh.ad.api.entity.AdType;
+import com.cyzh.ad.api.feigns.AdTypeFeign;
+import com.cyzh.common.core.beans.ResultBean;
+import com.cyzh.common.core.beans.ResultEnum;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * title: AdTypeFeignFallbackFactory
- * package: com.sptg.ad.api.feigns.fallback
+ * package: com.cyzh.ad.api.feigns.fallback
  * description: 广告类型接口容错处理
  *
  *