diff --git a/doc/部署说明/部署过程描述.md b/doc/部署说明/部署过程描述.md index 0ab44f0d..a312a6ab 100644 --- a/doc/部署说明/部署过程描述.md +++ b/doc/部署说明/部署过程描述.md @@ -52,6 +52,9 @@ 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/dbv1/zfjd_2026_06_15_ex_sszt_jbxx_utf8.sql ``` * 导入1期库（市监表） + ``` + mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 -e "update enterprise_pub_qrcode set create_by=0 where create_time>'2026-04-26';" + ``` * 升级到二期库 ``` mysql -h 10.134.89.36 -P 15144 -u zfjd -p'szsf@zfjd' --default-character-set=utf8mb4 zfjd_ef20_1 < /efcode20/dbv2/upgrade/000.sql diff --git a/ng/3/nginx.conf b/ng/3/nginx.conf index 65238168..90698a02 100644 --- a/ng/3/nginx.conf +++ b/ng/3/nginx.conf @@ -264,47 +264,15 @@ http { 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; -# } -# -# 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; -# } -# } server { - listen 85 ssl; + listen 85; server_name localhost; - - ssl_certificate /efcode20/ssl/selfsigned.crt; - ssl_certificate_key /efcode20/ssl/selfsigned.key; - ssl_protocols TLSv1.2 TLSv1.3; - 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; @@ -323,6 +291,38 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } } +# server { +# listen 85 ssl; +# server_name localhost; +# +# ssl_certificate /efcode20/ssl/selfsigned.crt; +# ssl_certificate_key /efcode20/ssl/selfsigned.key; +# ssl_protocols TLSv1.2 TLSv1.3; +# +# 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://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; +# } +# +# 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; +# } +# } server { listen 88; server_name localhost; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts index ed0cb371..3663b57b 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/store/modules/permission.ts @@ -28,7 +28,7 @@ export interface SystemCodeOption { export const CATCH_ALL_ROUTE_NAME = 'CatchAll404'; //http://10.132.108.3:85/loginByUserId export const systemCodeOptions: SystemCodeOption[] = [ - { label: '首页', value: 'planindex', icon: 'HomeFilled', iframeUrl: 'http://localhost:85/loginByUserId' }, + { label: '首页', value: 'planindex', icon: 'HomeFilled', iframeUrl: 'http://10.132.108.3:85/loginByUserId' }, { label: '执法监督码', value: 'supervisionCode', icon: 'Document' }, { label: '后台管理', value: 'authService', icon: 'Setting' } ]; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue index 8fd7e9d4..51ed8f3c 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/login.vue @@ -69,8 +69,8 @@ {{ proxy.$t('login.switchRegisterPage') }} - - + + 选择测试用户 @@ -142,6 +142,7 @@ const loginRef = ref(); const tenantList = ref([]); // ===== 测试用户快捷登录 ===== +const isLocalhost = ref(window.location.hostname === 'localhost'); const showTestUserDialog = ref(false); interface TestUser { @@ -152,7 +153,14 @@ interface TestUser { } const testUsers = ref([ - + { label: '超级管理员', tenantId: '000000', username: 'admin', password: 'szsf@zfjd' }, + { label: '深圳市司法局-刘倩琳', tenantId: '000000', username: 'liuqianlin', password: 'szsf@zfjd' }, + { label: '深圳市审计局-杜啟艺', tenantId: '000000', username: 'duqiyi', password: 'szsf@zfjd' }, + { label: '深圳市龙岗区司法局-黄占海', tenantId: '000000', username: 'huangzhanhai', password: 'szsf@zfjd' }, + { label: '深圳市南山区司法局-梁有志', tenantId: '000000', username: 'liangyouzhi', password: 'szsf@zfjd' }, + { label: '深圳市坪山区司法局-李旺', tenantId: '000000', username: 'liwang4', password: 'szsf@zfjd' }, + { label: '深圳市光明区司法局-李振禧', tenantId: '000000', username: 'lizhenxi', password: 'szsf@zfjd' }, + { label: '深圳市光明区司法局-王亚伟', tenantId: '000000', username: 'wangyawei3', password: 'szsf@zfjd' } ]); const selectTestUser = (user: TestUser) => { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue index 9dd0565a..ee6fce5c 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue @@ -18,7 +18,7 @@ 登录 -
+
选择测试用户 @@ -75,6 +75,7 @@ const loginParam = reactive({ secretKey: "" }) +const isLocalhost = ref(window.location.hostname === 'localhost'); const showTestPicker = ref(false); const showNavigatePicker = ref(false); @@ -87,6 +88,14 @@ const navigateTo = (target) => { } }; const testUsers = [ + {loginUserId:"0001002",account: 'cuifengyuan', name: '崔峰源', password: 'szsf@zfjd',bureauUnitName:"深圳市司法局"}, + {loginUserId:"0001001",account: 'liuqianlin', name: '刘倩琳', password: 'szsf@zfjd',bureauUnitName:"深圳市司法局"}, + {loginUserId:"0001003",account: 'baining', name: '白宁', password: 'szsf@zfjd',bureauUnitName:"深圳市坪山区司法局"}, + {loginUserId:"0001004",account: 'caizifan', name: '蔡梓帆', password: 'szsf@zfjd',bureauUnitName:"深圳市福田区司法局"}, + {loginUserId:"0001005",account: 'chenchong4', name: '陈冲', password: 'szsf@zfjd',bureauUnitName:"深圳市宝安区司法局"}, + {loginUserId:"0001006",account: 'chenggaozhan', name: '程高展', password: 'szsf@zfjd',bureauUnitName:"深圳市南山区司法局"}, + {loginUserId:"0001007",account: 'chenhaitao2', name: '陈海涛', password: 'szsf@zfjd',bureauUnitName:"深圳市南山区司法局"}, + {loginUserId:"0001008",account: 'chenhanyu', name: '陈汉羽', password: 'szsf@zfjd',bureauUnitName:"深圳市坪山区司法局"} ]; const selectTestUser = (item) => { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue index fe80d91b..fd3bef5d 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue @@ -17,7 +17,7 @@ 登录
-
+
选择测试企业
@@ -49,8 +49,17 @@ secretKey: "" }) + const isLocalhost = ref(window.location.hostname === 'localhost'); const showTestPicker = ref(false); const testEnterprises = [ + { account: 'free_kylin', name: '新粤云（深圳）信息技术有限公司', password: 'szsf@zfjd' }, + { account: 'weil45', name: '深圳农牧美益肉业有限公司', password: 'szsf@zfjd' }, + { account: 'DGD440881199506180622', name: '深圳市深水龙岗污水处理有限公司', password: 'szsf@zfjd' }, + { account: 'smiledzb1982', name: '深圳康泰生物制品股份有限公司', password: 'szsf@zfjd' }, + { account: 'A7271888', name: '深圳市里程食品有限公司', password: 'szsf@zfjd' }, + { account: 'qintongzhen138', name: '欧姆龙电子部件（深圳）有限公司', password: 'szsf@zfjd' }, + { account: 'XP073215', name: '深圳市强达电路股份有限公司', password: 'szsf@zfjd' }, + { account: '33ef1970fd449676fa4bc197', name: '吉田拉链（深圳）有限公司公明工厂', password: 'szsf@zfjd' }, ]; const selectTestEnterprise = (item) => {