根据用户ID获取用户接口不过滤删除用户

doc/backup-db.sh

@@ -2,13 +2,13 @@
 
 echo "$(date) backup start"
 export PGPASSWORD='gC5jP3oM1tQ8'
-backup_dir=/data/ts_acl_backup/$(date +%Y%m%d%H%M%S)
+backup_dir=/data1/ts_acl_backup/$(date +%Y%m%d%H%M%S)
 mkdir -p "${backup_dir}"
 host='192.168.70.136'
 port='9999'
 username='ts_acl'
 dbname='ts_acl'
-jobs='24'
-echo "pg_dump -h ${host} -p ${port} -U ${username} -d ${dbname} -v -O -Fd -j ${jobs} -Z9 -f ${backup_dir}"
-pg_dump -h "${host}" -p "${port}" -U "${username}" -d "${dbname}" -v -O -Fd -j "${jobs}" -Z9 -f "${backup_dir}"
+jobs='32'
+echo "pg_dump -h ${host} -p ${port} -U ${username} -d ${dbname} -v -O -Fd -j ${jobs} -Z9 -n sqmdb_rpt -T sqmdb_rpt.acl_operation_log -T sqmdb_rpt.acl_top_user_bak -T sqmdb_rpt.acl_verification_log -T sqmdb_rpt.sms_record -T sqmdb_rpt.sms_report -T sqmdb_rpt.sms_send_queue -f ${backup_dir}"
+pg_dump -h "${host}" -p "${port}" -U "${username}" -d "${dbname}" -v -O -Fd -j "${jobs}" -Z9 -n sqmdb_rpt -T sqmdb_rpt.acl_operation_log -T sqmdb_rpt.acl_top_user_bak -T sqmdb_rpt.acl_verification_log -T sqmdb_rpt.sms_record -T sqmdb_rpt.sms_report -T sqmdb_rpt.sms_send_queue -f "${backup_dir}"
 echo "$(date) backup end"

doc/backup-minio-data.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+docker run --rm \
+  -v minio-data:/volume \
+  -v $(pwd)/backup:/backup \
+  alpine \
+  tar cvf /backup/backup.tar -C /volume .

doc/restore-db.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-export PGPASSWORD='NFQCgBA6YhNvgAqG6THw'
+export PGPASSWORD='Richr00t'
 backup_dir=$1
-host='127.0.0.1'
+host='192.168.203.177'
 port='15432'
 username='postgres'
 dbname='ts_acl'
-jobs='24'
+jobs='32'
 pg_restore -O -c -v -h "${host}" -p "${port}" -U "${username}" -d "${dbname}" -Fd -j "${jobs}" "${backup_dir}"

doc/restore-minio-data.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+docker run --rm \
+  -v minio-data:/volume \
+  -v $(pwd):/backup \
+  alpine \
+  tar xvf /backup/minio-backup.tar -C /volume

doc/正式环境部署.md

@@ -42,7 +42,7 @@ docker run \
 -v /etc/localtime:/etc/localtime:ro \
 -e "MINIO_ROOT_USER=admin" \
 -e "MINIO_ROOT_PASSWORD=8#tGE3Y)ZTPinQCbX,ZY" \
--d minio/minio:RELEASE.2022-12-12T19-27-27Z server /data --address ":19000" --console-address ":19001"
+-d minio:RELEASE.2025-01-18T00-31-37Z server /data --address ":19000" --console-address ":19001"
 ```
 
 nginx配置

src/main/java/com/nokia/dao/UserDao.java

@@ -68,7 +68,7 @@ public interface UserDao extends BaseMapper<User> {
     @Select("select a.user_id as user_id, a.login_name as login_id, a.user_name as user_name, a.phone as mobile,"
             + " a.email as email, a.city_id as org_id, c.area_name as org_name, a.area_id as area"
             + " from sqmdb_rpt.acl_user a, sqmdb_rpt.acl_area c"
-            + " where a.city_id = c.area_id and user_id=#{userId} and a.deleted = 0")
+            + " where a.city_id = c.area_id and user_id=#{userId}")
     FlowUserVo getFlowUserVoByUserId(Integer userId);
 
     @Select("select r.role_id from  sqmdb_rpt.acl_role r, sqmdb_rpt.acl_user_role_city ur"

src/main/resources/application-test.properties

@@ -5,23 +5,25 @@ server.port=12128
 logging.level.root=info
 logging.level.com.nokia=debug
 
-# 测试环境数据库配置
+# 正式环境数据源GP数据库配置
 spring.datasource.driver-class-name=org.postgresql.Driver
-#spring.datasource.url=jdbc:postgresql://192.168.50.5:5432/sqmmt
-#spring.datasource.username=sqmdb
-#spring.datasource.password=sqmdb_1QAZ
-spring.datasource.url=jdbc:postgresql://192.168.50.3:15432/ts_acl
+spring.datasource.url=jdbc:postgresql://192.168.203.177:15432/ts_acl
 spring.datasource.username=postgres
-spring.datasource.password=NFQCgBA6YhNvgAqG6THw
+spring.datasource.password=Richr00t
 
-# 测试环境redis配置
-spring.redis.host=192.168.50.3
+# 正式环境Redis配置
+spring.redis.host=127.0.0.1
 spring.redis.port=6379
-spring.redis.password=gciVrjQGBiYrpA0VfQhW
+spring.redis.database=0
+#spring.redis.password=Richr00t
 redis.timeoutSeconds=600
+# 关闭接口文档
+springdoc.api-docs.enabled=false
+springdoc.swagger-ui.enabled=false
+knife4j.production=true
 # minio配置
-minio.endpoint=http://192.168.10.7:19000/
-minio.bucket=oss-acl-tousu-test
-minio.accessKey=acl-tousu-test
-minio.secretKey=LY6HPgUwc9GXzhU1Rq8wuwNC8Ac07V3a
+minio.endpoint=http://192.168.202.253:19000/
+minio.bucket=oss-acl-tousu-prod
+minio.accessKey=admin
+minio.secretKey=8#tGE3Y)ZTPinQCbX,ZY
 minio.expiry=15