Browse Source

修改项目名称

欧阳劲驰 1 month ago
parent
commit
6da51af66c
100 changed files with 206 additions and 206 deletions
  1. 5 5
      custom-gateway-app/pom.xml
  2. 3 3
      custom-gateway-app/src/main/java/com/shkpr/service/customgateway/CustomGatewayApplication.java
  3. 0 0
      bespoke-gateway-app/src/main/resources/alam_server.pfx
  4. 0 0
      bespoke-gateway-app/src/main/resources/application-jldma.yml
  5. 0 0
      bespoke-gateway-app/src/main/resources/application-zhscada.yml
  6. 0 0
      bespoke-gateway-app/src/main/resources/application-zydma.yml
  7. 2 2
      custom-gateway-app/src/main/resources/application.yml
  8. 0 0
      bespoke-gateway-app/src/main/resources/logback.xml
  9. 1 1
      custom-gateway-app/src/main/resources/zhscada-backup/application-zhscada.yml
  10. 4 4
      custom-gateway-app/src/main/resources/zhscada-backup/application.yml
  11. 3 3
      custom-gateway-app/src/test/java/com/shkpr/service/customgateway/CustomGatewayApplicationTests.java
  12. 3 3
      custom-gateway-core/pom.xml
  13. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/annotation/ExcelMapping.java
  14. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/annotation/InfluxDbMapping.java
  15. 4 4
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/AccessKeyGenerator.java
  16. 6 6
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/DeviceIdGenerator.java
  17. 10 10
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/DeviceRegistry.java
  18. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/InfluxDBClients.java
  19. 3 3
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/AsyncConfig.java
  20. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/CallingConfig.java
  21. 4 4
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/DataSourceConfig.java
  22. 6 6
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/DeviceConfig.java
  23. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/GatewayConfig.java
  24. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/GlobalConfig.java
  25. 4 4
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/InfluxDbConfig.java
  26. 3 3
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/JdbcRepositoriesConfig.java
  27. 3 3
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/PrimaryMybatisConfig.java
  28. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/SchedulingConfig.java
  29. 12 12
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/SecurityConfig.java
  30. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/TempFileConfig.java
  31. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/ValidatorConfig.java
  32. 3 3
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/WebConfig.java
  33. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/AccessMetadata.java
  34. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/Api.java
  35. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/AreaCode.java
  36. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CommDefine.java
  37. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerBillingType.java
  38. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerInfoStatus.java
  39. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerMeterType.java
  40. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerMeteringType.java
  41. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerPublicServiceType.java
  42. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerReadType.java
  43. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DataSourceNames.java
  44. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DeviceField.java
  45. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DeviceKind.java
  46. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ExcelEnum.java
  47. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ExcelMetadata.java
  48. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ExcelType.java
  49. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/InfluxdbMetadata.java
  50. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/IntegrationMetadata.java
  51. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/LogFlagBusiType.java
  52. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/LoginUserRoleType.java
  53. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ProtocolType.java
  54. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ResponseCode.java
  55. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/TokenMetadata.java
  56. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ValueType.java
  57. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/controller/RouteController.java
  58. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/AccessResult.java
  59. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/AccessToken.java
  60. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/CallingEndpoint.java
  61. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/CommonToken.java
  62. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/Device.java
  63. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/DeviceExcel.java
  64. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/DeviceTag.java
  65. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/InfluxDbClient.java
  66. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/IntegrationKey.java
  67. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/IntegrationKeyLoader.java
  68. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/LatLngBean.java
  69. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/PageRequest.java
  70. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/PageResponse.java
  71. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/Result.java
  72. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/ResultResponse.java
  73. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/TmpTokenData.java
  74. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/TokenData.java
  75. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/AccessKeys.java
  76. 6 6
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/CustomerInfo.java
  77. 3 3
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/CustomerMeterRead.java
  78. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/DeviceKind.java
  79. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/DeviceSequences.java
  80. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/DeviceTags.java
  81. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/FunctionInfo.java
  82. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/PersonnelInfo.java
  83. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/TypeDefine.java
  84. 3 3
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/exception/GlobalSelfExceptionHandler.java
  85. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/exception/SelfAuthFilterException.java
  86. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/exception/SelfException.java
  87. 9 9
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/filter/AccessFilter.java
  88. 7 7
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/filter/JWTControllerCheck.java
  89. 8 8
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/filter/TokenFilter.java
  90. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/GeomMultiLineStringTypeHandlePg.java
  91. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/GeomPointTypeHandlePg.java
  92. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/GeomTypeHandlePg.java
  93. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/StringListTypeHandle.java
  94. 1 1
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/YamlPropertySourceFactory.java
  95. 6 6
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/manager/IntegrationKeyManager.java
  96. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/CustomerInfoMapper.java
  97. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/CustomerMeterReadMapper.java
  98. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/DeviceKindMapper.java
  99. 2 2
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/FunctionInfoMapper.java
  100. 0 0
      custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/PersonnelInfoMapper.java

