大量更新

2025-04-17 15:13:02 +08:00
parent b9a006fc23
commit edcb27f0dc
38 changed files with 2307 additions and 423 deletions
--- a/50-202412-云南二级新/202504升级证书/real-nginx-conf.conf
+++ b/50-202412-云南二级新/202504升级证书/real-nginx-conf.conf
@@ -0,0 +1,59 @@
+upstream  proxy_server {
+    ip_hash;
+    server 192.168.186.12:30500;
+    server 192.168.186.13:30500;
+    server 192.168.186.14:30500;
+}
+
+server {
+  listen 8088 ssl;
+  server_name 5ga-onesky.yncloudsaas.com;
+  # 指定证书和私钥路径
+  ssl_certificate /etc/nginx/conf.d/ssl.d/x.yncloudsaas.com.cert;  # 包含域名证书+中间证书
+  ssl_certificate_key /etc/nginx/conf.d/ssl.d/x.yncloudsaas.com.key;    # 私钥
+
+  # 可选：增强安全性配置
+  ssl_protocols TLSv1.2 TLSv1.3;
+  ssl_prefer_server_ciphers on;
+  ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256';
+
+  location / {
+      proxy_pass http://proxy_server;
+      client_max_body_size 5120m;
+      client_body_buffer_size 5120m;
+      client_body_timeout 6000s;
+      proxy_send_timeout 10000s;
+      proxy_read_timeout 10000s;
+      proxy_connect_timeout 600s;
+      proxy_max_temp_file_size 5120m;
+      proxy_request_buffering on;
+      proxy_buffering off;
+      proxy_buffer_size 4k;
+      proxy_buffers 4 12k;
+      proxy_set_header Host fake-domain.ynydapp.io;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+  location /_AMapService/v4/map/styles {
+          set $args "$args&jscode=cf66cea95bdcdfcf8048456b36f357a1";
+          proxy_pass https://webapi.amap.com/v4/ap/styles;
+  }
+
+  location /_AMapService/ {
+      set $args "$args&jscode=cf66cea95bdcdfcf8048456b36f357a1";
+      proxy_pass https://restapi.amap.com/;
+  }
+
+  location /rtc/v1/ {
+        add_header Access-Control-Allow-Headers X-Requested-With;
+        add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
+        proxy_pass http://127.0.0.1:30985/rtc/v1/;
+  }
+
+  location ~ ^/\w*/actuator/ {
+      return 403;
+  }
+}
--- a/58-202503-新DEMO环境/批量指令.sh
+++ b/58-202503-新DEMO环境/批量指令.sh
@@ -24,4 +24,6 @@ do

 done

+
+
 ssh root@192.168.40.50 <<< 'scyd@lab1234'
--- a/59-202503-珠海边防升级/关停旧的minio.sh
+++ b/59-202503-珠海边防升级/关停旧的minio.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+
+for i in {1..8}
+do
+  echo ${i}
+#  docker stop cmii_minio${i}_1 && docker rm cmii_minio${i}_1
+  rm -rf /data/minio-pv/pv${i}
+done
--- a/60-202504-黑龙江移动/批量脚本.sh
+++ b/60-202504-黑龙江移动/批量脚本.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+
+all_server_list=(192.168.37.132 192.168.37.133 192.168.37.134 192.168.37.135 192.168.37.136 192.168.37.137 192.168.37.138)
+for server in "${all_server_list[@]}";do
+   echo "server is ${server}"
+   ssh root@"${server}" "df -TH | awk 'NR>1 {split(\$6, a, \"%\"); if (a[1] > 70) print \$0}'"
+  echo ""
+done
--- a/61-202504-厦门升级/k8s-pvc.yaml
+++ b/61-202504-厦门升级/k8s-pvc.yaml
@@ -0,0 +1,76 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: nfs-backend-log-pvc
+  namespace: xmyd
+  labels:
+    cmii.type: middleware-base
+    cmii.app: nfs-backend-log-pvc
+    helm.sh/chart: all-persistence-volume-claims-1.1.0
+    app.kubernetes.io/version: 6.2.0
+spec:
+  storageClassName: nfs-prod-distribute
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 100Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: helm-emqxs
+  namespace: xmyd
+  labels:
+    cmii.type: middleware-base
+    cmii.app: helm-emqxs
+    helm.sh/chart: all-persistence-volume-claims-1.1.0
+    app.kubernetes.io/version: 6.2.0
+spec:
+  storageClassName: nfs-prod-distribute
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 20Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: helm-mongo
+  namespace: xmyd
+  labels:
+    cmii.type: middleware-base
+    cmii.app: helm-mongo
+    helm.sh/chart: all-persistence-volume-claims-1.1.0
+    app.kubernetes.io/version: 6.2.0
+spec:
+  storageClassName: nfs-prod-distribute
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 30Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: helm-rabbitmq
+  namespace: xmyd
+  labels:
+    cmii.type: middleware-base
+    cmii.app: helm-rabbitmq
+    helm.sh/chart: all-persistence-volume-claims-1.1.0
+    app.kubernetes.io/version: 6.2.0
+spec:
+  storageClassName: nfs-prod-distribute
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 20Gi
--- a/61-202504-厦门升级/厦门移动升级/new_schema.sql
+++ b/61-202504-厦门升级/厦门移动升级/new_schema.sql
--- a/61-202504-厦门升级/厦门移动升级/new_table.sql
+++ b/61-202504-厦门升级/厦门移动升级/new_table.sql
@@ -0,0 +1,315 @@
+SET FOREIGN_KEY_CHECKS = 0;
+use uav_dev;
+CREATE TABLE `company_sort_order` (
+  `company_id` int NOT NULL COMMENT '公司id',
+  `company_name` varchar(254) DEFAULT NULL COMMENT '公司名称',
+  `sort` int NOT NULL COMMENT '排序顺序 ,从小到大',
+  PRIMARY KEY (`company_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='定制化公司排序顺序 ';
+use uav_dev;
+CREATE TABLE `uav_auth_5g` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `uav_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '中移凌云无人机编码',
+  `gpsi` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'gpsi',
+  `is_del` bit(1) DEFAULT b'0' COMMENT '是否删除',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新人',
+  `company_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '公司id',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='无人机认证表';
+use uav_dev;
+CREATE TABLE `uav_auth_log` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `uav_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '认证无人id',
+  `uav_id_5g` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '认证核心网无人机id',
+  `auth_result` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '认证结果',
+  `auth_time` datetime DEFAULT NULL COMMENT '认证时间',
+  `gpsi` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'gpsi',
+  `location_area_5g` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '5G的基站地址',
+  `company_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '公司id',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='无人机认证日志表';
+use uav_industrial_portfolio;
+CREATE TABLE `civil_military_alarm_his` (
+  `id` bigint NOT NULL COMMENT '告警id',
+  `aerocraft_type` int DEFAULT NULL COMMENT '飞行器类型，0：云平台无人机，1：基站探测到的飞行器',
+  `aerocraft_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '飞行器id',
+  `area_type` int DEFAULT NULL COMMENT '告警的区域类型，0：规划区域告警，1：基站探测区域告警',
+  `order_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '飞行编号，仅无人机使用',
+  `radar_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '基站雷达id，基站告警使用',
+  `target_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '探测到的目标类型',
+  `event` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '入侵事件，闯入：INTRUDE',
+  `status` int DEFAULT NULL COMMENT '告警状态：0：告警中，1:告警结束',
+  `company_id` bigint DEFAULT NULL COMMENT '公司id',
+  `begin_time` datetime(6) DEFAULT NULL COMMENT '开始时间',
+  `end_time` datetime(6) DEFAULT NULL COMMENT '结束时间',
+  `end_type` int DEFAULT NULL COMMENT '结束类型，0：自动结束，1：手动结束',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建用户id，如果是触发则为空',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新用户id',
+  `is_del` bit(1) DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='通感告警历史记录';
+use uav_industrial_portfolio;
+CREATE TABLE `civil_military_statisic_bak` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `bts_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '基站id',
+  `bts_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '基站编码',
+  `dimension` int DEFAULT '0' COMMENT '维度（0:全部 1:年  2:月 3:周  4:日 ）',
+  `dimension_value` int DEFAULT NULL COMMENT '年：2024，月202401，日20240101',
+  `total` int DEFAULT NULL COMMENT '探测总架次',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_at` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_bts_statistic_dim` (`bts_code`,`dimension`,`dimension_value`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='基站探测统计表';
+use uav_industrial_portfolio;
+CREATE TABLE `police_device_info` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+  `device_id` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '设备id',
+  `device_name` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '设备名称',
+  `deleted` int DEFAULT NULL COMMENT '删除标记',
+  `company_id` bigint DEFAULT NULL COMMENT '公司ID',
+  `wgs84_lon` bigint DEFAULT NULL COMMENT 'WGS84坐标系经度',
+  `wgs84_lat` bigint DEFAULT NULL COMMENT 'WGS84坐标系纬度',
+  `alerter` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '告警人',
+  `alerter_telephone` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '告警电话',
+  `police_station` varchar(225) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '所属派出所',
+  `create_timestamp` bigint DEFAULT NULL COMMENT '创建信息时间戳',
+  `update_timestamp` bigint DEFAULT NULL COMMENT '最后更新时间戳',
+  `crime_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '案发地址',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1907599916368584706 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='设备信息表';
+use uav_industrial_portfolio;
+CREATE TABLE `violation_record` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '记录id',
+  `label` int DEFAULT NULL COMMENT '1 发现垃圾， 2 违停占用 ，3 人员入侵',
+  `address` varchar(254) DEFAULT NULL COMMENT '记录地址,用户输入',
+  `dealt` int DEFAULT '0' COMMENT '是否处理 0 为处理,1 已处理,null 是没有处理',
+  `image_file_id` varchar(255) DEFAULT NULL COMMENT '视频截图文件id',
+  `latitude02` double DEFAULT NULL COMMENT '截图的纬度02',
+  `longitude02` double DEFAULT NULL COMMENT '截图的经度02',
+  `altitude` double DEFAULT NULL COMMENT '截图的海拔高度',
+  `latitude84` double DEFAULT NULL COMMENT '截图的纬度84',
+  `longitude84` double DEFAULT NULL COMMENT '截图的经度84',
+  `company_id` int NOT NULL COMMENT '公司id',
+  `deleted` int NOT NULL DEFAULT '0' COMMENT '0 未删除 1 删除',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='违规记录表';
+use uav_lifecycle;
+CREATE TABLE `bridge_device_mqtt_info` (
+  `id` bigint NOT NULL COMMENT '序列',
+  `provider_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '设备提供商id',
+  `device_type` int DEFAULT NULL COMMENT '设备类型;0、5G-A基站，1、合作无人机，2、监管无人机，3、RemoteID无人机，4、雷达设备，5、频谱设备，6、光电设备，7、反制设备，8、诱骗设备，9、干扰设备，10、指挥车，11、察打一体，999、其他设备',
+  `mqtt_user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'MQTT账号名',
+  `mqtt_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'MQTT密码',
+  `topic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'MQTT的topic;设备的topic 为：\r\n设备本身参数数据的Topic,bridge/{provider_code}/device/${device_type}/{deviceId},\r\n设备实时数据的Topic，bridge/{provider_code}/device_data/${device_type}/{deviceId}',
+  `create_by` bigint DEFAULT NULL COMMENT '创建人',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` bigint DEFAULT NULL COMMENT '更新人',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='设备topic相关信息';
+use uav_lifecycle;
+CREATE TABLE `bridge_statistic` (
+  `id` bigint NOT NULL COMMENT 'id',
+  `topic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '数据的来源或去处',
+  `point` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '统计指标点',
+  `dimension` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '统计维度，deviceId/objectId...',
+  `dimension_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '统计维度值：{deviceId}/{objectId}',
+  `count` bigint DEFAULT NULL COMMENT '总数',
+  `success_delay` bigint DEFAULT NULL COMMENT '总延迟',
+  `min_delay` bigint DEFAULT NULL COMMENT '最低延迟',
+  `max_delay` bigint DEFAULT NULL COMMENT '最大延迟',
+  `success_count` bigint DEFAULT NULL COMMENT '成功总数，发布有成功与失败，订阅只有成功',
+  `failure_count` bigint DEFAULT NULL COMMENT '失败总数',
+  `time` datetime(6) DEFAULT NULL COMMENT '统计时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_statistic_comp_id` (`topic`,`point`,`dimension`,`dimension_value`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='bridge统计表';
+use uav_lifecycle;
+CREATE TABLE `external_uav_detect_data` (
+  `id` bigint NOT NULL COMMENT '自增ID',
+  `type` varchar(100) NOT NULL COMMENT '数据类型：detect-轨迹；nofly-预警")',
+  `param` json DEFAULT NULL COMMENT '参数体',
+  `def_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建日期',
+  PRIMARY KEY (`id`),
+  KEY `idx_external_uav_detect_data_type` (`type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='无人机轨迹预测历史表';
+use uav_lifecycle;
+CREATE TABLE `photoelectric_alarm` (
+  `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '告警ID',
+  `camera_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '摄像头ID',
+  `thumbnail_file_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '缩略图文件ID',
+  `alarm_time` datetime DEFAULT NULL COMMENT '告警时间',
+  `ai_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '目标类型：bird、drone',
+  `bird` int DEFAULT NULL COMMENT '探测目标数量',
+  `drone` int DEFAULT NULL COMMENT '探测目标数量',
+  `file_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '文件ID',
+  `deleted` tinyint(1) DEFAULT '0' COMMENT '是否删除,0:否，1:是',
+  `company_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '公司ID',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建者',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新人',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='摄像头告警表';
+use uav_lifecycle;
+CREATE TABLE `regulator_defense_zone_choose` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `defense_zone_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '防区id集合',
+  `regulator_id` bigint NOT NULL COMMENT '监管员id',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='用户防区选择映射表';
+use uav_lifecycle;
+CREATE TABLE `regulator_defense_zone_strategy` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `defense_zone_id` bigint NOT NULL COMMENT '防区id',
+  `create_at` datetime(6) NOT NULL COMMENT '创建时间',
+  `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '创建用户id',
+  `defense_type` int DEFAULT NULL COMMENT '防区类型（0：核心区，1：处置区，2：预警区）',
+  `sms_notice` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '闯入短信通知：接收人',
+  `notice_time` int DEFAULT '10' COMMENT '系统提示音(1-10000)',
+  `device_ids` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '无人值守设备id集合',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='防区策略表';
+use uav_lifecycle;
+CREATE TABLE `regulator_detection_configure_info` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `ref_lat` decimal(20,7) DEFAULT NULL COMMENT '参考点02纬度',
+  `ref_lng` decimal(20,7) DEFAULT NULL COMMENT '参考点02经度',
+  `ref_wgs_lat` decimal(20,7) DEFAULT NULL COMMENT '参考点84纬度',
+  `ref_wgs_lng` decimal(20,7) DEFAULT NULL COMMENT '参考点84经度',
+  `configs` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '配置',
+  `keep_duration` bigint DEFAULT NULL COMMENT '保存时间',
+  `suppression_num` int DEFAULT NULL COMMENT '压制点数',
+  `user_id` bigint DEFAULT NULL COMMENT '用户id',
+  `user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '用户名称',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `modify_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `deleted` bit(1) DEFAULT b'0' COMMENT '是否删除',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='参考点等信息的配置';
+use uav_lifecycle;
+CREATE TABLE `regulator_detection_statistic` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `device_comp_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备组合id',
+  `provider_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '提供商编码',
+  `device_type` int DEFAULT NULL COMMENT '设备类型',
+  `device_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '设备id',
+  `dimension` int DEFAULT NULL COMMENT '统计纬度，0：全部，1：年，2：月，3：周，4：日',
+  `dimension_value` int DEFAULT NULL COMMENT '统计纬度值',
+  `total` int DEFAULT NULL COMMENT '统计值',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_device_comp_id` (`device_comp_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='设备探测统计表';
+use uav_lifecycle;
+CREATE TABLE `regulator_detection_track` (
+  `id` bigint NOT NULL COMMENT '主键id',
+  `device_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备id',
+  `provider_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '提供商编码',
+  `device_type` int DEFAULT NULL COMMENT '设备类型',
+  `track_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '目标id',
+  `create_at` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='设备探测统计表';
+use uav_lifecycle;
+CREATE TABLE `regulator_radiomap` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键id',
+  `create_at` date DEFAULT NULL COMMENT '创建时间',
+  `Longitude` double DEFAULT NULL COMMENT '经度',
+  `Latitude` double DEFAULT NULL COMMENT '纬度',
+  `height` double DEFAULT NULL COMMENT '高度',
+  `value` double DEFAULT NULL COMMENT 'RSRP信号值',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=70197 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='Radiomap数据';
+use uav_lifecycle;
+CREATE TABLE `regulator_warning_instance` (
+  `id` bigint NOT NULL COMMENT '监管警情表',
+  `regulator_defense_zone_id` bigint DEFAULT NULL COMMENT '监管防区id',
+  `uav_model` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '发现无人机型号',
+  `uav_sn` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '发现无人机SN',
+  `uav_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '无人机地址',
+  `identity` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '产品唯一识别码',
+  `longitude` double DEFAULT NULL COMMENT '经度',
+  `latitude` double DEFAULT NULL COMMENT '纬度',
+  `pilot_lon` double DEFAULT NULL COMMENT '飞手经度',
+  `pilot_lat` double DEFAULT NULL COMMENT '飞手纬度',
+  `pilot_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '飞手地址',
+  `height` double DEFAULT NULL COMMENT '高度',
+  `telephone` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '通知手机号',
+  `is_del` int NOT NULL DEFAULT '0' COMMENT '用户是否被删除，0：否，1：删除',
+  `send_flag` int DEFAULT NULL COMMENT '是否发送成功，0失败，1:成功',
+  `create_at` datetime(6) DEFAULT NULL COMMENT '创建时间',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建用户',
+  `update_at` datetime(6) DEFAULT NULL COMMENT '更新时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新用户',
+  PRIMARY KEY (`id`),
+  KEY `idx_warning_instance_createBy` (`create_by`) /*!80000 INVISIBLE */
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='上报遥控器警情表';
+use uav_mission;
+CREATE TABLE `drone_info` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键id,自增',
+  `uav_name` varchar(100) NOT NULL COMMENT '无人机名称',
+  `uav_code` varchar(20) NOT NULL COMMENT '无人机编号',
+  `link_id` varchar(36) NOT NULL COMMENT '多机飞行任务id',
+  `create_id` varchar(100) DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `deleted` int(1) unsigned zerofill DEFAULT '0' COMMENT '0保留,1假删除',
+  `sorted` int NOT NULL COMMENT '排序',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=589 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='多机任务-无人机信息';
+use uav_mission;
+CREATE TABLE `police_case_action` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键自增id',
+  `uas_id` varchar(254) DEFAULT NULL COMMENT '无人机id',
+  `action` varchar(32) DEFAULT NULL COMMENT '操作指令',
+  `action_time` datetime DEFAULT NULL COMMENT '操作时间',
+  `action_detail` varchar(254) DEFAULT NULL COMMENT '操作指令详情，补充信息',
+  `police_case_code` varchar(64) DEFAULT NULL COMMENT '警情编号',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `deleted` int NOT NULL DEFAULT '0' COMMENT '是否删除',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq_id` (`id`),
+  KEY `idx_uas_id` (`uas_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='警情信息操作记录表';
+use uav_mission;
+CREATE TABLE `smart_link_mission` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键id,自增',
+  `mission_name` varchar(100) NOT NULL COMMENT '作业名称',
+  `user_id` varchar(100) NOT NULL COMMENT '用户Id',
+  `company_id` varchar(100) NOT NULL COMMENT '公司Id',
+  `create_id` varchar(100) DEFAULT NULL COMMENT '创建人',
+  `update_id` varchar(100) DEFAULT NULL COMMENT '更新人',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `deleted` int(1) unsigned zerofill DEFAULT '0' COMMENT '0保留,1假删除',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=117 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='智能网联作业信息关联表';
+use uav_user;
+CREATE TABLE `sys_zhongtai_user_mapping` (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` int DEFAULT NULL COMMENT '用户id',
+  `app_code` varchar(100) DEFAULT NULL COMMENT '待开通用户的能力应用编码。该编码为中台分配的应用编码',
+  `open_userId_aaaS` varchar(100) DEFAULT NULL COMMENT '订单用户的中台账号Open user ID',
+  `account_type_aaaS` varchar(10) DEFAULT NULL COMMENT '需要开通的账号类型',
+  `open_userId_sub_account` varchar(100) DEFAULT NULL COMMENT '中台子账号Open user ID。当accountTypeAaaS=1时必填',
+  `open_userId_app_account` varchar(100) DEFAULT NULL COMMENT '中台应用从账号Open user ID，当accountTypeAaaS=2时必填',
+  `user_name` varchar(100) DEFAULT NULL COMMENT '帐号姓名',
+  `org_code` varchar(100) DEFAULT NULL COMMENT '帐号归属的组织编码。如果是平台或平台类订购（utilityCode不为空，abilityCode为空），本编码orgCode可以为空。\r\n" +             "如果是能力订购（abilityCode不为空， utilityCode为空），本编码orgCode不可以为空。',
+  `service_org_code` varchar(100) DEFAULT NULL COMMENT '帐号归属的服务机构编码',
+  `mobile` varchar(100) DEFAULT NULL COMMENT '手机号',
+  `accountDesc` varchar(100) DEFAULT NULL COMMENT '帐号描述',
+  `sub_order_item_list` varchar(500) DEFAULT NULL COMMENT '账号的订购集合',
+  `create_at` datetime DEFAULT NULL COMMENT '创建事件',
+  `update_at` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='中台账号映射表';
+SET FOREIGN_KEY_CHECKS = 1;
--- a/61-202504-厦门升级/更新APP.txt
+++ b/61-202504-厦门升级/更新APP.txt
@@ -0,0 +1,7 @@
+
+
+
+harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:6.2.0-36027-040202
+harbor.cdcyy.com.cn/cmii/cmii-uav-sense-adapter:6.2.0-250331
+harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:6.2.0-34673-040101
+harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:6.2.0-hbgs
--- a/61-202504-厦门升级/版本升级数据库脚本.sh
+++ b/61-202504-厦门升级/版本升级数据库脚本.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# 数据表备份
+
+export mysql_exec_file_prefix=/root/mysql-8.0.27-linux-glibc2.17-x86_64-minimal/bin
+export mysql_port=33306
+export SQL_DUMP_FILE=/root/wdd/update_6.0.0_6.2.0/all_tables_6.0.0.sql
+export SQL_FULL_BACK_UP_FILE=/root/wdd/update_6.0.0_6.2.0/all_tables_6.0.0_20250403_fullback.sql
+export SQL_DDL_FILE="/root/update_6.0.0_6.2.0/厦门5.7.0~6.0.0"
+
+backup_all_structure() {
+  echo ""
+  echo ""
+  echo "start to backup all-table-structure!"
+  $mysql_exec_file_prefix/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P$mysql_port -e 'show databases;' | grep -Ev 'Database|information_schema|mysql|sys|performance_schema' | xargs $mysql_exec_file_prefix/mysqldump -uroot -pQzfXQhd3bQ -h127.0.0.1 -P$mysql_port --single-transaction --source-data=2 --hex-blob --triggers --routines --events --no-data --set-gtid-purged=OFF --databases >"${SQL_DUMP_FILE}"
+  echo ""
+}
+
+backup_all_dump() {
+  echo ""
+  echo ""
+  echo ""
+  echo "start to backup all-table-database-data!"
+  $mysql_exec_file_prefix/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P$mysql_port -e 'show databases;' | grep -Ev 'Database|information_schema|mysql|sys|performance_schema' | xargs $mysql_exec_file_prefix/mysqldump -uroot -pQzfXQhd3bQ -h127.0.0.1 -P$mysql_port --single-transaction --source-data=2 --hex-blob --triggers --routines --events --set-gtid-purged=OFF --databases >"${SQL_FULL_BACK_UP_FILE}"
+  echo ""
+}
+
+import_ddl_sql(){
+  echo ""
+  echo ""
+  echo "start to import ddl sql !"
+
+  for sql_file in $(ls "$SQL_DDL_FILE" | sort -n -k1.1,1.2); do
+      echo "current file is ${sql_file}"
+
+      sudo $mysql_exec_file_prefix/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P$mysql_port <"$SQL_DDL_FILE/${sql_file}"
+      echo "------------------"
+      echo ""
+  done
+
+  echo ""
+
+}
+
+backup_all_structure
+backup_all_dump
+
+/root/mysql-8.0.27-linux-glibc2.17-x86_64-minimal/bin/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 < new_table.sql
+/root/mysql-8.0.27-linux-glibc2.17-x86_64-minimal/bin/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 < new_schema.sql
+/root/mysql-8.0.27-linux-glibc2.17-x86_64-minimal/bin/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 < new_table_index.sql
+/root/mysql-8.0.27-linux-glibc2.17-x86_64-minimal/bin/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 < new_table_column.sql
--- a/62-202504-云南甘肃漏洞/openssh相关漏洞.txt
+++ b/62-202504-云南甘肃漏洞/openssh相关漏洞.txt
@@ -0,0 +1,2 @@
+OpenSSH 安全漏洞(CVE-2023-51767)
+
--- a/62-202504-云南甘肃漏洞/ubuntu升级OpenSSH.md
+++ b/62-202504-云南甘肃漏洞/ubuntu升级OpenSSH.md
@@ -0,0 +1,69 @@
+### 🤖 Assistant
+
+以下是升级 Ubuntu 20.04.4 中 OpenSSH 版本的详细步骤，结合了公开资源和核心技术要点：
+
+---
+
+### **核心步骤概览**
+1. **依赖准备**  
+   - 升级前需同步更新 OpenSSL（OpenSSH 的加密依赖）：
+     ```bash
+     wget https://github.com/openssl/openssl/releases/download/openssl-3.0.16/openssl-3.0.16.tar.gz
+     tar -zxvf openssl-3.0.16.tar.gz
+     cd openssl-3.0.16
+     ./config --prefix=/usr/local/openssl --shared  # 关键参数 `--shared`
+     make && make install
+     ```
+     需手动链接库文件（解决动态库路径问题）：
+     ```bash
+     ln -s /usr/local/include/openssl /usr/include/openssl
+     ln -sf /usr/local/lib64/libssl.so /usr/local/openssl/lib64/libssl.so
+     echo "/usr/local/openssl/lib64" > /etc/ld.so.conf.d/openssl.conf
+     ldconfig  # 更新库缓存
+     ```
+     来源：[<sup>1</sup>](https://blog.csdn.net/weixin_44293618/article/details/128096741)、[<sup>2</sup>](https://www.cnblogs.com/subsea/p/17682962.html)
+   链接openssl的二进制文件
+- ln -sf /usr/local/openssl/bin/openssl /usr/bin/openssl
+
+2. **升级 OpenSSH**  
+   - 下载并编译最新版 OpenSSH（如 9.3p2）：
+     ```bash
+     wget https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.3p2.tar.gz
+     tar -zxvf openssh-9.3p2.tar.gz
+     cd openssh-9.3p2
+     ./configure --prefix=/usr/local/openssh --with-ssl-dir=/usr/local/openssl
+     make && make install
+     ```
+   - 替换系统默认二进制文件：
+     ```bash
+     mv /usr/bin/ssh /usr/bin/ssh.bak
+     ln -s /usr/local/openssh/bin/ssh /usr/bin/ssh
+     ```
+
+3. **服务配置与测试**  
+   - 重启 SSH 服务并验证版本：
+     ```bash
+     systemctl restart sshd
+     ssh -V  # 应显示新版本号
+     ```
+   - **注意事项**：
+     - 操作前确保通过 `telnet` 或本地终端保持会话，避免升级失败导致无法远程连接（参考 [<sup>3</sup>](https://blog.csdn.net/lqh_linux/article/details/128796892)）。
+     - 若遇到 `known_hosts` 报错，可清除 `~/.ssh/known_hosts` 中对应 IP 的记录（[深信服社区](https://bbs.sangfor.com.cn/forum.php?mod=viewthread&tid=128631)）。
+
+---
+
+### **常见问题解决**
+- **符号链接错误**：  
+  若报错 `relocation error: symbol EVP_mdc2 not defined`，检查 OpenSSL 库路径是否正确链接，并重新执行 `ldconfig`（[<sup>2</sup>](https://www.cnblogs.com/subsea/p/17682962.html)）。
+  
+- **权限问题**：  
+  升级后若无法 root 登录，需修改 `/etc/ssh/sshd_config` 中的 `PermitRootLogin yes` 并重启服务（[<sup>4</sup>](https://www.cnblogs.com/miaojx/p/14713244.html)）。
+
+---
+
+### **总结**
+- 核心依赖：升级 OpenSSL 时务必使用 `--shared` 参数并正确配置库路径。
+- 风险控制：保留备份会话，避免升级中断导致失联。
+- 验证方式：通过 `ssh -V` 和实际连接测试确认版本更新。
+
+如需更详细的配置参数或故障排查，可参考上述来源链接。
--- a/62-202504-云南甘肃漏洞/查看openssl的位置.md
+++ b/62-202504-云南甘肃漏洞/查看openssl的位置.md
@@ -0,0 +1,89 @@
+### 🤖 Assistant
+
+在Ubuntu系统中，可以通过以下方法查找OpenSSL的库文件（`.so`文件）和安装路径：
+
+---
+
+### **1. 查找OpenSSL可执行文件路径**
+```bash
+which openssl
+```
+输出示例：  
+`/usr/bin/openssl`
+
+---
+
+### **2. 查找OpenSSL动态库文件路径（`.so`文件）**
+#### 方法1：通过 `ldconfig` 查询  
+```bash
+ldconfig -p | grep libssl.so
+```
+输出示例：  
+```
+libssl.so.3 (libc6,x86-64) => /usr/lib/x86_64-linux-gnu/libssl.so.3
+libssl.so (libc6,x86-64) => /usr/lib/x86_64-linux-gnu/libssl.so
+```
+
+#### 方法2：全局搜索文件  
+```bash
+sudo find / -name "libssl.so*" 2>/dev/null
+```
+输出示例：  
+```
+/usr/lib/x86_64-linux-gnu/libssl.so.3
+/usr/local/openssl/lib/libssl.so
+```
+
+---
+
+### **3. 查找openssl头文件位置（`.h`文件）**
+```bash
+find /usr -name "openssl" -type d 2>/dev/null
+```
+输出示例：  
+```
+/usr/include/openssl       # 系统默认头文件路径
+/usr/local/include/openssl # 手动安装的可能路径
+```
+
+---
+
+### **4. 检查OpenSSL版本及安装路径**
+```bash
+openssl version -a
+```
+输出中会包含 `OPENSSLDIR`，即OpenSSL的配置目录：  
+```
+OPENSSLDIR: "/usr/local/ssl"
+```
+
+---
+
+### **常见路径说明**
+| 文件类型       | 典型路径（Ubuntu 20.04）                     |
+|----------------|---------------------------------------------|
+| **可执行文件** | `/usr/bin/openssl`                          |
+| **动态库**     | `/usr/lib/x86_64-linux-gnu/libssl.so.3`     |
+| **头文件**     | `/usr/include/openssl`                      |
+| **自定义安装** | `/usr/local/openssl/lib`（手动编译时指定）  |
+
+---
+
+### **特殊情况处理**
+- **手动编译的OpenSSL**：  
+  如果通过源码安装（例如指定了 `--prefix=/usr/local/openssl`），库文件通常位于 `/usr/local/openssl/lib`。  
+  需要通过 `ldconfig` 注册路径：  
+  ```bash
+  echo "/usr/local/openssl/lib" > /etc/ld.so.conf.d/openssl.conf
+  ldconfig
+  ```
+
+- **多版本共存问题**：  
+  使用 `update-alternatives` 管理多版本（参考 [<sup>1</sup>](https://blog.csdn.net/newbeixue/article/details/103029704)）。
+
+---
+
+### **总结**
+- **最快方法**：直接运行 `ldconfig -p | grep libssl.so`。  
+- **检查依赖**：编译报错时，需确认库路径是否在 `LD_LIBRARY_PATH` 中。  
+- **源码安装**：注意 `--prefix` 参数指定的路径（参考 [<sup>2</sup>](https://www.henghost.com/jishu/25183/)）。
--- a/63-202504-CICD新/1-jenkins安装.txt
+++ b/63-202504-CICD新/1-jenkins安装.txt
@@ -0,0 +1,17 @@
+
+
+docker network create jenkins
+
+docker run --name jenkins-docker --rm --detach \
+  --privileged --network jenkins --network-alias docker \
+  --env DOCKER_TLS_CERTDIR=/certs \
+  --volume jenkins-docker-certs:/certs/client \
+  --volume jenkins-data:/var/jenkins_home \
+  --publish 2376:2376 \
+  docker:dind --storage-driver overlay2
+
+
+  # build jenkins
+cd /root/wdd/jenkins-build
+
+docker build -t harbor.cdcyy.com.cn/cmii/jenkins-wdd-blueocean:2.492.3-lts-jdk21 .
--- a/63-202504-CICD新/1.1-自定义编译jenkins.dockerfile
+++ b/63-202504-CICD新/1.1-自定义编译jenkins.dockerfile
@@ -0,0 +1,13 @@
+FROM jenkins/jenkins:2.492.3-lts-jdk21
+USER root
+RUN apt-get update && apt-get install -y lsb-release ca-certificates curl && \
+    install -m 0755 -d /etc/apt/keyrings && \
+    curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc && \
+    chmod a+r /etc/apt/keyrings/docker.asc && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] \
+    https://mirrors.tuna.tsinghua.edu.cn $(. /etc/os-release && echo \"$VERSION_CODENAME\") stable" \
+    | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
+    apt-get update && apt-get install -y docker-ce-cli && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+USER jenkins
+RUN jenkins-plugin-cli --plugins "blueocean docker-workflow"
--- a/998-常用脚本/啊-Agent-WDD运行/a-AgentWdd-基础依赖.sh
+++ b/998-常用脚本/啊-Agent-WDD运行/a-AgentWdd-基础依赖.sh
@@ -24,8 +24,6 @@ wget ${oss_url_prefix}/rke_linux-amd64
 wget ${oss_url_prefix}/kubectl-1.20.4-amd64


-
-
 wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/mysql-8.0.27-linux-glibc2.17-x86_64-minimal.zip

 wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/mysql-8.0.27-linux-glibc2.17-x86_64-minimal.tar.gz
--- a/998-常用脚本/啊-部署脚本/0-octopus-agent初始化脚本.sh
+++ b/998-常用脚本/啊-部署脚本/0-octopus-agent初始化脚本.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-
-# internet
-bash <(curl -sL http://42.192.52.227:9000/octopus/init-script-wdd.sh)  --url http://42.192.52.227:9000/octopus --agent-install --offline
-
-# no internet
-
-export offline_minio=10.250.0.100
-bash <(curl -sL http://${offline_minio}:9000/octopus/init-script-wdd.sh) --url http://${offline_minio}:9000/octopus --help
-
-bash <(curl -sL http://${offline_minio}:9000/octopus/init-script-wdd.sh) --url http://${offline_minio}:9000/octopus --zsh --tools --cn
-
-bash <(curl -sL http://${offline_minio}:9000/octopus/init-script-wdd.sh) --url http://${offline_minio}:9000/octopus --agent-install --offline
-
-bash <(curl -sL http://${offline_minio}:9000/octopus/init-script-wdd.sh) --url http://${offline_minio}:9000/octopus --agent-update --offline
--- a/998-常用脚本/啊-部署脚本/MINIO-初始化-废弃.sh
+++ b/998-常用脚本/啊-部署脚本/MINIO-初始化-废弃.sh
@@ -1,46 +0,0 @@
-#!/bin/bash
-# 替换namespace
-# 替换minio的实际地址和端口
-# 修改rabbitmq的实际地址和端口，需要暴露出来
-
-curl https://dl.min.io/client/mc/release/linux-amd64/mc -o /usr/local/bin/mc
-chmod +x /usr/local/bin/mc
-
-
-export tenant_name=outside
-mc alias set ${tenant_name} https://minio.ig-dev.uavcmlc.com cmii B#923fC7mk
-
-
-mc mb ${tenant_name}/jadenq ${tenant_name}/tus ${tenant_name}/thumbnail ${tenant_name}/pub-cms ${tenant_name}/live-srs-hls/ ${tenant_name}/mission/ ${tenant_name}/surveillance ${tenant_name}/playback ${tenant_name}/tower ${tenant_name}/modelprocess ${tenant_name}/srs-hls  ${tenant_name}/live-cluster-hls
-
-
-# mc alias set demo  https://oss.demo.uavcmlc.com cmii B#923fC7mk
-#
-# mc cp -r demo/jadenq/scenariomock/xg/ ${tenant_name}/jadenq/scenariomock/xg/
-# mc cp demo/jadenq/application/file/中移凌云使用手册.pdf ${tenant_name}/jadenq/application/file/中移凌云使用手册.pdf
-# mc cp -r demo/jadenq/defimage/def.jpg ${tenant_name}/jadenq/defimage/def.jpg
-# mc cp -r demo/pub-cms/application/img/ ${tenant_name}/pub-cms/application/img/
-
-
-mc admin config set ${tenant_name} notify_amqp:1 delivery_mode="2" exchange_type="direct" no_wait="off" queue_dir="" queue_limit="0"  url="amqp://admin:nYcRN91r._hj@10.250.0.200:35672" auto_deleted="off" durable="on" exchange="cmii.chinamobile.minio.event" internal="off" mandatory="off" routing_key="cmii.chinamobile.material.warehouse"
-
-sleep 5
-
-mc admin service restart ${tenant_name}
-
-mc event add ${tenant_name}/mission       arn:minio:sqs::1:amqp  --event put
-
-mc event add ${tenant_name}/modelprocess  arn:minio:sqs::1:amqp  --event put
-
-mc event add ${tenant_name}/live-srs-hls  arn:minio:sqs::1:amqp  --event put
-
-mc event add ${tenant_name}/playback      arn:minio:sqs::1:amqp  --event put
-
-mc event add ${tenant_name}/live-cluster-hls   arn:minio:sqs::1:amqp  --event put
-
-mc event add ${tenant_name}/surveillance  arn:minio:sqs::1:amqp  --event put
-
-mc event add ${tenant_name}/tus           arn:minio:sqs::1:amqp  --event delete
-
-mc ilm add --expiry-days "1" ${tenant_name}/tus
-
--- a/998-常用脚本/啊-部署脚本/deploy-nfs-server.sh
+++ b/998-常用脚本/啊-部署脚本/deploy-nfs-server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

-nfs_data_path="/var/lib/docker/nfs_data"
-#nfs_data_path="/data/nfs_data"
+#nfs_data_path="/var/lib/docker/nfs_data"
+nfs_data_path="/data/nfs_data"


 deploy_nfs_server(){
--- a/998-常用脚本/啊-部署脚本/install_minio.sh
+++ b/998-常用脚本/啊-部署脚本/install_minio.sh
@@ -1,9 +1,9 @@
 #!/bin/bash

 minio_local_path=/var/lib/docker/minio-pv/pv1
-harbor_host=172.31.2.7:8033/admin
-inner_master_ip=172.31.2.7
-minio_host_ip=172.31.2.9
+harbor_host=192.168.233.100:8033
+inner_master_ip=192.168.233.100
+minio_host_ip=192.168.233.100

 install_minio(){
  
@@ -16,19 +16,20 @@ install_minio(){

 cat > /root/wdd/install/minio-docker-compose.yaml <<EOF
 version: '2'
-
 services:
-  minio1:
+  minio:
+    image: ${harbor_host}/cmii/minio:RELEASE.2023-06-02T23-17-26Z
+    container_name: live-minio
    ports:
      - "9000:9000"
      - "9001:9001"
-    image: '${harbor_host}/cmii/minio:2023.5.4'
-    environment:
-      - MINIO_ROOT_USER=cmii
-      - MINIO_ROOT_PASSWORD=B#923fC7mk
+    command: 'server /data --console-address ":9001"'
    restart: always
+    environment:
+      MINIO_ACCESS_KEY: cmii
+      MINIO_SECRET_KEY: B#923fC7mk
    volumes:
-      - ${minio_local_path}:/mnt/data
+      -  ${minio_local_path}:/data
 EOF

  echo "start minio container !"
@@ -101,13 +102,13 @@ init_minio(){

 # install_docker_compose

-install_minio
+#install_minio
+#
+#if [[ $(docker inspect -f '{{.State.Running}}' install-minio1-1) -eq "true" ]]; then
+#      echo "minio is running now! start to init minio!"
+#      init_minio
+#fi

-if [[ $(docker inspect -f '{{.State.Running}}' install-minio1-1) -eq "true" ]]; then
-      echo "minio is running now! start to init minio!"
-      init_minio
-fi
-
-#init_minio
+init_minio


--- a/998-常用脚本/啊-部署脚本/z_执行apply命令.sh
+++ b/998-常用脚本/啊-部署脚本/z_执行apply命令.sh
@@ -24,6 +24,7 @@ kubectl delete -f k8s-pvc.yaml
 kubectl apply -f k8s-mongo.yaml
 kubectl delete -f k8s-mongo.yaml

+vim k8s-emqx.yaml
 kubectl apply -f k8s-emqx.yaml
 kubectl delete -f k8s-emqx.yaml

@@ -43,6 +44,7 @@ kubectl delete -f k8s-nacos.yaml

 ---

+vim k8s-configmap.yaml
 kubectl apply -f k8s-configmap.yaml
 kubectl delete -f k8s-configmap.yaml

@@ -61,5 +63,6 @@ kubectl delete -f k8s-backend.yaml

 kubectl -n kube-system get pods -o jsonpath='{.items[*].metadata.name}' 

+vi k8s-srs.yaml
 kubectl apply -f k8s-srs.yaml
 kubectl delete -f k8s-srs.yaml
--- a/998-常用脚本/啊-部署脚本/为node打标签.sh
+++ b/998-常用脚本/啊-部署脚本/为node打标签.sh
@@ -5,7 +5,12 @@ kubectl get nodes --show-labels
 kubectl label nodes 172.31.2.7 uavcloud.env=szgz --overwrite
 kubectl label nodes 172.31.2.8 uavcloud.env=szgz --overwrite
 kubectl label nodes 172.31.2.9 uavcloud.env=szgz --overwrite
+kubectl label nodes 192.168.233.100 uavcloud.affinity=common --overwrite


 # 删除label
 kubectl label nodes 192.168.40.193 uavcloud.env-
+
+# 获取特定label的节点
+kubectl get nodes -l uavcloud.affinity=common
+
--- a/998-常用脚本/啊-部署脚本/从离线部署机倒入脚本到服务器.sh
+++ b/998-常用脚本/啊-部署脚本/从离线部署机倒入脚本到服务器.sh
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-need_to_import_sql_folder="/home/wdd/Documents/master_data_5.2.0"
-target_host_ip=20.4.13.81
-target_host_port=33306
-target_user=root
-target_passwd=QzfXQhd3bQ
-
-
-full_back_up_database(){
-    echo "yes"
-}
-
-
-batch_import_sql_struct_to_server(){
-
-    for sql_file in $(ls ${need_to_import_sql_folder} | sort -n); do
-        if [ -d $need_to_import_sql_folder/${sql_file} ];then
-            continue
-        fi
-
-        echo "current file is $need_to_import_sql_folder/${sql_file}"
-
-        /root/wdd/mysql/bin/mysql -u${target_user} -p${target_passwd} -h${target_host_ip} -P${target_host_port} <"$need_to_import_sql_folder/${sql_file}"
-
-        echo "------------------"
-        echo ""
-    done
-}
-
-batch_import_sql_struct_to_server
-
-
--- a/998-常用脚本/啊-部署脚本/安装ts2mp4.sh
+++ b/998-常用脚本/啊-部署脚本/安装ts2mp4.sh
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-minio_inner_ip_host=10.215.66.89:9000
-
-download_ts2mp4_file(){
-  echo ""
-  wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/ts2mp4_docker_image_v1.tar.gz
-  echo ""
-  echo ""
-  echo ""
-  wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/pack_ts2mp4_release-0521.tar.gz
-}
-
-bootup_ts2mp4(){
-  if [[ -f ts2mp4_docker_image_v1.tar.gz ]]; then
-    echo "start to load ts2mp4 image file !"
-    docker load -i ts2mp4_docker_image_v1.tar.gz
-    echo ""
-
-
-    echo "init ts2mp4 config!"
-    tar -zvxf pack_ts2mp4_release-0521.tar.gz
-
-    echo "start to modify!"
-    sed -i "s/https:\/\/minio.ig-uat.uavcmlc.com:31500/http:\/\/$minio_inner_ip_host/g" $(pwd)/pack_ts2mp4_release/server_config_docker.ini
-    bash $(pwd)/pack_ts2mp4_release/run_docker.sh
-
-    sleep 3
-    if docker ps | grep -q ts2mp4; then
-        echo "ts2mp4 started successful !"
-    else
-        echo "ts2mp4 FAILED!"
-    fi
-  fi
-}
-
-#download_ts2mp4_file
-bootup_ts2mp4
--- a/998-常用脚本/备份脚本/关停全部的服务.sh
+++ b/998-常用脚本/备份脚本/关停全部的服务.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-namespace=zhbf
+namespace=xmyd

 # 优雅地处理Deployment缩容
 scale_deployments() {
@@ -18,4 +18,4 @@ scale_statefulsets() {
 }

 scale_deployments
-scale_statefulsets
+#scale_statefulsets
--- a/998-常用脚本/备份脚本/备份命名空间.sh
+++ b/998-常用脚本/备份脚本/备份命名空间.sh
@@ -1,9 +1,10 @@
 #!/bin/bash

-namespace=gsyd-app
+namespace=szgz

 install_yq() {
  wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/yq_linux_amd64 -O /usr/local/bin/yq
+#  wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/aarch/yq_linux_arm64 -O /usr/local/bin/yq
  chmod +x /usr/local/bin/yq

  echo ""
@@ -43,7 +44,7 @@ backup_all_stateful_sets() {
  echo ""
 }

-install_yq
+#install_yq
 backup_all_deployment
 backup_all_service
 backup_all_stateful_sets
--- a/998-常用脚本/容器镜像ARM/ARM版本的镜像仓库.sh
+++ b/998-常用脚本/容器镜像ARM/ARM版本的镜像仓库.sh
@@ -1,65 +1,66 @@
-#/bin/bash
-
-# https://blog.csdn.net/weixin_43902588/article/details/142279993 参考文档
-
-export QUAY=/var/lib/docker/quay
-
-mkdir -p $QUAY/postgres
-setfacl -m u:26:-wx $QUAY/postgres
-
-docker run -d --name postgresql \
-	-e POSTGRES_USER=user \
-	-e POSTGRES_PASSWORD=pass \
-	-e POSTGRES_DB=quay \
-	-p 5432:5432 \
-	-v $QUAY/postgres:/var/lib/postgresql/data:Z \
-	postgres:10.12
-
-docker exec -it postgresql /bin/bash -c 'echo "CREATE EXTENSION IF NOT EXISTS pg_trgm" | psql -d quay -U user'
-
-docker inspect -f "{{.NetworkSettings.IPAddress}}" postgresql
-
-# 不需要执行
-docker run  -it --rm --name redis \
-	-p 6379:6379 \
-	redis:6.2.14 \
-	redis-server --test-memory 4096
-
-
-
-mkdir $QUAY/storage
-mkdir $QUAY/config
-
-
-docker run -d --name redis \
-        -p 6379:6379 \
-		-m 4g \
-        redis:6.2.14 \
-        --requirepass strongpassword
-
-docker inspect -f "{{.NetworkSettings.IPAddress}}" redis
-
-# 运行config服务 需要浏览器打开 http://172.31.2.7:8080/，并用 quayconfig/secret 登录。
-docker run --rm -it --name quay_config -p 8080:8080 quay.io/projectquay/quay:3.11.1 config secret
-
-
-setfacl -m u:1001:-wx $QUAY/storage
-setfacl -m u:1001:-wx $QUAY/config
-
-docker run -p 8033:8080 \
-   --name=quay \
-   --privileged=true \
-   -v $QUAY/config:/conf/stack:Z \
-   -v $QUAY/storage:/datastorage:Z \
-   -d quay.io/projectquay/quay:3.11.1
-
-
-# 登录dashboard 8033 创建账户和密码 创建项目
-admin
-V2ryStr@ngPss
-
-
-docker login --tls-verify=false -u admin -p V2ryStr@ngPss 172.31.2.7:8033
-docker login  -u admin -p V2ryStr@ngPss 172.31.2.7:8033
-
+#/bin/bash
+
+# https://blog.csdn.net/weixin_43902588/article/details/142279993 参考文档
+
+export QUAY=/var/lib/docker/quay
+
+mkdir -p $QUAY/postgres
+setfacl -m u:26:-wx $QUAY/postgres
+
+docker run -d --name postgresql \
+  --restart=always \
+	-e POSTGRES_USER=user \
+	-e POSTGRES_PASSWORD=pass \
+	-e POSTGRES_DB=quay \
+	-p 5432:5432 \
+	-v $QUAY/postgres:/var/lib/postgresql/data:Z \
+	postgres:10.12
+
+docker exec -it postgresql /bin/bash -c 'echo "CREATE EXTENSION IF NOT EXISTS pg_trgm" | psql -d quay -U user'
+
+docker inspect -f "{{.NetworkSettings.IPAddress}}" postgresql
+
+# 不需要执行
+docker run  -it --rm --name redis \
+	-p 6379:6379 \
+	redis:6.2.14 \
+	redis-server --test-memory 4096
+
+
+
+mkdir $QUAY/storage
+mkdir $QUAY/config
+
+
+docker run -d --name redis \
+        -p 6379:6379 \
+		-m 4g \
+        redis:6.2.14 \
+        --requirepass strongpassword
+
+docker inspect -f "{{.NetworkSettings.IPAddress}}" redis
+
+# 运行config服务 需要浏览器打开 http://172.31.2.7:8080/，并用 quayconfig/secret 登录。
+docker run --rm -it --name quay_config -p 8080:8080 quay.io/projectquay/quay:3.11.1 config secret
+
+
+setfacl -m u:1001:-wx $QUAY/storage
+setfacl -m u:1001:-wx $QUAY/config
+
+docker run -p 8033:8080 \
+   --name=quay \
+   --privileged=true \
+   -v $QUAY/config:/conf/stack:Z \
+   -v $QUAY/storage:/datastorage:Z \
+   -d quay.io/projectquay/quay:3.11.1
+
+
+# 登录dashboard 8033 创建账户和密码 创建项目
+admin
+V2ryStr@ngPss
+
+
+docker login --tls-verify=false -u admin -p V2ryStr@ngPss 172.31.2.7:8033
+docker login  -u admin -p V2ryStr@ngPss 172.31.2.7:8033
+
 docker pull 172.31.2.7:8033/admin/cmii
--- a/998-常用脚本/常用脚本.sh
+++ b/998-常用脚本/常用脚本.sh
@@ -1,103 +0,0 @@
-# 下载所有离线文件
-
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/kebite-4.1.6.tar.gz
-
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/v4.1.6/middleware-images.tar.gz
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/v4.1.6/rancher-1.20.4-image.tar.gz
-
-
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/rke_linux-aarch64-1.2.6
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/kubectl-1.20.4-0.aarch64.rpm
-
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/cmlc-zzzsj.tar.gz
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/offline_map-2023-12-18.zip
-
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/frontend-arm.tar.gz
-
-wget --no-check-certificate https://oss.demo.uavcmlc.com:18000/cmlc-installation/cmlc-srs.tar.gz
-wget --no-check-certificate https://oss.demo.uavcmlc.com:18000/cmlc-installation/docker_release_ts2mp4_arm64.tar.gz
-wget --no-check-certificate https://oss.demo.uavcmlc.com:18000/cmlc-installation/ts2mp4_docker_image_arm64_v1.0.0.tar.gz
-
-wget https://oss.demo.uavcmlc.com/cmlc-installation/v4.1.6/离线地图.zip
-
-wget https://oss.demo.uavcmlc.com:18000/cmlc-installation/v4.1.6/mysql-8.2.0-linux-glibc2.28-aarch64.tar.xz
-
-# 批量复制文件
-ip_list=(172.10.125.6 172.10.125.141 172.10.125.120)
-for ip in "${ip_list[@]}"; do
-
-    echo "yes
-    yes
-    " | scp /etc/ssh/sshd_config root@${ip}:/etc/ssh/sshd_config
-
-    ssh root@${ip} "systemctl restart sshd"
-done
-
-ip_list=(10.20.1.133 10.20.1.134 10.20.1.132)
-for ip in "${ip_list[@]}"; do
-    scp /etc/docker/daemon.json root@${ip}:/etc/docker/daemon.json
-#    scp /etc/ssh/sshd_config root@${ip}:/etc/ssh/sshd_config
-
-    ssh root@${ip} "systemctl restart docker"
-#    ssh root@${ip} "systemctl restart sshd"
-done
-
-
-vim /etc/docker/daemon.json
-{
-  "insecure-registries" : ["172.10.125.92:8033","harbor.cq-mlkj.com"]
-}
-
-systemctl restart docker
-
-
-list=(iptables)
-
-for Packages in "${list[@]}"
-do
-    apt-get download $(apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances ${Packages} | grep "^\w" | sort -u)
-done
-
-
-sudo dpkg -i ./containerd.io_1.6.15-1_amd64.deb \
-  ./docker-ce-cli_20.10.10~3-0~ubuntu-focal_amd64.deb \
-  ./docker-ce_20.10.10~3-0~ubuntu-focal_amd64.deb \
-  ./docker-ce-rootless-extras_20.10.10~3-0~ubuntu-focal_amd64.deb \
-  ./docker-buildx-plugin_0.11.1-1~ubuntu.20.04~focal_amd64.deb \
-  ./docker-compose-plugin_2.19.1-1~ubuntu.20.04~focal_amd64.deb
-
-rpcinfo -p localhost
-
-# 生成ed25519 版本的ssh key
-ssh-keygen -t ed25519 -f .ssh/id_ed25519  -C "m@github"
-
-echo $(cat .ssh/id_ed25519.pub)
-
-echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXDzet+Z2/AmrzIZpPviz7Z9AMxLWiJUOwtj/3NPauk m@github" >>.ssh/authorized_keys
-
-# 修改calico-node检测的IP
-kubectl -n kube-system edit daemonset calico-node
-env:
- name: FELIX_INTERFACEPREFIX
-  value: "eth0"
-
-# 强行删除所有的calico-node
-for calico in $(kubectl -n kube-system get pods | grep calico-node | awk '{print$1}');do
-  echo "calico pod is => $calico"
-  kubectl -n kube-system delete pod $calico
-done
-
-# 强行删除所有的flannel-pod
-for flannel in $(kubectl -n kube-system get pods | grep kube-flannel | awk '{print$1}');do
-  echo "flannel pod is => $flannel"
-  kubectl -n kube-system delete pod $flannel
-done
-
-
-./mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306
-
-
-redis-cli -h 127.0.0.1 -a Mcache@4522
-
-
-curl -X POST -u "admin:V2ryStr@ngPss" -H  "authorization: Basic YWRtaW46VjJyeVN0ckBuZ1Bzcw==" -H "Content-Type: application/json" -d '{"project_name":"rancher","registry_id":null,"metadata":{"public":"true"},"storage_limit":-1}' http://172.10.125.92:8033/api/v2.0/projects
--- a/998-常用脚本/批量复制脚本
+++ b/998-常用脚本/批量复制脚本
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-ip_list=(10.20.1.133 10.20.1.134)
-
-for ip in "${ip_list[@]}"; do
-
-    echo "yes
-    yes
-    " | scp fuse-overlayfs-1.7.1-2.x86_64.rpm slirp4netns-1.2.0-1.oe2203sp2.x86_64.rpm root@${ip}:/root/
-  done
--- a/998-常用脚本/故障恢复脚本/删除状态不为Running的Pod.sh
+++ b/998-常用脚本/故障恢复脚本/删除状态不为Running的Pod.sh
@@ -2,10 +2,11 @@


 wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/jq-linux-amd64 -O /usr/local/bin/jq
+#wget https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/aarch/jq-linux-arm64 -O /usr/local/bin/jq
 chmod +x /usr/local/bin/jq


-export name_space=ingress-nginx
+export name_space=cqejpt

 kubectl delete pods -n $name_space --field-selector status.phase!=Running --force

--- a/998-常用脚本/故障恢复脚本/重启cmii的前端后端Pod.sh
+++ b/998-常用脚本/故障恢复脚本/重启cmii的前端后端Pod.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash


-name_space=jlyd
+name_space=szgz

 delete_all_fronted_cmii_pod(){

--- a/998-常用脚本/数据库备份脚本.sh
+++ b/998-常用脚本/数据库备份脚本.sh
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-SQL_DUMP_FILE=/root/all_tables_5.2.0.sql
-./mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 -e 'show databases;' | grep -Ev 'Database|information_schema|mysql|sys|performance_schema' | xargs ./mysqldump -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 --single-transaction  --source-data=2 --hex-blob --triggers --routines --events --no-data --set-gtid-purged=OFF --databases  > "${SQL_DUMP_FILE}"
-
-
-SQL_FULL_BACK_UP_FILE=/home/mmc/all_tables_4.0.2_230914_fullback.sql
-./mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 -e 'show databases;' | grep -Ev 'Database|information_schema|mysql|sys|performance_schema' | xargs ./mysqldump -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 --single-transaction  --source-data=2 --hex-blob --triggers --routines --events --set-gtid-purged=OFF --databases  > "${SQL_FULL_BACK_UP_FILE}"
-
-
-
-# 导入脚本
-
-NEW_UPDATED_SQL_FILE_FOLDER=/root/database/123
-for sql_file in $(ls ${NEW_UPDATED_SQL_FILE_FOLDER} | sort -n); do
-    echo "current file is $NEW_UPDATED_SQL_FILE_FOLDER/${sql_file}"
-    ./mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 <"$NEW_UPDATED_SQL_FILE_FOLDER/${sql_file}"
-    echo "------------------"
-    echo ""
-done
-
-
-./mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306
-
-
-
--- a/998-常用脚本/更新deplyment的tag号.sh
+++ b/998-常用脚本/更新deplyment的tag号.sh
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export name_space=ly
-export new_tag=5.1.0
-export deployment_name=cmii-uav-tower
-
-image_prefix=$(kubectl -n ${name_space} get deployment ${deployment_name} -o=jsonpath='{.spec.template.spec.containers[*].image}' | cut -d":" -f1)
-
-echo "image grep is => ${image_prefix}"
-
-kubectl -n ${name_space} patch deployment ${deployment_name} -p "{\"spec\":{\"template\":{\"spec\":{\"containers\":[{\"name\":\"${deployment_name}\",\"image\": \"${image_prefix}:${new_tag}\"}]}}}}"
-
--- a/998-常用脚本/更新脚本/一键更新Tag脚本.sh
+++ b/998-常用脚本/更新脚本/一键更新Tag脚本.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

-harbor_host=192.168.233.100:8033
-namespace=zhbf
+harbor_host=192.168.0.10:8033
+namespace=hbyd
 app_name=""
 new_tag=""

--- a/998-常用脚本/设置apt走代理.md
+++ b/998-常用脚本/设置apt走代理.md
@@ -1,37 +0,0 @@
-要在Ubuntu上使用代理服务器来进行apt操作，可以按照以下步骤进行配置：
-
-1. 打开终端，并进入`/etc/apt`目录：
-   ```shell
-   cd /etc/apt
-   ```
-
-2. 创建一个新的文件或编辑已有的文件，例如`apt.conf.d/99proxy`：
-   ```shell
-   sudo nano apt.conf.d/99proxy
-   ```
-
-3. 在打开的文件中添加以下内容，将代理服务器的地址和端口替换为实际的代理服务器信息：
-   ```shell
-   Acquire::http::Proxy "http://proxy-server-address:proxy-port";
-   Acquire::https::Proxy "http://proxy-server-address:proxy-port";
-   ```
-
-4. 保存并关闭文件（使用Ctrl + X，然后按Y确认保存）。
-
-5. 现在，您可以尝试运行任何apt命令，例如更新软件包列表：
-   ```shell
-   sudo apt update
-   ```
-
-注意：如果代理服务器需要用户名和密码进行身份验证，您还需要添加额外的配置。在步骤3中，将http和https行更改为如下所示，并替换`username`和`password`为实际的凭据：
-```shell
-Acquire::http::Proxy "http://username:password@proxy-server-address:proxy-port";
-Acquire::https::Proxy "http://username:password@proxy-server-address:proxy-port";
-```
-
-这样就完成了在Ubuntu上使用代理服务器进行apt操作的配置。确保替换`proxy-server-address`和`proxy-port`为实际的代理服务器地址和端口，并根据需要进行身份验证的配置。
-
-```shell
-Acquire::http::Proxy "http://192.168.8.102:10811";
-Acquire::https::Proxy "http://192.168.8.102:10811";
-```
--- a/998-常用脚本/镜像同步/ImageSyncDLTU.sh
+++ b/998-常用脚本/镜像同步/ImageSyncDLTU.sh
@@ -5,7 +5,7 @@ gzip_image_list_txt="all-gzip-image-list.txt" # 一般不需要修改
 oss_prefix_url="https://oss.demo.uavcmlc.com/cmlc-installation"
 local_gzip_path="/root/octopus-image"

-DockerRegisterDomain="192.168.233.100:8033" # 需要根据实际修改
+DockerRegisterDomain="192.168.0.8:8033" # 需要根据实际修改
 HarborAdminPass=V2ryStr@ngPss              # 需要跟第一脚本中的密码保持一致

 print_green() {
@@ -40,7 +40,7 @@ Download_Load_Tag_Upload() {
    cmii)
      local_gzip_path="$local_gzip_path/cmii"
      mkdir -p $local_gzip_path
-      oss_prefix_url="$oss_prefix_url/6.2.0-demo/"
+      oss_prefix_url="$oss_prefix_url/6.2.0-from-demo/"
      dltu
      shift # past argument
      ;;
--- a/999-数据库脚本/z_database_execute.sh
+++ b/999-数据库脚本/z_database_execute.sh
@@ -1,10 +1,16 @@
 #!/bin/bash

 # 将sql文件上传到mysql的目录 /var/lib/docker/mysql-pv
-# 修改目录的权限为 chown 1001:1001 ./6.2.0/*
+# 修改目录的权限为
+
+chown 1001:1001 /var/lib/docker/mysql-pv/6.2.0/
 # 然后执行mysql的pod

-export sql_import_file_path="/bitnami/mysql/6.2.0"
+
+export sql_file_folder_name=6.2.0
+
+export local_mysql_host_path="/var/lib/docker/mysql-pv/$sql_file_folder_name"
+export sql_import_file_path="/bitnami/mysql/${sql_file_folder_name}"
 for sql_file in $(ls "$sql_import_file_path" | sort -n -k1.1,1.2); do
    echo "current file is ${sql_file}"

@@ -14,6 +20,17 @@ for sql_file in $(ls "$sql_import_file_path" | sort -n -k1.1,1.2); do
    echo ""
 done

+# nacos备份
+## 在pod里面执行
+mysqldump  -uroot -pQzfXQhd3bQ -h127.0.0.1 -P3306 -t --set-gtid-purged=OFF cmii_nacos_config config_info his_config_info roles users > ${sql_import_file_path}/cmii_nacos_config_wdd.sql
+sed -i '1s/^/use cmii_nacos_config;\n/' ${sql_import_file_path}/cmii_nacos_config_wdd.sql
+
+
+## 在主机上执行
+cp ${local_mysql_host_path}/cmii_nacos_config_wdd.sql /root/wdd/install/cmii_nacos_config_wdd.sql
+
+
+# 传统的版本
 https://oss.demo.uavcmlc.com/cmlc-installation/downloadfile/amd/mysql-8.0.27-linux-glibc2.17-x86_64-minimal.zip


--- a/999-数据库脚本/备份cmii-nacos-config表.sh
+++ b/999-数据库脚本/备份cmii-nacos-config表.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+
+# 被封了nacos_config
+/root/wdd/mysql/bin/mysqldump -uroot -pQzfXQhd3bQ -h10.250.0.200 -P33306 -t --set-gtid-purged=OFF cmii_nacos_config config_info his_config_info roles users > 17.cmii_nacos_config.sql
+sed -i '1s/^/use cmii_nacos_config;\n/' 17.cmii_nacos_config.sql
+mv 17.cmii_nacos_config.sql "/home/wdd/nextcloudData/MasterLoad/Work/UAV Cloud/22.希腊项目-阿里云-德国/999-数据库脚本/5.6.0/17.cmii_nacos_config.sql"
+chown wdd:wdd "/home/wdd/nextcloudData/MasterLoad/Work/UAV Cloud/22.希腊项目-阿里云-德国/999-数据库脚本/5.6.0/17.cmii_nacos_config.sql"
+
+
--- a/999-数据库脚本/数据库同步脚本.sh
+++ b/999-数据库脚本/数据库同步脚本.sh
@@ -10,11 +10,7 @@ SQL_FULL_BACK_UP_FILE=/home/mmc/all_tables_4.0.2_230914_fullback.sql
 /root/wdd/mysql/bin/mysql -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 -e 'show databases;' | grep -Ev 'Database|information_schema|mysql|sys|performance_schema' | xargs /root/wdd/mysql/bin/mysqldump -uroot -pQzfXQhd3bQ -h127.0.0.1 -P33306 --single-transaction  --source-data=2 --hex-blob --triggers --routines --events --set-gtid-purged=OFF --databases  > "${SQL_FULL_BACK_UP_FILE}"


-# 被封了nacos_config
-/root/wdd/mysql/bin/mysqldump -uroot -pQzfXQhd3bQ -h10.250.0.200 -P33306 -t --set-gtid-purged=OFF cmii_nacos_config config_info his_config_info roles users > 17.cmii_nacos_config.sql
-sed -i '1s/^/use cmii_nacos_config;\n/' 17.cmii_nacos_config.sql
-mv 17.cmii_nacos_config.sql "/home/wdd/nextcloudData/MasterLoad/Work/UAV Cloud/22.希腊项目-阿里云-德国/999-数据库脚本/5.6.0/17.cmii_nacos_config.sql"
-chown wdd:wdd "/home/wdd/nextcloudData/MasterLoad/Work/UAV Cloud/22.希腊项目-阿里云-德国/999-数据库脚本/5.6.0/17.cmii_nacos_config.sql"
+


 # 导入脚本