24282 1 månad sedan
förälder
incheckning
135571c6b9

+ 21 - 21
hx-admin/pom.xml

@@ -29,10 +29,10 @@
             <artifactId>hx-supply</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-iot</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-iot</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fjhx</groupId>
@@ -64,30 +64,30 @@
             <artifactId>hx-account</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-mail</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-sale</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-dingding</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-dingding</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-ehsd</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-ehsd</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-jxst</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-jxst</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fjhx</groupId>
@@ -131,7 +131,7 @@
                 </configuration>
             </plugin>
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>bytesailing</finalName>
     </build>
 
 </project>

+ 39 - 169
hx-admin/src/main/resources/application-dev.yml

@@ -5,77 +5,61 @@ spring:
             strict: true
             primary: base
             datasource:
-                victoriatourist:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
                 common:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 oa:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 mes:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 wms:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 item:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 supply:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 base:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
-                iot:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 customer:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 purchase:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 account:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 sale:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
-                mail:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
-                kd100:
-                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: bytesailing_db_user
-                    password: kfG-A93-w7h-qX8
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
 
     # redis 配置
     redis:
         # 地址
-        host: 139.9.102.170
+        host: 8.148.108.223
         # 端口,默认为6379
-        port: 9673
+        port: 6874
         # 数据库索引
-        database: 5
+        database: 1
         # 密码
-        password: ss34dsA3DdsF
+        password: inU26s~RdLL@3xnbRcC8
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -95,7 +79,7 @@ mail:
     abroadUrlPrefix:
 
 hx:
-    httpUrl: http://localhost:9898/
+    httpUrl:
 
 # token配置
 token:
@@ -104,118 +88,4 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期(默认30分钟)
-    expireTime: 2880
-
-
-
-## 数据源配置
-#spring:
-#    datasource:
-#        dynamic:
-#            strict: true
-#            primary: base
-#            datasource:
-#                victoriatourist:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                common:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                oa:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                mes:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                wms:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                item:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                supply:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                base:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                iot:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                customer:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                purchase:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                account:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                sale:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                mail:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#                kd100:
-#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: bytesailing_db_user
-#                    password: kfG-A93-w7h-qX8
-#
-#    # redis 配置
-#    redis:
-#        # 地址
-#        host: 139.159.251.109
-#        # 端口,默认为6379
-#        port: 31347
-#        # 数据库索引
-#        database: 1
-#        # 密码
-#        password: w3G_11h4YjrsO_6P5Oi
-#        # 连接超时时间
-#        timeout: 10s
-#        lettuce:
-#            pool:
-#                # 连接池中的最小空闲连接
-#                min-idle: 0
-#                # 连接池中的最大空闲连接
-#                max-idle: 8
-#                # 连接池的最大数据库连接数
-#                max-active: 8
-#                # #连接池最大阻塞等待时间(使用负值表示没有限制)
-#                max-wait: -1ms
-#
-#server:
-#    servlet:
-#        context-path: /prod-api
-#
-#mail:
-#    # 调用邮箱服务url前缀
-#    urlPrefix: http://localhost:8088/mailService/
-#    abroadUrlPrefix: http://159.138.54.234:8088/mailService/
-#
-#hx:
-#    httpUrl: http://139.159.251.109:81/prod-api/
-#
-## token配置
-#token:
-#    # 令牌自定义标识
-#    header: Authorization
-#    # 令牌密钥
-#    secret: abcdefghijklmnopqrstuvwxyz
-#    # 令牌有效期(默认30分钟)
-#    expireTime: 240
+    expireTime: 2880

+ 39 - 57
hx-admin/src/main/resources/application-prod.yml

@@ -5,77 +5,61 @@ spring:
       strict: true
       primary: base
       datasource:
-        victoriatourist:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
         common:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         oa:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         mes:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         wms:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         item:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         supply:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         base:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
-        iot:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         customer:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         purchase:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         account:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
         sale:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
-        mail:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
-        kd100:
-          url: jdbc:mysql://192.168.0.238:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-          username: bytesailing_db_user
-          password: kfG-A93-w7h-qX8
+          url: jdbc:mysql://rm-gw0i0555rlxx31n83.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: e4O5x_OTKr4w_hH
+          password: cn0J5y3DsvdP1M-Y8AyD
 
   # redis 配置
   redis:
     # 地址
     host: 127.0.0.1
     # 端口,默认为6379
-    port: 9673
+    port: 6874
     # 数据库索引
     database: 1
     # 密码