+ 5 - 5
custom-gateway-app/pom.xml

@@ -4,18 +4,18 @@
     <!--父工程信息-->
     <parent>
         <groupId>com.shkpr.service</groupId>
-        <artifactId>kpr-custom-gateway</artifactId>
+        <artifactId>kpr-bespoke-gateway</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <!--工件名-->
-    <artifactId>custom-gateway-app</artifactId>
+    <artifactId>bespoke-gateway-app</artifactId>
     <!--版本号-->
     <version>${project.version}</version>
     <!--打包方式-->
     <packaging>jar</packaging>
     <!--项目名-->
-    <name>CustomGatewayApp</name>
+    <name>BespokeGatewayApp</name>
     <!--项目描述-->
     <description>启动模块</description>
 
@@ -24,7 +24,7 @@
         <!--启用模块-->
         <dependency>
             <groupId>com.shkpr.service</groupId>
-            <artifactId>custom-gateway-${enable.module}</artifactId>
+            <artifactId>bespoke-gateway-${enable.module}</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
@@ -89,7 +89,7 @@
                 <configuration>
                     <fork>true</fork>
                     <executable>true</executable>
-                    <mainClass>com.shkpr.service.customgateway.CustomGatewayApplication</mainClass>
+                    <mainClass>com.shkpr.service.bespokegateway.BespokeGatewayApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>

+ 3 - 3
custom-gateway-app/src/main/java/com/shkpr/service/customgateway/CustomGatewayApplication.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway;
+package com.shkpr.service.bespokegateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,8 +10,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @since 1.0.0
  */
 @SpringBootApplication
