Browse Source

业务数据同步

dev
zhuibobo 1 month ago
parent
commit
e7a07efaa9
  1. 11
      doc/部署说明/部署过程描述.md
  2. 36
      ng/10/start.sh
  3. 38
      ng/10/stop.sh
  4. 14
      ng/3/nginx.conf
  5. 2
      script/sql/businessdatasyn/002-二期数据库更新.sql
  6. 4
      zdxt-web-server/nacos-server/conf/application.properties
  7. 3
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enf-ep.yml
  8. 3
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-ent-ep.yml
  9. 3
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-job-ep.yml
  10. 3
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-sup-ep.yml
  11. 13
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml
  12. 1
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
  13. 4
      zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-dev.yml
  14. 6
      zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml

11
doc/部署说明/部署过程描述.md

@ -80,9 +80,12 @@ Nginx 是源码编译安装的,安装在 `/usr/local/nginx/`,可执行文件
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/0613.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/098.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/099.sql
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod < /efcode20/dbv2/upgrade/0726.sql
```
* 备份2期库
* 备份1期库(排除市监表)
* 查询字符集
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod -e "SELECT SCHEMA_NAME, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='zfjd_ef20_1';"
* 备份1期库(排除市监表)
```bash
mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events --ignore-table=zfjd_ef20_1.sszt_jbxx110497_new --ignore-table=zfjd_ef20_1.sszt_jbxx110497 zfjd_ef20_1 > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8.sql
mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_07_08 > /efcode20/dbv2/zfjd_ef20_1_2026_07_21_utf8.sql
@ -92,7 +95,11 @@ Nginx 是源码编译安装的,安装在 `/usr/local/nginx/`,可执行文件
mysqldump -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 --single-transaction --triggers --events zfjd_ef20_1 sszt_jbxx110497_new > /efcode20/dbv2/zfjd_ef20_1_2026_06_20_utf8_sszt_jbxx110497_new.sql
```
* 压缩备份文件
zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv2/zfjd_ef20_07_21.zip /efcode20/dbv2/zfjd_ef20_1_2026_07_21_utf8.sql
zip -e -P 'xj.sdeweqwew222qwe.12345' /efcode20/dbv2/zfjd_ef20_prod_2026_07_26.zip /efcode20/dbv2/zfjd_ef20_prod_2026_07_26.sql
* 导入2期库
```
mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_prod < /efcode20/dbv2/zfjd_ef20_1_2026_07_21_utf8.sql
```
* sql客户端
* mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd'
### DATAX

36
ng/10/start.sh

@ -0,0 +1,36 @@
#!/bin/bash
# 执法码2.0 - 启动脚本
# 用法: ./start.sh
APP_HOME="/efcode20"
JAR_NAME="zdxt-job-ep.jar"
PROFILES="prod,prod-job-ep"
LOG_FILE="${APP_HOME}/zdxt-job-ep.log"
JAR_PATH="${APP_HOME}/${JAR_NAME}"
# 检查 jar 是否存在
if [ ! -f "$JAR_PATH" ]; then
echo "[FAIL] ${JAR_PATH} 不存在"
exit 1
fi
# 检查是否已在运行
PID=$(pgrep -f "${JAR_NAME}" 2>/dev/null)
if [ -n "$PID" ]; then
echo "[INFO] 服务已在运行 (PID: ${PID})"
exit 0
fi
# 启动服务
echo "[INFO] 启动 ${JAR_NAME} ..."
nohup java -jar "${JAR_PATH}" --spring.profiles.active=${PROFILES} > "${LOG_FILE}" 2>&1 &
NEW_PID=$!
sleep 1
if kill -0 "$NEW_PID" 2>/dev/null; then
echo "[OK] 启动成功 (PID: ${NEW_PID})"
else
echo "[FAIL] 启动失败,请查看日志: ${LOG_FILE}"
exit 1
fi

38
ng/10/stop.sh

@ -0,0 +1,38 @@
#!/bin/bash
# 执法码2.0 - 停止脚本
# 用法: ./stop.sh
JAR_NAME="zdxt-job-ep.jar"
SHUTDOWN_WAIT=15
# 查找进程
PID=$(pgrep -f "${JAR_NAME}" 2>/dev/null)
if [ -z "$PID" ]; then
echo "[INFO] 服务未在运行"
exit 0
fi
echo "[INFO] 停止 ${JAR_NAME} (PID: ${PID}) ..."
# 优雅停止
kill "$PID" 2>/dev/null
# 等待退出
COUNT=0
while kill -0 "$PID" 2>/dev/null; do
if [ $COUNT -ge $SHUTDOWN_WAIT ]; then
echo "[WARN] ${SHUTDOWN_WAIT}s 未退出,强制终止..."
kill -9 "$PID" 2>/dev/null
sleep 1
break
fi
sleep 1
((COUNT++))
done
if kill -0 "$PID" 2>/dev/null; then
echo "[FAIL] 停止失败 (PID: ${PID})"
exit 1
else
echo "[OK] 已停止"
fi

14
ng/3/nginx.conf

@ -108,19 +108,19 @@ http {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
# location /efcode20-sup-web/ {
# proxy_pass http://10.76.108.15:12004/;
# proxy_set_header Host $http_host;
# proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# }
location /efcode20-sup-web/ {
proxy_pass http://10.76.108.15:12004/;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
#location ~* /(uploads|images)/.*\.(php|php2|php3|php4|php5|phpm|phpml|phtml|phtm|phps|pht|asp|aspx|asa|cer|cdx|ashx|exe|sh|bash|jsp|jspx|jspa|html|web.config|cfm|cgi|war|ashx|htaccess|py|pl)$ {
#deny all; # 拦截.html和.htm文件,并返回403禁止访问
#return 403;
#}
location /enforce {
# 执法端
alias /usr/local/nginx/html/dist-zf-tmp/;
alias /usr/local/nginx_new/html/dist-zf/;
#root /usr/local/nginx/html/zfjdm/;
index index.html index.htm;
}

2
script/sql/businessdatasyn/002-二期数据库更新.sql

@ -206,3 +206,5 @@ ALTER TABLE qr_code_generate_history
ALTER TABLE enterprise_pub_qrcode
MODIFY COLUMN update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE enforcement_registration ADD COLUMN other_reasons varchar(500) DEFAULT NULL COMMENT '其他原因';

4
zdxt-web-server/nacos-server/conf/application.properties

@ -234,7 +234,7 @@ server.error.include-message=ALWAYS
### Nacos Console Main port
nacos.console.port=8080
### Nacos Server Web context path:
nacos.console.contextPath=
nacos.console.contextPath=/nacos-console
### Nacos Server context path, which link to nacos server `nacos.server.contextPath`, works when deployment type is `console`
nacos.console.remote.server.context-path=/nacos
@ -292,7 +292,7 @@ nacos.core.auth.plugin.nacos.token.cache.enable=false
nacos.core.auth.plugin.nacos.token.expire.seconds=18000
### The default token (Base64 string):
#nacos.core.auth.plugin.nacos.token.secret.key=VGhpc0lzTXlDdXN0b21TZWNyZXRLZXkwMTIzNDU2Nzg=
nacos.core.auth.plugin.nacos.token.secret.key=VGhpc0lzTXlDdXN0b21TZWNyZXRLZXkwMTIzNDU2Nzg=
nacos.core.auth.plugin.nacos.token.secret.key=YAcIiA5DAki5hqPWe0MkyzvmzO2XEqVIhHwTuKiWzD/FCXJqiO+0TomeDlhHn42y
### Allow anonymous read access, default `false`, current only ai(skill, agentspec) supported.
#nacos.core.auth.nacos.anonymous.ai.enabled=true

3
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-enf-ep.yml

@ -8,4 +8,5 @@ spring:
cloud:
nacos:
discovery:
enabled: false
metadata:
zdxt-role: enf-ep

3
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-ent-ep.yml

@ -8,4 +8,5 @@ spring:
cloud:
nacos:
discovery:
enabled: false
metadata:
zdxt-role: ent-ep

3
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-job-ep.yml

@ -10,7 +10,8 @@ spring:
cloud:
nacos:
discovery:
enabled: false
metadata:
zdxt-role: job-ep
--- # Quartz 定时任务配置
spring:

3
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod-sup-ep.yml

@ -8,4 +8,5 @@ spring:
cloud:
nacos:
discovery:
enabled: false
metadata:
zdxt-role: sup-ep

13
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml

@ -39,6 +39,10 @@ snail-job:
--- # 数据源配置
spring:
cloud:
nacos:
discovery:
server-addr: 10.76.108.11:8848
datasource:
type: com.zaxxer.hikari.HikariDataSource
# 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
@ -56,7 +60,14 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://10.76.108.1:15144/zfjd_ef20_07_08?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://10.76.108.1:15144/zfjd_ef20_prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: zfjd
password: szsf@zfjd
v1:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.76.108.1:15144/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: zfjd
password: szsf@zfjd
# # 从库数据源

1
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml

@ -61,7 +61,6 @@ spring:
namespace: public
group: DEFAULT_GROUP
username: nacos
password: nacos
# 注册到 Nacos 的服务名(与 application.name 解耦,方便网关按 lb://zdxt-admin-service 路由)
service: zdxt-admin-service
# 通过环境变量/启动参数控制是否启用 Nacos 注册

4
zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-dev.yml

@ -8,10 +8,6 @@ spring:
nacos:
discovery:
server-addr: 127.0.0.1:8848
namespace: public
group: DEFAULT_GROUP
username: nacos
password: nacos
gateway:
# 全局CORS配置
globalcors:

6
zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml

@ -5,6 +5,12 @@ spring:
application:
name: zdxt-gateway
cloud:
nacos:
discovery:
server-addr: 10.76.108.11:8848
namespace: public
group: DEFAULT_GROUP
username: nacos
# LoadBalancer 配置
# 健康检查交给 Nacos 心跳(gRPC),不启用 Spring Cloud LoadBalancer 自带的 HTTP 探测,
# 否则会因后端 /actuator/health 被 Sa-Token 拦截返回 401 而把实例误判为不健康,

Loading…
Cancel
Save