解析token代码替换为直接从BaseContextHolder中取

bi-server/src/main/java/com/usoftchina/bi/server/controller/dataSource/DataBasesController.java

@@ -54,7 +54,7 @@ public class DataBasesController {
     @Auth(user = "admin")
     @PostMapping("/delDatabases")
     public RepEntity delDatabases(@RequestHeader String token,@RequestBody Long body){
-        return dataBasesService.delDatabases(token, body);
+        return dataBasesService.delDatabases(body);
     }
 
     /*

bi-server/src/main/java/com/usoftchina/bi/server/controller/dataSource/DataConnectorController.java

@@ -84,7 +84,7 @@ public class DataConnectorController {
     @CheckToken
     @PostMapping("/changeDbOrder")
     public RepEntity changeDbOrder(@RequestHeader String token,@RequestBody ChangeOrderInfo body){
-        return dataConnectorService.changeOrder(body, token);
+        return dataConnectorService.changeOrder(body);
     }
 
     /*

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ChartsConfigService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.bi.server.service.chart;
 
+import com.usoftchina.bi.core.base.BaseContextHolder;
 import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
@@ -161,9 +162,8 @@ public class ChartsConfigService {
     移交图表
      */
     public RepEntity changeChartOrder(ChangeOrderInfo changeOrderInfo, String token){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(resMap.get("id"));
-        String username = userMapper.getName(changeOrderInfo.getUserId());
+        int userId = BaseContextHolder.getUserId();
+        String username = BaseContextHolder.getUserName();
         int createId = chartsConfigMapper.getCreateId(changeOrderInfo.getId());
         if (createId != userId){
             return new RepEntity(RepCode.NoAuthority);
@@ -179,8 +179,7 @@ public class ChartsConfigService {
     更新图表配置的分组
      */
     public RepEntity updateConfigGroup(String token, GroupUpdateId groupUpdateId){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         int chartId = groupUpdateId.getId();
         int chartGroupId = groupUpdateId.getGroupId();
         chartsConfigMapper.updateConfigGroup(chartId, chartGroupId);
@@ -194,8 +193,7 @@ public class ChartsConfigService {
     删除图表
      */
     public RepEntity delChartsConfig(String token, Long id){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         int count = chartsConfigMapper.countDashboardsById(id);
         if (count > 0) {
             throw new MyException(RepCode.DASHBOARD_USED_CHARTS);
@@ -211,8 +209,7 @@ public class ChartsConfigService {
     查询图表列表
      */
     public RepEntity getListCharts(String token, TestPage testPage){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        int id = Integer.parseInt(resMap.get("id"));
+        int id = BaseContextHolder.getUserId();
         List<ChartConfigList> chartsList = chartsConfigMapper.getListByUser(id,testPage.enablePaging());
         PageInfo<ChartConfigList> pageInfo = new PageInfo<>(chartsList);
         return new RepEntity(RepCode.success, pageInfo);
@@ -237,8 +234,7 @@ public class ChartsConfigService {
     创建图表分组
      */
     public RepEntity setDataConnectorGroup(String token, GroupInfo groupInfo){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         if (groupInfo == null){
             return new RepEntity(RepCode.Null);
         }
@@ -254,8 +250,7 @@ public class ChartsConfigService {
     更新图表分组
      */
     public RepEntity updataDataConnectorGroup(String token, GroupInfo groupInfo){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         chartsConfigMapper.updataChartsGroup(groupInfo);
         //记录LOg
         messageLogService.update("图表", groupInfo.getGroupName(), username, "更新图表分组");
@@ -263,8 +258,7 @@ public class ChartsConfigService {
     }
 
     public RepEntity saveChartsGroup(String token, List<GroupInfo> groupInfoList) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         List<GroupInfo> addGroupInfoList = new ArrayList<>();
         List<GroupInfo> deleteGroupInfoList = new ArrayList<>();
         List<GroupInfo> updateGroupInfoList = new ArrayList<>();
@@ -297,8 +291,7 @@ public class ChartsConfigService {
     批量更新图表分组
      */
     public RepEntity updataListGroup(String token, List<GroupInfo> groupInfoList){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         Iterator isList = groupInfoList.iterator();
         GroupInfo groupInfo = new GroupInfo();
         while (isList.hasNext()){
@@ -313,8 +306,7 @@ public class ChartsConfigService {
     删除图表分组
      */
     public RepEntity delDataConnectorGroup(String token, List<Integer> idList){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         List<Integer> integerList = idList;
         Iterator isList = integerList.iterator();
         while (isList.hasNext()){

bi-server/src/main/java/com/usoftchina/bi/server/service/dashboard/DashboardsService.java

@@ -3,6 +3,7 @@ package com.usoftchina.bi.server.service.dashboard;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.usoftchina.bi.core.base.BaseContextHolder;
 import com.usoftchina.bi.core.exception.MyException;
 import com.usoftchina.bi.core.utils.EncryUtil;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
@@ -163,8 +164,7 @@ public class DashboardsService {
     删除看板
      */
     public RepEntity delDashboards(String token, Integer id) {
-        Map<String, String> stringMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(stringMap.get("id"));
+        int userId = BaseContextHolder.getUserId();
         int createId = dashboardsMapper.getCreateIdById(id);
         if (userId != createId) {
             return new RepEntity(RepCode.NoAuthority);
@@ -177,7 +177,7 @@ public class DashboardsService {
         dashboardsMapper.delDashboards(id);
         //删除看板-图表关联关系
         dashboardsMapper.deleteDashboardChartRelation(id);
-        messageLogService.delete("看板", name, stringMap.get("name"), null);
+        messageLogService.delete("看板", name, BaseContextHolder.getUserName(), null);
         return new RepEntity(RepCode.success);
     }
 
@@ -185,8 +185,7 @@ public class DashboardsService {
     查看看板
      */
     public RepEntity getListDashboards(String token, TestPage testPage) {
-        Map<String, String> stringMap = GetTokenDataUtil.getTokenData(token);
-        int id = Integer.parseInt(stringMap.get("id"));
+        int id = BaseContextHolder.getUserId();
         List<Dashboards> getListDashboards = dashboardsMapper.getListDashboards(id, testPage.enablePaging());
         PageInfo<Dashboards> pageInfo = new PageInfo<>(getListDashboards);
         return new RepEntity(RepCode.success, pageInfo);
@@ -196,8 +195,7 @@ public class DashboardsService {
     查看单个看板
      */
     public RepEntity getDashboards(String token, int id) {
-        Map<String, String> stringMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(stringMap.get("id"));
+        int userId = BaseContextHolder.getUserId();
         Dashboards dashboards = dashboardsMapper.getDashboards(userId, id);
         if (dashboards == null){
             return new RepEntity(RepCode.DashboardNonExistent);
@@ -287,8 +285,7 @@ public class DashboardsService {
     转交看板
      */
     public RepEntity changeDashOrder(String token, ChangeOrderInfo changeOrderInfo) {
-        Map<String, String> stringMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(stringMap.get("id"));
+        int userId = BaseContextHolder.getUserId();
         int createId = dashboardsMapper.getCreateIdById(changeOrderInfo.getId());
         if (userId != createId) {
             return new RepEntity(RepCode.NoAuthority);
@@ -302,8 +299,7 @@ public class DashboardsService {
     查看看板分发对象
      */
     public RepEntity getDashOrder(String token, int dashId) {
-        Map<String, String> stringMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(stringMap.get("id"));
+        int userId = BaseContextHolder.getUserId();
         int createId = dashboardsMapper.getCreateIdById(dashId);
         if (userId != createId) {
             return new RepEntity(RepCode.NoAuthority);
@@ -334,9 +330,8 @@ public class DashboardsService {
      */
     @Transactional
     public RepEntity copy(String token, DashboardCopyInfo dashboardCopyInfo) {
-        Map<String, String> resultMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(resultMap.get("id"));
-        String userName = resultMap.get("name");
+        int userId = BaseContextHolder.getUserId();
+        String userName = BaseContextHolder.getUserName();
         int dashboardId = dashboardCopyInfo.getDashboardId(),
             dataSourceId = dashboardCopyInfo.getDataSourceId();
         List<String> idList = new ArrayList<>();

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataBasesService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.bi.server.service.dataSource;
 
+import com.usoftchina.bi.core.base.BaseContextHolder;
 import com.usoftchina.bi.core.exception.MyException;
 import com.usoftchina.bi.core.utils.ContextUtil;
 import com.usoftchina.bi.core.utils.GetTokenDataUtil;
@@ -108,9 +109,8 @@ public class DataBasesService {
     /*
     删除数据库配置
      */
-    public RepEntity delDatabases(String token, Long id){
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+    public RepEntity delDatabases(Long id){
+        String username = BaseContextHolder.getUserName();
         int count = dataConnectorMapper.countDataConnectorById(id);
         if (count > 0) {
             throw new MyException(RepCode.DATACONNECTOR_USED_DATASOURCE);

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataConnectorService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.bi.server.service.dataSource;
 
+import com.usoftchina.bi.core.base.BaseContextHolder;
 import com.usoftchina.bi.core.exception.MyException;
 import com.usoftchina.bi.core.utils.GetTokenDataUtil;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
@@ -204,10 +205,9 @@ public class DataConnectorService {
     /*
     转交数据源
      */
-    public RepEntity changeOrder(ChangeOrderInfo changeOrderInfo, String token) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(resMap.get("id"));
-        String name = userMapper.getName(changeOrderInfo.getUserId());
+    public RepEntity changeOrder(ChangeOrderInfo changeOrderInfo) {
+        int userId = BaseContextHolder.getUserId();
+        String name = BaseContextHolder.getUserName();
         int createId = dataConnectorMapper.getCreateIdById(changeOrderInfo.getId());
         if (createId != userId) {
             return new RepEntity(RepCode.NoAuthority);
@@ -220,8 +220,7 @@ public class DataConnectorService {
     更新数据源分组
      */
     public RepEntity updateConfigGroup(String token, GroupUpdateId groupUpdateId) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         int id = groupUpdateId.getId();
         int groupId = groupUpdateId.getGroupId();
         GroupInfo groupInfo = dataConnectorMapper.getConnectorGroupById(groupId);
@@ -241,8 +240,7 @@ public class DataConnectorService {
     删除数据源
      */
     public RepEntity delDataConnector(String token, Long id) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         String dataName = dataConnectorMapper.getOneData(id.intValue()).getDataName();
         int count = dataConnectorMapper.countChartsById(id);
         if (count > 0) {
@@ -258,8 +256,7 @@ public class DataConnectorService {
     创建数据源分组
      */
     public RepEntity setDataConnectorGroup(String token, GroupInfo groupInfo) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         if (groupInfo == null || "".equals(groupInfo)) {
             return new RepEntity(RepCode.Null);
         }
@@ -277,8 +274,7 @@ public class DataConnectorService {
      */
     @Transactional
     public RepEntity saveConnectorGroups(String token, List<GroupInfo> groupInfoList) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         List<GroupInfo> addGroupInfoList = new ArrayList<>();
         List<GroupInfo> deleteGroupInfoList = new ArrayList<>();
         List<GroupInfo> updateGroupInfoList = new ArrayList<>();
@@ -336,8 +332,7 @@ public class DataConnectorService {
     删除数据源分组
      */
     public RepEntity delDataConnectorGroup(String token, Long id) {
-        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
-        String username = resMap.get("name");
+        String username = BaseContextHolder.getUserName();
         List<String> groupName = dataConnectorMapper.getFatherId(id.intValue());
         if (groupName.size() != 0) {
             return new RepEntity(RepCode.hasGroupUsing);
@@ -417,9 +412,8 @@ public class DataConnectorService {
      * @return
      */
     public RepEntity<Integer> copyDataSource(String token, DataSourceCopyInfo dataSourceCopyInfo){
-        Map<String, String> resultMap = GetTokenDataUtil.getTokenData(token);
-        int userId = Integer.parseInt(resultMap.get("id"));
-        String userName = resultMap.get("name");
+        int userId = BaseContextHolder.getUserId();
+        String userName = BaseContextHolder.getUserName();
 
         int dataSourceId = dataSourceCopyInfo.getDataSourceId(),
             dataConnectionId = dataSourceCopyInfo.getDataConnectionId();