去除接口权限

src/main/java/com/neotel/smfcore/core/order/service/manager/impl/LiteOrderManagerImpl.java

@@ -37,6 +37,11 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
         LiteOrder order= liteOrderDao.findOneByCondition(new String[] {"orderNo"}, new String[] {orderNo});
         LiteOrder order= liteOrderDao.findOneByCondition(new String[] {"orderNo"}, new String[] {orderNo});
         if(order!=null&& order.getOrderItems()==null){
         if(order!=null&& order.getOrderItems()==null){
             List<LiteOrderItem> items=liteOrderItemManager.findOrderItems(order.getId());
             List<LiteOrderItem> items=liteOrderItemManager.findOrderItems(order.getId());
+            //优先根据ID查, 考虑兼容性,如果根据ID没有查询到,使用orderNo再查询一次
+            if(items == null || items.isEmpty()){
+                Query q = Query.query(Criteria.where("orderNo").is(orderNo));
+                items=liteOrderItemManager.findByQuery(q);
+            }
             order.setOrderItems(items);
             order.setOrderItems(items);
         }
         }
         return order;
         return order;

src/main/java/com/neotel/smfcore/custom/hella/tcp/HellaTcpClient.java

@@ -62,8 +62,11 @@ public class HellaTcpClient {
         if(ObjectUtil.isEmpty(host)||ObjectUtil.isEmpty(port)){
         if(ObjectUtil.isEmpty(host)||ObjectUtil.isEmpty(port)){
             log.info("配置不完整，不需要连接");
             log.info("配置不完整，不需要连接");
         }else{
         }else{
-            updateServerInfo(host, port);
-            start();
+            String apiName = dataCache.getConfigCache("api.name","");
+            if(apiName != null && apiName.equalsIgnoreCase("Hella")){
+                updateServerInfo(host, port);
+                start();
+            }
         }
         }
     }
     }
 
 

src/main/java/com/neotel/smfcore/security/config/ElPermissionConfig.java

@@ -15,41 +15,42 @@ import java.util.stream.Collectors;
 public class ElPermissionConfig {
 public class ElPermissionConfig {
     public Boolean check(String ... permissions) {
     public Boolean check(String ... permissions) {
 
 
+        boolean result = true;
         //超级管理员
         //超级管理员
-        if (SecurityUtils.getCurrentUsername().equals(Constants.SUPER_USERNAME)) {
-            return true;
-        }
-
-        // 获取当前用户的所有权限
-        List<String> elPermissions = SecurityUtils.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
-
-        // 判断当前用户的所有权限是否包含接口上定义的权限
-        boolean result = elPermissions.contains("admin") || Arrays.stream(permissions).anyMatch(elPermissions::contains);
-        String msg = "";
-        for (String str :
-                permissions) {
-            msg += str + ",";
-        }
-        if (!result) {
-
-            //未找到匹配项，分割后匹配
-            for (String per :
-                    permissions) {
-                if (!DataInitManager.allPermissionSet.contains(per)) {
-
-                    String[] perArray = per.split(":");
-                    if (perArray.length > 1) {
-                        String newper = perArray[0];
-                        if (elPermissions.contains(newper)) {
-                            result = true;
-                        }
-                    }
-                }
-            }
-        }
-        if (!result) {
-            log.info("username[" + SecurityUtils.getCurrentUsername() + "] 对 [" + msg + "]无访问权限");
-        }
+//        if (SecurityUtils.getCurrentUsername().equals(Constants.SUPER_USERNAME)) {
+//            return true;
+//        }
+//
+//        // 获取当前用户的所有权限
+//        List<String> elPermissions = SecurityUtils.getCurrentUser().getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
+//
+//        // 判断当前用户的所有权限是否包含接口上定义的权限
+//        result = elPermissions.contains("admin") || Arrays.stream(permissions).anyMatch(elPermissions::contains);
+//        String msg = "";
+//        for (String str :
+//                permissions) {
+//            msg += str + ",";
+//        }
+//        if (!result) {
+//
+//            //未找到匹配项，分割后匹配
+//            for (String per :
+//                    permissions) {
+//                if (!DataInitManager.allPermissionSet.contains(per)) {
+//
+//                    String[] perArray = per.split(":");
+//                    if (perArray.length > 1) {
+//                        String newper = perArray[0];
+//                        if (elPermissions.contains(newper)) {
+//                            result = true;
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        if (!result) {
+//            log.info("username[" + SecurityUtils.getCurrentUsername() + "] 对 [" + msg + "]无访问权限");
+//        }
         return result;
         return result;
     }
     }
 }
 }

src/main/resources/config/application.yml

@@ -38,7 +38,7 @@ rsa:
 
 
 
 
 app:
 app:
-  version: '1.27.0110'
+  version: '1.27.2515'
   type: ""
   type: ""
 
 
 menu:
 menu: