Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

csm-service/cms-service-user/pom.xml

@@ -90,7 +90,7 @@
             <artifactId>piggy-settlement</artifactId>
             <version>1.0.0</version>
             <scope>system</scope>
-            <systemPath>${basedir}/src/main/resources/lib/piggy-settlement-sdk-1.7.0.jar</systemPath>
+            <systemPath>${project.basedir}/src/main/resources/lib/piggy-settlement-sdk-1.7.0.jar</systemPath>
         </dependency>
 
         <dependency>
@@ -106,6 +106,9 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
             </plugin>
         </plugins>
     </build>

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

@@ -118,7 +118,7 @@ public class XzServiceImpl implements XzService {
     @Transactional
     @Override
     public String xzAuthNotify(JSONObject notify) {
-        log.info("获取到的推送结果：{}", notify.toString());
+        log.info("xzAuthNotify获取到的推送结果：{}", notify.toString());
         // 认证成功，修改认证状态
         if (notify.get("code").toString().equals("0")) {
             XzAuthDO authDO = notify.get("data", XzAuthDO.class);
@@ -248,8 +248,8 @@ public class XzServiceImpl implements XzService {
 
     @Override
     public String xzWithdrawNotify(JSONObject notify) {
-        log.info("获取到的推送结果：{}", notify.toString());
-
+        log.info("xzWithdrawNotify获取到的推送结果：{}", notify.toString());
+        // TODO 会受到两次回调
         return "success";
     }
 

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -76,8 +76,8 @@ third-party:
     domain: https://uat.xzsz.ltd/
     position: 销售推广
     taxFundId: xxxxxxxxxxxxxxxxxxxxxxx
-    authNotify: https://test.iuav.shop/xz/xzAuthNotify
-    withdrawNotify: http://test.iuav.shop/xz/xzWithdrawNotify
+    authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
+    withdrawNotify: http://test.iuav.shop/userapp/xz/xzWithdrawNotify
 
 iuav:
   pay:

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -45,8 +45,8 @@ third-party:
     domain: https://uat.xzsz.ltd/
     position: 销售推广
     taxFundId: xxxxxxxxxxxxxxxxxxxxxxx
-    authNotify: https://test.iuav.shop/xz/xzAuthNotify
-    withdrawNotify: http://test.iuav.shop/xz/xzWithdrawNotify
+    authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
+    withdrawNotify: http://test.iuav.shop/userapp/xz/xzWithdrawNotify
 
 
 iuav:

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -278,7 +278,7 @@
             AND rna.check_status = #{realAuthStatus}
         </if>
         <if test="realAuthStatus == 0">
-            AND ( rna.check_status is not null or rna.check_status = 0 )
+            AND ( rna.check_status is null or rna.check_status = 0 )
         </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}
@@ -349,7 +349,7 @@
             AND rna.check_status = #{realAuthStatus}
         </if>
         <if test="realAuthStatus == 0">
-            AND ( rna.check_status is not null or rna.check_status = 0 )
+            AND ( rna.check_status is null or rna.check_status = 0 )
         </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -29,4 +29,6 @@ data-filter:
     - /userapp/cooperation/appBrandMessage
     - /userapp/pilot/detailPilot
     - /userapp/pilot/appListPilot
+    - /userapp/xz/xzAuthNotify
+    - /userapp/xz/xzWithdrawNotify
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 8f5e640c264efbb0d1d92d72f810d4b3daebb15e
+  newTag: 5fa4a4d1d44c069135251377d516783b69a1c274

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: d38385144aaeecfff8c147e07aac460ea1f01b43
+  newTag: 1ab13d69651c5b403ab777b73c8ad72ec5831057