2025-05-26 08:58:13

.obsidian/workspace.json

@@ -4,21 +4,21 @@
     "type": "split",
     "children": [
       {
-        "id": "6b595011b0881018",
+        "id": "20643ea109697057",
         "type": "tabs",
         "children": [
           {
-            "id": "00bbf36ebec8ab56",
+            "id": "80d97eb66c1811c4",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Spring/106/接口联调/0521.md",
+                "file": "工具/macOS/brew 更新日志/2024-09-22.md",
                 "mode": "source",
                 "source": true
               },
               "icon": "lucide-file",
-              "title": "0521"
+              "title": "2024-09-22"
             }
           }
         ]
@@ -53,7 +53,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "二码",
+                "query": "hht.test:7788",
                 "matchingCase": true,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -197,38 +197,38 @@
       "command-palette:打开命令面板": false
     }
   },
-  "active": "00bbf36ebec8ab56",
+  "active": "80d97eb66c1811c4",
   "lastOpenFiles": [
-    "Spring/106/基础信息.md",
-    "Spring/106/接口联调/0521.md",
-    "Spring/106/接口联调",
-    "每日工作笔记/2025-05-21.md",
-    "每日工作笔记/2025-05-20.md",
-    "文档/临时停车/二码合一_新.md",
-    "每日工作笔记/2023/2023-10-24.md",
-    "Spring/106/接口文档.md",
+    "工具/macOS/brew 更新日志/2025-03-18.md",
+    "工具/macOS/brew 更新日志/2025-05-24.md",
+    "工具/nginx/macos nginx 配置.md",
+    "文档/金刚般若波罗蜜经.md",
+    "文档/个推回调消息.md",
+    "文档/使用流程.md",
+    "文档/S端环境配置.md",
+    "文档/APP 调试方案.md",
+    "文档/dev环境的问题.md",
+    "工具/nginx/详细信息.md",
+    "工具/nginx/说明.md",
+    "任务/spring40/tick1.31/临时停车H5.md",
+    "工具/mysql/第二次配置mysql.md",
+    "每日工作笔记/2023/2023-12-01.md",
     "工具/git/多项目管理ssh-ken.md",
     "工具/git/Git 设置本地分支对应的远程分支的两类方法.md",
+    "工具/git/一个开发人员需要知道的 commit 规范.md",
+    "工具/git/基础信息.md",
+    "工具/nginx/H5页面跳转.md",
+    "Spring/106/基础信息.md",
+    "Spring/106/接口文档.md",
     "Spring/106/天津事故说明.md",
-    "Spring/106/停车扫码之后出现定位弹窗.md",
-    "工具/前端工具/小程序开发者工具/启动模式.md",
     "Spring/106/未命名.md",
+    "工具/webstorm/识别rpx.md",
+    "工具/redis/说明.md",
+    "工具/sqlite/说明.md",
+    "Spring/106/接口联调",
     "工具/前端工具/小程序开发者工具",
-    "开发/S端管理.md",
-    "Spring/105/接口梳理/会议纪要.md",
     "Spring/106",
-    "Spring/105/接口梳理/03会员绑定车辆查询.md",
-    "文档/临时停车/UI设计稿.md",
-    "未命名 1.md",
     "文档/未命名",
-    "未命名 2.md",
-    "文档/APP 调试方案.md",
-    "文档/S端环境配置.md",
-    "文档/dev环境的问题.md",
-    "文档/临时停车/K+扫描 CRM无牌车出入场码.md",
-    "文档/使用流程.md",
-    "文档/临时停车/二维码生成文档.md",
-    "文档/临时停车/二维码生成文档-精简版本.md",
     "文档/临时停车/projects-buildings-lbs-names-240207.pdf",
     "文档/临时停车/小猫云端计费开放接口说明.pdf",
     "文档/微信小程序",

Spring/106/基础信息.md

@@ -4,6 +4,8 @@ https://www.figma.com/design/C8okIeeFeRT33QX28glda9/-CRM----S%E7%AB%AF?node-id=0
 
 iframe src="https://www.figma.com/design/C8okIeeFeRT33QX28glda9/-CRM----S%E7%AB%AF?node-id=0-1&p=f&t=wFtNFN0DZvwuFXz9-0" width="100%" height="800px" frameborder="0" scrolling="yes"></iframe>
 
+添加CRM管理端的菜单task
+https://kerryprops.atlassian.net/browse/KIP-20637
 
 pages/home/home?scene=code%3D8b0022a6%26type%3DunlicensedIn
 

工具/macOS/brew 更新日志/2025-05-22.md

@@ -0,0 +1,13 @@
+```
+==> autojump
+Add the following line to your ~/.bash_profile or ~/.zshrc file:
+  [ -f /opt/homebrew/etc/profile.d/autojump.sh ] && . /opt/homebrew/etc/profile.d/autojump.sh
+
+If you use the Fish shell then add the following line to your ~/.config/fish/config.fish:
+  [ -f /opt/homebrew/share/autojump/autojump.fish ]; and source /opt/homebrew/share/autojump/autojump.fish
+
+Restart your terminal for the settings to take effect.
+
+zsh completions have been installed to:
+  /opt/homebrew/share/zsh/site-functions
+```

工具/macOS/brew 更新日志/2025-05-24.md

@@ -0,0 +1,141 @@
+# electron-website  的一些尝试
+personal access token
+
+1fa9dee43dcf80eec421edfa7629b7553a6996c2e4473c60fd3ad8dbca8a11ae364d87636e2c8c12
+
+export CROWDIN_PERSONAL_TOKEN="1fa9dee43dcf80eec421edfa7629b7553a6996c2e4473c60fd3ad8dbca8a11ae364d87636e2c8c12"
+
+```bash
+➜  electron-website git:(main) ✗ brew install openjdk@11
+==> Auto-updating Homebrew...
+Adjust how often this is run with HOMEBREW_AUTO_UPDATE_SECS or disable with
+HOMEBREW_NO_AUTO_UPDATE. Hide these hints with HOMEBREW_NO_ENV_HINTS (see `man brew`).
+==> Auto-updated Homebrew!
+Updated 2 taps (homebrew/core and homebrew/cask).
+==> New Formulae
+alejandra                                   boa                                         cornelis                                    flip-link                                   lima-additional-guestagents                 rna-star
+aws-lc                                      concurrentqueue                             cram                                        goshs                                       readsb                                      shamrock
+
+You have 15 outdated formulae installed.
+
+==> Downloading https://ghcr.io/v2/homebrew/core/openjdk/11/manifests/11.0.27
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching dependencies for openjdk@11: glib
+==> Downloading https://ghcr.io/v2/homebrew/core/glib/manifests/2.84.2
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching dependencies for glib: gettext
+==> Downloading https://ghcr.io/v2/homebrew/core/gettext/manifests/0.25
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching gettext
+==> Downloading https://ghcr.io/v2/homebrew/core/gettext/blobs/sha256:8dba9424a9409d3ba085acccfd8c88c196e31e31944c32c1d811cfdd6aae8280
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching glib
+==> Downloading https://ghcr.io/v2/homebrew/core/glib/blobs/sha256:4c797e5a42c6e0cb3eb846e15634662d4cc29f10e47609353bbad80c51fec38d
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching openjdk@11
+==> Downloading https://ghcr.io/v2/homebrew/core/openjdk/11/blobs/sha256:9157b4fbd9639c0f0883b5fd5ceae4eeda0700bb3807d320ed2b72a3c802aec0
+######################################################################################################################################################################################################################################################### 100.0%
+==> Installing dependencies for openjdk@11: glib
+==> Installing openjdk@11 dependency: glib
+==> Downloading https://ghcr.io/v2/homebrew/core/glib/manifests/2.84.2
+Already downloaded: /Users/sysadmin/Library/Caches/Homebrew/downloads/e7f6f6a81f2be46cd9bb6f73b50663ee7338afac6a97e0f4462c48a6023ca92c--glib-2.84.2.bottle_manifest.json
+==> Installing dependencies for glib: gettext
+==> Installing glib dependency: gettext
+==> Downloading https://ghcr.io/v2/homebrew/core/gettext/manifests/0.25
+Already downloaded: /Users/sysadmin/Library/Caches/Homebrew/downloads/344607fc5b91bb0c1287d07bb445cc40cc465a163a52e12eed3cc5cd60498f78--gettext-0.25.bottle_manifest.json
+==> Pouring gettext--0.25.arm64_sequoia.bottle.tar.gz
+🍺  /opt/homebrew/Cellar/gettext/0.25: 2,418 files, 27.7MB
+==> Installing glib
+==> Pouring glib--2.84.2.arm64_sequoia.bottle.tar.gz
+🍺  /opt/homebrew/Cellar/glib/2.84.2: 504 files, 37.6MB
+==> Installing openjdk@11
+==> Pouring openjdk@11--11.0.27.arm64_sequoia.bottle.tar.gz
+==> Caveats
+For the system Java wrappers to find this JDK, symlink it with
+  sudo ln -sfn /opt/homebrew/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk
+
+openjdk@11 is keg-only, which means it was not symlinked into /opt/homebrew,
+because this is an alternate version of another formula.
+
+If you need to have openjdk@11 first in your PATH, run:
+  echo 'export PATH="/opt/homebrew/opt/openjdk@11/bin:$PATH"' >> ~/.zshrc
+
+For compilers to find openjdk@11 you may need to set:
+  export CPPFLAGS="-I/opt/homebrew/opt/openjdk@11/include"
+==> Summary
+🍺  /opt/homebrew/Cellar/openjdk@11/11.0.27: 667 files, 296MB
+==> Running `brew cleanup openjdk@11`...
+Disable this behaviour by setting HOMEBREW_NO_INSTALL_CLEANUP.
+Hide these hints with HOMEBREW_NO_ENV_HINTS (see `man brew`).
+==> Upgrading 2 dependents of upgraded formulae:
+Disable this behaviour by setting HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK.
+Hide these hints with HOMEBREW_NO_ENV_HINTS (see `man brew`).
+harfbuzz 11.0.1 -> 11.2.1, ghostscript 10.05.0_1 -> 10.05.1
+==> Downloading https://ghcr.io/v2/homebrew/core/harfbuzz/manifests/11.2.1
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching dependencies for harfbuzz: libpng and pixman
+==> Downloading https://ghcr.io/v2/homebrew/core/libpng/manifests/1.6.48
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching libpng
+==> Downloading https://ghcr.io/v2/homebrew/core/libpng/blobs/sha256:a6ca2508569d9237cbb46a2d3da13b9e2e8d9d042ca48b78463f34aa527cd7ce
+######################################################################################################################################################################################################################################################### 100.0%
+==> Downloading https://ghcr.io/v2/homebrew/core/pixman/manifests/0.46.0
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching pixman
+==> Downloading https://ghcr.io/v2/homebrew/core/pixman/blobs/sha256:6d08a20cf16a9f69e925000085b4062501df3c8838b25284a7a5733608fd944a
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching harfbuzz
+==> Downloading https://ghcr.io/v2/homebrew/core/harfbuzz/blobs/sha256:c2bfac8d26f33150c1fbe86293113c217b6a452c347a509428f3a7ee4752b956
+######################################################################################################################################################################################################################################################### 100.0%
+==> Downloading https://ghcr.io/v2/homebrew/core/ghostscript/manifests/10.05.1
+######################################################################################################################################################################################################################################################### 100.0%
+==> Fetching ghostscript
+==> Downloading https://ghcr.io/v2/homebrew/core/ghostscript/blobs/sha256:29a6c1c81a8c04ccc3a1a918b7bb75843318e13c4123cd196bae785466dc572a
+######################################################################################################################################################################################################################################################### 100.0%
+==> Upgrading harfbuzz
+  11.0.1 -> 11.2.1
+==> Installing dependencies for harfbuzz: libpng and pixman
+==> Installing harfbuzz dependency: libpng
+==> Downloading https://ghcr.io/v2/homebrew/core/libpng/manifests/1.6.48
+Already downloaded: /Users/sysadmin/Library/Caches/Homebrew/downloads/a83930e1f9d8eaa78c037181b255fa781a9c1db46e446b23e427995cac04300f--libpng-1.6.48.bottle_manifest.json
+==> Pouring libpng--1.6.48.arm64_sequoia.bottle.tar.gz
+🍺  /opt/homebrew/Cellar/libpng/1.6.48: 28 files, 1.3MB
+==> Installing harfbuzz dependency: pixman
+==> Downloading https://ghcr.io/v2/homebrew/core/pixman/manifests/0.46.0
+Already downloaded: /Users/sysadmin/Library/Caches/Homebrew/downloads/076f76287048a542e5f3dabc41a9c7506bd89979c89ed755b1a7e02b3b6d2806--pixman-0.46.0.bottle_manifest.json
+==> Pouring pixman--0.46.0.arm64_sequoia.bottle.tar.gz
+🍺  /opt/homebrew/Cellar/pixman/0.46.0: 10 files, 687.3KB
+==> Installing harfbuzz
+==> Pouring harfbuzz--11.2.1.arm64_sequoia.bottle.tar.gz
+🍺  /opt/homebrew/Cellar/harfbuzz/11.2.1: 77 files, 10.2MB
+==> Running `brew cleanup harfbuzz`...
+Removing: /opt/homebrew/Cellar/harfbuzz/11.0.1... (76 files, 9.9MB)
+==> Upgrading ghostscript
+  10.05.0_1 -> 10.05.1
+==> Pouring ghostscript--10.05.1.arm64_sequoia.bottle.tar.gz
+==> Caveats
+Ghostscript is now built `--without-versioned-path`. Temporary backwards
+compatibility symlinks exist but will be removed with 10.07.0 release.
+==> Summary
+🍺  /opt/homebrew/Cellar/ghostscript/10.05.1: 640 files, 122.2MB
+==> Running `brew cleanup ghostscript`...
+Removing: /opt/homebrew/Cellar/ghostscript/10.05.0_1... (638 files, 122MB)
+==> Checking for dependents of upgraded formulae...
+==> No broken dependents found!
+==> Caveats
+==> openjdk@11
+For the system Java wrappers to find this JDK, symlink it with
+  sudo ln -sfn /opt/homebrew/opt/openjdk@11/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk-11.jdk
+
+openjdk@11 is keg-only, which means it was not symlinked into /opt/homebrew,
+because this is an alternate version of another formula.
+
+If you need to have openjdk@11 first in your PATH, run:
+  echo 'export PATH="/opt/homebrew/opt/openjdk@11/bin:$PATH"' >> ~/.zshrc
+
+For compilers to find openjdk@11 you may need to set:
+  export CPPFLAGS="-I/opt/homebrew/opt/openjdk@11/include"
+==> ghostscript
+Ghostscript is now built `--without-versioned-path`. Temporary backwards
+	compatibility symlinks exist but will be removed with 10.07.0 release.
+```

工具/nginx/macos nginx 配置.md

@@ -0,0 +1,144 @@
+```conf
+```Nginx
+# 重启 brew services restart nginx
+server {
+    listen       7788;
+    server_name vue2.hht.test;
+    location / {
+        root /Users/sysadmin/code/vue_project/v2.cn.vuejs.org;
+        index index.html index.htm;
+    }
+}
+
+server {
+    listen       7788;
+    server_name vue3.hht.test;
+    location / {
+        root /Users/sysadmin/code/vue_project/docs-zh-cn/.vitepress/dist;
+        index index.html index.htm;
+    }
+}
+
+server {
+    listen       7788;
+    server_name vant.hht.test;
+     location /vant/ {
+        alias  /Users/sysadmin/code/vue_project/vant/;
+        try_files $uri $uri/ /tparking/index.html;
+        index  index.html;
+        add_header Access-Control-Allow-Origin *;
+    }
+}
+
+server {
+    listen       7788;
+    server_name bs.hht.test;
+
+    location / {
+        #root /Users/sysadmin/code/vue_project/better-scroll-docs/zh-CN;
+        #index index.html index.htm;
+
+        alias  /Users/sysadmin/code/vue_project/better-scroll-docs/zh-CN/;
+        try_files $uri $uri/ /index.html;
+        index  index.html;
+        add_header Access-Control-Allow-Origin *;
+    }
+    
+     location /docs/ {
+        alias  /Users/sysadmin/code/vue_project/better-scroll-docs/;
+        #try_files $uri $uri/ /tparking/index.html;
+        #index  index.html;
+        #add_header Access-Control-Allow-Origin *;
+    }
+    
+}
+
+# server {
+#     listen       7788;
+#     server_name qa-tparking.hht.test;
+#     # location / {
+#     #     root /Users/sysadmin/code/kerry_project/temporary-parking/dist;
+#     #     index index.html index.htm;
+#     #     # try_files $uri $uri/ router;
+#     # }
+
+    
+#      location /tparking/ {
+#         alias  /Users/sysadmin/code/kerry_project/temporary-parking/dist/;
+#         try_files $uri $uri/ /tparking/index.html;
+#         index  index.html;
+#         add_header Access-Control-Allow-Origin *;
+#     }
+#     location /static/ {
+#         alias  /Users/sysadmin/code/kerry_project/temporary-parking/dist/static/;
+#         # try_files $uri $uri/ /tparking/index.html;
+#         # index  index.html;
+#         # add_header Access-Control-Allow-Origin *;
+#     }
+#     # location /tparking/static {
+#     #     root  /Users/sysadmin/code/kerry_project/temporary-parking/dist/static;
+#     #     # index index.html index.htm;
+#     #     # try_files $uri $uri/;
+#     # }
+
+#     location router {
+#         rewrite ^.*$ /index.html last;
+#     }
+    
+# }
+
+# server {
+#     listen       7788;
+#     server_name tp.hht.test;
+#     add_header Access-Control-Allow-Origin http://localhost:8080 always; 
+#     # add_header Access-Control-Allow-Origin *; 
+#     # add_header Access-Control-Allow-Credentials true;
+#     #   $http_origin动态获取请求客户端请求的域   不用*的原因是带cookie的请求不支持*号
+#     # add_header Access-Control-Allow-Origin $http_origin;
+
+#     # #   表示请求头的字段 动态获取
+#     # add_header Access-Control-Allow-Headers $http_access_control_request_headers;
+
+#     #允许跨域请求的域，* 代表所有
+#     # add_header 'Access-Control-Allow-Origin' 'http://localhost:8080' always;
+#     #允许带上cookie请求
+#     # add_header 'Access-Control-Allow-Credentials' 'true' always;
+#     #允许请求的方法，比如 GET/POST/PUT/DELETE
+#     # add_header 'Access-Control-Allow-Methods' *;
+#     #允许请求的header
+#     # add_header 'Access-Control-Allow-Headers' *;
+#     # add_header Access-Control-Max-Age: 18000L
+#     # if ($request_method = 'OPTIONS') {
+#     #     # add_header 'Access-Control-Allow-Origin' "$http_origin" always;
+#     #     # add_header 'Access-Control-Allow-Credentials' 'true' always;
+#     #     # add_header 'Access-Control-Allow-Headers' "Origin, X-Requested-With, Content-Type, Accept" always;
+#     #     # add_header 'Access-Control-Allow-Methods' * always;
+#     #     add_header 'Access-Control-Allow-Headers' * always;
+#     #     # add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+#     #     # add_header 'Access-Control-Max-Age' 1728000;
+#     #     # add_header 'Content-Type' 'text/plain; charset=utf-8';
+#     #     # add_header 'Content-Length' 0;
+#     #     return 204;
+#     # }
+#     location / {
+#         # add_header Access-Control-Allow-Origin 'http://localhost:8080';
+#         #   表示允许这个域跨域调用（客户端发送请求的域名和端口）
+#         # proxy_pass https://dev-kip-service-internal.kerryonvip.com/parking-lots/buildings/shenzhen01;
+#         # return 200 'rmja2iMHaYCiylSG2';
+#         default_type text/html;
+#         return 200 'rmja2iMHaYCiylSG2';
+#     }
+    
+# }
+
+server {
+    listen       7788;
+    server_name h5.hht.test;
+    location /tparking {
+        proxy_pass http://localhost:8080;
+        # root /Users/sysadmin/code/vue_project/v2.cn.vuejs.org;
+        # index index.html index.htm;
+    }
+}
+```
+```