Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mob...

shichongfu

2023-08-21 90be36e53ecac9893bcb780225372ef33f9cd8fa

Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0

# Conflicts:
#	src/main/java/com/product/mobile/core/service/NavBarManagerService.java

 src/main/java/com/product/mobile/core/service/NavBarManagerService.java

@@ -160,7 +160,6 @@
        sql.append(" a.nav_bar_name, ");
        sql.append(" a.module_category, ");
        sql.append(" a.uuid ,");
//        sql.append(" b.uuid ,");
        sql.append(" concat( '/', b.uuid ),");
        sql.append(" a.sequence, ");
        sql.append(" b.route_name,a.module_sequence ");
@@ -177,8 +176,11 @@
                }
                String file_uuid = dt.getString(i, MobileCoreConst.NAV_BAR_IMG);
                try {
                    String bytes = null;
                    byte[] fileContent = fileManagerService.getFileContent(file_uuid);
                    String bytes = Base64.encodeBase64String(fileContent);
                    if (fileContent != null && fileContent.length > 0) {
                        bytes = Base64.encodeBase64String(fileContent);
                    }
                    dt.setFieldValue(i, MobileCoreConst.NAV_BAR_IMG, bytes);
                } catch (Exception e) {
                    dt.setFieldValue(i, MobileCoreConst.NAV_BAR_IMG, null);