-    password: ss34dsA3DdsF
+    password: inU26s~RdLL@3xnbRcC8
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -90,17 +74,15 @@ spring:
         max-wait: -1ms
 
 server:
-  port: 9910
-  servlet:
-    context-path: /prod-api
+  port: 8001
 
 mail:
   # 调用邮箱服务url前缀
-  urlPrefix: http://localhost:8088/mailService/
-  abroadUrlPrefix: http://159.138.54.234:8088/mailService/
+  urlPrefix:
+  abroadUrlPrefix:
 
 hx:
-  httpUrl: http://139.159.251.109:81/prod-api/
+  httpUrl:
 
 # token配置
 token:

+ 38 - 51
hx-admin/src/main/resources/application-test.yml

@@ -6,68 +6,60 @@ spring:
             primary: base
             datasource:
                 common:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 oa:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 mes:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 wms:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 item:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 supply:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 base:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
-                iot:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 customer:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 purchase:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 account:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
                 sale:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
-                mail:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
+                    url: jdbc:mysql://rm-gw0i0555rlxx31n834o.mysql.cn-chengdu.rds.aliyuncs.com:9642/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: e4O5x_OTKr4w_hH
+                    password: cn0J5y3DsvdP1M-Y8AyD
 
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 8.148.108.223
         # 端口,默认为6379
-        port: 30103
+        port: 6874
         # 数据库索引
-        database: 5
+        database: 1
         # 密码
-        password: Fjhx@pwd123
+        password: inU26s~RdLL@3xnbRcC8
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -81,18 +73,13 @@ spring:
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
                 max-wait: -1ms
 
-server:
-    port: 20001
-    servlet:
-        context-path: /test-api
-
 mail:
     # 调用邮箱服务url前缀
     urlPrefix:
     abroadUrlPrefix:
 
 hx:
-    httpUrl: http://121.37.194.75:10006/test-api/
+    httpUrl: http://localhost:9898/
 
 # token配置
 token:

+ 0 - 183
hx-admin/src/test/java/DingDingTest.java

@@ -1,183 +0,0 @@
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.aliyun.dingtalkoauth2_1_0.Client;
-import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenRequest;
-import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenResponseBody;
-import com.aliyun.tea.TeaException;
-import com.aliyun.teaopenapi.models.Config;
-import com.fjhx.admin.BytesailingApplication;
-import com.fjhx.area.service.CustomizeAreaService;
-import com.fjhx.dingding.constant.Constant;
-import com.fjhx.dingding.service.DingService;
-import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.framework.mybatis.holder.TenantHolder;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = BytesailingApplication.class)
-@Slf4j
-public class DingDingTest {
-
-
-    @Autowired
-    private DingService dingService;
-
-    @Autowired
-    private CustomizeAreaService customizeAreaService;
-
-    @TenantIgnore
-    @Test
-    public void test1() {
-
-        TenantHolder.setIgnore(true);
-
-        String a = "{ \"bizData\":[\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683798054000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19960,\n" +
-                "            \"gmt_modified\":1683798054000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager2795\\\"},\\\"eventId\\\":\\\"e18758c115604987bb7ba2b4621ab34e\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"dingc265ea6f59c8a65524f2f5cc6abecb85\\\",\\\"auth_level\\\":0,\\\"corp_city\\\":\\\"吉隆坡\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"影音视频\\\",\\\"full_corp_name\\\":\\\"宏星钉测\\\",\\\"corp_name\\\":\\\"宏星钉测\\\",\\\"corp_province\\\":\\\"吉隆坡\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&amp;corpId=dingc265ea6f59c8a65524f2f5cc6abecb85&amp;inviteCode=LWeFQxRHOfULrKM\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581464649,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager2795\\\",\\\"231344025724080775\\\",\\\"1244061748905460\\\"]}]},\\\"permanent_code\\\":\\\"MGUG4eSzQWXajGqyCKlVxeZDly-fIhvIsg-Oe_9RiDAuVZselpxX3utY7KBYJLNx\\\",\\\"syncSeq\\\":\\\"8C4DD3DFE04AAE2FB1E6B2AEF7\\\"}\",\n" +
-                "            \"corp_id\":\"dingc265ea6f59c8a65524f2f5cc6abecb85\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683798959000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19966,\n" +
-                "            \"gmt_modified\":1683798959000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"0146512911051043578\\\"},\\\"eventId\\\":\\\"04a9b05f50334f9fa51293892e20ed95\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding53d823e205604918a39a90f97fcb1e09\\\",\\\"auth_level\\\":1,\\\"corp_city\\\":\\\"福州\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"计算机软件\\\",\\\"full_corp_name\\\":\\\"福建数字云帆科技有限公司\\\",\\\"corp_name\\\":\\\"福建数字云帆科技有限公司\\\",\\\"corp_province\\\":\\\"福建\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&amp;corpId=ding53d823e205604918a39a90f97fcb1e09&amp;inviteCode=NxLoVevdvDloXGi\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":true,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581336572,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"01392913111186905\\\",\\\"0146512911051043578\\\"]}]},\\\"permanent_code\\\":\\\"-icZLdi8NmOL2Rte7Sh3CqdbBcIOGf6eZtJhFNMRBkBugTISTm7zbP21uspckibW\\\",\\\"syncSeq\\\":\\\"844DD3DFE04AAE2FB1E6B2AEA0\\\"}\",\n" +
-                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683799205000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19970,\n" +
-                "            \"gmt_modified\":1683799205000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager6338\\\"},\\\"eventId\\\":\\\"025ca5fb30c9472c8a7ea8211adf78ef\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"dingb543e6dc430497bbee0f45d8e4f7c288\\\",\\\"auth_level\\\":0,\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"\\\",\\\"full_corp_name\\\":\\\"hffff 测试\\\",\\\"corp_name\\\":\\\"hffff 测试\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&amp;corpId=dingb543e6dc430497bbee0f45d8e4f7c288&amp;inviteCode=DVwNu9mv9AowRNZ\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581242807,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager6338\\\"]}]},\\\"permanent_code\\\":\\\"oVS5wid1S_B5JPXGZtiNH_gu0N0Diev6SLWHSaEpvHvClNEua_eIINRMOw2JIUC4\\\",\\\"syncSeq\\\":\\\"874DD3DFE04AA32FA1E6B2AEA5\\\"}\",\n" +
-                "            \"corp_id\":\"dingb543e6dc430497bbee0f45d8e4f7c288\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683810014000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19981,\n" +
-                "            \"gmt_modified\":1683810014000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager8063\\\"},\\\"eventId\\\":\\\"9cee61dc4e3e4226a424b0f07c593a0e\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding379d86d92b0c876eee0f45d8e4f7c288\\\",\\\"auth_level\\\":0,\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"\\\",\\\"full_corp_name\\\":\\\"中星华宸\\\",\\\"corp_name\\\":\\\"中星华宸\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&amp;corpId=ding379d86d92b0c876eee0f45d8e4f7c288&amp;inviteCode=r1zJSofuiKs5eDA\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581402962,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager8063\\\"]}]},\\\"permanent_code\\\":\\\"jZa3L6vaNTyEhmg5ZmAT2Ym9-NUrUjTIp8wSNek2SO8O3bZPGzn9pfDUE0N5E82k\\\",\\\"syncSeq\\\":\\\"804DD3DFE04AAF2F01E6B2AE67\\\"}\",\n" +
-                "            \"corp_id\":\"ding379d86d92b0c876eee0f45d8e4f7c288\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683854166000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19993,\n" +
-                "            \"gmt_modified\":1683854166000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager7560\\\"},\\\"eventId\\\":\\\"8f508ef39eab4a37b643c0195e8ec862\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding3f327504d104ac1cf2c783f7214b6d69\\\",\\\"auth_level\\\":0,\\\"corp_city\\\":\\\"福州\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"计算机软件\\\",\\\"full_corp_name\\\":\\\"hf测试\\\",\\\"corp_name\\\":\\\"hf测试\\\",\\\"corp_province\\\":\\\"福建\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&amp;corpId=ding3f327504d104ac1cf2c783f7214b6d69&amp;inviteCode=i8yWYDEytZJIkIa\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581273014,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager7560\\\"]}]},\\\"permanent_code\\\":\\\"caY2fuNclujXwRXlDOuctE-4HlOY6hWfgBTnMDbOaCPGQ-yzWQBxE6-axKq9XSJy\\\",\\\"syncSeq\\\":\\\"844DD3DFE04AAD2F91E6B2AEE5\\\"}\",\n" +
-                "            \"corp_id\":\"ding3f327504d104ac1cf2c783f7214b6d69\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683854404000,\n" +
-                "            \"biz_type\":2,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19994,\n" +
-                "            \"gmt_modified\":1683854404000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"eventId\\\":\\\"e50ed7cdf209448fa567e523bfc52b83\\\",\\\"syncAction\\\":\\\"suite_ticket\\\",\\\"suiteTicket\\\":\\\"2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl\\\",\\\"syncSeq\\\":\\\"2AEA5DA284BB85DEE8CA8D33A9\\\"}\",\n" +
-                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
-                "            \"status\":0\n" +
-                "        }\n" +
-                "    ]}";
-
-
-        dingService.pushHigh(JSON.parseObject(a));
-
-        System.out.println();
-
-    }
-
-    public static void main(String[] args) {
-        String a = "{ \"bizData\":[        {\n" +
-                "            \"gmt_create\":1683854404000,\n" +
-                "            \"biz_type\":2,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19994,\n" +
-                "            \"gmt_modified\":1683854404000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"eventId\\\":\\\"e50ed7cdf209448fa567e523bfc52b83\\\",\\\"syncAction\\\":\\\"suite_ticket\\\",\\\"suiteTicket\\\":\\\"2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl\\\",\\\"syncSeq\\\":\\\"2AEA5DA284BB85DEE8CA8D33A9\\\"}\",\n" +
-                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
-                "            \"status\":0\n" +
-                "        }]}";
-        System.out.println(JSON.parse(a));
-    }
-
-
-    private static String test1(String corpId) {
-        GetCorpAccessTokenRequest getCorpAccessTokenRequest = new GetCorpAccessTokenRequest()
-                .setSuiteKey(Constant.SUITE_KEY)
-                .setSuiteSecret(Constant.SUITE_SECRET)
-                .setAuthCorpId(corpId)
-                .setSuiteTicket("2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl");
-
-        try {
-            Client client = getClient2();
-            GetCorpAccessTokenResponseBody body = client.getCorpAccessToken(getCorpAccessTokenRequest).getBody();
-            return body.getAccessToken();
-        } catch (Exception e) {
-
-            TeaException teaException;
-
-            if (e instanceof TeaException) {
-                teaException = (TeaException) e;
-            } else {
-                teaException = new TeaException(e.getMessage(), e);
-            }
-
-            String errCode = teaException.getCode();
-            String errMsg = teaException.getMessage();
-
-            if (StrUtil.isAllNotBlank(errCode, errMsg)) {
-                log.error("钉钉授权认证失败: code:{},message:{}", errCode, errMsg);
-                throw new ServiceException(errMsg);
-            } else {
-                log.error("钉钉授权认证失败", teaException);
-                throw new ServiceException("发生未知异常,钉钉授权认证失败");
-            }
-
-        }
-    }
-
-
-    private static com.aliyun.dingtalkoauth2_1_0.Client getClient2() throws Exception {
-        Config config = new Config();
-        config.protocol = "https";
-        config.regionId = "central";
-        return new com.aliyun.dingtalkoauth2_1_0.Client(config);
-    }
-
-}

