fix:fix AppV1ServiceImplTest and blockMapper (#159)

Author: zhangjuncao

base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java

@@ -137,7 +137,7 @@ public interface BlockMapper extends BaseMapper<Block> {
             @Result(column = "occupier_by", property = "occupier",
                     one = @One(select = "com.tinyengine.it.mapper.UserMapper.queryUserById"))
     })
-    @Select("select b.*,bcbcb.block_id as block_categories_blocks_id,bsh.block_id as block_histories_block_id "
+    @Select("select b.*,bh.ref_id as block_id "
             + "from t_block b "
             + "left join t_block_history bh on b.latest_history_id = bh.id "
             + "where b.id = #{blockId} "

base/src/test/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImplTest.java

@@ -17,6 +17,8 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.when;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tinyengine.it.mapper.AppExtensionMapper;
 import com.tinyengine.it.mapper.AppMapper;
 import com.tinyengine.it.mapper.BlockGroupMapper;
@@ -102,12 +104,18 @@ void setUp() {
     }
 
     @Test
-    void testAppSchema() {
+    void testAppSchema() throws JsonProcessingException {
         App app = new App();
         int appId = 2;
         app.setId(appId);
         app.setHomePage(1);
         app.setPlatformId(1);
+
+        String json = "{\"dataHandler\":{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}}";
+        ObjectMapper objectMapper = new ObjectMapper();
+        Map<String, Object> dataSourceGlobal = objectMapper.readValue(json, Map.class);
+        app.setDataSourceGlobal(dataSourceGlobal);
+
         when(appMapper.queryAppById(anyInt())).thenReturn(app);
         Page page = new Page();
         page.setIsPage(true);