解决CHANGELOG冲突

Signed-off-by: zgf <zenggaofeng2@h-partners.com>

CHANGELOG.md

@@ -6,6 +6,7 @@
 - removeRunning删除running队列log设置开关
 - ImageKnife新增图片宽高自适应功能
 - 修复onlyRetrieveFromCache属性(仅磁盘和内存获取资源)失效
+- 修改拼写错误
 
 ## 2.1.2-rc.10
 - 修复部分gif图片识别成静态图

entry/src/ohosTest/ets/test/List.test.ets

@@ -15,7 +15,7 @@
 import abilityTest from './Ability.test'
 import lruCacheTest from './lrucache.test'
 import LogUtilTest from './logutil.test'
-import Transform from './transfrom.test'
+import Transfrom from './transfrom.test'
 import RequestOptionTest from './requestoption.test'
 import ImageKnifeTest from './imageknife.test'
 import DiskLruCacheTest from './diskLruCache.test'
@@ -25,7 +25,7 @@ export default function testsuite() {
   lruCacheTest()
   DiskLruCacheTest()
   LogUtilTest()
-  Transform()
+  Transfrom()
   RequestOptionTest()
   ImageKnifeTest();
 }

entry/src/ohosTest/ets/test/transfrom.test.ets

@@ -85,8 +85,8 @@ export default function Transform() {
         new ContrastFilterTransformation(30);
       }
       endTime(startTime, 'TestContrastFilterTransformation');
-      let constrast = new ContrastFilterTransformation(30);
+      let contrast = new ContrastFilterTransformation(30);
-      expect(constrast.getName()).assertEqual("ContrastFilterTransformation:30")
+      expect(contrast.getName()).assertEqual("ContrastFilterTransformation:30")
     })
     it('TestCropCircleTransformation', 3, ()=>{
       let startTime = new Date().getTime();

library/src/main/ets/components/cache/FileUtils.ets

@@ -298,7 +298,7 @@ export class FileUtils {
       let stat = fs.statSync(path)
       return stat.isDirectory()
     } catch (e) {
-      console.debug("fileutils folder exsit error=" + e)
+      console.debug("fileutils folder exist error=" + e)
       return false
     }
   }