feat: init project

commit.sh

@@ -1,198 +0,0 @@
-#!/bin/bash
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-MAGENTA='\033[0;35m'
-RESET='\033[0m'
-
-flag_add=false
-flag_commit=false
-flag_md=false
-flag_mm=false
-flag_pm=false
-commit_message=""
-
-function execute_command() {
-    command="$1"
-    message="$2"
-    exit_on_failure=${3:-true}
-
-    echo "${GREEN}执行命令：${command}${RESET}"
-
-    eval "${command}"
-    status=$?
-
-    if [[ ${status} -ne 0 ]]; then
-        echo "${RED}错误：${message}${RESET}"
-        if [[ "$exit_on_failure" == "true" ]]; then
-            exit ${status}
-        else
-            return ${status}
-        fi
-    fi
-}
-
-function show_usage() {
-    echo "用法：$0 [选项]"
-    echo "选项："
-    echo "  -a              添加所有更改到暂存区"
-    echo "  -c <message>    提交更改到 xiaom 分支"
-    echo "  -md             合并 xiaom 到 dev 分支"
-    echo "  -mm             合并 xiaom 到 main 分支"
-    echo "  -pm             合并 main 到 xiaom 分支"
-    echo "  -h              显示此帮助信息"
-    echo ""
-    echo "示例："
-    echo "  $0 -a -c \"feat: 添加新功能\""
-    echo "  $0 -md"
-    echo "  $0 -mm"
-    echo "  $0 -pm"
-}
-
-# 解析参数
-while [[ $# -gt 0 ]]; do
-    case $1 in
-    -a)
-        flag_add=true
-        shift
-        ;;
-    -c)
-        if [[ -z "$2" || "$2" == -* ]]; then
-            echo "${RED}错误：-c 选项需要一个提交信息参数${RESET}"
-            show_usage
-            exit 1
-        fi
-        flag_commit=true
-        commit_message="$2"
-        shift 2
-        ;;
-    -md)
-        flag_md=true
-        shift
-        ;;
-    -mm)
-        flag_mm=true
-        shift
-        ;;
-    -pm)
-        flag_pm=true
-        shift
-        ;;
-    -h | --help)
-        show_usage
-        exit 0
-        ;;
-    -*)
-        echo "${RED}错误：未知选项 $1${RESET}"
-        show_usage
-        exit 1
-        ;;
-    *)
-        echo "${RED}错误：未知参数 $1${RESET}"
-        show_usage
-        exit 1
-        ;;
-    esac
-done
-
-if [ "$flag_add" = true ]; then
-    echo "${MAGENTA}执行添加所有更改操作...${RESET}"
-    execute_command "git add ." "git add 操作失败"
-fi
-
-if [ "$flag_commit" = true ] && [ -n "$commit_message" ]; then
-    echo "${MAGENTA}正在向 xiaom 分支提交变更，提交信息：${RESET}${YELLOW}\"${commit_message}\"${RESET}"
-    execute_command "git checkout xiaom" "切换至 xiaom 分支失败"
-    execute_command "git commit -m \"$commit_message\"" "提交操作失败"
-    execute_command "git push" "推送至 xiaom 分支失败"
-fi
-
-if [ "$flag_pm" = true ]; then
-    echo "${MAGENTA}正在合并 main 分支代码到个人分支 xiaom...${RESET}"
-    # 合并 main 到 xiaom
-    execute_command "git checkout main" "切换至 main 分支失败"
-    execute_command "git pull" "拉取 main 分支最新内容失败"
-    execute_command "git checkout xiaom" "切换至 xiaom 分支失败"
-    execute_command "git merge main" "合并 main 到 xiaom 分支失败" "false"
-    merge_m2x_status=$?
-    if [ $merge_m2x_status -ne 0 ]; then
-        # 检查是否有冲突
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-            echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-            read -n 1 -s -r -p ""
-
-            if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-                echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-                exit 1
-            fi
-
-            execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-        else
-            exit ${merge_m2x_status}
-        fi
-    fi
-    execute_command "git push" "推送 xiaom 分支失败"
-fi
-
-if [ "$flag_md" = true ]; then
-    echo "${MAGENTA}正在合并代码到 nomo-dev 分支...${RESET}"
-    # 合并 xiaom 到 nomo-dev
-    execute_command "git checkout nomo-dev" "切换至 nomo-dev 分支失败"
-    execute_command "git pull" "拉取 nomo-dev 分支最新内容失败"
-    execute_command "git merge xiaom" "合并 xiaom 到 nomo-dev 分支失败" "false"
-    merge_x2d_status=$?
-    if [ $merge_x2d_status -ne 0 ]; then
-        # 检查是否有冲突
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-            echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-            read -n 1 -s -r -p ""
-
-            if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-                echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-                exit 1
-            fi
-
-            execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-        else
-            exit ${merge_x2d_status}
-        fi
-    fi
-    execute_command "git push" "推送 nomo-dev 分支失败"
-    execute_command "git checkout xiaom" "切换至 xiaom 分支失败"
-fi
-
-if [ "$flag_mm" = true ]; then
-    echo "${MAGENTA}正在合并代码到 main 分支...${RESET}"
-    # 合并 xiaom 到 main
-    execute_command "git checkout main" "切换至 main 分支失败"
-    execute_command "git pull" "拉取 main 分支最新内容失败"
-    execute_command "git merge xiaom" "合并 xiaom 到 main 分支失败" "false"
-    merge_x2m_status=$?
-    if [ $merge_x2m_status -ne 0 ]; then
-        # 检查是否有冲突
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-            echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-            read -n 1 -s -r -p ""
-
-            if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-                echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-                exit 1
-            fi
-
-            execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-        else
-            exit ${merge_x2m_status}
-        fi
-    fi
-    execute_command "git push" "推送 main 分支失败"
-    execute_command "git checkout xiaom" "切换至 xiaom 分支失败"
-fi
-
-if [ "$flag_add" = false ] && [ "$flag_commit" = false ] && [ "$flag_pm" = false ] && [ "$flag_md" = false ] && [ "$flag_mm" = false ]; then
-    echo "${YELLOW}未提供有效参数${RESET}"
-    show_usage
-fi

