删除IM,修改资源系统菜单请求为异步
This commit is contained in:
parent
d0f245fc49
commit
0ea9db59bf
@ -2,7 +2,6 @@ package com.cm.serviceusercenter.controller.resources.system.menu;
|
|||||||
|
|
||||||
import com.cm.common.constants.ISystemConstant;
|
import com.cm.common.constants.ISystemConstant;
|
||||||
import com.cm.common.result.ErrorResult;
|
import com.cm.common.result.ErrorResult;
|
||||||
import com.cm.common.result.SuccessResult;
|
|
||||||
import com.cm.common.result.SuccessResultData;
|
import com.cm.common.result.SuccessResultData;
|
||||||
import com.cm.serviceusercenter.controller.BaseController;
|
import com.cm.serviceusercenter.controller.BaseController;
|
||||||
import com.cm.serviceusercenter.pojo.dtos.MenuDTO;
|
import com.cm.serviceusercenter.pojo.dtos.MenuDTO;
|
||||||
@ -12,8 +11,10 @@ import io.swagger.annotations.*;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ClassName: MenuController
|
* @ClassName: MenuController
|
||||||
@ -51,8 +52,8 @@ public class MenuResourceController extends BaseController {
|
|||||||
})
|
})
|
||||||
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
|
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
|
||||||
@GetMapping("listmenubyclientid/{clientId}/{userId}")
|
@GetMapping("listmenubyclientid/{clientId}/{userId}")
|
||||||
public SuccessResultData<List<MenuDTO>> listMenuByClientId(@PathVariable("clientId") String clientId, @PathVariable("userId") String userId) throws Exception {
|
public Callable<SuccessResultData<List<MenuDTO>>> listMenuByClientId(@PathVariable("clientId") String clientId, @PathVariable("userId") String userId, HttpServletRequest httpServletRequest) throws Exception {
|
||||||
return menuService.listMenuByClientIdAndUserId(clientId, userId);
|
return () -> menuService.listMenuByClientIdAndUserId(clientId, userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
server:
|
server:
|
||||||
port: 7001
|
port: 7001
|
||||||
url: http://192.168.0.103:7001/usercenter
|
url: http://192.168.0.103:7001/usercenter
|
||||||
ws: ws://192.168.0.103:7001/usercenter/ws
|
# ws: ws://192.168.0.103:7001/usercenter/ws
|
||||||
title: 统一用户管理平台
|
title: 统一用户管理平台
|
||||||
login-page-name: 统一用户管理平台
|
login-page-name: 统一用户管理平台
|
||||||
servlet:
|
servlet:
|
||||||
@ -29,10 +29,13 @@ spring:
|
|||||||
datasource:
|
datasource:
|
||||||
druid:
|
druid:
|
||||||
url: jdbc:mysql://49.233.36.36:6688/db_cloud?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
|
url: jdbc:mysql://49.233.36.36:6688/db_cloud?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
|
||||||
|
# url: jdbc:mysql://127.0.0.1:3306/db_cloud_v2_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
|
||||||
db-type: mysql
|
db-type: mysql
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
username: wanggeng
|
username: wanggeng
|
||||||
|
# username: root
|
||||||
password: WenG>2132997
|
password: WenG>2132997
|
||||||
|
# password: root
|
||||||
initial-size: 2
|
initial-size: 2
|
||||||
min-idle: 2
|
min-idle: 2
|
||||||
max-active: 10
|
max-active: 10
|
||||||
@ -168,7 +171,7 @@ open-platform:
|
|||||||
wechat:
|
wechat:
|
||||||
mini-app:
|
mini-app:
|
||||||
# 激活状态
|
# 激活状态
|
||||||
active: true
|
active: false
|
||||||
authorizeUrl: https://api.weixin.qq.com/sns/jscode2session
|
authorizeUrl: https://api.weixin.qq.com/sns/jscode2session
|
||||||
# 绑定用户连接,指向统一用户,可以内网
|
# 绑定用户连接,指向统一用户,可以内网
|
||||||
bindUserUrl: http://127.0.0.1:7001/usercenter/wxminiapp/sign/logincheckusername
|
bindUserUrl: http://127.0.0.1:7001/usercenter/wxminiapp/sign/logincheckusername
|
||||||
@ -182,7 +185,7 @@ open-platform:
|
|||||||
# 公众号
|
# 公众号
|
||||||
official-account:
|
official-account:
|
||||||
# 开启跨域
|
# 开启跨域
|
||||||
apiCrossOrigin: true
|
apiCrossOrigin: false
|
||||||
activate: false
|
activate: false
|
||||||
authorize:
|
authorize:
|
||||||
authorize-url: https://open.weixin.qq.com/connect/oauth2/authorize
|
authorize-url: https://open.weixin.qq.com/connect/oauth2/authorize
|
||||||
|
@ -146,7 +146,7 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 菜单列表 -->
|
<!-- 菜单列表 -->
|
||||||
<select id="listMenus" parameterType="map" resultMap="menuDTO" useCache="false">
|
<select id="listMenus" parameterType="map" resultMap="menuDTO" useCache="true">
|
||||||
SELECT
|
SELECT
|
||||||
*
|
*
|
||||||
FROM
|
FROM
|
||||||
|
@ -162,7 +162,7 @@
|
|||||||
base: 'assets/layuiadmin/' //静态资源所在路径
|
base: 'assets/layuiadmin/' //静态资源所在路径
|
||||||
}).extend({
|
}).extend({
|
||||||
index: 'lib/index' //主入口模块
|
index: 'lib/index' //主入口模块
|
||||||
}).use(['index', 'restajax', 'datamessage', 'dialog', 'im-socket'], function() {
|
}).use(['index', 'restajax', 'datamessage', 'dialog'/*, 'im-socket'*/], function() {
|
||||||
var $ = layui.$;
|
var $ = layui.$;
|
||||||
|
|
||||||
var layer = layui.layer;
|
var layer = layui.layer;
|
||||||
|
Loading…
Reference in New Issue
Block a user