add tim

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

.gitlab-ci.yml

@@ -1,16 +0,0 @@
-# This file is a template, and might need editing before it works on your project.
-# Full project: https://gitlab.com/pages/plain-html
-
-image: git.mesalab.cn:7443/nezha/nz-build-env:1.6
-
-pages:
-  stage: deploy
-  script:
-    - echo "The site will be deployed to $CI_PAGES_URL"
-  artifacts:
-    paths:
-      - public
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  tags:
-    - asw

README.md

@@ -1,72 +1,10 @@
-# 使用说明
-applications目录存放app相关内容，每新增一个application，在applications目录下创建application同名目录。
-目录结构如下：
-```
-└─applications
-    ├─tiktok
-    │      app.json   // 记录application属性及特征
-    │      README.md  // 帮助文档
-    │      icon.png   // 尺寸： 512*512 px， 大小不超过2MB
-    ├─wechat
-    │      app.json
-    │      README.md
-    │      icon.png
-```
-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": "北京中网易企秀科技有限公司"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-    ]
-}
-```
+# app-test
+
+asdfasdpublic static void main
+
+asdfas===abc
+adf
+test
+
+
+exit

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/api/README.md

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

applications/tiktok/signature.json

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

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,2 +1,61 @@
-abc
-abcd
+<<<<<<< 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

applications/wechat/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
-    }
-}

applications/wechat/ccc.log

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

applications/wechat/signature.json

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

applications/义乌购/app.json

@@ -1,71 +1,21 @@
 {
-    "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": "浙江义乌购电子商务有限公司"
-                    }
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-    ]
-}
+  "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
+  }
+}

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": []
+}

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
-    }
-}

public/index.html

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="generator" content="GitLab Pages">
-    <title>Plain HTML site using GitLab Pages</title>
-    <link rel="stylesheet" href="style.css">
-  </head>
-  <body>
-    <div class="navbar">
-      <a href="https://pages.gitlab.io/plain-html/">Plain HTML Example</a>
-      <a href="https://gitlab.com/pages/plain-html/">Repository</a>
-      <a href="https://gitlab.com/pages/">Other Examples</a>
-    </div>
-
-    <h1>Hello World!</h1>
-
-    <p>
-      This is a simple plain-HTML website on GitLab Pages, without any fancy static site generator.
-    </p>
-  </body>
-</html>
-

public/style.css

@@ -1,25 +0,0 @@
-body {
-    font-family: sans-serif;
-    margin: auto;
-    max-width: 1280px;
-  }
-  
-  .navbar {
-    background-color: #313236;
-    border-radius: 2px;
-    max-width: 800px;
-  }
-  
-  .navbar a {
-    color: #aaa;
-    display: inline-block;
-    font-size: 15px;
-    padding: 10px;
-    text-decoration: none;
-  }
-  
-  .navbar a:hover {
-    color: #ffffff;
-  }
-  
-