config/env/nomo/prod.ts

@@ -1,5 +0,0 @@
-export default {
-  REACT_APP_API_URL: 'https://pmp.znomo.com/api/v1/pmp',
-  REACT_APP_STAT_API_URL: 'https://stat-pmp.znomo.com/api/v1/pmp',
-  REACT_APP_RES_SERVER: 'https://pmp.znomo.com',
-} as NodeJS.ProcessEnv;

config/env/nomo/test.ts

@@ -1,5 +0,0 @@
-export default {
-  REACT_APP_API_URL: 'https://pmp.znomo.com/api/v1/pmp',
-  REACT_APP_STAT_API_URL: 'https://stat-pmp.znomo.com/api/v1/pmp',
-  REACT_APP_RES_SERVER: 'https://pmp.znomo.com',
-} as NodeJS.ProcessEnv;

config/env/nomo/default.ts → config/env/perms-system/default.ts

@@ -1,9 +1,9 @@
 export default {
   REACT_APP_ENV: 'prod',
-  REACT_APP_ID: 'nomo',
-  REACT_APP_NAME: 'Nomo PMP',
+  REACT_APP_ID: 'perms-system-web',
+  REACT_APP_NAME: 'Perms System PMP',
   REACT_APP_VERSION: '1.0.0',
-  STORAGE_NAME_SPACE: 'nomo-pmp-',
+  STORAGE_NAME_SPACE: 'perms-system-web-',
   ENABLE_REQUEST_ENCRYPTION: false,
   REQUEST_ENCRYPTION_KEY: 'dc8da78edbfb641ea32dc2ff627aa1cc', // md5(sha256(${REACT_APP_ID}-${REACT_APP_VERSION}))
   ENABLE_STORAGE_ENCRYPTION: true,

config/env/perms-system/prod.ts

@@ -0,0 +1,5 @@
+export default {
+  REACT_APP_API_URL: 'https://pmp.zperms-system.com/api/v1/pmp',
+  REACT_APP_STAT_API_URL: 'https://stat-pmp.zperms-system.com/api/v1/pmp',
+  REACT_APP_RES_SERVER: 'https://pmp.zperms-system.com',
+} as NodeJS.ProcessEnv;

config/env/perms-system/test.ts

@@ -0,0 +1,5 @@
+export default {
+  REACT_APP_API_URL: 'https://pmp.zperms-system.com/api/v1/pmp',
+  REACT_APP_STAT_API_URL: 'https://stat-pmp.zperms-system.com/api/v1/pmp',
+  REACT_APP_RES_SERVER: 'https://pmp.zperms-system.com',
+} as NodeJS.ProcessEnv;

package.json

@@ -1,20 +1,18 @@
 {
-  "name": "ant-design-pro",
+  "name": "perms-system-web",
   "version": "6.0.1",
   "private": true,
   "description": "An out-of-box UI solution for enterprise applications",
   "scripts": {
     "analyze": "npm run convert-svg-icon && cross-env ANALYZE=1 REACT_APP_ENV=prod UMI_ENV=prod max build",
     "build:generic": "npm run convert-svg-icon && cross-env PROD_ID=${npm_config_prod_id:-go-pmp} REACT_APP_ENV=${npm_config_env:-prod} UMI_ENV=${npm_config_env:-prod} max build",
-    "build:nomo": "npm run build:nomo:prod",
-    "build:nomo:dev": "npm run build:generic --prod-id=nomo --env=dev",
-    "build:nomo:prod": "npm run build:generic --prod-id=nomo --env=prod",
-    "build:nomo:test": "npm run build:generic --prod-id=nomo --env=test",
+    "build:perms-system": "npm run build:perms-system:prod",
+    "build:perms-system:dev": "npm run build:generic --prod-id=perms-system --env=dev",
+    "build:perms-system:prod": "npm run build:generic --prod-id=perms-system --env=prod",
+    "build:perms-system:test": "npm run build:generic --prod-id=perms-system --env=test",
     "convert-svg-icon": "node tools/convertSVG.mjs",
-    "dev:nomo": "npm run dev:nomo:no-mock",
-    "dev:nomo-win": "npm run dev:nomo-win:no-mock",
-    "dev:nomo-win:no-mock": "npm run convert-svg-icon && cross-env PROD_ID=nomo REACT_APP_ENV=local MOCK=none UMI_ENV=dev max dev",
-    "dev:nomo:no-mock": "npm run start:generic:no-mock --prod-id=nomo --env=local",
+    "dev:perms-system": "npm run dev:perms-system:no-mock",
+    "dev:perms-system:no-mock": "npm run start:generic:no-mock --prod-id=perms-system --env=local",
     "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
     "postinstall": "max setup",
     "jest": "jest",

pull.sh

@@ -1,109 +0,0 @@
-#!/bin/bash
-
-prodList=("nomo")
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-MAGENTA='\033[0;35m'
-RESET='\033[0m'
-
-function execute_command() {
-    command="$1"
-    message="$2"
-    exit_on_failure=${3:-true}
-
-    echo "${GREEN}执行命令：${command}${RESET}"
-
-    eval "${command}"
-    status=$?
-
-    if [[ ${status} -ne 0 ]]; then
-        echo "${RED}错误：${message}${RESET}"
-        if [[ "$exit_on_failure" == "true" ]]; then
-            exit ${status}
-        else
-            return ${status}
-        fi
-    fi
-}
-
-for prod in "${prodList[@]}"; do
-    echo "${MAGENTA}正在合并 ${prod} 代码...${RESET}"
-    # 切换并拉取 ${prod}-prod 分支
-    execute_command "git checkout ${prod}-prod" "切换至 ${prod}-prod 分支失败"
-    execute_command "git pull" "拉取 ${prod}-prod 分支最新内容失败"
-
-    # 合并 ${prod}-prod 到 ${prod}-test
-    execute_command "git checkout ${prod}-test" "切换至 ${prod}-test 分支失败"
-    execute_command "git pull" "拉取 ${prod}-test 分支最新内容失败"
-    execute_command "git merge ${prod}-prod" "合并 ${prod}-prod 到 ${prod}-test 分支失败" "false"
-    merge_p2t_status=$?
-    if [ $merge_p2t_status -ne 0 ]; then
-        # 检查是否有冲突
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-            echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-            read -n 1 -s -r -p ""
-
-            if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-                echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-                exit 1
-            fi
-
-            execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-        else
-            exit ${merge_p2t_status}
-        fi
-    fi
-    execute_command "git push" "推送 ${prod}-test 分支失败"
-
-    # 合并 ${prod}-test 到 main
-    execute_command "git checkout main" "切换至 main 分支失败"
-    execute_command "git pull" "拉取 main 分支最新内容失败"
-    execute_command "git merge ${prod}-test" "合并 ${prod}-test 到 main 分支失败" "false"
-    merge_t2m_status=$?
-    if [ $merge_t2m_status -ne 0 ]; then
-        # 检查是否有冲突
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-            echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-            read -n 1 -s -r -p ""
-
-            if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-                echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-                exit 1
-            fi
-
-            execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-        else
-            exit ${merge_t2m_status}
-        fi
-    fi
-    execute_command "git push" "推送至 main 分支失败"
-done
-
-# # 合并 main 到 dev
-# execute_command "git checkout dev" "切换至 dev 分支失败"
-# execute_command "git pull" "拉取 dev 分支最新内容失败"
-# execute_command "git merge main" "合并 main 到 dev 分支失败" "false"
-# merge_m2d_status=$?
-# if [ $merge_m2d_status -ne 0 ]; then
-#     # 检查是否有冲突
-#     if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-#         echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-#         echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-#         read -n 1 -s -r -p ""
-#         if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-#             echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-#             exit 1
-#         fi
-#         execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-#     else
-#         exit ${merge_m2d_status}
-#     fi
-# fi
-# execute_command "git push" "推送至 dev 分支失败"
-
-# 切换到 xiaom 分支
-execute_command "git checkout xiaom" "切换至 xiaom 分支失败"

push.sh

@@ -1,110 +0,0 @@
-#!/bin/bash
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-MAGENTA='\033[0;35m'
-RESET='\033[0m'
-
-function execute_command() {
-    command="$1"
-    message="$2"
-    exit_on_failure=${3:-true}
-
-    echo "${GREEN}执行命令：${command}${RESET}"
-
-    eval "${command}"
-    status=$?
-
-    if [[ ${status} -ne 0 ]]; then
-        echo "${RED}错误：${message}${RESET}"
-        if [[ "$exit_on_failure" == "true" ]]; then
-            exit ${status}
-        else
-            return ${status}
-        fi
-    fi
-}
-
-while getopts "p:e:" opt; do
-    case $opt in
-    p)
-        product_code="${OPTARG}"
-        ;;
-    e)
-        env="${OPTARG}"
-        ;;
-    *)
-        echo "用法：$0 -p 产品code [-e 发布环境]"
-        exit 1
-        ;;
-    esac
-done
-
-if [ -z "$product_code" ]; then
-    echo "错误：必须指定产品 code (-p)"
-    echo "用法：$0 -p 产品code [-e 发布环境]"
-    exit 1
-fi
-
-env=${env:-test}
-
-echo "${MAGENTA}正在合并代码到 ${product_code}-test 分支...${RESET}"
-
-# 切换并拉取 main 分支
-execute_command "git checkout main" "切换至 main 分支失败"
-execute_command "git pull" "拉取 main 分支最新内容失败"
-
-# 合并 main 到 ${product_code}-test
-execute_command "git checkout ${product_code}-test" "切换至 ${product_code}-test 分支失败"
-execute_command "git pull" "拉取 ${product_code}-test 分支最新内容失败"
-execute_command "git merge main" "合并 main 到 ${product_code}-test 分支失败" "false"
-merge_m2t_status=$?
-if [ $merge_m2t_status -ne 0 ]; then
-    # 检查是否有冲突
-    if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-        echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-        echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-        read -n 1 -s -r -p ""
-
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-            exit 1
-        fi
-
-        execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-    else
-        exit ${merge_m2t_status}
-    fi
-fi
-execute_command "git push" "推送 ${product_code}-test 分支失败"
-
-# 合并 ${product_code}-test 到 ${product_code}-prod
-if [ "$env" = "prod" ]; then
-    echo "${MAGENTA}正在合并代码到 ${product_code}-prod 分支...${RESET}"
-    execute_command "git checkout ${product_code}-prod" "切换至 ${product_code}-prod 分支失败"
-    execute_command "git pull" "拉取 ${product_code}-prod 分支最新内容失败"
-    execute_command "git merge ${product_code}-test" "合并 ${product_code}-test 到 ${product_code}-prod 分支失败" "false"
-    merge_t2p_status=$?
-    if [ $merge_t2p_status -ne 0 ]; then
-        # 检查是否有冲突
-        if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-            echo "${YELLOW}检测到合并冲突，请手动解决冲突...${RESET}"
-            echo "${YELLOW}解决冲突后，按任意键继续...${RESET}"
-            read -n 1 -s -r -p ""
-
-            if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
-                echo "${RED}错误：仍存在未解决的冲突，请处理后再继续${RESET}"
-                exit 1
-            fi
-
-            execute_command "git commit -m 'chore(merge): 解决冲突'" "提交冲突解决方案失败"
-        else
-            exit ${merge_t2p_status}
-        fi
-    fi
-    execute_command "git push" "推送 ${product_code}-prod 分支失败"
-fi
-
-# 切换到 xiaom 分支
-execute_command "git checkout xiaom" "切换至 xiaom 分支失败"