-public class CustomGatewayApplication {
+public class BespokeGatewayApplication {
     public static void main(String[] args) {
-        SpringApplication.run(CustomGatewayApplication.class, args);
+        SpringApplication.run(BespokeGatewayApplication.class, args);
     }
 }

custom-gateway-app/src/main/resources/alam_server.pfx → bespoke-gateway-app/src/main/resources/alam_server.pfx


custom-gateway-app/src/main/resources/application-jldma.yml → bespoke-gateway-app/src/main/resources/application-jldma.yml


custom-gateway-app/src/main/resources/application-zhscada.yml → bespoke-gateway-app/src/main/resources/application-zhscada.yml


custom-gateway-app/src/main/resources/application-zydma.yml → bespoke-gateway-app/src/main/resources/application-zydma.yml


+ 2 - 2
custom-gateway-app/src/main/resources/application.yml

@@ -2,7 +2,7 @@
 server:
   port: 9011
   servlet:
-    context-path: /custom-gw/
+    context-path: /bespoke-gw/
 #网关
 gateway:
   routes:
@@ -11,7 +11,7 @@ gateway:
 spring:
   #app
   application:
-    name: KprCustomGateway
+    name: KprBespokeGateway
   #servlet
   servlet:
     multipart:

custom-gateway-app/src/main/resources/logback.xml → bespoke-gateway-app/src/main/resources/logback.xml


+ 1 - 1
custom-gateway-app/src/main/resources/zhscada-backup/application-zhscada.yml

@@ -30,4 +30,4 @@ migrate:
   #模式
   schema: scada
   #传感器映射文件
-  sensor-map-path: file:E:\kpr\kpr-custom-gateway\sensor-id.yml
+  sensor-map-path: file:E:\kpr\kpr-bespoke-gateway\sensor-id.yml

+ 4 - 4
custom-gateway-app/src/main/resources/zhscada-backup/application.yml

@@ -2,7 +2,7 @@
 server:
   port: 9011
   servlet:
-    context-path: /custom-gw/
+    context-path: /bespoke-gw/
 #网关
 gateway:
   routes:
@@ -11,7 +11,7 @@ gateway:
 spring:
   #app
   application:
-    name: KprCustomGateway
+    name: KprBespokeGateway
   #servlet
   servlet:
     multipart:
@@ -61,7 +61,7 @@ spring:
         driver-class-name: org.postgresql.Driver
       #嵌入式
       embedded:
-        url: jdbc:h2:file:E:\kpr\kpr-custom-gateway\data
+        url: jdbc:h2:file:E:\kpr\kpr-bespoke-gateway\data
         driver-class-name: org.h2.Driver
         username: sa
         password: kpr.25535.sa
@@ -91,4 +91,4 @@ temp-file:
   max-age: PT4H
 #设备
 device:
-  map-path: E:\kpr\kpr-custom-gateway\dev_@enable.module@.yml
+  map-path: E:\kpr\kpr-bespoke-gateway\dev_@enable.module@.yml

+ 3 - 3
custom-gateway-app/src/test/java/com/shkpr/service/customgateway/CustomGatewayApplicationTests.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway;
+package com.shkpr.service.bespokegateway;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -6,8 +6,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 /**
  * 测试启动类
  */
-@SpringBootTest(classes = CustomGatewayApplication.class)
-public class CustomGatewayApplicationTests {
+@SpringBootTest(classes = BespokeGatewayApplication.class)
+public class BespokeGatewayApplicationTests {
 
     @Test
     public void test() {

+ 3 - 3
custom-gateway-core/pom.xml

@@ -4,18 +4,18 @@
     <!--父工程信息-->
     <parent>
         <groupId>com.shkpr.service</groupId>
-        <artifactId>kpr-custom-gateway</artifactId>
+        <artifactId>kpr-bespoke-gateway</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <!--工件名-->
-    <artifactId>custom-gateway-core</artifactId>
+    <artifactId>bespoke-gateway-core</artifactId>
     <!--版本号-->
     <version>${project.version}</version>
     <!--打包方式-->
     <packaging>jar</packaging>
     <!--项目名-->
-    <name>CustomGatewayCore</name>
+    <name>BespokeGatewayCore</name>
     <!--项目描述-->
     <description>核心模块</description>
 

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/annotation/ExcelMapping.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.annotation;
+package com.shkpr.service.bespokegateway.core.annotation;
 
-import com.shkpr.service.customgateway.core.constants.ExcelEnum;
+import com.shkpr.service.bespokegateway.core.constants.ExcelEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/annotation/InfluxDbMapping.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.annotation;
+package com.shkpr.service.bespokegateway.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 4 - 4
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/AccessKeyGenerator.java

@@ -1,8 +1,8 @@
-package com.shkpr.service.customgateway.core.components;
+package com.shkpr.service.bespokegateway.core.components;
 
-import com.shkpr.service.customgateway.core.domain.po.AccessKeys;
-import com.shkpr.service.customgateway.core.service.AccessKeysService;
-import com.shkpr.service.customgateway.core.utils.HexUtil;
+import com.shkpr.service.bespokegateway.core.domain.po.AccessKeys;
+import com.shkpr.service.bespokegateway.core.service.AccessKeysService;
+import com.shkpr.service.bespokegateway.core.utils.HexUtil;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;
 

+ 6 - 6
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/DeviceIdGenerator.java

@@ -1,10 +1,10 @@
-package com.shkpr.service.customgateway.core.components;
+package com.shkpr.service.bespokegateway.core.components;
 
-import com.shkpr.service.customgateway.core.constants.AreaCode;
-import com.shkpr.service.customgateway.core.constants.DeviceKind;
-import com.shkpr.service.customgateway.core.domain.Device;
-import com.shkpr.service.customgateway.core.domain.DeviceTag;
-import com.shkpr.service.customgateway.core.service.DeviceSequencesService;
+import com.shkpr.service.bespokegateway.core.constants.AreaCode;
+import com.shkpr.service.bespokegateway.core.constants.DeviceKind;
+import com.shkpr.service.bespokegateway.core.domain.Device;
+import com.shkpr.service.bespokegateway.core.domain.DeviceTag;
+import com.shkpr.service.bespokegateway.core.service.DeviceSequencesService;
 import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDate;

+ 10 - 10
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/DeviceRegistry.java

@@ -1,18 +1,18 @@
-package com.shkpr.service.customgateway.core.components;
+package com.shkpr.service.bespokegateway.core.components;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
-import com.shkpr.service.customgateway.core.constants.DeviceField;
-import com.shkpr.service.customgateway.core.constants.DeviceKind;
-import com.shkpr.service.customgateway.core.constants.ExcelType;
-import com.shkpr.service.customgateway.core.constants.LogFlagBusiType;
-import com.shkpr.service.customgateway.core.domain.Device;
-import com.shkpr.service.customgateway.core.domain.DeviceExcel;
-import com.shkpr.service.customgateway.core.domain.DeviceTag;
-import com.shkpr.service.customgateway.core.service.DeviceTagsService;
-import com.shkpr.service.customgateway.core.utils.ExcelUtil;
+import com.shkpr.service.bespokegateway.core.constants.DeviceField;
+import com.shkpr.service.bespokegateway.core.constants.DeviceKind;
+import com.shkpr.service.bespokegateway.core.constants.ExcelType;
+import com.shkpr.service.bespokegateway.core.constants.LogFlagBusiType;
+import com.shkpr.service.bespokegateway.core.domain.Device;
+import com.shkpr.service.bespokegateway.core.domain.DeviceExcel;
+import com.shkpr.service.bespokegateway.core.domain.DeviceTag;
+import com.shkpr.service.bespokegateway.core.service.DeviceTagsService;
+import com.shkpr.service.bespokegateway.core.utils.ExcelUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/components/InfluxDBClients.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.components;
+package com.shkpr.service.bespokegateway.core.components;
 
-import com.shkpr.service.customgateway.core.domain.InfluxDbClient;
+import com.shkpr.service.bespokegateway.core.domain.InfluxDbClient;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;

+ 3 - 3
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/AsyncConfig.java

@@ -1,9 +1,9 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
-import com.shkpr.service.customgateway.core.constants.LogFlagBusiType;
-import com.shkpr.service.customgateway.core.properties.AsyncProperties;
+import com.shkpr.service.bespokegateway.core.constants.LogFlagBusiType;
+import com.shkpr.service.bespokegateway.core.properties.AsyncProperties;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/CallingConfig.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.properties.CallingProperties;
+import com.shkpr.service.bespokegateway.core.properties.CallingProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

+ 4 - 4
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/DataSourceConfig.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.properties.DataSourceProperties;
+import com.shkpr.service.bespokegateway.core.properties.DataSourceProperties;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import org.h2.jdbcx.JdbcDataSource;
@@ -11,8 +11,8 @@ import org.springframework.context.annotation.Configuration;
 
 import javax.sql.DataSource;
 
-import static com.shkpr.service.customgateway.core.constants.DataSourceNames.EMBEDDED;
-import static com.shkpr.service.customgateway.core.constants.DataSourceNames.PRIMARY;
+import static com.shkpr.service.bespokegateway.core.constants.DataSourceNames.EMBEDDED;
+import static com.shkpr.service.bespokegateway.core.constants.DataSourceNames.PRIMARY;
 
 /**
  * 数据源配置

+ 6 - 6
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/DeviceConfig.java

@@ -1,12 +1,12 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.shkpr.service.customgateway.core.components.DeviceIdGenerator;
-import com.shkpr.service.customgateway.core.components.DeviceRegistry;
-import com.shkpr.service.customgateway.core.properties.DeviceProperties;
-import com.shkpr.service.customgateway.core.service.DeviceSequencesService;
-import com.shkpr.service.customgateway.core.service.DeviceTagsService;
+import com.shkpr.service.bespokegateway.core.components.DeviceIdGenerator;
+import com.shkpr.service.bespokegateway.core.components.DeviceRegistry;
+import com.shkpr.service.bespokegateway.core.properties.DeviceProperties;
+import com.shkpr.service.bespokegateway.core.service.DeviceSequencesService;
+import com.shkpr.service.bespokegateway.core.service.DeviceTagsService;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/GatewayConfig.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.properties.GatewayProperties;
+import com.shkpr.service.bespokegateway.core.properties.GatewayProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/GlobalConfig.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.properties.GlobalProperties;
+import com.shkpr.service.bespokegateway.core.properties.GlobalProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

+ 4 - 4
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/InfluxDbConfig.java

@@ -1,8 +1,8 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.components.InfluxDBClients;
-import com.shkpr.service.customgateway.core.domain.InfluxDbClient;
-import com.shkpr.service.customgateway.core.properties.InfluxDbProperties;
+import com.shkpr.service.bespokegateway.core.components.InfluxDBClients;
+import com.shkpr.service.bespokegateway.core.domain.InfluxDbClient;
+import com.shkpr.service.bespokegateway.core.properties.InfluxDbProperties;
 import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.influx.InfluxDbOkHttpClientBuilderProvider;

+ 3 - 3
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/JdbcRepositoriesConfig.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -11,7 +11,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.sql.DataSource;
 
-import static com.shkpr.service.customgateway.core.constants.DataSourceNames.EMBEDDED;
+import static com.shkpr.service.bespokegateway.core.constants.DataSourceNames.EMBEDDED;
 
 /**
  * jdbc配置
@@ -22,7 +22,7 @@ import static com.shkpr.service.customgateway.core.constants.DataSourceNames.EMB
 @Configuration
 @EnableJdbcRepositories(jdbcOperationsRef = EMBEDDED + "JdbcOperations",
         transactionManagerRef = EMBEDDED + "TransactionManager",
-        basePackages = "com.shkpr.service.customgateway.core.repository." + EMBEDDED)
+        basePackages = "com.shkpr.service.bespokegateway.core.repository." + EMBEDDED)
 public class JdbcRepositoriesConfig {
     /**
      * @param dataSource 数据源

+ 3 - 3
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/PrimaryMybatisConfig.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -15,7 +15,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 import javax.sql.DataSource;
 
-import static com.shkpr.service.customgateway.core.constants.DataSourceNames.PRIMARY;
+import static com.shkpr.service.bespokegateway.core.constants.DataSourceNames.PRIMARY;
 
 /**
  * mybatis配置
@@ -25,7 +25,7 @@ import static com.shkpr.service.customgateway.core.constants.DataSourceNames.PRI
  */
 @Configuration
 @EnableConfigurationProperties(MybatisProperties.class)
-@MapperScan(sqlSessionTemplateRef = PRIMARY + "SqlSessionTemplate", basePackages = "com.shkpr.service.customgateway.**.mapper." + PRIMARY)
+@MapperScan(sqlSessionTemplateRef = PRIMARY + "SqlSessionTemplate", basePackages = "com.shkpr.service.bespokegateway.**.mapper." + PRIMARY)
 public class PrimaryMybatisConfig {
     private static final ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
 

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/SchedulingConfig.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.task.TaskSchedulerCustomizer;

+ 12 - 12
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/SecurityConfig.java

@@ -1,16 +1,16 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.components.AccessKeyGenerator;
-import com.shkpr.service.customgateway.core.constants.AccessMetadata;
-import com.shkpr.service.customgateway.core.constants.ResponseCode;
-import com.shkpr.service.customgateway.core.constants.TokenMetadata;
-import com.shkpr.service.customgateway.core.filter.AccessFilter;
-import com.shkpr.service.customgateway.core.filter.TokenFilter;
-import com.shkpr.service.customgateway.core.properties.GlobalProperties;
-import com.shkpr.service.customgateway.core.properties.SecurityProperties;
-import com.shkpr.service.customgateway.core.service.AccessKeysService;
-import com.shkpr.service.customgateway.core.utils.ResponseUtil;
-import com.shkpr.service.customgateway.core.utils.TokenUtil;
+import com.shkpr.service.bespokegateway.core.components.AccessKeyGenerator;
+import com.shkpr.service.bespokegateway.core.constants.AccessMetadata;
+import com.shkpr.service.bespokegateway.core.constants.ResponseCode;
+import com.shkpr.service.bespokegateway.core.constants.TokenMetadata;
+import com.shkpr.service.bespokegateway.core.filter.AccessFilter;
+import com.shkpr.service.bespokegateway.core.filter.TokenFilter;
+import com.shkpr.service.bespokegateway.core.properties.GlobalProperties;
+import com.shkpr.service.bespokegateway.core.properties.SecurityProperties;
+import com.shkpr.service.bespokegateway.core.service.AccessKeysService;
+import com.shkpr.service.bespokegateway.core.utils.ResponseUtil;
+import com.shkpr.service.bespokegateway.core.utils.TokenUtil;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/TempFileConfig.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.properties.TempFileProperties;
+import com.shkpr.service.bespokegateway.core.properties.TempFileProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/ValidatorConfig.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.context.annotation.Bean;

+ 3 - 3
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/config/WebConfig.java

@@ -1,7 +1,7 @@
-package com.shkpr.service.customgateway.core.config;
+package com.shkpr.service.bespokegateway.core.config;
 
-import com.shkpr.service.customgateway.core.properties.AsyncProperties;
-import com.shkpr.service.customgateway.core.properties.TempFileProperties;
+import com.shkpr.service.bespokegateway.core.properties.AsyncProperties;
+import com.shkpr.service.bespokegateway.core.properties.TempFileProperties;
 import lombok.NonNull;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/AccessMetadata.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/Api.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * api

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/AreaCode.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CommDefine.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * 通用定义

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerBillingType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerInfoStatus.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerMeterType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerMeteringType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerPublicServiceType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/CustomerReadType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DataSourceNames.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * 数据源名称

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DeviceField.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/DeviceKind.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ExcelEnum.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * excel枚举

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ExcelMetadata.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * excel元数据

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ExcelType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * excel类型

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/InfluxdbMetadata.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * influxdb元数据

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/IntegrationMetadata.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * 集成元数据

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/LogFlagBusiType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 public enum LogFlagBusiType {
     BUSI_INIT(0,"Init Busi"),

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/LoginUserRoleType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 public enum LoginUserRoleType {
     ROOT_ADMIN(0,"admin"),

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ProtocolType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ResponseCode.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/TokenMetadata.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 /**
  * influxdb元数据

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/constants/ValueType.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.constants;
+package com.shkpr.service.bespokegateway.core.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/controller/RouteController.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.controller;
+package com.shkpr.service.bespokegateway.core.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/AccessResult.java

@@ -1,7 +1,7 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.shkpr.service.customgateway.core.constants.AccessMetadata;
+import com.shkpr.service.bespokegateway.core.constants.AccessMetadata;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/AccessToken.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/CallingEndpoint.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.Data;
 

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/CommonToken.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/Device.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/DeviceExcel.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
-import com.shkpr.service.customgateway.core.annotation.ExcelMapping;
+import com.shkpr.service.bespokegateway.core.annotation.ExcelMapping;
 import lombok.Data;
 
 /**

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/DeviceTag.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/InfluxDbClient.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.Getter;
 import okhttp3.OkHttpClient;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/IntegrationKey.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/IntegrationKeyLoader.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 /**
  * 密钥加载器

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/LatLngBean.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/PageRequest.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.Data;
 import lombok.NonNull;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/PageResponse.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/Result.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 /**
  * 结果

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/ResultResponse.java

@@ -1,7 +1,7 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.shkpr.service.customgateway.core.constants.ResponseCode;
+import com.shkpr.service.bespokegateway.core.constants.ResponseCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/TmpTokenData.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
-import com.shkpr.service.customgateway.core.utils.AesUtil;
+import com.shkpr.service.bespokegateway.core.utils.AesUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/TokenData.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain;
+package com.shkpr.service.bespokegateway.core.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/AccessKeys.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 6 - 6
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/CustomerInfo.java

@@ -1,10 +1,10 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
-import com.shkpr.service.customgateway.core.annotation.ExcelMapping;
-import com.shkpr.service.customgateway.core.constants.CustomerBillingType;
-import com.shkpr.service.customgateway.core.constants.CustomerMeterType;
-import com.shkpr.service.customgateway.core.constants.CustomerMeteringType;
-import com.shkpr.service.customgateway.core.constants.CustomerPublicServiceType;
+import com.shkpr.service.bespokegateway.core.annotation.ExcelMapping;
+import com.shkpr.service.bespokegateway.core.constants.CustomerBillingType;
+import com.shkpr.service.bespokegateway.core.constants.CustomerMeterType;
+import com.shkpr.service.bespokegateway.core.constants.CustomerMeteringType;
+import com.shkpr.service.bespokegateway.core.constants.CustomerPublicServiceType;
 import lombok.Data;
 import org.locationtech.jts.geom.Geometry;
 

+ 3 - 3
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/CustomerMeterRead.java

@@ -1,7 +1,7 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
-import com.shkpr.service.customgateway.core.annotation.ExcelMapping;
-import com.shkpr.service.customgateway.core.constants.CustomerReadType;
+import com.shkpr.service.bespokegateway.core.annotation.ExcelMapping;
+import com.shkpr.service.bespokegateway.core.constants.CustomerReadType;
 import lombok.Data;
 
 import java.time.LocalDate;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/DeviceKind.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/DeviceSequences.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/DeviceTags.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/FunctionInfo.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import lombok.Data;
 

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/PersonnelInfo.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/domain/po/TypeDefine.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.domain.po;
+package com.shkpr.service.bespokegateway.core.domain.po;
 
 import lombok.Data;
 

+ 3 - 3
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/exception/GlobalSelfExceptionHandler.java

@@ -1,9 +1,9 @@
-package com.shkpr.service.customgateway.core.exception;
+package com.shkpr.service.bespokegateway.core.exception;
 
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
-import com.shkpr.service.customgateway.core.constants.ResponseCode;
-import com.shkpr.service.customgateway.core.domain.ResultResponse;
+import com.shkpr.service.bespokegateway.core.constants.ResponseCode;
+import com.shkpr.service.bespokegateway.core.domain.ResultResponse;
 import org.apache.catalina.connector.ClientAbortException;
 import org.springframework.beans.ConversionNotSupportedException;
 import org.springframework.beans.TypeMismatchException;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/exception/SelfAuthFilterException.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.exception;
+package com.shkpr.service.bespokegateway.core.exception;
 
 public class SelfAuthFilterException extends Exception {
     private int nErrorCode;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/exception/SelfException.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.exception;
+package com.shkpr.service.bespokegateway.core.exception;
 
 
 public class SelfException extends Exception{

+ 9 - 9
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/filter/AccessFilter.java

@@ -1,13 +1,13 @@
-package com.shkpr.service.customgateway.core.filter;
+package com.shkpr.service.bespokegateway.core.filter;
 
-import com.shkpr.service.customgateway.core.constants.AccessMetadata;
-import com.shkpr.service.customgateway.core.constants.AccessMetadata.ResponseCode;
-import com.shkpr.service.customgateway.core.domain.AccessToken;
-import com.shkpr.service.customgateway.core.domain.po.AccessKeys;
-import com.shkpr.service.customgateway.core.properties.SecurityProperties;
-import com.shkpr.service.customgateway.core.service.AccessKeysService;
-import com.shkpr.service.customgateway.core.utils.AccessUtil;
-import com.shkpr.service.customgateway.core.utils.SecurityUtil;
+import com.shkpr.service.bespokegateway.core.constants.AccessMetadata;
+import com.shkpr.service.bespokegateway.core.constants.AccessMetadata.ResponseCode;
+import com.shkpr.service.bespokegateway.core.domain.AccessToken;
+import com.shkpr.service.bespokegateway.core.domain.po.AccessKeys;
+import com.shkpr.service.bespokegateway.core.properties.SecurityProperties;
+import com.shkpr.service.bespokegateway.core.service.AccessKeysService;
+import com.shkpr.service.bespokegateway.core.utils.AccessUtil;
+import com.shkpr.service.bespokegateway.core.utils.SecurityUtil;
 import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;

+ 7 - 7
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/filter/JWTControllerCheck.java

@@ -1,15 +1,15 @@
-package com.shkpr.service.customgateway.core.filter;
+package com.shkpr.service.bespokegateway.core.filter;
 
 
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
 import com.global.base.tools.FastJsonUtil;
-import com.shkpr.service.customgateway.core.constants.LogFlagBusiType;
-import com.shkpr.service.customgateway.core.constants.ResponseCode;
-import com.shkpr.service.customgateway.core.storage.GlobalData;
-import com.shkpr.service.customgateway.core.utils.CommTool;
-import com.shkpr.service.customgateway.core.utils.RequestUtil;
-import com.shkpr.service.customgateway.core.utils.ResponseUtil;
+import com.shkpr.service.bespokegateway.core.constants.LogFlagBusiType;
+import com.shkpr.service.bespokegateway.core.constants.ResponseCode;
+import com.shkpr.service.bespokegateway.core.storage.GlobalData;
+import com.shkpr.service.bespokegateway.core.utils.CommTool;
+import com.shkpr.service.bespokegateway.core.utils.RequestUtil;
+import com.shkpr.service.bespokegateway.core.utils.ResponseUtil;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+ 8 - 8
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/filter/TokenFilter.java

@@ -1,14 +1,14 @@
-package com.shkpr.service.customgateway.core.filter;
+package com.shkpr.service.bespokegateway.core.filter;
 
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
-import com.shkpr.service.customgateway.core.constants.LogFlagBusiType;
-import com.shkpr.service.customgateway.core.constants.ResponseCode;
-import com.shkpr.service.customgateway.core.properties.GlobalProperties;
-import com.shkpr.service.customgateway.core.properties.SecurityProperties;
-import com.shkpr.service.customgateway.core.utils.ResponseUtil;
-import com.shkpr.service.customgateway.core.utils.SecurityUtil;
-import com.shkpr.service.customgateway.core.utils.TokenUtil;
+import com.shkpr.service.bespokegateway.core.constants.LogFlagBusiType;
+import com.shkpr.service.bespokegateway.core.constants.ResponseCode;
+import com.shkpr.service.bespokegateway.core.properties.GlobalProperties;
+import com.shkpr.service.bespokegateway.core.properties.SecurityProperties;
+import com.shkpr.service.bespokegateway.core.utils.ResponseUtil;
+import com.shkpr.service.bespokegateway.core.utils.SecurityUtil;
+import com.shkpr.service.bespokegateway.core.utils.TokenUtil;
 import lombok.NonNull;
 import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.BadCredentialsException;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/GeomMultiLineStringTypeHandlePg.java

@@ -1,7 +1,7 @@
-package com.shkpr.service.customgateway.core.io;
+package com.shkpr.service.bespokegateway.core.io;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.shkpr.service.customgateway.core.utils.GeomUtil;
+import com.shkpr.service.bespokegateway.core.utils.GeomUtil;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/GeomPointTypeHandlePg.java

@@ -1,7 +1,7 @@
-package com.shkpr.service.customgateway.core.io;
+package com.shkpr.service.bespokegateway.core.io;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.shkpr.service.customgateway.core.utils.GeomUtil;
+import com.shkpr.service.bespokegateway.core.utils.GeomUtil;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/GeomTypeHandlePg.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.io;
+package com.shkpr.service.bespokegateway.core.io;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/StringListTypeHandle.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.io;
+package com.shkpr.service.bespokegateway.core.io;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 1 - 1
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/io/YamlPropertySourceFactory.java

@@ -1,4 +1,4 @@
-package com.shkpr.service.customgateway.core.io;
+package com.shkpr.service.bespokegateway.core.io;
 
 import lombok.NonNull;
 import org.springframework.boot.env.YamlPropertySourceLoader;

+ 6 - 6
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/manager/IntegrationKeyManager.java

@@ -1,12 +1,12 @@
-package com.shkpr.service.customgateway.core.manager;
+package com.shkpr.service.bespokegateway.core.manager;
 
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
-import com.shkpr.service.customgateway.core.constants.LogFlagBusiType;
-import com.shkpr.service.customgateway.core.domain.CallingEndpoint;
-import com.shkpr.service.customgateway.core.domain.IntegrationKey;
-import com.shkpr.service.customgateway.core.domain.IntegrationKeyLoader;
-import com.shkpr.service.customgateway.core.properties.CallingProperties;
+import com.shkpr.service.bespokegateway.core.constants.LogFlagBusiType;
+import com.shkpr.service.bespokegateway.core.domain.CallingEndpoint;
+import com.shkpr.service.bespokegateway.core.domain.IntegrationKey;
+import com.shkpr.service.bespokegateway.core.domain.IntegrationKeyLoader;
+import com.shkpr.service.bespokegateway.core.properties.CallingProperties;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/CustomerInfoMapper.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.mapper.primary;
+package com.shkpr.service.bespokegateway.core.mapper.primary;
 
-import com.shkpr.service.customgateway.core.domain.po.CustomerInfo;
+import com.shkpr.service.bespokegateway.core.domain.po.CustomerInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/CustomerMeterReadMapper.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.mapper.primary;
+package com.shkpr.service.bespokegateway.core.mapper.primary;
 
-import com.shkpr.service.customgateway.core.domain.po.CustomerMeterRead;
+import com.shkpr.service.bespokegateway.core.domain.po.CustomerMeterRead;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/DeviceKindMapper.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.mapper.primary;
+package com.shkpr.service.bespokegateway.core.mapper.primary;
 
-import com.shkpr.service.customgateway.core.domain.po.DeviceKind;
+import com.shkpr.service.bespokegateway.core.domain.po.DeviceKind;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

+ 2 - 2
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/FunctionInfoMapper.java

@@ -1,6 +1,6 @@
-package com.shkpr.service.customgateway.core.mapper.primary;
+package com.shkpr.service.bespokegateway.core.mapper.primary;
 
-import com.shkpr.service.customgateway.core.domain.po.FunctionInfo;
+import com.shkpr.service.bespokegateway.core.domain.po.FunctionInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 0 - 0
custom-gateway-core/src/main/java/com/shkpr/service/customgateway/core/mapper/primary/PersonnelInfoMapper.java


Some files were not shown because too many files changed in this diff