From b1ec966a1b9397ea7adc975a6c4ef5c8811ab6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?= <10549902+zhuangruibo@user.noreply.gitee.com> Date: Wed, 17 Jun 2026 15:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/庄锐波-工作周报.md | 35 +- doc/部署说明/部署过程描述.md | 23 +- ng/14/nginx.conf | 83 +++++ ng/3/nginx.conf | 328 ++++++++++++++++++ .../099-初始化测试账号密码.sql | 22 ++ .../src/common/globalRouter.js | 2 +- .../vite-config/index.js | 4 +- .../vite-env/.env.enterprise-dev-zrb | 1 + .../vite-env/.env.enterprise-prod | 7 +- .../zdxt-efcode-enterprise-app/vite.config.js | 4 +- .../src/main/resources/application-dev.yml | 63 ++++ .../src/main/resources/application-prod.yml | 63 ++++ 12 files changed, 624 insertions(+), 11 deletions(-) create mode 100644 ng/14/nginx.conf create mode 100644 ng/3/nginx.conf create mode 100644 script/sql/zfjd-refactoring-v1/099-初始化测试账号密码.sql create mode 100644 zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-dev.yml create mode 100644 zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-prod.yml diff --git a/doc/庄锐波-工作周报.md b/doc/庄锐波-工作周报.md index cb2a27d7..1f724118 100644 --- a/doc/庄锐波-工作周报.md +++ b/doc/庄锐波-工作周报.md @@ -193,7 +193,7 @@ 执法监督码 ├── [🟡]统计查询 │ ├── [🟡]行政执法 - │ │ ├── [🟡]涉企执法情况 + │ │ ├── [✅]涉企执法情况 │ │ ├── [❌]企业受检次数 │ │ ├── [❌]企业信息情况 │ │ ├── [❌]执法单位情况 @@ -210,4 +210,35 @@ * 可能需要分部分时间处理计划，预约，任务，预告的bug和网络策略通后进行部署方面的工作,上边的迁移工作时间可能会延长. **下周工作：** -* 继续完成迁移一期的统计报表功能.预计21号前完成. \ No newline at end of file +* 继续完成迁移一期的统计报表功能.预计21号前完成. + +## 时间：2026-06-15 至 2026-06-21 + +**本周工作：** +* 计划,预约,任务,预告bug处理. +* 执法端待办的功能开发. +* 准备部署二期的生成环境. +* 迁移一期中的以下功能,预计时间需要2周左右 +```text + 执法监督码 + ├── [✅]统计查询 + │ ├── [✅]行政执法 + │ │ ├── [✅]涉企执法情况 + │ │ ├── [✅]企业受检次数 + │ │ ├── [✅]企业信息情况 + │ │ ├── [✅]执法单位情况[使用一期权限过滤] + │ │ ├── [✅]执法投诉情况[使用一期权限过滤] + │ │ ├── [✅]检查计划情况[使用一期权限过滤] + │ ├── [✅]非行政执法 + │ │ ├── [✅]非行政执法 + ├── [✅]工作报表 + │ │ ├── [✅]执法分析 + ├── [✅]综合管理 + │ ├── [✅]送码入企 + │ ├── [✅]送码入企查询 +``` +* 可能需要分部分时间处理计划，预约，任务，预告的bug和网络策略通后进行部署方面的工作,上边的迁移工作时间可能会延长. + +**下周工作：** +* 部署二期的生成环境. +* 计划,预约,任务,预告bug处理. \ No newline at end of file diff --git a/doc/部署说明/部署过程描述.md b/doc/部署说明/部署过程描述.md index b1b68802..d7db5df5 100644 --- a/doc/部署说明/部署过程描述.md +++ b/doc/部署说明/部署过程描述.md @@ -70,6 +70,7 @@ 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/016.sql mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/017.sql mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/018.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 ``` * 备份2期库 * 备份1期库（排除市监表） @@ -94,6 +95,16 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 ## 10.76.108.3 +配置文件在： + +/usr/local/nginx/conf/nginx.conf +日志在 /usr/local/nginx/logs/。 + +/usr/local/nginx/sbin/nginx -t && /usr/local/nginx/sbin/nginx -s reload + +firewall-cmd --add-port={12001,12002,12003,12004}/tcp --permanent +firewall-cmd --reload +firewall-cmd --list-all --- ## 10.76.108.4 @@ -111,6 +122,8 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 ## 10.76.108.7 企业端后台服务 * 初次部署 + * df -h + * mkdir -p /data/upload * 挂载文件存储目录 ```bash mount -t nfs 10.76.108.19:/data/upload /data/upload @@ -131,6 +144,7 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 * 安装 JDK 17 包已经传上来了，直接解压安装： ```bash + cd /efcode20/sdk tar -zxvf bisheng-jdk-17.0.18-b13-linux-aarch64.tar.gz -C /usr/local/ ls /usr/local/ | grep jdk ``` @@ -147,6 +161,13 @@ Nginx 是源码编译安装的，安装在 `/usr/local/nginx/`，可执行文件 java -version ``` 输出 17 就 OK 了。 + 开放防火墙端口 + * firewall-cmd --add-port=18002/tcp --permanent + * firewall-cmd --reload + * firewall-cmd --list-all + 启动jar + nohup java -jar /efcode20/zdxt-ent-ep.jar --spring.profiles.active=prod,prod-ent-ep > /efcode20/zdxt-ent-ep.log 2>&1 & + * 日常维护 --- @@ -225,7 +246,7 @@ yum install nginx nginx-mod-stream -y # 2. 启动并设置开机自启 systemctl start nginx systemctl enable nginx - +nginx -t && systemctl reload nginx # 3. 确认 stream 模块已加载 nginx -V 2>&1 | grep stream diff --git a/ng/14/nginx.conf b/ng/14/nginx.conf new file mode 100644 index 00000000..c1c5cdba --- /dev/null +++ b/ng/14/nginx.conf @@ -0,0 +1,83 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /run/nginx.pid; + +# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. +include /usr/share/nginx/modules/*.conf; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 4096; + + # 限制请求体大小 + client_max_body_size 100m; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; + + # zdxt-efcode-enterprise-app 企业端应用 + server { + listen 12001; + listen [::]:12001; + server_name _; + + # 企业端前端静态资源 + location / { + root /efcode20/zdxt-ent-app; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + # 后端API代理（匹配前端 VITE_BASE_URL = '/api/ent-ep'） + location /api/ { + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_read_timeout 86400s; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection upgrade; + proxy_buffering off; + proxy_cache off; + proxy_pass http://10.76.108.11:17000/; + } + + # 限制外网访问 actuator 相关路径 + location ~ ^(/[^/]*)?/actuator.*(/.*)?$ { + return 403; + } + + error_page 404 /404.html; + location = /40x.html { + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + } + } +} + diff --git a/ng/3/nginx.conf b/ng/3/nginx.conf new file mode 100644 index 00000000..ce6769b2 --- /dev/null +++ b/ng/3/nginx.conf @@ -0,0 +1,328 @@ + +#user nobody; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + add_header X-Frame-Options SAMEORIGIN; + server_tokens off; + + # 定义后端集群 + upstream java_cluster { + server 10.76.108.1:85; + # server 10.76.108.4:85; + # server 10.76.108.5:85; + # server 10.76.108.6:85; + # 可加 weight、backup、max_fails 等参数 + } + + #allow 61.144.226.33; + #allow 10.76.108.25; + #allow 192.168.93.1; + #deny all; + #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + # '$status $body_bytes_sent "$http_referer" ' + # '"$http_user_agent" "$http_x_forwarded_for"'; + + #access_log logs/access.log main; + + sendfile on; + #tcp_nopush on; + + #keepalive_timeout 0; + keepalive_timeout 65; + + #gzip on; + + server { + listen 81; + + location / { + proxy_pass http://10.76.108.1:80; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + } + + # 企业端应用代理至 14 号服务器 + server { + listen 12001; + + location / { + proxy_pass http://10.76.108.14:12001; + 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; + } + } + + server { + listen 80; + server_name localhost; + + client_max_body_size 200M; + #charset koi8-r; + + #access_log logs/host.access.log main; + #prpoxy_cookie_path / "/; httponly;secure; SameSite=Lax"; + location / { + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_headers_hash_max_size 51200; + #1proxy_headers_hash_bucket_size 6400; + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #root /usr/local/nginx/html/HTML-ICP/; + root /usr/local/nginx/html/dist-zf/; + index index.html index.htm; + } + + location /icp { + alias /usr/local/nginx/html/HTML-ICP/; + index index.html index.htm; + } + + location /efcode20-ent-app/ { + proxy_pass http://10.76.108.14:12001/; + 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/; + #root /usr/local/nginx/html/zfjdm/; + index index.html index.htm; + } + location /enterprise { + # 企业端 + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # 注意这里只能使用 alias + alias /usr/local/nginx/html/dist-qy/; + # root /usr/local/nginx/html/st-screen; + index index.html index.htm; + } + + location /enforcetest { + # 执法端 - 测试 + alias /usr/local/nginx/html/dist-qy-test/; + index index.html index.htm; + } + location /enterprisetest { + # 企业端 - 测试 (注意这里只能使用 alias) + alias /usr/local/nginx/html/dist-qy-test/; + # root /usr/local/nginx/html/st-screen; + index index.html index.htm; + } + + #proxy_cookie_path / "/; httponly;secure; SameSite=Lax"; + #location / { + # proxy_cookie_path / "/api; secure; SameSite=None"; + # proxy_pass http://10.76.108.1:85; + #} + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + location /siqApi { + proxy_pass https://egbpub.szsiq.com/egb/api/thirdauth; + # proxy_pass http://10.76.108.3/siqApi; + } + location ^~ /sjWeb/ { + proxy_pass http://www.szcredit.com.cn/web/GSZJGSPT/; + #proxy_pass http://10.76.108.3/siqApi; + } + location /GJQYCredit { + proxy_pass http://www.szcredit.com.cn/web/GSZJGSPT/; + } + location /mssqApi { + proxy_pass http://10.224.158.64:8282/proxy; + } + location /profile/ { + proxy_pass http://10.76.108.1:85/profile/; + } + + location /szszfjdm { + alias /usr/local/nginx/html/zfjdm/; + index index.html index.htm; + } + + #执法监督码后台接口地址 + location ^~ /jdmApi/ { + # proxy_pass http://10.76.108.1:85/; + proxy_pass http://java_cluster/; + proxy_set_header Host $host:$server_port; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Port $server_port; + proxy_pass_header Set-Cookie; + #proxy_set_header Host $host; + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_headers_hash_max_size 51200; + #proxy_headers_hash_bucket_size 6400; + #proxy_intercept_errors on; + #error_page 301 302 307 = @handle_redirects; + #client_max_body_size 5120m; + } + # 执法监督码后台测试接口地址 + location ^~ /jdmTestApi/ { + proxy_pass http://10.76.108.1:88/; + proxy_set_header Host $host:$server_port; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Port $server_port; + proxy_pass_header Set-Cookie; + + proxy_intercept_errors on; + error_page 301 302 307 = @handle_redirects; + client_max_body_size 5120m; + } + location @handle_redirects { + set $saved_redirect_location '$upstream_http_location'; + proxy_pass $saved_redirect_location; + } + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root / html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} + } + + server { + listen 8087; + server_name localhost; + #proxy_cookie_path / "/; httponly;secure; SameSite=Lax"; + location / { + proxy_pass http://10.224.158.64:8282/; + + proxy_set_header Host $host:$server_port; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + client_max_body_size 50m; + client_body_buffer_size 256k; + proxy_connect_timeout 100; + proxy_send_timeout 100; + proxy_read_timeout 100; + proxy_buffer_size 256k; + proxy_buffers 4 256k; + proxy_busy_buffers_size 256k; + proxy_temp_file_write_size 256k; + proxy_next_upstream error timeout invalid_header http_500 http_503 http_404; + proxy_max_temp_file_size 128m; + } + } + server { + listen 85; + server_name localhost; + proxy_set_header Host $host; + proxy_set_header X-real-ip $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + client_max_body_size 100M; + location / { + # proxy_pass http://10.76.108.1:85; + proxy_pass http://java_cluster/; + proxy_set_header Host $host:$server_port; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_redirect default; + proxy_connect_timeout 600s; + proxy_send_timeout 600s; + proxy_read_timeout 600s; + } + } + server { + listen 88; + server_name localhost; + proxy_set_header Host $host; + proxy_set_header X-real-ip $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + client_max_body_size 100M; + location / { + proxy_pass http://10.76.108.1:81/; + } + } + + # another virtual host using mix of IP-, name-, and port-based configuration + # + #server { + # listen 8000; + # listen somename:8080; + # server_name somename alias another.alias; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + + + # HTTPS server + # + server { + listen 443 ssl; + server_name jdm.szssfj.cn; + + ssl_certificate /usr/local/nginx/ssl/szssfj.cn.pem; + ssl_certificate_key /usr/local/nginx/ssl/szssfj.cn.key; + + ssl_session_cache shared:SSL:1m; + ssl_session_timeout 5m; + + ssl_ciphers HIGH:!aNULL:!MD5; + ssl_prefer_server_ciphers on; + + root /usr/local/nginx/html; + + location /enterprisetest { + # 企业端 + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # 注意这里只能使用 alias + alias /usr/local/nginx/html/dist-qy-test/; + index index.html index.htm; + + } + } +} diff --git a/script/sql/zfjd-refactoring-v1/099-初始化测试账号密码.sql b/script/sql/zfjd-refactoring-v1/099-初始化测试账号密码.sql new file mode 100644 index 00000000..36624d02 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/099-初始化测试账号密码.sql @@ -0,0 +1,22 @@ +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '董志彪', login_name = 'smiledzb1982', nick_name = '', user_type = '00', email = '', phonenumber = '13723454151', sex = '0', avatar = '', password = 'c81912a9d2b7aef18c7e9b95be9b8568', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2024-08-29 16:27:07', salt = 'd2a122', create_dept = null, create_by = 0, create_time = '2024-08-29 16:04:35', update_by = 0, update_time = '2024-08-29 16:25:59', remark = null WHERE user_id = 17608540121; +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '罗伟', login_name = 'weil45', nick_name = '', user_type = '00', email = '', phonenumber = '15817307171', sex = '0', avatar = '', password = '83d52427acce17332988ad7646821ac3', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2024-08-29 16:18:06', salt = '0af89b', create_dept = null, create_by = 0, create_time = '2024-08-29 16:14:23', update_by = 0, update_time = '2024-08-29 16:16:57', remark = null WHERE user_id = 17608540150; +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '毛先祥', login_name = '33ef1970fd449676fa4bc197', nick_name = '', user_type = '00', email = '', phonenumber = '13537602265', sex = '0', avatar = '', password = '4d9a647e7ba10305468a11108d2d9d31', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2024-09-24 10:58:33', salt = '3d6e2a', create_dept = null, create_by = 0, create_time = '2024-09-24 10:49:32', update_by = 0, update_time = '2024-09-24 10:54:56', remark = null WHERE user_id = 17608556724; +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '马嘉玲', login_name = 'DGD440881199506180622', nick_name = '', user_type = '00', email = '', phonenumber = '15817381630', sex = '0', avatar = '', password = '74206ad1c88f2e339c9884e99d1aef96', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2024-10-17 12:03:44', salt = 'f53d4e', create_dept = null, create_by = 0, create_time = '2024-10-08 16:19:00', update_by = 0, update_time = '2024-10-17 11:59:38', remark = null WHERE user_id = 17608557492; +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '秦同真', login_name = 'qintongzhen138', nick_name = '', user_type = '00', email = '', phonenumber = '13823610579', sex = '0', avatar = '', password = '04768e6f64a9ad05f26a3c8fd22f00f5', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2024-12-19 10:15:21', salt = 'f39b78', create_dept = null, create_by = 0, create_time = '2024-12-19 10:09:13', update_by = 0, update_time = '2024-12-19 10:10:02', remark = null WHERE user_id = 17608565612; +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '钟芳婷', login_name = 'A7271888', nick_name = '', user_type = '00', email = '', phonenumber = '13751661770', sex = '0', avatar = '', password = '6dfdee8f3aff978b0a45bbefd9842426', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2025-04-09 16:09:31', salt = '9df8f3', create_dept = null, create_by = 0, create_time = '2025-04-09 16:02:01', update_by = 0, update_time = '2025-04-09 16:02:02', remark = null WHERE user_id = 17608594890; +UPDATE enterprise_user SET tenant_id = '000000', dept_id = '405', user_name = '周军', login_name = 'XP073215', nick_name = '', user_type = '00', email = '', phonenumber = '15012671807', sex = '0', avatar = '', password = '30522017a2b452a5fb3ac1b41b3400c6', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2025-07-08 10:19:58', salt = 'c50b0b', create_dept = null, create_by = 0, create_time = '2025-06-19 12:09:02', update_by = 0, update_time = '2025-07-08 10:10:37', remark = null WHERE user_id = 17608601734; + +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922213334342-BAF2-EBD8EF897', user_name = '刘倩琳', login_name = 'liuqianlin', nick_name = '', user_type = '00', email = '1950712844@qq.com', phonenumber = '67tS8WoU19KGYv2t5wSudg==', sex = '0', avatar = '', password = '9e68af2e7fe0e0d37cfb88ff80855b4b', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-09 22:08:12', salt = 'ea356d', create_dept = null, create_by = 0, create_time = '2024-05-31 14:09:10', update_by = -1, update_time = '2026-06-09 22:08:12', remark = '', type = '0', law_certificate_num = '19020011041', fullname = '刘倩琳', taskId = '97055dfb-c914-4dcc-8ee8-d2c0c98fe2c0', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'UPDATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065211909', updateAt = '1754646883614', mobileNumber = '67tS8WoU19KGYv2t5wSudg==', certificateNumber = '31nylKvncOOOz4z0RNiEcQDv5OcXNQowwTb9vUh8RCo=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市司法局行政执法协调监督处三级主任科员","zwbscode":"","jbcc":"三级主任科员","priority":"","zwjc":"","gzgxcode":"00","gzgx":"主职","jbcccode":"160090","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20210922213334342-BAF2-EBD8EF897","position":"","zwjccode":"","isMappingPerson":"0","order":"15231750"}]', organizationId = '20210922213334342-BAF2-EBD8EF897', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811170431003-2EFB-6B2217C70', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 7897; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922214042443-C1E6-E2489F594', user_name = '白宁', login_name = 'baining', nick_name = '', user_type = '00', email = '', phonenumber = '4p9mipP7ZxDshFDHaQOfYg==', sex = '0', avatar = '', password = '686b6725b894ac60fed4dd2c3eb64e26', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-09 22:03:38', salt = 'bd202c', create_dept = null, create_by = 0, create_time = '2024-05-31 14:07:57', update_by = 17608416912, update_time = '2026-06-09 22:03:38', remark = null, type = null, law_certificate_num = '19020811001', fullname = '白宁', taskId = '00003e5e-41b0-43b0-9d06-4982e409d9f8', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065071662', updateAt = '1754646860325', mobileNumber = '4p9mipP7ZxDshFDHaQOfYg==', certificateNumber = 'c/+TMp+6HZ8AdcjUgZ8Q5wU/r/6xYA5YZvQlLfL/DAI=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市坪山区司法局党组书记、局长","zwbscode":"","jbcc":"一级调研员","priority":"","zwjc":"局长","gzgxcode":"00","gzgx":"主职","jbcccode":"160030","zwbs":"","positioncode":"010060","zgdw":"Y","unitid":"20210922214042443-C1E6-E2489F594","position":"正处级","zwjccode":"216A","isMappingPerson":"0","order":"166956000"}]', organizationId = '20210922214042443-C1E6-E2489F594', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210922224417280-B03D-8791A1ED7', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608416858; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20250707152926088-BD4B-B8826EF6E', user_name = '蔡梓帆', login_name = 'caizifan', nick_name = '', user_type = '00', email = '', phonenumber = 'FfsKo0ZfI4LmogmmvCSgVA==', sex = '0', avatar = '', password = 'b9306650dc4bb5507ebd568784cef941', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-09 20:32:13', salt = '9f1ccd', create_dept = null, create_by = 0, create_time = '2024-05-31 14:07:59', update_by = 17608416858, update_time = '2026-06-09 20:32:13', remark = null, type = null, law_certificate_num = '19020111006', fullname = '蔡梓帆', taskId = 'c68210ee-dd4c-4b15-8eb5-45680f7a9ac8', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'UPDATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065075004', updateAt = '1754646861020', mobileNumber = 'FfsKo0ZfI4LmogmmvCSgVA==', certificateNumber = 'eubcUYjnWdPlQkMfsjELR62gs88ReMSCUVhfg29V7sU=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"一级科员","zwbscode":"","jbcc":"一级科员","priority":"","zwjc":"科员","gzgxcode":"00","gzgx":"主职","jbcccode":"160110","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20250707152926088-BD4B-B8826EF6E","position":"","zwjccode":"221A","isMappingPerson":"0","order":"1073743219"}]', organizationId = '20250707152926088-BD4B-B8826EF6E', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20221209114734284-E4EB-AF8A92152', user_source = 0, rylbCode = '0102', rylb = '参照公务员法管理人员(含试用期)' WHERE user_id = 17608416876; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922222646374-28E7-F52587DB6', user_name = '陈冲', login_name = 'chenchong4', nick_name = '', user_type = '00', email = '', phonenumber = 'gne6imv6JplS7rM1N3Q55Q==', sex = '0', avatar = '', password = '07b375a330c0a67782409271cf9d36da', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2025-08-07 16:26:01', salt = 'c15698', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:01', update_by = 0, update_time = '2026-02-26 02:00:03', remark = null, type = null, law_certificate_num = '19020511886', fullname = '陈冲', taskId = '1dd4718c-d775-4357-be96-435b0fa4eba8', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'UPDATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065080725', updateAt = '1772004701029', mobileNumber = 'gne6imv6JplS7rM1N3Q55Q==', certificateNumber = 'Jo2jpmi0OZuT+rK0jKuAJM9OHqCXqWOKmUE68KehPnI=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市宝安区司法局执法协调科科长","zwbscode":"","jbcc":"","priority":"","zwjc":"科长","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"010080","zgdw":"Y","unitid":"20210922222646374-28E7-F52587DB6","position":"正科级","zwjccode":"220A","isMappingPerson":"0","order":"140928000"}]', organizationId = '20210922222646374-28E7-F52587DB6', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210922222001345-A3E7-9D37007EB', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608416904; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922213529688-21ED-FFB53A808', user_name = '程高展', login_name = 'chenggaozhan', nick_name = '', user_type = '00', email = '', phonenumber = '1bcGfmqsQCxmt0hxsS/Bzw==', sex = '0', avatar = '', password = '3e97bf63cb851f23a0298ac46abb6cda', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-09 22:02:45', salt = '83a908', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:02', update_by = 17608416912, update_time = '2026-06-09 22:02:45', remark = null, type = null, law_certificate_num = '19020411005', fullname = '程高展', taskId = '1627ff9e-6ab6-491d-a171-0d015eb22a4d', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065082422', updateAt = '1754646862258', mobileNumber = '1bcGfmqsQCxmt0hxsS/Bzw==', certificateNumber = '8ByJXImdVinNmP2VsLyF3LK5FnkLn4nWuj6UqTy9cmw=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"科长","zwbscode":"","jbcc":"","priority":"","zwjc":"二级主任科员","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"010080","zgdw":"Y","unitid":"20210922213529688-21ED-FFB53A808","position":"正科级","zwjccode":"160080","isMappingPerson":"0","order":"147888000"}]', organizationId = '20210922213529688-21ED-FFB53A808', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811205836306-5788-EFA467D89', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608416912; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922213529671-89DC-D087DC27C', user_name = '陈海涛', login_name = 'chenhaitao2', nick_name = '', user_type = '00', email = '', phonenumber = 'yVIs4dCfq7QLxFSCmzB2Ug==', sex = '0', avatar = '', password = '99f129200267a54470660ccd8ff46e91', status = '0', del_flag = '0', login_ip = '', login_date = null, salt = '8f706a', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:03', update_by = 0, update_time = '2025-08-14 15:43:39', remark = null, type = null, law_certificate_num = '19020411010', fullname = '陈海涛', taskId = '8a6b4315-dfdc-45b7-94df-0c79054559ba', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065085040', updateAt = '1754646862850', mobileNumber = 'yVIs4dCfq7QLxFSCmzB2Ug==', certificateNumber = 'Jf0S6ppUrjQqru+XCAdXUOcoz3KcCkFyFLe2lqbwlog=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市南山区司法局一级主任科员","zwbscode":"","jbcc":"一级主任科员","priority":"","zwjc":"一级主任科员","gzgxcode":"00","gzgx":"主职","jbcccode":"160070","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20210922213529671-89DC-D087DC27C","position":"","zwjccode":"160070","isMappingPerson":"0","order":"68715000"}]', organizationId = '20210922213529671-89DC-D087DC27C', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811205953297-3CBB-A20286B45', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608416926; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922214043035-170A-AE09B5273', user_name = '陈汉羽', login_name = 'chenhanyu', nick_name = '', user_type = '00', email = '', phonenumber = 'mNtuglgCe/AgamQN/xF04Q==', sex = '0', avatar = '', password = '989bccbdecb425564dd6a599ecaf3a83', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2026-04-02 11:34:39', salt = '8ddd5d', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:03', update_by = 0, update_time = '2026-04-02 11:34:39', remark = null, type = null, law_certificate_num = '19020811004', fullname = '陈汉羽', taskId = '5e90d6e5-7eb7-4e38-b6fd-ef9a68c895ed', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'UPDATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065085448', updateAt = '1770864625341', mobileNumber = 'mNtuglgCe/AgamQN/xF04Q==', certificateNumber = 'YsAXU2tvY5LnGY+n79fpEoeVrKAppJFKXHAxhHgpmwg=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市坪山区司法局三级主任科员","zwbscode":"","jbcc":"三级主任科员","priority":"","zwjc":"","gzgxcode":"00","gzgx":"主职","jbcccode":"160090","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20210922214043035-170A-AE09B5273","position":"","zwjccode":"","isMappingPerson":"0","order":"44775000"}]', organizationId = '20210922214043035-170A-AE09B5273', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811181758913-DF7C-9A1D8D6C1', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608416927; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922213545498-8BDA-F1CD0F188', user_name = '陈佳宁', login_name = 'chenjianing', nick_name = '', user_type = '00', email = '', phonenumber = '5kyXHv5MJXXYd8C/9JjB/A==', sex = '0', avatar = '', password = '0503a344cc8ebff4ff0709db6cb7e0de', status = '0', del_flag = '0', login_ip = '', login_date = null, salt = '054945', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:05', update_by = 0, update_time = '2025-08-14 15:31:45', remark = null, type = null, law_certificate_num = '19020111002', fullname = '陈佳宁', taskId = '72703586-23bc-4cba-a8bf-adab7056c151', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065089651', updateAt = '1754646863270', mobileNumber = '5kyXHv5MJXXYd8C/9JjB/A==', certificateNumber = 'tBTeoMenZtEU3bbt70fwKa2gs88ReMSCUVhfg29V7sU=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"四级主任科员","zwbscode":"","jbcc":"四级主任科员","priority":"","zwjc":"四级主任科员","gzgxcode":"00","gzgx":"主职","jbcccode":"160100","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20210922213545498-8BDA-F1CD0F188","position":"","zwjccode":"160100","isMappingPerson":"0","order":"1073742011"}]', organizationId = '20210922213545498-8BDA-F1CD0F188', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811200248135-FDB5-62C89F6E6', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608416945; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922222740384-6ED9-31A478033', user_name = '黄占海', login_name = 'huangzhanhai', nick_name = '', user_type = '00', email = '', phonenumber = '2cRt1/CksG9luO+n0jcibA==', sex = '0', avatar = '', password = '98b9a48de9e123e554d591e56f454c43', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-13 19:05:04', salt = '9c5d1b', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:40', update_by = -1, update_time = '2026-06-13 19:05:04', remark = null, type = null, law_certificate_num = '19020611001', fullname = '黄占海', taskId = '96bd23ea-4db8-49e4-83e7-91997057e41c', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'UPDATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065157099', updateAt = '1767513218991', mobileNumber = '2cRt1/CksG9luO+n0jcibA==', certificateNumber = 'KvJQOUsQ3/LQMsHF+FErsecoz3KcCkFyFLe2lqbwlog=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市龙岗区司法局律师管理和公共法律服务科副科长","zwbscode":"","jbcc":"","priority":"","zwjc":"副科长","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"010090","zgdw":"Y","unitid":"20210922222740384-6ED9-31A478033","position":"副科级","zwjccode":"220B","isMappingPerson":"0","order":"35342625"}]', organizationId = '20210922222740384-6ED9-31A478033', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811184931673-20EE-7E4284ADB', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608417340; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922213203599-720E-DCB73849F', user_name = '梁有志', login_name = 'liangyouzhi', nick_name = '', user_type = '00', email = '', phonenumber = 'u1tevCjt4klfHJmS/5+DCg==', sex = '0', avatar = '', password = '5355ce43022ca7b5f15e1f3c81760136', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-14 10:06:57', salt = '379ec4', create_dept = null, create_by = 0, create_time = '2024-05-31 14:08:50', update_by = -1, update_time = '2026-06-14 10:06:57', remark = null, type = null, law_certificate_num = '19020411009', fullname = '梁有志', taskId = '84dc45d8-850a-4af4-b3f9-35c50f1ab325', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065173867', updateAt = '1754646877022', mobileNumber = 'u1tevCjt4klfHJmS/5+DCg==', certificateNumber = 'qXJo31uNIUHSzo7BQGuMmgU/r/6xYA5YZvQlLfL/DAI=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市南山区司法局综合执法指导监督科副科长","zwbscode":"","jbcc":"","priority":"","zwjc":"副科长","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"010090","zgdw":"Y","unitid":"20210922213203599-720E-DCB73849F","position":"副科级","zwjccode":"220B","isMappingPerson":"0","order":"140874000"}]', organizationId = '20210922213203599-720E-DCB73849F', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210811205631136-EAD6-6732398CE', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608417451; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20240809195533080-5D9C-509F76EFA', user_name = '李旺', login_name = 'liwang4', nick_name = '', user_type = '00', email = '', phonenumber = 'XPGm7g41f0qj/HwGuCKYNA==', sex = '0', avatar = '', password = 'f1c05b931ac8d92443763c3f65779bee', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2026-04-01 14:45:01', salt = '0a6b75', create_dept = null, create_by = 0, create_time = '2024-05-31 14:09:14', update_by = 0, update_time = '2026-04-01 14:45:00', remark = null, type = null, law_certificate_num = '19020811008', fullname = '李旺', taskId = 'f9959aed-8739-46df-ad21-56b9a76ccaad', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'UPDATE', isDeleted = 'false', isDisabled = 'false', createAt = '1717065219414', updateAt = '1770864625494', mobileNumber = 'XPGm7g41f0qj/HwGuCKYNA==', certificateNumber = 'CnwIvBkFCu0q95NoyLTugnawRDCdNcYEFill963Vznc=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"深圳市坪山区司法局行政复议与应诉科科长","zwbscode":"","jbcc":"","priority":"","zwjc":"科长","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"010080","zgdw":"Y","unitid":"20240809195533080-5D9C-509F76EFA","position":"正科级","zwjccode":"220A","isMappingPerson":"0","order":"59700000"}]', organizationId = '20240809195533080-5D9C-509F76EFA', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20210922224417998-3F81-D179F234C', user_source = 0, rylbCode = '0101', rylb = '公务员(含试用期)' WHERE user_id = 17608417716; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922214414511-C3F9-F6B47689E', user_name = '李振禧', login_name = 'lizhenxi', nick_name = '', user_type = '00', email = '', phonenumber = 'NXIcQbwZmjOT7lYQnOfOtQ==', sex = '0', avatar = '', password = 'a5bb99bb1dffa33e73305edb820cf91a', status = '0', del_flag = '0', login_ip = '127.0.0.1', login_date = '2026-06-14 09:49:39', salt = 'f57ee4', create_dept = null, create_by = 0, create_time = '2025-09-08 15:18:48', update_by = -1, update_time = '2026-06-14 09:49:39', remark = null, type = null, law_certificate_num = null, fullname = '李振禧', taskId = '15a39065-e681-49fd-8d8b-71a1d5772a80', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1757301791374', updateAt = '1757301791466', mobileNumber = 'NXIcQbwZmjOT7lYQnOfOtQ==', certificateNumber = 'NJ+S44JevtH5RLTaw4Pf75nQv2Q0Ob3r+Gc9DXX/I30=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"行政执法监督专项服务购买服务人员","zwbscode":"","jbcc":"","priority":"","zwjc":"","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20210922214414511-C3F9-F6B47689E","position":"","zwjccode":"","isMappingPerson":"0","order":"1668"}]', organizationId = '20210922214414511-C3F9-F6B47689E', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20250908112248892-105B-738067B74', user_source = 0, rylbCode = '0302', rylb = '第三方派遣' WHERE user_id = 17608614169; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922214414511-C3F9-F6B47689E', user_name = '王亚伟', login_name = 'wangyawei3', nick_name = '', user_type = '00', email = '', phonenumber = '9tKNgcWKD1tLkxmbvkyOsA==', sex = '0', avatar = '', password = '9282c6b8f10c6fc9212cd8157f9adf8c', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2026-04-01 15:15:05', salt = '715cdc', create_dept = null, create_by = 0, create_time = '2025-09-15 17:22:39', update_by = 0, update_time = '2026-04-01 15:15:04', remark = null, type = null, law_certificate_num = null, fullname = '王亚伟', taskId = '00115b39-cf42-4a71-abc2-2a61df81db7d', systemId = '20240527155602377-9C71-8284C0FB6', effectOn = 'CREATE', isDeleted = 'false', isDisabled = 'false', createAt = '1757578140755', updateAt = '1757578140790', mobileNumber = '9tKNgcWKD1tLkxmbvkyOsA==', certificateNumber = '2n2Lp40qhlxYvXQFQnKWBjK8hv/LYotb9vdnFLfZu+Y=', srzUserid = null, isMappingPerson = '0', units = '[{"unitleader":"","positionname":"行政执法监督服务辅助人员","zwbscode":"","jbcc":"","priority":"","zwjc":"","gzgxcode":"00","gzgx":"主职","jbcccode":"","zwbs":"","positioncode":"","zgdw":"Y","unitid":"20210922214414511-C3F9-F6B47689E","position":"","zwjccode":"","isMappingPerson":"0","order":"834"}]', organizationId = '20210922214414511-C3F9-F6B47689E', certificateTypeId = '居民身份证', certificateTypeIdCode = '1', strUserId = '20250911160837098-E4DA-3B9AB476B', user_source = 0, rylbCode = '0302', rylb = '第三方派遣' WHERE user_id = 17608614499; +UPDATE sys_user SET tenant_id = '000000', dept_id = '20210922221835562-30A2-A3A497A8D', user_name = '杜啟艺', login_name = 'duqiyi', nick_name = '', user_type = '00', email = '123@qq.com', phonenumber = '13267042701', sex = '0', avatar = '', password = '43236ff225689000b8c13c5c3017c0a7', status = '0', del_flag = '0', login_ip = '10.76.108.3', login_date = '2026-04-02 10:31:39', salt = '08c322', create_dept = null, create_by = 0, create_time = '2026-03-24 17:09:29', update_by = 0, update_time = '2026-04-02 10:31:39', remark = null, type = '3', law_certificate_num = null, fullname = null, taskId = null, systemId = null, effectOn = null, isDeleted = null, isDisabled = null, createAt = null, updateAt = null, mobileNumber = null, certificateNumber = null, srzUserid = null, isMappingPerson = null, units = null, organizationId = null, certificateTypeId = null, certificateTypeIdCode = null, strUserId = null, user_source = 0, rylbCode = null, rylb = null WHERE user_id = 17608634290; diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/common/globalRouter.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/common/globalRouter.js index 4217ed6e..53203408 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/common/globalRouter.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/common/globalRouter.js @@ -20,7 +20,7 @@ const $globalRouter = createRouter({ // 企业端u // history: createWebHashHistory(), // 执法端 - history: createWebHistory(), + history: createWebHistory(import.meta.env.BASE_URL), routes, }); diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js index 052e18f7..7a84af33 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js @@ -25,9 +25,9 @@ const loadPluginModules = async () => { // 基本配置 const baseCfg = (viteEnv = {}) => { - const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET } = viteEnv; + const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET, VITE_CONTEXT_PATH } = viteEnv; return { - base: './', + base: VITE_CONTEXT_PATH || './', envDir: "vite-env", resolve: { alias: { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb index fe6a166f..393cf82c 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb @@ -2,5 +2,6 @@ VITE_PORT = 12001 VITE_PROXY_TARGET = 'http://localhost:17000' VITE_BASE_URL = '/api/ent-ep' +VITE_CONTEXT_PATH = '/efcode20-ent-app/' VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword' VITE_APP_ENV = 'dev' diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod index b8a2c925..5fde8abd 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod @@ -1,6 +1,7 @@ # 企业端生产环境 VITE_PORT = 12001 -# 直接访问后端端口，不通过代理 -VITE_BASE_URL = 'http://139.186.148.21:8080' -VITE_DEFAULT_LOGIN = '/enterprise/login' +VITE_PROXY_TARGET = 'http://10.76.108.11:17000' +VITE_BASE_URL = '/efcode20-ent-app/api/ent-ep' +VITE_CONTEXT_PATH = '/efcode20-ent-app/' +VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword' VITE_APP_ENV = 'prod' diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite.config.js b/zdxt-web-client/zdxt-efcode-enterprise-app/vite.config.js index 3312ad24..4332892b 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite.config.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite.config.js @@ -4,9 +4,9 @@ import { baseCfg, pluginCfg } from "./vite-config"; import basicSsl from '@vitejs/plugin-basic-ssl' // ,basicSsl() export default async ({ mode }) => { - const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET } = loadEnv(mode, `${process.cwd()}/vite-env`); + const { VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET, VITE_CONTEXT_PATH } = loadEnv(mode, `${process.cwd()}/vite-env`); return defineConfig({ - ...baseCfg({ VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET }), + ...baseCfg({ VITE_BASE_URL, VITE_PORT, VITE_PROXY_TARGET, VITE_CONTEXT_PATH }), plugins: [ vue(), ...await pluginCfg({ VITE_BASE_URL })], diff --git a/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-dev.yml new file mode 100644 index 00000000..d0869490 --- /dev/null +++ b/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-dev.yml @@ -0,0 +1,63 @@ +server: + port: 17000 + +spring: + application: + name: zdxt-gateway + cloud: + gateway: + # 全局CORS配置 + globalcors: + cors-configurations: + '[/**]': + allowedOriginPatterns: "*" + allowedMethods: + - GET + - POST + - PUT + - DELETE + - OPTIONS + allowedHeaders: "*" + allowCredentials: true + maxAge: 3600 + # 路由配置 + routes: + - id: enterprise-service + uri: http://localhost:18000 + predicates: + - Path=/ent-ep/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + - id: supervision-service + uri: http://localhost:18001 + predicates: + - Path=/sup-ep/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + - id: enforcement-service + uri: http://localhost:18002 + predicates: + - Path=/enf-ep/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + +# Actuator监控端点配置 +management: + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: ALWAYS + +# 日志配置 +logging: + level: + root: info + org.springframework.cloud.gateway: info + com.zdxt.gateway: info + com.zdxt.gateway.webserver.filter: info diff --git a/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-prod.yml b/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-prod.yml new file mode 100644 index 00000000..cff7af61 --- /dev/null +++ b/zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application-prod.yml @@ -0,0 +1,63 @@ +server: + port: 17000 + +spring: + application: + name: zdxt-gateway + cloud: + gateway: + # 全局CORS配置 + globalcors: + cors-configurations: + '[/**]': + allowedOriginPatterns: "*" + allowedMethods: + - GET + - POST + - PUT + - DELETE + - OPTIONS + allowedHeaders: "*" + allowCredentials: true + maxAge: 3600 + # 路由配置 + routes: + - id: enterprise-service + uri: http://10.76.108.7:18000 + predicates: + - Path=/ent-ep/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + - id: supervision-service + uri: http://10.76.108.9:18001 + predicates: + - Path=/sup-ep/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + - id: enforcement-service + uri: http://10.76.108.8:18002 + predicates: + - Path=/enf-ep/** + filters: + - StripPrefix=0 + - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE + +# Actuator监控端点配置 +management: + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: ALWAYS + +# 日志配置 +logging: + level: + root: info + org.springframework.cloud.gateway: info + com.zdxt.gateway: info + com.zdxt.gateway.webserver.filter: info