工具类修改,包结构调整

bi-auth/src/main/java/com/usoftchina/bi/auth/interceptor/SecurityInterceptor.java

@@ -2,7 +2,7 @@ package com.usoftchina.bi.auth.interceptor;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.usoftchina.bi.auth.annotation.Auth;
-import com.usoftchina.bi.core.utils.GetTokenData;
+import com.usoftchina.bi.core.utils.GetTokenDataUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +18,7 @@ import java.util.Map;
 
 @Component
 public class SecurityInterceptor implements HandlerInterceptor {
-    @Autowired
-    GetTokenData getTokenData;
+
     @Autowired
     ObjectMapper objectMapper;
 
@@ -41,7 +40,7 @@ public class SecurityInterceptor implements HandlerInterceptor {
         String admin = auth.user();
         logger.info("auth={}", admin);
         String token = request.getHeader("token");
-        Map<String, String> resultMap = getTokenData.getTokenData(token);
+        Map<String, String> resultMap = GetTokenDataUtil.getTokenData(token);
         logger.info("user={}", resultMap.get("role"));
         if (!admin.equals(resultMap.get("role"))) {
             logger.error("permission denied");

bi-core/src/main/java/com/usoftchina/bi/core/utils/CalculationJudgeUtil.java

@@ -1,8 +1,5 @@
 package com.usoftchina.bi.core.utils;
 
-import org.springframework.stereotype.Component;
-
-@Component
 public class CalculationJudgeUtil {
 
     public static String Judge(String type){

bi-core/src/main/java/com/usoftchina/bi/core/utils/GetTokenData.java → bi-core/src/main/java/com/usoftchina/bi/core/utils/GetTokenDataUtil.java

@@ -12,11 +12,11 @@ import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
-@Component
-public class GetTokenData {
+public class GetTokenDataUtil {
     //公共密钥
     public static String SECRET = "YouRuanKeJiBi";
-    public Map<String, String> getTokenData(String token){
+
+    public static Map<String, String> getTokenData(String token){
         DecodedJWT jwt = null;
 
         JWTVerifier verifier = null;

bi-server/src/main/java/com/usoftchina/bi/Application.java → bi-server/src/main/java/com/usoftchina/bi/server/Application.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi;
+package com.usoftchina.bi.server;
 
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceRegister;
 import com.usoftchina.bi.core.utils.ContextUtil;
@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.autoconfigure.core.AutoConfigureCache;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -15,6 +16,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Import({DynamicDataSourceRegister.class})
 @EnableCaching
 @AutoConfigureCache
+@ComponentScan("com.usoftchina.bi")
 public class Application {
     public static void main(String[] args) {
         ApplicationContext app = SpringApplication.run(Application.class, args);

bi-server/src/main/java/com/usoftchina/bi/aspect/DynamicDattaSourceAspect.java → bi-server/src/main/java/com/usoftchina/bi/server/aspect/DynamicDattaSourceAspect.java

@@ -1,10 +1,10 @@
-package com.usoftchina.bi.aspect;
+package com.usoftchina.bi.server.aspect;
 
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
-import com.usoftchina.bi.dao.dataSource.DataColumnMapper;
+import com.usoftchina.bi.server.dao.dataSource.DataColumnMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.usoftchina.bi.model.bo.ToSql;
+import com.usoftchina.bi.server.model.bo.ToSql;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
@@ -34,7 +34,7 @@ public class DynamicDattaSourceAspect {
     private static final Logger logger = LoggerFactory.getLogger(DynamicDattaSourceAspect.class);
 
     //改变数据源
-    @Before("@annotation(com.usoftchina.bi.model.pojo.annotation.TargetDataSource)")
+    @Before("@annotation(com.usoftchina.bi.server.model.pojo.annotation.TargetDataSource)")
     public void changeDataSource(JoinPoint joinPoint) {
         Object[] arr = joinPoint.getArgs();
         String joinStr = null;
@@ -60,7 +60,7 @@ public class DynamicDattaSourceAspect {
         }
     }
 
-    @After("@annotation(com.usoftchina.bi.model.pojo.annotation.TargetDataSource)")
+    @After("@annotation(com.usoftchina.bi.server.model.pojo.annotation.TargetDataSource)")
     public void clearDataSource(JoinPoint joinPoint) {
         logger.info("清除数据源!");
         DynamicDataSourceContextHolder.clearDataSourceType();

bi-server/src/main/java/com/usoftchina/bi/aspect/JwtTokenAspect.java → bi-server/src/main/java/com/usoftchina/bi/server/aspect/JwtTokenAspect.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.aspect;
+package com.usoftchina.bi.server.aspect;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
@@ -6,8 +6,8 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.usoftchina.bi.core.exception.MyException;
-import com.usoftchina.bi.model.po.TokenData;
-import com.usoftchina.bi.model.po.User;
+import com.usoftchina.bi.server.model.po.TokenData;
+import com.usoftchina.bi.server.model.po.User;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -27,7 +27,7 @@ public class JwtTokenAspect {
     //公共密钥
     public static String SECRET = "YouRuanKeJiBi";
 
-    @Pointcut("@annotation(com.usoftchina.bi.model.pojo.annotation.CheckToken)")
+    @Pointcut("@annotation(com.usoftchina.bi.server.model.pojo.annotation.CheckToken)")
     public void CheckToken() {
 
     }

bi-server/src/main/java/com/usoftchina/bi/controller/chart/ChartsConfigController.java → bi-server/src/main/java/com/usoftchina/bi/server/controller/chart/ChartsConfigController.java

@@ -1,13 +1,13 @@
-package com.usoftchina.bi.controller.chart;
+package com.usoftchina.bi.server.controller.chart;
 
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.bo.GroupUpdateId;
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
-import com.usoftchina.bi.model.vo.configVo.ChangeOrderInfo;
-import com.usoftchina.bi.model.vo.configVo.ChartConfigInfo;
-import com.usoftchina.bi.model.vo.configVo.GroupInfo;
-import com.usoftchina.bi.service.chart.ChartsConfigService;
+import com.usoftchina.bi.server.model.bo.GroupUpdateId;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.vo.configVo.ChangeOrderInfo;
+import com.usoftchina.bi.server.model.vo.configVo.ChartConfigInfo;
+import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
+import com.usoftchina.bi.server.service.chart.ChartsConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

bi-server/src/main/java/com/usoftchina/bi/controller/chart/ShowChartsController.java → bi-server/src/main/java/com/usoftchina/bi/server/controller/chart/ShowChartsController.java

@@ -1,10 +1,10 @@
-package com.usoftchina.bi.controller.chart;
+package com.usoftchina.bi.server.controller.chart;
 
 import com.usoftchina.bi.core.base.RepEntity;
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
-import com.usoftchina.bi.model.vo.configVo.*;
-import com.usoftchina.bi.service.chart.*;
-import com.usoftchina.bi.service.dataSource.ColumnScreenService;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.vo.configVo.*;
+import com.usoftchina.bi.server.service.chart.*;
+import com.usoftchina.bi.server.service.dataSource.ColumnScreenService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bi-server/src/main/java/com/usoftchina/bi/controller/dashboard/DashboardsController.java → bi-server/src/main/java/com/usoftchina/bi/server/controller/dashboard/DashboardsController.java

@@ -1,13 +1,13 @@
-package com.usoftchina.bi.controller.dashboard;
+package com.usoftchina.bi.server.controller.dashboard;
 
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
-import com.usoftchina.bi.model.vo.configVo.ChangeOrderInfo;
-import com.usoftchina.bi.model.vo.configVo.ChartsToDashInfo;
-import com.usoftchina.bi.model.vo.configVo.DashboardsInfo;
-import com.usoftchina.bi.service.dashboard.DashboardsService;
-import com.usoftchina.bi.service.dashboard.DashboardsToChartsUtilService;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.vo.configVo.ChangeOrderInfo;
+import com.usoftchina.bi.server.model.vo.configVo.ChartsToDashInfo;
+import com.usoftchina.bi.server.model.vo.configVo.DashboardsInfo;
+import com.usoftchina.bi.server.service.dashboard.DashboardsService;
+import com.usoftchina.bi.server.service.dashboard.DashboardsToChartsUtilService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package com.usoftchina.bi.controller.dataSource;
+package com.usoftchina.bi.server.controller.dataSource;
 
 import com.usoftchina.bi.auth.annotation.Auth;
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
-import com.usoftchina.bi.model.po.Databases;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.po.Databases;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.vo.configVo.DatabasesInfo;
-import com.usoftchina.bi.service.dataSource.DataBasesService;
-import com.usoftchina.bi.service.dataSource.ImplementSqlService;
+import com.usoftchina.bi.server.model.vo.configVo.DatabasesInfo;
+import com.usoftchina.bi.server.service.dataSource.DataBasesService;
+import com.usoftchina.bi.server.service.dataSource.ImplementSqlService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,18 +1,18 @@
-package com.usoftchina.bi.controller.dataSource;
+package com.usoftchina.bi.server.controller.dataSource;
 
 import com.usoftchina.bi.auth.annotation.Auth;
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
-import com.usoftchina.bi.model.bo.BaseToDataInfo;
-import com.usoftchina.bi.model.bo.GroupUpdateId;
-import com.usoftchina.bi.model.bo.ToSql;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.bo.BaseToDataInfo;
+import com.usoftchina.bi.server.model.bo.GroupUpdateId;
+import com.usoftchina.bi.server.model.bo.ToSql;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.vo.configVo.ChangeOrderInfo;
-import com.usoftchina.bi.model.vo.configVo.DataConnectorInfo;
-import com.usoftchina.bi.model.vo.configVo.GroupInfo;
-import com.usoftchina.bi.service.dataSource.DataConnectorService;
-import com.usoftchina.bi.service.dataSource.ImplementSqlService;
-import com.usoftchina.bi.model.pojo.annotation.TargetDataSource;
+import com.usoftchina.bi.server.model.vo.configVo.ChangeOrderInfo;
+import com.usoftchina.bi.server.model.vo.configVo.DataConnectorInfo;
+import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
+import com.usoftchina.bi.server.service.dataSource.DataConnectorService;
+import com.usoftchina.bi.server.service.dataSource.ImplementSqlService;
+import com.usoftchina.bi.server.model.pojo.annotation.TargetDataSource;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bi-server/src/main/java/com/usoftchina/bi/controller/strategy/StrategysController.java → bi-server/src/main/java/com/usoftchina/bi/server/controller/strategy/StrategysController.java

@@ -1,9 +1,9 @@
-package com.usoftchina.bi.controller.strategy;
+package com.usoftchina.bi.server.controller.strategy;
 
 import com.usoftchina.bi.core.base.RepEntity;
-import com.usoftchina.bi.model.vo.configVo.ObjectInfo;
-import com.usoftchina.bi.model.vo.configVo.StrategysInfo;
-import com.usoftchina.bi.service.strategy.StrategysService;
+import com.usoftchina.bi.server.model.vo.configVo.ObjectInfo;
+import com.usoftchina.bi.server.model.vo.configVo.StrategysInfo;
+import com.usoftchina.bi.server.service.strategy.StrategysService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bi-server/src/main/java/com/usoftchina/bi/controller/user/RecodeController.java → bi-server/src/main/java/com/usoftchina/bi/server/controller/user/RecodeController.java

@@ -1,11 +1,11 @@
-package com.usoftchina.bi.controller.user;
+package com.usoftchina.bi.server.controller.user;
 
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
 import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
-import com.usoftchina.bi.model.vo.configVo.RecordInfo;
-import com.usoftchina.bi.service.chart.ChartsUtilService;
-import com.usoftchina.bi.service.user.RecodeService;
+import com.usoftchina.bi.server.model.vo.configVo.RecordInfo;
+import com.usoftchina.bi.server.service.chart.ChartsUtilService;
+import com.usoftchina.bi.server.service.user.RecodeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bi-server/src/main/java/com/usoftchina/bi/controller/user/UserController.java → bi-server/src/main/java/com/usoftchina/bi/server/controller/user/UserController.java

@@ -1,13 +1,13 @@
-package com.usoftchina.bi.controller.user;
+package com.usoftchina.bi.server.controller.user;
 
 import com.usoftchina.bi.auth.annotation.Auth;
 import com.usoftchina.bi.core.base.RepEntity;
-import com.usoftchina.bi.model.po.User;
-import com.usoftchina.bi.model.pojo.annotation.CheckToken;
-import com.usoftchina.bi.model.vo.configVo.LoginInfo;
-import com.usoftchina.bi.model.vo.configVo.UserGroupInfo;
-import com.usoftchina.bi.model.vo.configVo.UserGroupSetInfo;
-import com.usoftchina.bi.service.user.UserService;
+import com.usoftchina.bi.server.model.po.User;
+import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
+import com.usoftchina.bi.server.model.vo.configVo.UserGroupInfo;
+import com.usoftchina.bi.server.model.vo.configVo.UserGroupSetInfo;
+import com.usoftchina.bi.server.service.user.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

bi-server/src/main/java/com/usoftchina/bi/dao/chart/ChartsConfigMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java

@@ -1,12 +1,12 @@
-package com.usoftchina.bi.dao.chart;
+package com.usoftchina.bi.server.dao.chart;
 
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.bo.ChartsColumnConfig;
-import com.usoftchina.bi.model.bo.ColumnConfigAndSql;
-import com.usoftchina.bi.model.po.ChartConfig;
-import com.usoftchina.bi.model.po.ChartConfigList;
-import com.usoftchina.bi.model.po.ChartsConfigToDash;
-import com.usoftchina.bi.model.vo.configVo.GroupInfo;
+import com.usoftchina.bi.server.model.bo.ChartsColumnConfig;
+import com.usoftchina.bi.server.model.bo.ColumnConfigAndSql;
+import com.usoftchina.bi.server.model.po.ChartConfig;
+import com.usoftchina.bi.server.model.po.ChartConfigList;
+import com.usoftchina.bi.server.model.po.ChartsConfigToDash;
+import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

bi-server/src/main/java/com/usoftchina/bi/dao/chart/ShowChartsMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ShowChartsMapper.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.dao.chart;
+package com.usoftchina.bi.server.dao.chart;
 
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.po.TargetData;
+import com.usoftchina.bi.server.model.po.TargetData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

bi-server/src/main/java/com/usoftchina/bi/dao/dashboard/DashboardsMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/dashboard/DashboardsMapper.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.dao.dashboard;
+package com.usoftchina.bi.server.dao.dashboard;
 
-import com.usoftchina.bi.model.bo.DashOrder;
-import com.usoftchina.bi.model.po.Dashboards;
+import com.usoftchina.bi.server.model.bo.DashOrder;
+import com.usoftchina.bi.server.model.po.Dashboards;
 import com.usoftchina.bi.core.base.TestPage;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;

bi-server/src/main/java/com/usoftchina/bi/dao/dataSource/DataColumnMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/dataSource/DataColumnMapper.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.dao.dataSource;
+package com.usoftchina.bi.server.dao.dataSource;
 
 
 import org.apache.ibatis.annotations.Mapper;

bi-server/src/main/java/com/usoftchina/bi/dao/dataSource/DataConnectorMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/dataSource/DataConnectorMapper.java

@@ -1,11 +1,11 @@
-package com.usoftchina.bi.dao.dataSource;
+package com.usoftchina.bi.server.dao.dataSource;
 
-import com.usoftchina.bi.model.po.DataConnector;
-import com.usoftchina.bi.model.po.DataConnectorList;
-import com.usoftchina.bi.model.po.Databases;
+import com.usoftchina.bi.server.model.po.DataConnector;
+import com.usoftchina.bi.server.model.po.DataConnectorList;
+import com.usoftchina.bi.server.model.po.Databases;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.vo.configVo.DatabasesInfo;
-import com.usoftchina.bi.model.vo.configVo.GroupInfo;
+import com.usoftchina.bi.server.model.vo.configVo.DatabasesInfo;
+import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

bi-server/src/main/java/com/usoftchina/bi/dao/strategy/StrategysBdMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/strategy/StrategysBdMapper.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.dao.strategy;
+package com.usoftchina.bi.server.dao.strategy;
 
-import com.usoftchina.bi.model.bo.DashOrder;
-import com.usoftchina.bi.model.po.Strategys;
+import com.usoftchina.bi.server.model.bo.DashOrder;
+import com.usoftchina.bi.server.model.po.Strategys;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

bi-server/src/main/java/com/usoftchina/bi/dao/strategy/StrategysChartMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/strategy/StrategysChartMapper.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.dao.strategy;
+package com.usoftchina.bi.server.dao.strategy;
 
-import com.usoftchina.bi.model.bo.DashOrder;
-import com.usoftchina.bi.model.po.Strategys;
+import com.usoftchina.bi.server.model.bo.DashOrder;
+import com.usoftchina.bi.server.model.po.Strategys;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

bi-server/src/main/java/com/usoftchina/bi/dao/user/RecordMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/user/RecordMapper.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.dao.user;
+package com.usoftchina.bi.server.dao.user;
 
-import com.usoftchina.bi.model.po.ChartConfigList;
-import com.usoftchina.bi.model.po.Dashboards;
+import com.usoftchina.bi.server.model.po.ChartConfigList;
+import com.usoftchina.bi.server.model.po.Dashboards;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

bi-server/src/main/java/com/usoftchina/bi/dao/user/UserMapper.java → bi-server/src/main/java/com/usoftchina/bi/server/dao/user/UserMapper.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.dao.user;
+package com.usoftchina.bi.server.dao.user;
 
-import com.usoftchina.bi.model.po.User;
-import com.usoftchina.bi.model.po.UserGroup;
+import com.usoftchina.bi.server.model.po.User;
+import com.usoftchina.bi.server.model.po.UserGroup;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/AggregateTable.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/AggregateTable.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 /*
 总体统计
  */

bi-server/src/main/java/com/usoftchina/bi/model/bo/BaseToDataInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/BaseToDataInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 import com.usoftchina.bi.core.base.TestPage;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/ChartsColumnConfig.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/ChartsColumnConfig.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class ChartsColumnConfig {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Column.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Column.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Column {
     private String columnName;

bi-server/src/main/java/com/usoftchina/bi/model/bo/ColumnConfigAndSql.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/ColumnConfigAndSql.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class ColumnConfigAndSql {
     private String sql;

bi-server/src/main/java/com/usoftchina/bi/model/bo/DashOrder.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/DashOrder.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class DashOrder {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/bo/DataView.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/DataView.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 /*
 个体统计

bi-server/src/main/java/com/usoftchina/bi/model/bo/DatabaseConfig.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/DatabaseConfig.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class DatabaseConfig {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/bo/GroupUpdateId.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/GroupUpdateId.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class GroupUpdateId {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Histogram.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Histogram.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Histogram {
     private Column xAxis;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Layout.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Layout.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Layout {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Line.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Line.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Line {
     private Column xAxis;

bi-server/src/main/java/com/usoftchina/bi/model/bo/LineSeries.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/LineSeries.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/LineSeriesMap.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/LineSeriesMap.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class LineSeriesMap {
     private String date;

bi-server/src/main/java/com/usoftchina/bi/model/bo/LoginResult.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/LoginResult.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class LoginResult {
     private String em_name;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Obj.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Obj.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Obj {
     private int obId;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Pages.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Pages.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Pages {
     private int pageNum;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Pie.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Pie.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Pie {
     private Column legendData;

bi-server/src/main/java/com/usoftchina/bi/model/bo/PieSeries.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/PieSeries.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/PieSeriesMap.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/PieSeriesMap.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class PieSeriesMap {
     private Double value;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Scatter.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Scatter.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 /*
 散点图
  */

bi-server/src/main/java/com/usoftchina/bi/model/bo/ScatterSeries.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/ScatterSeries.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/ScatterSeriesMap.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/ScatterSeriesMap.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class ScatterSeriesMap {
     private String date;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Screen.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Screen.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Screen {
     private String columnName;

bi-server/src/main/java/com/usoftchina/bi/model/bo/ScreenStr.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/ScreenStr.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class ScreenStr {
     private String ret;

bi-server/src/main/java/com/usoftchina/bi/model/bo/Series.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Series.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/Style.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Style.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class Style {
     private int isLegend;           //图例

bi-server/src/main/java/com/usoftchina/bi/model/bo/TimeReture.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/TimeReture.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/bo/ToSql.java → bi-server/src/main/java/com/usoftchina/bi/server/model/bo/ToSql.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.bo;
+package com.usoftchina.bi.server.model.bo;
 
 public class ToSql {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/po/BaseConfig.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/BaseConfig.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class BaseConfig {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/po/ChartConfig.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfig.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class ChartConfig {
     private int chartId;

bi-server/src/main/java/com/usoftchina/bi/model/po/ChartConfigList.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfigList.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 import java.util.Date;
 

bi-server/src/main/java/com/usoftchina/bi/model/po/ChartsConfigToDash.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartsConfigToDash.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class ChartsConfigToDash {
     private int chartId;

bi-server/src/main/java/com/usoftchina/bi/model/po/ColumnData.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/ColumnData.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class ColumnData {
     private String columnName;

bi-server/src/main/java/com/usoftchina/bi/model/po/ColumnToShow.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/ColumnToShow.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class ColumnToShow {
 //    private int id;

bi-server/src/main/java/com/usoftchina/bi/model/po/Dashboards.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/Dashboards.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 import java.util.Date;
 

bi-server/src/main/java/com/usoftchina/bi/model/po/DataConnector.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/DataConnector.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 /*
 数据源

bi-server/src/main/java/com/usoftchina/bi/model/po/DataConnectorList.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/DataConnectorList.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class DataConnectorList {
     private int dataId;

bi-server/src/main/java/com/usoftchina/bi/model/po/Databases.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/Databases.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class Databases {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/po/Strategys.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/Strategys.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 import java.util.Date;
 

bi-server/src/main/java/com/usoftchina/bi/model/po/StrategysData.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/StrategysData.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
-import com.usoftchina.bi.model.bo.DashOrder;
+import com.usoftchina.bi.server.model.bo.DashOrder;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/po/TargetData.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/TargetData.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class TargetData {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/po/TokenData.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/TokenData.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 public class TokenData {
     private String token;

bi-server/src/main/java/com/usoftchina/bi/model/po/User.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/User.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 import java.util.Date;
 

bi-server/src/main/java/com/usoftchina/bi/model/po/UserGroup.java → bi-server/src/main/java/com/usoftchina/bi/server/model/po/UserGroup.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.po;
+package com.usoftchina.bi.server.model.po;
 
 import java.util.Date;
 

bi-server/src/main/java/com/usoftchina/bi/model/pojo/annotation/CheckToken.java → bi-server/src/main/java/com/usoftchina/bi/server/model/pojo/annotation/CheckToken.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.pojo.annotation;
+package com.usoftchina.bi.server.model.pojo.annotation;
 
 import java.lang.annotation.*;
 

bi-server/src/main/java/com/usoftchina/bi/model/pojo/annotation/TargetDataSource.java → bi-server/src/main/java/com/usoftchina/bi/server/model/pojo/annotation/TargetDataSource.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.pojo.annotation;
+package com.usoftchina.bi.server.model.pojo.annotation;
 
 import java.lang.annotation.*;
 

bi-server/src/main/java/com/usoftchina/bi/model/pojo/annotation/TargetDataSourceCharts.java → bi-server/src/main/java/com/usoftchina/bi/server/model/pojo/annotation/TargetDataSourceCharts.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.pojo.annotation;
+package com.usoftchina.bi.server.model.pojo.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ChangeOrderInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ChangeOrderInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class ChangeOrderInfo {
     private int userId;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ChartConfigInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ChartConfigInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
-import com.usoftchina.bi.model.bo.Column;
+import com.usoftchina.bi.server.model.bo.Column;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ChartsToDashInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ChartsToDashInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Screen;
 import com.usoftchina.bi.core.base.TestPage;
 
 import java.util.List;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ColumnRenameInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ColumnRenameInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class ColumnRenameInfo {
     private String columnName;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ColumnScreenInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ColumnScreenInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class ColumnScreenInfo {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/DashboardsInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/DashboardsInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class DashboardsInfo {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/DataConnectorInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/DataConnectorInfo.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 
-import com.usoftchina.bi.model.bo.DatabaseConfig;
+import com.usoftchina.bi.server.model.bo.DatabaseConfig;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/DatabasesInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/DatabasesInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class DatabasesInfo {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/GroupInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/GroupInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 import java.util.Date;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/HistogramConfigInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/HistogramConfigInfo.java

@@ -1,8 +1,8 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 
-import com.usoftchina.bi.model.bo.Column;
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Column;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/IndividualConfigInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/IndividualConfigInfo.java

@@ -1,7 +1,7 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/LineConfigInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/LineConfigInfo.java

@@ -1,8 +1,8 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 
-import com.usoftchina.bi.model.bo.Column;
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Column;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/LoginInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/LoginInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class LoginInfo {
     private String userName;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ObjectInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ObjectInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
-import com.usoftchina.bi.model.bo.Obj;
+import com.usoftchina.bi.server.model.bo.Obj;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/PieConfigInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/PieConfigInfo.java

@@ -1,8 +1,8 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 
-import com.usoftchina.bi.model.bo.Column;
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Column;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/PopulationInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/PopulationInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/RecordInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/RecordInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class RecordInfo {
     private int tarId;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ScatterConfigInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ScatterConfigInfo.java

@@ -1,8 +1,8 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 
-import com.usoftchina.bi.model.bo.Column;
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Column;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/ShowDataChartInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ShowDataChartInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 
 import com.usoftchina.bi.core.base.TestPage;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/StrategysInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/StrategysInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
-import com.usoftchina.bi.model.bo.Screen;
+import com.usoftchina.bi.server.model.bo.Screen;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/UserGroupInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/UserGroupInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class UserGroupInfo {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/UserGroupSetInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/UserGroupSetInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/configVo/UserInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/UserInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.configVo;
+package com.usoftchina.bi.server.model.vo.configVo;
 
 public class UserInfo {
     private int id;

bi-server/src/main/java/com/usoftchina/bi/model/vo/dataVo/ChartsDataInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/dataVo/ChartsDataInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.dataVo;
+package com.usoftchina.bi.server.model.vo.dataVo;
 
-import com.usoftchina.bi.model.bo.ChartsColumnConfig;
+import com.usoftchina.bi.server.model.bo.ChartsColumnConfig;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/dataVo/ColumnTypeInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/dataVo/ColumnTypeInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.dataVo;
+package com.usoftchina.bi.server.model.vo.dataVo;
 
 public class ColumnTypeInfo {
     private String columnName;

bi-server/src/main/java/com/usoftchina/bi/model/vo/dataVo/ColumnValuesInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/dataVo/ColumnValuesInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.dataVo;
+package com.usoftchina.bi.server.model.vo.dataVo;
 
 public class ColumnValuesInfo<T> {
     private String columnConfig;

bi-server/src/main/java/com/usoftchina/bi/model/vo/dataVo/DashboardOrderInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/dataVo/DashboardOrderInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.dataVo;
+package com.usoftchina.bi.server.model.vo.dataVo;
 
-import com.usoftchina.bi.model.bo.DashOrder;
+import com.usoftchina.bi.server.model.bo.DashOrder;
 
 import java.util.List;
 

bi-server/src/main/java/com/usoftchina/bi/model/vo/dataVo/PopAndIndDataInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/dataVo/PopAndIndDataInfo.java

@@ -1,6 +1,6 @@
-package com.usoftchina.bi.model.vo.dataVo;
+package com.usoftchina.bi.server.model.vo.dataVo;
 
-import com.usoftchina.bi.model.bo.ChartsColumnConfig;
+import com.usoftchina.bi.server.model.bo.ChartsColumnConfig;
 
 public class PopAndIndDataInfo<T> {
     private ChartsColumnConfig chartsColumnConfig;

bi-server/src/main/java/com/usoftchina/bi/model/vo/dataVo/TableDataInfo.java → bi-server/src/main/java/com/usoftchina/bi/server/model/vo/dataVo/TableDataInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.model.vo.dataVo;
+package com.usoftchina.bi.server.model.vo.dataVo;
 
 import java.util.List;