Merge branches 'develop' and 'master' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/TokenCheckHandleInterceptor.java

@@ -37,7 +37,6 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
         if (!shouldFilter(requestURI)){
             return true;
         }
-
         String token = request.getHeader("token");
         if (StringUtils.isBlank(token)){
             exceptionProcess(response);

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

@@ -142,6 +142,13 @@
                 #{id}
             </foreach>
         </if>
+        <if test="keyword != null">
+            and (
+            user_name like CONCAT("%",#{keyword},"%") or
+            nick_name like CONCAT("%",#{keyword},"%") or
+            phone_num like CONCAT("%",#{keyword},"%")or
+            uid like CONCAT("%",#{keyword},"%"))
+        </if>
         <if test="provinceCode != null">
             and ua.province_code = #{provinceCode}
         </if>

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: f3feaca2b4ecd07343122ef2a7b3bfd8e40a9b19
+  newTag: d38385144aaeecfff8c147e07aac460ea1f01b43