+ 41 - 54
pom.xml

@@ -14,11 +14,11 @@
         <module>code</module>
         <module>hx-admin</module>
         <module>hx-customer</module>
-        <module>hx-ehsd</module>
-        <module>hx-finance</module>
-        <module>hx-iot</module>
+<!--        <module>hx-ehsd</module>-->
+<!--        <module>hx-finance</module>-->
+<!--        <module>hx-iot</module>-->
         <module>hx-item</module>
-        <module>hx-mail</module>
+<!--        <module>hx-mail</module>-->
         <module>hx-mes</module>
         <module>hx-supply</module>
         <module>hx-wms</module>
@@ -27,9 +27,9 @@
         <module>hx-purchase</module>
         <module>hx-account</module>
         <module>hx-sale</module>
-        <module>hx-dingding</module>
+<!--        <module>hx-dingding</module>-->
         <module>hx-data</module>
-        <module>hx-jxst</module>
+<!--        <module>hx-jxst</module>-->
         <module>hx-form</module>
     </modules>
 
@@ -69,31 +69,31 @@
                 <artifactId>hx-customer</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-ehsd</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-finance</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-iot</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-ehsd</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-finance</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-iot</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-item</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-mail</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-mail</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-mes</artifactId>
@@ -114,49 +114,36 @@
                 <artifactId>hx-oa</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-customer</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-purchase</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-sale</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-account</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-dingding</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-data</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-jxst</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-dingding</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-data</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-jxst</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-form</artifactId>