Browse Source

合并非现场

dev-v1.0.2
庄锐波 3 months ago
parent
commit
ec6c273df5
  1. 18
      ng/3/nginx.conf
  2. 4
      zdxt-common/zdxt-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
  3. 6
      zdxt-common/zdxt-common-satoken/src/main/resources/common-satoken.yml
  4. 13
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java
  5. 88
      zdxt-web-client/zdxt-admin-plus-ui/public/css/index.html
  6. 2
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml
  7. 3
      zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java

18
ng/3/nginx.conf

@ -329,7 +329,9 @@ http {
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_ciphers HIGH:!aNULL:!MD5:!3DES:!RC4:!DES:!EXPORT;
ssl_prefer_server_ciphers on;
root /usr/local/nginx/html;
@ -343,5 +345,19 @@ http {
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 /efcode20-enf-app/ {
proxy_pass http://10.76.108.14:12003/;
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;
}
}
}

4
zdxt-common/zdxt-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java

@ -1,6 +1,7 @@
package org.dromara.common.satoken.config;
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.jwt.StpLogicJwtForMixin;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.stp.StpInterface;
import cn.dev33.satoken.stp.StpLogic;
@ -24,7 +25,8 @@ public class SaTokenConfig {
@Bean
public StpLogic getStpLogicJwt() {
// Sa-Token 整合 jwt (简单模式)
return new StpLogicJwtForSimple();
//return new StpLogicJwtForSimple();
return new StpLogicJwtForMixin();
}
/**

6
zdxt-common/zdxt-common-satoken/src/main/resources/common-satoken.yml

@ -1,6 +1,10 @@
# 内置配置 不允许修改 如需修改请在 nacos 上写相同配置覆盖
# Sa-Token配置
sa-token:
# token有效期(单位:秒) 默认7天
timeout: 604800
# token最低活跃频率(单位:秒) 默认30分钟无操作则过期
active-timeout: 1800
# 允许动态设置 token 有效期
dynamic-active-timeout: true
# 允许从 请求参数 读取 token
@ -11,3 +15,5 @@ sa-token:
is-read-cookie: false
# token前缀
token-prefix: "Bearer"
# jwt签名密钥(Mixin模式必须配置)
jwt-secret-key: "zdxt-efcode-jwt-secret-key-2026@Secure!"

13
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java

@ -28,6 +28,17 @@ public abstract class LoginController {
*/
protected static final String AES_KEY = "1234567898745621";
/**
* App端token固定超时时间单位 7天
*/
protected static final long APP_TOKEN_TIMEOUT = 604800;
/**
* App端token活跃超时时间单位 30分钟
*/
protected static final long APP_TOKEN_ACTIVE_TIMEOUT = 1800;
/**
* 校验登录参数非空
*
@ -89,6 +100,8 @@ public abstract class LoginController {
}
SaLoginParameter model = new SaLoginParameter();
model.setDeviceType(deviceType);
model.setTimeout(APP_TOKEN_TIMEOUT);
model.setActiveTimeout(APP_TOKEN_ACTIVE_TIMEOUT);
model.setExtra("clientid", clientId);
LoginHelper.login(loginUser, model);

88
zdxt-web-client/zdxt-admin-plus-ui/public/css/index.html

@ -1,88 +0,0 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>路书</title>
<style type="text/css">
body, html{width: 100%;height: 100%;margin:0;font-family:"微软雅黑";}
#map_canvas{width:100%;height:700px;}
#result {width:100%}
</style>
<script>
window.BMAP_AUTHENTIC_KEY = '7Cc5Kmn672miPzG4qQhvlOrERcXMMinq';
</script>
<script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=1XjLLEhZhQNUzd93EjU5nOGQ"></script>
<script type="text/javascript" src="//bj.bcebos.com/v1/mapopen/github/BMapGLLib/Lushu/src/Lushu.min.js"></script>
</head>
<body>
<div id="map_canvas"></div>
<div id="result"></div>
<button id="run">开始</button>
<button id="stop">停止</button>
<button id="clear">清除</button>
<button id="pause">暂停</button>
<button id="hide">隐藏信息窗口</button>
<button id="show">展示信息窗口</button>
<input type="text" />
<script>
var map = new BMapGL.Map('map_canvas');
map.enableScrollWheelZoom();
map.centerAndZoom(new BMapGL.Point(116.404, 39.915), 13);
var lushu;
// 实例化一个驾车导航用来生成路线
var drv = new BMapGL.DrivingRoute('北京', {
onSearchComplete: function(res) {
if (drv.getStatus() == BMAP_STATUS_SUCCESS) {
var plan = res.getPlan(0);
var arrPois =[];
for(var j=0;j<plan.getNumRoutes();j++){
var route = plan.getRoute(j);
arrPois= arrPois.concat(route.getPath());
}
map.addOverlay(new BMapGL.Polyline(arrPois, {strokeColor: '#111'}));
map.setViewport(arrPois);
lushu = new BMapGLLib.LuShu(map, arrPois, {
defaultContent: '', // "从天安门到百度大厦"
autoView: true, // 是否开启自动视野调整,如果开启那么路书在运动过程中会根据视野自动调整
icon: new BMapGL.Icon('./img/car.png', new BMapGL.Size(32, 32), {anchor: new BMapGL.Size(10, 10)}),
speed: 500,
enableRotation: true, // 是否设置marker随着道路的走向进行旋转
// landmarkPois: [
// {lng:116.314782, lat:39.913508, html:'加油站', pauseTime:2},
// {lng:116.315391, lat:39.964429, html:'高速公路收费<div><img src="//map.baidu.com/img/logo-map.gif"/></div>', pauseTime:3},
// {lng:116.381476, lat:39.974073, html:'肯德基早餐', pauseTime:2}
// ]
});
}
}
});
var start=new BMapGL.Point(116.404844, 40);
var end=new BMapGL.Point(116.308102, 40.056057);
drv.search(start, end);
//绑定事件
$("run").onclick = function(){
lushu.start();
}
$("stop").onclick = function(){
lushu.stop();
}
$("clear").onclick = function(){
lushu.clear();
}
$("pause").onclick = function(){
lushu.pause();
}
$("hide").onclick = function(){
lushu.hideInfoWindow();
}
$("show").onclick = function(){
lushu.showInfoWindow();
}
function $(element){
return document.getElementById(element);
}
</script>
</body>
</html>

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

@ -310,7 +310,7 @@ management:
--- # 默认/推荐使用sse推送
sse:
enabled: true
enabled: false
path: /resource/sse
--- # websocket

3
zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java

@ -50,6 +50,7 @@ public class ResetUserPasswordTest {
/** 重置后的明文密码 */
private static final String NEW_PASSWORD = "szsf@zfjd";
//private static final String NEW_PASSWORD = "Szsf@123";
private static final String TEST_CLIENT_ID = "e5cd7e4891bf95d1d19206ce24a7b32e";
@ -164,7 +165,7 @@ public class ResetUserPasswordTest {
// 1. 执法端的测试用户
List<Long> userIds = Arrays.asList(
// TODO: 在此填入需要重置的用户ID
7897L, 17608416858L,17608416876L, 17608416904L,17608416912L, 17608416926L,17608416927L, 17608416945L,17608417058L
7897L, 17608416858L,17608416876L, 17608416904L,17608416912L, 17608416926L,17608416927L, 17608416945L,17608417058L,17608642193L
);
// 监督端的报表测试用户

Loading…
Cancel
Save