Merge branch '20220802' into 'master'

20220802

See merge request huang/thingsboard3.3.2!122

@@ -3,6 +3,7 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +40,7 @@ public class YtConfigurationCenterController extends BaseController {
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(PAGE) int page,
       @RequestParam(value = "name", required = false) String name,
       @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "platform", required = false) String platform,
       @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
@@ -49,12 +51,15 @@ public class YtConfigurationCenterController extends BaseController {
     queryMap.put(PAGE, page);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
     queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
-    if (null != name) {
+    if (StringUtils.isNotBlank(name)) {
       queryMap.put("name", name);
       queryMap.put("name", name);
     }
     }
-    if (null != organizationId) {
+    if (StringUtils.isNotBlank(organizationId)) {
       queryMap.put("organizationId", organizationId);
       queryMap.put("organizationId", organizationId);
     }
     }
+    if (StringUtils.isNotBlank(platform)) {
+      queryMap.put("platform", platform);
+    }
     if (null != orderType) {
     if (null != orderType) {
       queryMap.put(ORDER_TYPE, orderType.name());
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     }

@@ -1151,7 +1151,7 @@ file:
       randomFileName: ${file.storage.randomFileName}
       randomFileName: ${file.storage.randomFileName}
 account:
 account:
   info:
   info:
-    emailSuffix: yunteng.com
+    emailSuffix: ${ACCOUNT_EMAIL_SUFFIX:yunteng.com}
 #    emailSuffix: thingskit.com
 #    emailSuffix: thingskit.com
     defaultPassword: 123456
     defaultPassword: 123456
 third:
 third:
@@ -1159,8 +1159,8 @@ third:
     url: https://api.weixin.qq.com
     url: https://api.weixin.qq.com
 #    appId: wxd5d018355f38262b
 #    appId: wxd5d018355f38262b
 #    appSecret: a07fab1d2d6c6def1fa4796535f8af30
 #    appSecret: a07fab1d2d6c6def1fa4796535f8af30
-    appId: wx99c411dc3c5571ef
-    appSecret: 606153abd59308b20a6e41fb6c852ad2
+    appId: ${WECHAT_APP_ID:wx99c411dc3c5571ef}
+    appSecret: ${WECHAT_APP_SECRET:606153abd59308b20a6e41fb6c852ad2}
 logging:
 logging:
   level:
   level:
     org.thingsboard.server.dao.yunteng.mapper: info
     org.thingsboard.server.dao.yunteng.mapper: info
@@ -1169,4 +1169,4 @@ logging:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 frp:
 frp:
   server:
   server:
-    address: http://127.0.0.1
+    address: ${FRP_SERVER_ADDRESS:http://127.0.0.1}

@@ -40,6 +40,9 @@
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND a.tenant_id = #{queryMap.tenantId}
                 AND a.tenant_id = #{queryMap.tenantId}
             </if>
             </if>
+            <if test="queryMap.platform !=null and queryMap.platform !=''">
+                AND a.platform = #{queryMap.platform}
+            </if>
             <if test="queryMap.name !=null and queryMap.name !=''">
             <if test="queryMap.name !=null and queryMap.name !=''">
                 AND a.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
                 AND a.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
             </if>
             </if>

@@ -46,5 +46,6 @@
             <if test="dictId !=null and dictId!=''">AND sdi.dict_id=#{dictId}</if>
             <if test="dictId !=null and dictId!=''">AND sdi.dict_id=#{dictId}</if>
             <if test="dictCode !=null and dictCode!=''">AND sd.dict_code=#{dictCode}</if>
             <if test="dictCode !=null and dictCode!=''">AND sd.dict_code=#{dictCode}</if>
         </where>
         </where>
+        ORDER BY sort
     </select>
     </select>
 </mapper>
 </mapper>