tes

README.md

@@ -1,72 +1,13 @@
-# 使用说明
+# app-test
-applications目录存放app相关内容，每新增一个application，在applications目录下创建application同名目录。
+
-目录结构如下：
+====abc
-```
+adfafkh
-└─applications
+publadfic adfastatic void main
-    ├─tiktok
+adfa
-    │      app.json   // 记录application属性及特征
+adfa
-    │      README.md  // 帮助文档
+adf2rs
-    │      icon.png   // 尺寸： 512*512 px， 大小不超过2MB
+test
-    ├─wechat
+adaoa
-    │      app.json
+adf
-    │      README.md
+exit
-    │      icon.png
+adfaf
-```
-app.json 内容模版如下
-```
-{
-    "name":"陕西社会保险",
-    "longName":"陕西社会保险",
-    "developer":"陕西省社会保障局",
-    "website":"http://www.pansky.com.cn/",
-    "packageName":{
-        "android":"cn.com.pansky.sxzgyl",
-        "ios":"cn.com.pansky.sxzgyl"
-    },
-    "properties":{
-        "category":"business-systems",
-        "subcategory":"general-business",
-        "content":"unknown",
-        "parentApp":"",
-        "risk":1
-    },
-    "surrogates": [
-        {
-          "name": "surrogate-1",
-          "description": "",
-          "signatures": [
-            {
-              "name": "signature-陕西社会保险-1",
-              "description": "",
-              "conditions": [
-                {
-                  "attributeName": "common.server_fqdn",
-                  "attributeType": "string",
-                  "negate_option": false,
-                  "description": "",
-                  "items": [
-                    {
-                      "item": "$zcxc.shaanxi.gov.cn",
-                      "description": "陕西省社会保障局"
-                    },
-                    {
-                      "item": "$ylbx.shaanxi.gov.cn",
-                      "description": "陕西省社会保障局"
-                    },
-                    {
-                      "item": "$s.eqxiu.cn",
-                      "description": "北京中网易企秀科技有限公司"
-                    },
-                    {
-                      "item": "$v.eqxiu.com",
-                      "description": "北京中网易企秀科技有限公司"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-    ]
-}
-```

applications/api/README.md

@@ -0,0 +1 @@
+file add from gitlab api

applications/tiktok/signature.json

@@ -1,3 +1,3 @@
 {
-    "name":"tiktok"
+    "name":"tiktokoooooo"
 }

applications/wechat/README.md

@@ -1,2 +1,3 @@
+conflict test
 abc
-abcd
+eed

applications/wechat/basic.json

@@ -1 +0,0 @@
-afa

applications/wechat/signature.json

@@ -2,7 +2,6 @@
     "name":"wechat",
     "longName":"wechat",
     "properties":{
-      
         "category":"bussines"
     },
     "surrogates": [

applications/陕西社会保险/basic.json

@@ -1,17 +0,0 @@
-{
-    "name":"陕西社会保险",
-    "longName":"陕西社会保险",
-    "developer":"陕西省社会保障局",
-    "website":"http://www.pansky.com.cn/",
-    "packageName":{
-        "android":"cn.com.pansky.sxzgyl",
-        "ios":"cn.com.pansky.sxzgyl"
-    },
-    "properties":{
-        "category":"business-systems",
-        "subcategory":"general-business",
-        "content":"unknown",
-        "parentApp":"",
-        "risk":1
-    }
-}