add tim

# Conflicts:
#   applications/wechat/README.md
#   applications/义乌购/app.json

applications/OPPO/README.md

@@ -0,0 +1,23 @@
+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。

applications/OPPO/meta.json

@@ -0,0 +1,18 @@
+{
+    "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
+    }
+}

applications/OPPO/signature.json

@@ -0,0 +1,3 @@
+{
+    "surrogates": []
+}

applications/tim/meta.json

@@ -0,0 +1,18 @@
+{
+  "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": ""
+  }
+}

applications/tim/signature.json

@@ -0,0 +1,28 @@
+{
+  "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": ""
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

applications/wechat/README.md

@@ -1,3 +1,23 @@
+<<<<<<< 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:
 
@@ -38,3 +58,4 @@ sudo rpm -ivh opensearch-2.17.1-linux-arm64.rpm
 ## E46B50683A96499886A7BE07C339EF84
 ## E46B50683A96499886A7BE07C339EF84
 ## E46B50683A96499886A7BE07C339EF84
+>>>>>> applications/wechat/README.md

applications/wechat/ccc.log

@@ -0,0 +1,5 @@
+5
+5
+5
+5
+5

applications/wechat/signature.json

@@ -3,12 +3,4 @@ connect_device("Android:///")  # local adb device using default 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
-connect_device("Windows:///")  # connect to the desktop
-connect_device("Windows:///123456")  # Connect to the window with handle 123456
-connect_device("windows:///?title_re='.*explorer.*'")  # Connect to the window that name include "explorer"
-connect_device("Windows:///123456?foreground=False")  # Connect to the window without setting it foreground
-connect_device("iOS:///127.0.0.1:8100")  # iOS device
-connect_device("iOS:///http://localhost:8100/?mjpeg_port=9100")  # iOS with mjpeg port
-connect_device("iOS:///http://localhost:8100/?mjpeg_port=9100&&udid=00008020-001270842E88002E")  # iOS with mjpeg port and udid
-connect_device("iOS:///http://localhost:8100/?mjpeg_port=9100&&uuid=00008020-001270842E88002E")  # udid/uuid/serialno are all ok
+connect_device("Android://127.0.0.1:5037/10.234.60.1:5555?name=serialnumber")  # add serialno to params

applications/义乌购/app.json

@@ -4,6 +4,13 @@
   "longName": "77",
   "developer": "",
   "website": "",
+<<<<<<< applications/义乌购/app.json
+  "packageName": {
+    "android": "1",
+    "ios": ""
+  },
+======
+>>>>>>> applications/义乌购/app.json
   "properties": {
     "category": "",
     "subcategory": "",

applications/小米/README.md

@@ -0,0 +1,30 @@
+{
+  "$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

applications/小米/basic.json

@@ -0,0 +1,18 @@
+{
+    "id": "df76d5ce-0b94-4ed6-89f5-c663f49e9fac",
+    "name": "小米",
+    "longName": "小米",
+    "developer": "",
+    "website": "",
+    "packageName": {
+        "android": "",
+        "ios": ""
+    },
+    "properties": {
+        "category": "",
+        "subcategory": "",
+        "content": "unknown",
+        "parentApp": "",
+        "risk": 1
+    }
+}

applications/小米/signature.json

@@ -0,0 +1,3 @@
+{
+    "surrogates": []
+}