zhuibobo
/
EnforcementCode-2.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

dev-v1.0.2
wangmingyong 4 months ago
parent
a20dfe1f71 eaec214832
commit
3a443f44d5
9 changed files with 57 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ng/14/nginx.conf
  2. 3
      ng/15/nginx.conf
  3. 1
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
  4. 3
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
  5. 17
      zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
  6. 17
      zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js
  7. 2
      zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy
  8. 39
      zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js
  9. 2
      zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy

2
ng/14/nginx.conf
View File

@ -28,7 +28,7 @@ http {
types_hash_max_size 4096;
# 限制请求体大小
client_max_body_size 100m;
client_max_body_size 50m;
include /etc/nginx/mime.types;
default_type application/octet-stream;

3
ng/15/nginx.conf
View File

@ -27,6 +27,9 @@ http {
keepalive_timeout 65;
types_hash_max_size 4096;
# 限制请求体大小
client_max_body_size 50m;
include /etc/nginx/mime.types;
default_type application/octet-stream;

1
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
View File

@ -39,6 +39,7 @@ public class AppComprehensiveAnalysisController extends BaseController {
@ResponseBody
public R<ComprehensiveAnalysisBo> whole(ComprehensiveAnalysisBo comprehensiveAnalysis){
if("user".equals(comprehensiveAnalysis.getSearchType())){
comprehensiveAnalysis.setUserId(LoginHelper.getUserId());
return R.ok(comprehensiveAnalysisService.whole(comprehensiveAnalysis));
} else if ("bureauDept".equals(comprehensiveAnalysis.getSearchType())) {
String deptId = LoginHelper.getDeptId();

3
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java
View File

@ -122,7 +122,7 @@ public class AppEnforcementRegistrationController extends BaseController {
}
if (pageQuery.getPageSize() == null || pageQuery.getPageSize() <= 0) {
pageQuery.setPageSize(50);
pageQuery.setPageSize(10);
}
if (pageQuery.getPageNum() == null || pageQuery.getPageNum() <= 0) {
pageQuery.setPageNum(1);
@ -132,6 +132,7 @@ public class AppEnforcementRegistrationController extends BaseController {
if (StringUtils.isBlank(bo.getDateSearch()) && bo.getDateType() == null
&& StringUtils.isBlank(bo.getBeginTime()) && StringUtils.isBlank(bo.getEndTime())) {
bo.setDateType(3);
bo.setEnterpriseNumber(null);
log.warn("查询全市数据时未指定时间范围，默认限制为本年数据");
}

17
zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.dromara.system.service.impl;
import cn.dev33.satoken.exception.ApiDisabledException;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
@ -544,7 +545,13 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
if (num == 0) {
return;
}
List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
List<String> keys;
try {
keys = StpUtil.searchTokenValue("", 0, -1, false);
} catch (ApiDisabledException e) {
// JWT模式下不支持searchTokenValue，跳过在线用户清理
return;
}
if (CollUtil.isEmpty(keys)) {
return;
}
@ -586,7 +593,13 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
*/
@Override
public void cleanOnlineUser(List<Long> userIds) {
List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
List<String> keys;
try {
keys = StpUtil.searchTokenValue("", 0, -1, false);
} catch (ApiDisabledException e) {
// JWT模式下不支持searchTokenValue，跳过在线用户清理
return;
}
if (CollUtil.isEmpty(keys)) {
return;
}

17
zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js
View File

@ -43,11 +43,11 @@ const baseCfg = (viteEnv = {}) => {
cors: true,
proxy: {
//适配外网的测试环境临时使用
'/efcode20-enf-app/api/enf-ep': {
target: VITE_PROXY_TARGET || 'http://localhost:17000',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/efcode20-enf-app\/api\/enf-ep/, ''),
},
// '/efcode20-enf-app/api/enf-ep': {
// target: VITE_PROXY_TARGET || 'http://localhost:17000',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/efcode20-enf-app\/api\/enf-ep/, ''),
// },
'/efcode20-enf-app/api': {
target: VITE_PROXY_TARGET || 'http://localhost:17000',
changeOrigin: true,
@ -55,7 +55,12 @@ const baseCfg = (viteEnv = {}) => {
},
'/profile': {
target: VITE_PROXY_TARGET || 'http://139.186.148.21:8080',
rewrite: (path) => path.replace(/^\/profile/, '/ent-ep/profile'),
rewrite: (path) => {
if (VITE_BASE_URL.includes('enf-ep')) {
return path.replace(/^\/profile/, '/enf-ep/profile');
}
return path.replace(/^\/profile/, '/profile')
},
changeOrigin: true,
}
}

2
zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev-wmy
View File

@ -1,6 +1,6 @@
# 执法端测试环境
VITE_PORT = 12002
VITE_BASE_URL = '/efcode20-enf-app/api/enf-ep'
VITE_BASE_URL = '/efcode20-enf-app/api'
VITE_CONTEXT_PATH = '/efcode20-enf-app/'
VITE_PROXY_TARGET = 'http://139.186.148.21:8080'
VITE_DEFAULT_LOGIN = '/enforcement/loginByPassword'

39
zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js
View File

@ -42,22 +42,22 @@ const baseCfg = (viteEnv = {}) => {
open: false,
cors: true,
proxy: {
'/efcode20-ent-app/api/ent-ep': {
target: VITE_PROXY_TARGET ||'http://139.186.148.21:8080',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/efcode20-ent-app\/api\/ent-ep/, ''),
configure: (proxy) => {
proxy.on('proxyReq', (proxyReq, req) => {
console.log(`[Proxy] ${req.method} ${req.url} → ${proxyReq.protocol}//${proxyReq.host}${proxyReq.path}`);
});
proxy.on('proxyRes', (proxyRes, req) => {
console.log(`[Proxy] ${proxyRes.statusCode} ← ${req.method} ${req.url}`);
});
proxy.on('error', (err, req) => {
console.error(`[Proxy Error] ${req.method} ${req.url}`, err.message);
});
}
},
// '/efcode20-ent-app/api/ent-ep': {
// target: VITE_PROXY_TARGET ||'http://139.186.148.21:8080',
// changeOrigin: true,
// rewrite: (path) => path.replace(/^\/efcode20-ent-app\/api\/ent-ep/, ''),
// configure: (proxy) => {
// proxy.on('proxyReq', (proxyReq, req) => {
// console.log(`[Proxy] ${req.method} ${req.url} → ${proxyReq.protocol}//${proxyReq.host}${proxyReq.path}`);
// });
// proxy.on('proxyRes', (proxyRes, req) => {
// console.log(`[Proxy] ${proxyRes.statusCode} ← ${req.method} ${req.url}`);
// });
// proxy.on('error', (err, req) => {
// console.error(`[Proxy Error] ${req.method} ${req.url}`, err.message);
// });
// }
// },
'/efcode20-ent-app/api': {
target: VITE_PROXY_TARGET ||'http://139.186.148.21:8080',
changeOrigin: true,
@ -76,7 +76,12 @@ const baseCfg = (viteEnv = {}) => {
},
'/profile': {
target: VITE_PROXY_TARGET || 'http://139.186.148.21:8080',
rewrite: (path) => path.replace(/^\/profile/, '/ent-ep/profile'),
rewrite: (path) => {
if (VITE_BASE_URL.includes('ent-ep')) {
return path.replace(/^\/profile/, '/ent-ep/profile');
}
return path.replace(/^\/profile/, '/profile')
},
changeOrigin: true,
}
}

2
zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy
View File

@ -1,7 +1,7 @@
# 企业端开发环境
VITE_PORT = 12001
VITE_PROXY_TARGET = 'http://139.186.148.21:8080'
VITE_BASE_URL = '/efcode20-ent-app/api/ent-ep'
VITE_BASE_URL = '/efcode20-ent-app/api'
VITE_CONTEXT_PATH = '/efcode20-ent-app/'
VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword'
VITE_FILE_URL = ''

Write Preview
Loading…
Cancel
Save