Merge branch 'newbranch-api-test' into 'newbranch-api-test-2'

# Conflicts:
#   README.md

README.md

@@ -1,10 +1,33 @@
 # app-test
 
-asdfasdpublic static void main
+gggg
+tttt
+
+## Getting started
+
+To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+
+Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+
+## Add your files
+
+- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
+- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+
+```
+cd existing_repo
+git remote add origin https://git.mesalab.cn/appsketch-works/app-test.git
+git branch -M main
+git push -uf origin main
+```
+
+
+public static void main
+
+===abc
 
-asdfas===abc
-adf
 test
 
 
 exit
+

applications/api/app.json

@@ -0,0 +1 @@
+{'key':'value'}

applications/tiktok/signature.json

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

applications/wechat/README.md

@@ -1,40 +0,0 @@
-# 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/signature.json

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

applications/义乌购/app.json

@@ -1,14 +1,71 @@
 {
-  "id": "f595b509-67cd-4b35-8576-5d0db89468c4",
-  "name": "77",
-  "longName": "77",
-  "developer": "",
-  "website": "",
-  "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": "浙江义乌购电子商务有限公司"
                     }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+    ]
 }