Merge branch 'main' of https://github.youjiala.com/itcsx/Docker

# Conflicts:
#	uniapp/security/src/manifest.json

uniapp/security/package-lock.json

@@ -4619,9 +4619,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4773,9 +4770,6 @@
       "cpu": [
         "arm"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4789,9 +4783,6 @@
       "cpu": [
         "arm"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4805,9 +4796,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4821,9 +4809,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4837,9 +4822,6 @@
       "cpu": [
         "loong64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4853,9 +4835,6 @@
       "cpu": [
         "loong64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4869,9 +4848,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4885,9 +4861,6 @@
       "cpu": [
         "ppc64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4901,9 +4874,6 @@
       "cpu": [
         "riscv64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4917,9 +4887,6 @@
       "cpu": [
         "riscv64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4933,9 +4900,6 @@
       "cpu": [
         "s390x"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4949,9 +4913,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4965,9 +4926,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [

uniapp/security/src/manifest.json

@@ -52,6 +52,19 @@
                 "dSYMs": false
             },
             /* SDK配置 */
+<<<<<<< HEAD
+            "sdkConfigs" : {
+                "ad" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "UniversalLinks" : ""
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
+=======
             "sdkConfigs": {
                 "share": {}
             },
@@ -89,6 +102,7 @@
                         "spotlight@3x": "unpackage/res/icons/120x120.png"
                     }
                 }
+>>>>>>> 8260c417e21af16b318dd9155b55aa00378c20a5
             }
         }
     },
@@ -114,5 +128,11 @@
     "uniStatistics": {
         "enable": false
     },
+<<<<<<< HEAD
+    "vueVersion" : "3",
+    "locale" : "zh-Hans"
+}
+=======
     "vueVersion": "3"
-}
+}
+>>>>>>> 8260c417e21af16b318dd9155b55aa00378c20a5