tes

2024-10-29 06:18:46 +00:00
19 changed files with 128 additions and 240 deletions
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
 # app-test

-asdfasdpublic static void main
-
-asdfas===abc
-adf
+====abc
+adfafkh
+publadfic adfastatic void main
+adfa
+adfa
+adf2rs
 test
-
-
+adaoa
+adf
 exit
+adfaf
--- a/applications/OPPO/README.md
+++ b/applications/OPPO/README.md
@@ -1,23 +0,0 @@
-git branch [--color[=<when>] | --no-color] [--show-current]
-	[-v [--abbrev=<n> | --no-abbrev]]
-	[--column[=<options>] | --no-column] [--sort=<key>]
-	[--merged [<commit>]] [--no-merged [<commit>]]
-	[--contains [<commit>]] [--no-contains [<commit>]]
-	[--points-at <object>] [--format=<format>]
-	[(-r | --remotes) | (-a | --all)]
-	[--list] [<pattern>…]
-
-$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
-$ cd my2.6
-$ git branch my2.6.14 v2.6.14 <1>.
-$ git switch my2.6.14
-
-git branch [--track[=(direct|inherit)] | --no-track] [-f]
-	[--recurse-submodules] <分支名> [<起始点>]
-git branch (--set-upstream-to=<上游> | -u <上游>) [<分支名>]
-git branch --unset-upstream [<分支名>]
-git branch (-m | -M) [<旧分支>] <新分支>
-git branch (-c | -C) [<旧分支>] <新分支>
-git branch (-d | -D) [-r] <分支名>…
-git branch --edit-description [<分支名>]
-git-check-ref-format[1], git-fetch[1], git-remote[1], ‘`了解历史：什么是分支？’ 在 Git User’s Manual。
--- a/applications/OPPO/icon.png
+++ b/applications/OPPO/icon.png
--- a/applications/OPPO/meta.json
+++ b/applications/OPPO/meta.json
@@ -1,18 +0,0 @@
-{
-    "id": "9cbf3883-f85b-46b9-891b-4b57fd05f96b",
-    "name": "OPPO",
-    "longName": "OPPO",
-    "developer": "",
-    "website": "",
-    "packageName": {
-        "android": "o.o.o.o",
-        "ios": ""
-    },
-    "properties": {
-        "category": "",
-        "subcategory": "",
-        "content": "unknown",
-        "parentApp": "",
-        "risk": 1
-    }
-}
--- a/applications/OPPO/signature.json
+++ b/applications/OPPO/signature.json
@@ -1,3 +0,0 @@
-{
-    "surrogates": []
-}
--- a/applications/tiktok/signature.json
+++ b/applications/tiktok/signature.json
@@ -1,3 +1,3 @@
 {
-    "name":"adfafdtiktok"
+    "name":"tiktokoooooo"
 }
--- a/applications/tim/README.md
+++ b/applications/tim/README.md
--- a/applications/tim/icon.png
+++ b/applications/tim/icon.png
--- a/applications/tim/meta.json
+++ b/applications/tim/meta.json
@@ -1,18 +0,0 @@
-{
-  "id": "60e7b8ad-5b70-ff3f-6e06-2d63436a979c",
-  "name": "1_悦动圈_20240809",
-  "longName": "1_悦动圈_20240809",
-  "developer": "深圳市悦动天下科技有限公司",
-  "website": "http://www.yodorun.com/     http://yodorun.com/",
-  "packageName": {
-    "android": "com.yuedong.sport",
-    "ios": "com.sport.yuedong"
-  },
-  "properties": {
-    "category": "general-internet",
-    "subcategory": "internet-utility",
-    "content": "unknown",
-    "risk": 1,
-    "characteristics": ""
-  }
-}
--- a/applications/tim/signature.json
+++ b/applications/tim/signature.json
@@ -1,28 +0,0 @@
-{
-  "surrogates": [
-    {
-      "name": "surrogate_1",
-      "description": "",
-      "signatures": [
-        {
-          "name": "1_悦动圈_fqdn_20240809",
-          "description": "",
-          "conditions": [
-            {
-              "attributeType": "string",
-              "description": "",
-              "attributeName": "common.server_fqdn",
-              "negate_option": false,
-              "items": [
-                {
-                  "item": "*.51yund.com",
-                  "description": ""
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
--- a/applications/wechat/README.md
+++ b/applications/wechat/README.md
@@ -1,61 +1,3 @@
-<<<<<<< applications/wechat/README.md
-{
-"name" : "hostname",
-"cluster_name" : "opensearch",
-"cluster_uuid" : "6XNc9m2gTUSIoKDqJit0PA",
-"version" : {
-"distribution" : "opensearch",
-"number" : <version>,
-"build_type" : <build-type>,
-"build_hash" : <build-hash>,
-"build_date" : <build-date>,
-"build_snapshot" : false,
-"lucene_version" : <lucene-version>,
-"minimum_wire_compatibility_version" : "7.10.0",
-"minimum_index_compatibility_version" : "7.0.0"
-},
-"tagline" : "The OpenSearch Project: https://opensearch.org/"
-}
-test3
-=======
-# For new installations of OpenSearch 2.12 and later, you must define a custom admin password in order to set up a demo security configuration.
-# Use one of the following commands to define a custom admin password:
-
-## Install the x64 package using yum.
-sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=<custom-admin-password> yum install opensearch-2.17.1-linux-x64.rpm
-
-## Install the x64 package using rpm.
-sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=<custom-admin-password> rpm -ivh opensearch-2.17.1-linux-x64.rpm
-
-## Install the arm64 package using yum.
-sudo env OPENSEARCH_INITIAL_ADMIN_PASSWORD=<custom-admin-password> yum install opensearch-2.17.1-linux-arm64.rpm
-
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-SSWORD=<custom-admin-password> rpm -ivh opensearch-2.17.1-linux-arm64.rpm
-
-# Use the following command for OpenSearch versions 2.11 and earlier:
-
-## Install the x64 package using yum.
-sudo yum install opensearch-2.17.1-linux-x64.rpm
-
-## Install the x64 package using rpm.
-sudo rpm -ivh opensearch-2.17.1-linux-x64.rpm
-
-## Install the arm64 package using yum.
-sudo yum install opensearch-2.17.1-linux-arm64.rpm
-
-## Install the arm64 package using rpm.
-sudo rpm -ivh opensearch-2.17.1-linux-arm64.rpm
-
-## test1
-
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
-## E46B50683A96499886A7BE07C339EF84
->>>>>> applications/wechat/README.md
+conflict test
+abc
+eed
--- a/applications/wechat/bbb.log
+++ b/applications/wechat/bbb.log
--- a/applications/wechat/ccc.log
+++ b/applications/wechat/ccc.log
@@ -1,5 +0,0 @@
-5
-5
-5
-5
-5
--- a/applications/wechat/signature.json
+++ b/applications/wechat/signature.json
@@ -1,6 +1,45 @@
-connect_device("Android:///")  # local adb device using default params
-# local device with serial number SJE5T17B17 and custom params
-connect_device("Android:///SJE5T17B17?cap_method=javacap&touch_method=adb")
-# remote device using custom params Android://adbhost:adbport/serialno
-connect_device("Android://127.0.0.1:5037/10.254.60.1:5555")
-connect_device("Android://127.0.0.1:5037/10.234.60.1:5555?name=serialnumber")  # add serialno to params
+{
+    "name":"wechat",
+    "longName":"wechat",
+    "properties":{
+        "category":"bussines"
+    },
+    "surrogates": [
+        {
+          "name": "405_招商银行_fqdn_20240809",
+          "description": "",
+          "signatures": [
+            {
+              "name": "405_招商银行_fqdn_20240809",
+              "description": "",
+              "conditions": [
+                {
+                  "attributeName": "common.server_fqdn",
+                  "attributeType": "string",
+                  "negate_option": false,
+                  "description": "",
+                  "items": [
+                    {
+                      "item": "$cmbchina.com",
+                      "description": ""
+                    },
+                    {
+                      "item": "*.cmbchina.com",
+                      "description": ""
+                    },
+                    {
+                      "item": "$cmbimg.com",
+                      "description": ""
+                    },
+                    {
+                      "item": "*.cmbimg.com",
+                      "description": ""
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+    ]
+}
--- a/applications/义乌购/app.json
+++ b/applications/义乌购/app.json
@@ -1,21 +1,71 @@
 {
-  "id": "f595b509-67cd-4b35-8576-5d0db89468c4",
-  "name": "77",
-  "longName": "77",
-  "developer": "",
-  "website": "",
-<<<<<<< applications/义乌购/app.json
-  "packageName": {
-    "android": "1",
-    "ios": ""
-  },
-======
->>>>>>> applications/义乌购/app.json
-  "properties": {
-    "category": "",
-    "subcategory": "",
-    "content": "unknown",
-    "parentApp": "",
-    "risk": 1
-  }
-}
+    "name":"义乌购",
+    "longName":"义乌购",
+    "developer":"浙江义乌购电子商务有限公司",
+    "website":"https://m.yiwugou.com",
+    "packageName":{
+        "android":"com.yiwugou.yiwukan",
+        "ios":"com.yiwugou.yiwugoucompany"
+    },
+    "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": "$gl.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$enapp.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$h.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$app.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$user.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$wap.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$img1.yiwugou.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    },
+                    {
+                      "item": "$ywgimg.yiwugo.com",
+                      "description": "浙江义乌购电子商务有限公司"
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+    ]
+}
--- a/applications/小米/README.md
+++ b/applications/小米/README.md
@@ -1,30 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Generated schema for Root",
-  "type": "object",
-  "properties": {
-    "userId": {
-      "type": "number"
-    },
-    "id": {
-      "type": "number"
-    },
-    "title": {
-      "type": "string"
-    },
-    "completed": {
-      "type": "boolean"
-    }
-  },
-  "required": [
-    "userId",
-    "id",
-    "title",
-    "completed"
-  ]
-}
-1
-2
-3
-4
-5
--- a/applications/小米/basic.json
+++ b/applications/小米/basic.json
@@ -1,18 +0,0 @@
-{
-    "id": "df76d5ce-0b94-4ed6-89f5-c663f49e9fac",
-    "name": "小米",
-    "longName": "小米",
-    "developer": "",
-    "website": "",
-    "packageName": {
-        "android": "",
-        "ios": ""
-    },
-    "properties": {
-        "category": "",
-        "subcategory": "",
-        "content": "unknown",
-        "parentApp": "",
-        "risk": 1
-    }
-}
--- a/applications/小米/icon.png
+++ b/applications/小米/icon.png
--- a/applications/小米/signature.json
+++ b/applications/小米/signature.json
@@ -1,3 +0,0 @@
-{
-    "surrogates": []
-}