项目结构调整初始化

.gitignore

@@ -1,6 +1,7 @@
 .idea
 target
 .project
+.settings
 .settings/org.eclipse.core.resources.prefs
 .settings/org.eclipse.jdt.apt.core.prefs
 .settings/org.eclipse.jdt.core.prefs

.settings/.jsdtscope

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

Dockerfile

@@ -1,46 +0,0 @@
-######################
-## Dockerfile to build container images consisting of Node.js and nginx environment
-# Based on Ubuntu
-#####
-
-# Set the base image to Ubuntu
-FROM ubuntu
-# File Author / Maintainer
-# MAINTAINER name Chunteng Xiao
-RUN apt-get clean
-RUN apt-get update
-RUN apt-get install -y software-properties-common
-RUN add-apt-repository ppa:webupd8team/java
-RUN apt-get update
-RUN apt-get -f install -y curl unzip wget tar
-RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
-RUN apt-get install -y oracle-java8-installer 
-RUN apt-get install -y oracle-java8-set-default
-ADD ./sonar-scanner-cli-3.2.0.1227-linux.zip ./sonarscanner.zip
-RUN unzip sonarscanner.zip
-RUN rm sonarscanner.zip
-ENV SONAR_RUNNER_HOME=/sonar-scanner-3.2.0.1227-linux
-ENV PATH $PATH:/sonar-scanner-3.2.0.1227-linux/bin
-RUN wget http://mirrors.hust.edu.cn/apache/tomcat/tomcat-9/v9.0.12/bin/apache-tomcat-9.0.12.tar.gz
-RUN tar xzf apache-tomcat-9.0.12.tar.gz
-RUN mv apache-tomcat-9.0.12 apache-tomcat9
-RUN wget http://mirrors.hust.edu.cn/apache/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
-RUN tar xzvf apache-maven-3.5.4-bin.tar.gz
-RUN ln -s apache-maven-3.5.4 apache-maven
-ENV M2_HOME=//apache-maven
-ENV CATALINA_HOME=/apache-tomcat9
-ENV TOMCAT_HOME=/apache-tomcat9
-ENV MAVEN_HOME=/apache-maven
-ENV PATH=${M2_HOME}/bin:${PATH}
-ENV JAVA_HOME=/usr/lib/jvm/java-8-oracle
-ENV JRE_HOME=/usr/lib/jvm/java-8-oracle/jre
-ADD ca.crt ./
-COPY ./additional_jars ./additional_jars
-COPY tomcat-users.xml ${CATALINA_HOME}/conf/tomcat-users.xml
-COPY context.xml ${CATALINA_HOME}/webapps/manager/META-INF/context.xml
-RUN keytool -import -trustcacerts -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias maven2.ca -file ca.crt
-RUN keytool -import -trustcacerts -keystore $JAVA_HOME/jre/lib/security/jssecacerts -storepass changeit -noprompt -alias maven2.ca -file ca.crt
-RUN mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc7 -Dversion=12.2.0.1.0 -Dpackaging=jar -Dfile=./additional_jars/ojdbc7.jar
-COPY sonar-runner.properties ./sonar-scanner-3.2.0.1227-linux/conf/sonar-scanner.properties
-EXPOSE 84
-EXPOSE 8080

Jenkinsfile

@@ -1,41 +0,0 @@
-pipeline {
-    agent {
-        dockerfile {
-            filename 'Dockerfile'
-            registryUrl 'https://registry.docker-cn.com'
-            args '-p 8081:8080 --security-opt apparmor=unconfined'
-        }
-    }
-    stages {
-        stage('Maven Test and Deploy') {
-            steps {
-                    sh "mvn clean install"
-            }
-        }
-        stage('SonarQube Analysis') {
-            steps {
-                sh 'sonar-scanner'
-            }
-        }
-        stage('Import to Webapps'){
-            steps {
-                sh 'cp ./target/BI.war /apache-tomcat9/webapps'
-            }
-        }
-        stage('Start Tomcat9'){
-            steps {
-                sh '/apache-tomcat9/bin/catalina.sh run'
-            }
-        }
-        stage('Deliver'){
-            steps {
-                input message: 'Finished using the server site? (Click "Proceed" to continue)'
-            }
-        }
-    }
-    post { 
-        always { 
-            cleanWs()
-        }
-    }
-}

bi-auth/pom.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>BI</artifactId>
+    <groupId>com.usoftchina.platform</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.usoftchina.platform</groupId>
+  <artifactId>bi-auth</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.usoftchina.platform</groupId>
+      <artifactId>bi-core</artifactId>
+    </dependency>
+
+    <!-- spring webmvc -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+    </dependency>
+    <!-- servlet -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+</project>

src/main/java/com/config/RoleInterceptor/Auth.java → bi-auth/src/main/java/com/usoftchina/bi/auth/annotation/Auth.java

@@ -1,4 +1,4 @@
-package com.config.RoleInterceptor;
+package com.usoftchina.bi.auth.annotation;
 
 import java.lang.annotation.*;
 

src/main/java/com/config/RoleInterceptor/ConfigAdapter.java → bi-auth/src/main/java/com/usoftchina/bi/auth/config/ConfigAdapter.java

@@ -1,5 +1,6 @@
-package com.config.RoleInterceptor;
+package com.usoftchina.bi.auth.config;
 
+import com.usoftchina.bi.auth.interceptor.SecurityInterceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;

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

@@ -1,7 +1,8 @@
-package com.config.RoleInterceptor;
+package com.usoftchina.bi.auth.interceptor;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.util.GetTokenData;
+import com.usoftchina.bi.auth.annotation.Auth;
+import com.usoftchina.bi.core.utils.GetTokenData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +27,6 @@ public class SecurityInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        logger.info("preHandle");
         if (!handler.getClass().isAssignableFrom(HandlerMethod.class)) {
             logger.error("cat cast handler to HandlerMethod.class");
             return true;
@@ -52,11 +52,11 @@ public class SecurityInterceptor implements HandlerInterceptor {
 
     @Override
     public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
-        logger.info("postHandler");
+
     }
 
     @Override
     public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
-        logger.info("afterCompletion");
+
     }
 }

bi-core/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>BI</artifactId>
+    <groupId>com.usoftchina.platform</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.usoftchina.platform</groupId>
+  <artifactId>bi-core</artifactId>
+
+  <dependencies>
+    <!-- pageHelper -->
+    <dependency>
+      <groupId>com.github.pagehelper</groupId>
+      <artifactId>pagehelper-spring-boot-starter</artifactId>
+    </dependency>
+    <!-- JSON -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <!-- JWT -->
+    <dependency>
+      <groupId>com.auth0</groupId>
+      <artifactId>java-jwt</artifactId>
+    </dependency>
+    <!-- druid -->
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>druid</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>

src/main/java/com/model/pojo/AbstractPageForm.java → bi-core/src/main/java/com/usoftchina/bi/core/base/AbstractPageForm.java

@@ -1,4 +1,4 @@
-package com.model.pojo;
+package com.usoftchina.bi.core.base;
 
 import com.github.pagehelper.PageHelper;
 

src/main/java/com/model/pojo/RepCode.java → bi-core/src/main/java/com/usoftchina/bi/core/base/RepCode.java

@@ -1,4 +1,4 @@
-package com.model.pojo;
+package com.usoftchina.bi.core.base;
 
 public enum  RepCode {
     success(200,"成功"),

bi-core/src/main/java/com/usoftchina/bi/core/base/RepEntity.java

@@ -0,0 +1,80 @@
+package com.usoftchina.bi.core.base;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.usoftchina.bi.core.utils.JsonUtils;
+
+import java.io.Serializable;
+
+public class RepEntity<T> implements Serializable {
+    /**
+     * 错误码
+     */
+    private int code;
+    /**
+     * 错误消息
+     */
+    private String msg;
+    /**
+     * 结果
+     */
+    private T data;
+
+    public RepEntity(RepCode repCode) {
+        this.code = repCode.getCode();
+        this.msg = repCode.getMsg();
+    }
+
+    public RepEntity(RepCode repCode, T data) {
+        this(repCode);
+        if (data != null){
+            this.data = data;
+        }
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    /**
+     * json字符串转换RepEntity对象
+     *
+     * @param jsonString
+     * @param <T>
+     * @return
+     */
+    public static <T> RepEntity<T> fromJsonString(String jsonString,  Class<T> targetClass) {
+        return JsonUtils.fromJsonString(jsonString, RepEntity.class, targetClass);
+    }
+
+    /**
+     * json字符串转换RepEntity对象
+     *
+     * @param jsonString
+     * @param targetType
+     * @param <T>
+     * @return
+     */
+    public static <T> RepEntity<T> fromJsonString(String jsonString, JavaType targetType) {
+        return JsonUtils.fromJsonString(jsonString, JsonUtils.getJavaType(RepEntity.class, targetType));
+    }
+}

src/main/java/com/model/pojo/TestPage.java → bi-core/src/main/java/com/usoftchina/bi/core/base/TestPage.java

@@ -1,4 +1,4 @@
-package com.model.pojo;
+package com.usoftchina.bi.core.base;
 
 public class TestPage extends AbstractPageForm<TestPage> {
     private static final long serialVersionUID = 1L;

src/main/java/com/config/exception/MyException.java → bi-core/src/main/java/com/usoftchina/bi/core/exception/MyException.java

@@ -1,4 +1,4 @@
-package com.config.exception;
+package com.usoftchina.bi.core.exception;
 
 public class MyException extends RuntimeException{
     /**

src/main/java/com/config/BasesSource/DynamicDataSource.java → bi-core/src/main/java/com/usoftchina/bi/core/jdbc/DynamicDataSource.java

@@ -1,4 +1,4 @@
-package com.config.BasesSource;
+package com.usoftchina.bi.core.jdbc;
 
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 

src/main/java/com/config/BasesSource/DynamicDataSourceContextHolder.java → bi-core/src/main/java/com/usoftchina/bi/core/jdbc/DynamicDataSourceContextHolder.java

@@ -1,4 +1,4 @@
-package com.config.BasesSource;
+package com.usoftchina.bi.core.jdbc;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/config/BasesSource/DynamicDataSourceRegister.java → bi-core/src/main/java/com/usoftchina/bi/core/jdbc/DynamicDataSourceRegister.java

@@ -1,4 +1,4 @@
-package com.config.BasesSource;
+package com.usoftchina.bi.core.jdbc;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidDataSourceFactory;

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

@@ -1,13 +1,9 @@
-package com.util;
+package com.usoftchina.bi.core.utils;
 
-import com.server.chart.TimeConverterUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class CalculationJudgeUtil {
-    @Autowired
-    TimeConverterUtil timeConverterUtil;
 
     public static String Judge(String type){
         if (type == null || "".equals(type) || "sum".equals(type)){

src/main/java/com/util/ContextUtil.java → bi-core/src/main/java/com/usoftchina/bi/core/utils/ContextUtil.java

@@ -1,62 +1,62 @@
-package com.util;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-
-public class ContextUtil {
-	private static ApplicationContext applicationContext;
-	public static void setApplicationContext(ApplicationContext applicationContext) {
-		synchronized (ContextUtil.class) {
-			ContextUtil.applicationContext = applicationContext;
-			ContextUtil.class.notifyAll();
-		}
-	}
-
-	public static ApplicationContext getApplicationContext() {
-		synchronized (ContextUtil.class) {
-			while (applicationContext == null) {
-				try {
-					ContextUtil.class.wait(6000);
-				} catch (InterruptedException ex) {
-				}
-			}
-			return applicationContext;
-		}
-	}
-
-	/**
-	 * 获取bean
-	 *
-	 * @param name
-	 * @return
-	 */
-	public static Object getBean(String name) {
-		try {
-			return getApplicationContext().getBean(name);
-		} catch (Exception e) {
-			return null;
-		}
-
-	}
-
-	/**
-	 * 获取bean
-	 *
-	 * @param cls
-	 * @return
-	 */
-	public static <T> T getBean(Class<T> cls) {
-		return getApplicationContext().getBean(cls);
-	}
-
-
-	/**
-	 * 触发事件
-	 *
-	 * @param event
-	 */
-	public static void publishEvent(ApplicationEvent event) {
-		getApplicationContext().publishEvent(event);
-	}
-
-}
+package com.usoftchina.bi.core.utils;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+
+public class ContextUtil {
+	private static ApplicationContext applicationContext;
+	public static void setApplicationContext(ApplicationContext applicationContext) {
+		synchronized (ContextUtil.class) {
+			ContextUtil.applicationContext = applicationContext;
+			ContextUtil.class.notifyAll();
+		}
+	}
+
+	public static ApplicationContext getApplicationContext() {
+		synchronized (ContextUtil.class) {
+			while (applicationContext == null) {
+				try {
+					ContextUtil.class.wait(6000);
+				} catch (InterruptedException ex) {
+				}
+			}
+			return applicationContext;
+		}
+	}
+
+	/**
+	 * 获取bean
+	 *
+	 * @param name
+	 * @return
+	 */
+	public static Object getBean(String name) {
+		try {
+			return getApplicationContext().getBean(name);
+		} catch (Exception e) {
+			return null;
+		}
+
+	}
+
+	/**
+	 * 获取bean
+	 *
+	 * @param cls
+	 * @return
+	 */
+	public static <T> T getBean(Class<T> cls) {
+		return getApplicationContext().getBean(cls);
+	}
+
+
+	/**
+	 * 触发事件
+	 *
+	 * @param event
+	 */
+	public static void publishEvent(ApplicationEvent event) {
+		getApplicationContext().publishEvent(event);
+	}
+
+}

src/main/java/com/util/DesUtil.java → bi-core/src/main/java/com/usoftchina/bi/core/utils/DesUtil.java

@@ -1,4 +1,4 @@
-package com.util;
+package com.usoftchina.bi.core.utils;
 
 import org.springframework.stereotype.Component;
 

src/main/java/com/util/EncryUtil.java → bi-core/src/main/java/com/usoftchina/bi/core/utils/EncryUtil.java

@@ -1,4 +1,4 @@
-package com.util;
+package com.usoftchina.bi.core.utils;
 
 import org.springframework.stereotype.Component;
 

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

@@ -1,15 +1,15 @@
-package com.util;
+package com.usoftchina.bi.core.utils;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.config.exception.MyException;
-import com.google.common.collect.Maps;
+import com.usoftchina.bi.core.exception.MyException;
 import org.springframework.stereotype.Component;
 
 import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
 import java.util.Map;
 
 @Component
@@ -32,7 +32,7 @@ public class GetTokenData {
             throw new MyException(-505, "token过期");
         }
         Map<String, Claim> claimMap = jwt.getClaims();
-        Map<String, String> resultMap = Maps.newHashMap();
+        Map<String, String> resultMap = new HashMap<String, String>();
         claimMap.forEach((k,v) -> resultMap.put(k, v.asString()));
         return resultMap;
     }

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

@@ -0,0 +1,90 @@
+package com.usoftchina.bi.core.utils;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.util.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.TimeZone;
+
+/**
+ * @author yingp
+ * @date 2018/9/30
+ */
+public class JsonUtils {
+
+    private static ObjectMapper mapper;
+
+    static {
+        mapper = new ObjectMapper()
+                .setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))
+                .setTimeZone(TimeZone.getTimeZone("GMT+8"));
+    }
+
+    public static String toJsonString(Object object) {
+        try {
+            return mapper.writeValueAsString(object);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static <T> T fromJsonString(String json, Class<T> targetCls) {
+        if (StringUtils.isEmpty(json)) {
+            return null;
+        }
+        try {
+            return mapper.readValue(json, targetCls);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static JavaType getJavaType(Class<?> targetClass, Class<?>... elementClasses) {
+        return mapper.getTypeFactory().constructParametricType(targetClass, elementClasses);
+    }
+
+    public static JavaType getJavaType(Class<?> targetClass, JavaType... parameterTypes) {
+        return mapper.getTypeFactory().constructParametricType(targetClass, parameterTypes);
+    }
+
+    public static <T> T fromJsonString(String json, Class<?> targetClass, Class<?>... elementClasses) {
+        if (StringUtils.isEmpty(json)) {
+            return null;
+        }
+        try {
+            return mapper.readValue(json, getJavaType(targetClass, elementClasses));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static <T> T fromJsonString(String json, JavaType type) {
+        if (StringUtils.isEmpty(json)) {
+            return null;
+        }
+        try {
+            return mapper.readValue(json, type);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static <T> List<T> fromJsonArray(String json, Class<T> targetCls) {
+        if (StringUtils.isEmpty(json)) {
+            return null;
+        }
+        try {
+            if (!json.startsWith("[")) {
+                json = "[" + json + "]";
+            }
+            return mapper.readValue(json, getJavaType(List.class, targetCls));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

bi-server-starter/pom.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>BI</artifactId>
+    <groupId>com.usoftchina.platform</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.usoftchina.platform</groupId>
+  <artifactId>bi-server-starter</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.usoftchina.platform</groupId>
+      <artifactId>bi-core</artifactId>
+    </dependency>
+
+    <!-- spring starter web -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <!-- spring starter aop -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-aop</artifactId>
+    </dependency>
+    <!-- spring boot test -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+    </dependency>
+    <!-- swagger2 -->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+    </dependency>
+    <!-- spring web -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <!-- mybatis -->
+    <dependency>
+      <groupId>org.mybatis.spring.boot</groupId>
+      <artifactId>mybatis-spring-boot-starter</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- servlet -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <!-- json -->
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>fastjson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>

src/main/java/com/config/CommonConfiguration.java → bi-server-starter/src/main/java/com/usoftchina/bi/starter/config/CommonConfiguration.java

@@ -1,4 +1,4 @@
-package com.config;
+package com.usoftchina.bi.starter.config;
 
 import com.github.pagehelper.PageHelper;
 import org.springframework.context.annotation.Bean;

src/main/java/com/config/Swagger2.java → bi-server-starter/src/main/java/com/usoftchina/bi/starter/config/Swagger2.java

@@ -1,4 +1,4 @@
-package com.config;
+package com.usoftchina.bi.starter.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/config/WebMvcConfig.java → bi-server-starter/src/main/java/com/usoftchina/bi/starter/config/WebMvcConfig.java

@@ -1,11 +1,11 @@
-package com.config;
+package com.usoftchina.bi.starter.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {

bi-server-starter/src/main/java/com/usoftchina/bi/starter/error/GlobalException.java

@@ -0,0 +1,52 @@
+package com.usoftchina.bi.starter.error;
+
+import com.auth0.jwt.exceptions.InvalidClaimException;
+import org.apache.ibatis.binding.BindingException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.management.OperationsException;
+import java.util.HashMap;
+import java.util.Map;
+
+@ControllerAdvice
+public class GlobalException {
+    @ExceptionHandler(RuntimeException.class)
+    @ResponseBody
+    public Map<String, Object> exceptionHandle(){
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("code" , "-502");
+        result.put("msg" , "服务器异常");
+        return result;
+    }
+
+    @ExceptionHandler(OperationsException.class)
+    @ResponseBody
+    public Map<String, Object> operationsException(){
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("code" , "-503");
+        result.put("msg", "权限不足");
+        return result;
+    }
+
+
+    @ExceptionHandler(BindingException.class)
+    @ResponseBody
+    public Map<String, Object> BindingException(){
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("code" , "-504");
+        result.put("msg" , "数据为空");
+        return result;
+    }
+
+    @ExceptionHandler(InvalidClaimException.class)
+    @ResponseBody
+    public Map<String, Object> InvalidClaimException(){
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("code" , "-505");
+        result.put("msg" , "token过期");
+        return result;
+    }
+
+}

bi-server-starter/src/main/java/com/usoftchina/bi/starter/test/BaseControllerTest.java

@@ -0,0 +1,159 @@
+package com.usoftchina.bi.starter.test;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.JavaType;
+import com.usoftchina.bi.core.base.RepEntity;
+import org.junit.Before;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * @Author chenwei
+ * @Date 2019/03/01
+ */
+public class BaseControllerTest {
+
+    @Autowired
+    protected WebApplicationContext context;
+
+    protected MockMvc mockMvc;
+
+    @Before
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(context)
+                .alwaysDo(print())
+                .alwaysExpect(isOk())
+                .alwaysExpect(isJson())
+                .build();
+    }
+
+    /**
+     * GET请求
+     *
+     * @param urlTemplate
+     * @return
+     */
+    public static MockHttpServletRequestBuilder get(String urlTemplate, Object... uriVars) {
+        return MockMvcRequestBuilders.get(urlTemplate, uriVars);
+    }
+
+    /**
+     * POST form方式请求
+     *
+     * @param urlTemplate
+     * @return
+     */
+    public static MockHttpServletRequestBuilder post(String urlTemplate, Object... uriVars) {
+        return MockMvcRequestBuilders.post(urlTemplate, uriVars);
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param urlTemplate
+     * @param uriVars
+     * @return
+     */
+    public static MockMultipartHttpServletRequestBuilder multipart(String urlTemplate, Object... uriVars) {
+        return MockMvcRequestBuilders.multipart(urlTemplate, uriVars);
+    }
+
+    /**
+     * 请求
+     *
+     * @param urlTemplate
+     * @return
+     */
+    public static MockHttpServletRequestBuilder request(HttpMethod method, String urlTemplate, Object... uriVars) {
+        return MockMvcRequestBuilders.request(method, urlTemplate, uriVars);
+    }
+
+    /**
+     * POST Payload方式请求，使用@RequestBody注解情况下
+     *
+     * @param object
+     * @return
+     */
+    public static MockHttpServletRequestBuilder requestBody(String urlTemplate, Object object) {
+        return post(urlTemplate).contentType(MediaType.APPLICATION_JSON_UTF8)
+                .content(JSON.toJSONString(object));
+    }
+
+    /**
+     * 是否返回 http status: 200
+     *
+     * @return
+     */
+    public static ResultMatcher isOk() {
+        return status().isOk();
+    }
+
+    /**
+     * 是否返回json格式
+     *
+     * @return
+     */
+    public static ResultMatcher isJson() {
+        return content().contentType(MediaType.APPLICATION_JSON_UTF8);
+    }
+
+    /**
+     * 是否执行成功 {"success": true}
+     *
+     * @return
+     */
+    public static ResultMatcher isSuccess() {
+        return jsonPath("success").value(true);
+    }
+
+    /**
+     * 是否执行失败 {"success": false}
+     *
+     * @return
+     */
+    public static ResultMatcher isFail() {
+        return jsonPath("success").value(false);
+    }
+
+    /**
+     * Result转换
+     *
+     * @param mvcResult
+     * @param <T>
+     * @return
+     * @throws Exception
+     */
+    public static <T> RepEntity<T> result(MvcResult mvcResult, Class<T> targetClass) throws Exception {
+        String content = mvcResult.getResponse().getContentAsString();
+        return RepEntity.fromJsonString(content, targetClass);
+    }
+
+    /**
+     * Result转换
+     *
+     * @param mvcResult
+     * @param targetType
+     * @param <T>
+     * @return
+     * @throws Exception
+     */
+    public static <T> RepEntity<T> result(MvcResult mvcResult, JavaType targetType) throws Exception {
+        String content = mvcResult.getResponse().getContentAsString();
+        return RepEntity.fromJsonString(content, targetType);
+    }
+
+}

bi-server/pom.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>BI</artifactId>
+    <groupId>com.usoftchina.platform</groupId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.usoftchina.platform</groupId>
+  <artifactId>bi-server</artifactId>
+  <description>bi-server</description>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.usoftchina.platform</groupId>
+      <artifactId>bi-server-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.usoftchina.platform</groupId>
+      <artifactId>bi-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.usoftchina.platform</groupId>
+      <artifactId>bi-auth</artifactId>
+    </dependency>
+    <!-- Mysql -->
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+    </dependency>
+    <!-- oracle -->
+    <dependency>
+      <groupId>com.oracle</groupId>
+      <artifactId>ojdbc7</artifactId>
+      <version>12.2.0.1.0</version>
+      <scope>system</scope>
+      <systemPath>${basedir}/../additional_jars/ojdbc7.jar</systemPath>
+    </dependency>
+    <!-- JWT -->
+    <dependency>
+      <groupId>com.auth0</groupId>
+      <artifactId>java-jwt</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>bi-server</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <includeSystemScope>true</includeSystemScope>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

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

@@ -1,19 +1,16 @@
-package com;
+package com.usoftchina.bi;
 
-import com.config.BasesSource.DynamicDataSourceRegister;
-import com.util.ContextUtil;
+import com.usoftchina.bi.core.jdbc.DynamicDataSourceRegister;
+import com.usoftchina.bi.core.utils.ContextUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.autoconfigure.core.AutoConfigureCache;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
-//@ComponentScan(basePackages={"com.util"})
 @EnableSwagger2
 @Import({DynamicDataSourceRegister.class})
 @EnableCaching

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

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

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

@@ -1,13 +1,13 @@
-package com.util;
+package com.usoftchina.bi.aspect;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.config.exception.MyException;
-import com.model.po.TokenData;
-import com.model.po.User;
+import com.usoftchina.bi.core.exception.MyException;
+import com.usoftchina.bi.model.po.TokenData;
+import com.usoftchina.bi.model.po.User;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -23,11 +23,11 @@ import java.util.Map;
 
 @Aspect
 @Component
-public class JwtTokenUtil {
+public class JwtTokenAspect {
     //公共密钥
     public static String SECRET = "YouRuanKeJiBi";
 
-    @Pointcut("@annotation(com.model.pojo.annotation.CheckToken)")
+    @Pointcut("@annotation(com.usoftchina.bi.model.pojo.annotation.CheckToken)")
     public void CheckToken() {
 
     }

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

@@ -1,13 +1,13 @@
-package com.controller.chart;
-
-import com.model.bo.GroupUpdateId;
-import com.model.pojo.RepEntity;
-import com.model.pojo.TestPage;
-import com.model.pojo.annotation.CheckToken;
-import com.model.vo.configVo.ChangeOrderInfo;
-import com.model.vo.configVo.ChartConfigInfo;
-import com.model.vo.configVo.GroupInfo;
-import com.server.chart.ChartsConfigService;
+package com.usoftchina.bi.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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -1,10 +1,10 @@
-package com.controller.chart;
+package com.usoftchina.bi.controller.chart;
 
-import com.model.pojo.annotation.CheckToken;
-import com.model.pojo.RepEntity;
-import com.model.vo.configVo.*;
-import com.server.chart.*;
-import com.server.dataSource.ColumnScreenService;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package com.controller.dashboard;
+package com.usoftchina.bi.controller.dashboard;
 
-import com.model.pojo.RepEntity;
-import com.model.pojo.TestPage;
-import com.model.pojo.annotation.CheckToken;
-import com.model.vo.configVo.ChangeOrderInfo;
-import com.model.vo.configVo.ChartsToDashInfo;
-import com.model.vo.configVo.DashboardsInfo;
-import com.server.dashboard.DashboardsService;
-import com.server.dashboard.DashboardsToChartsUtilService;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package com.controller.dataSource;
+package com.usoftchina.bi.controller.dataSource;
 
-import com.model.pojo.annotation.CheckToken;
-import com.model.po.Databases;
-import com.model.pojo.RepEntity;
-import com.model.pojo.TestPage;
-import com.model.vo.configVo.DatabasesInfo;
-import com.server.dataSource.DataBasesService;
-import com.server.dataSource.ImplementSqlService;
-import com.config.RoleInterceptor.Auth;
+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.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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,18 +1,18 @@
-package com.controller.dataSource;
-
-import com.model.pojo.annotation.CheckToken;
-import com.model.bo.BaseToDataInfo;
-import com.model.bo.GroupUpdateId;
-import com.model.bo.ToSql;
-import com.model.pojo.RepEntity;
-import com.model.pojo.TestPage;
-import com.model.vo.configVo.ChangeOrderInfo;
-import com.model.vo.configVo.DataConnectorInfo;
-import com.model.vo.configVo.GroupInfo;
-import com.server.dataSource.DataConnectorService;
-import com.server.dataSource.ImplementSqlService;
-import com.model.pojo.annotation.TargetDataSource;
-import com.config.RoleInterceptor.Auth;
+package com.usoftchina.bi.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.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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,9 @@
-package com.controller.strategy;
+package com.usoftchina.bi.controller.strategy;
 
-import com.model.pojo.RepEntity;
-import com.model.vo.configVo.ObjectInfo;
-import com.model.vo.configVo.StrategysInfo;
-import com.server.strategy.StrategysService;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,11 +1,11 @@
-package com.controller.user;
+package com.usoftchina.bi.controller.user;
 
-import com.model.pojo.annotation.CheckToken;
-import com.model.pojo.RepCode;
-import com.model.pojo.RepEntity;
-import com.model.vo.configVo.RecordInfo;
-import com.server.chart.ChartsUtilService;
-import com.server.user.RecodeService;
+import com.usoftchina.bi.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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package com.controller.user;
+package com.usoftchina.bi.controller.user;
 
-import com.config.RoleInterceptor.Auth;
-import com.model.po.User;
-import com.model.pojo.RepEntity;
-import com.model.pojo.annotation.CheckToken;
-import com.model.vo.configVo.LoginInfo;
-import com.model.vo.configVo.UserGroupInfo;
-import com.model.vo.configVo.UserGroupSetInfo;
-import com.server.user.UserService;
+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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,12 +1,12 @@
-package com.dao.chart;
-
-import com.model.bo.ChartsColumnConfig;
-import com.model.bo.ColumnConfigAndSql;
-import com.model.po.ChartConfig;
-import com.model.po.ChartConfigList;
-import com.model.po.ChartsConfigToDash;
-import com.model.pojo.TestPage;
-import com.model.vo.configVo.GroupInfo;
+package com.usoftchina.bi.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 org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -138,19 +138,19 @@ public interface ChartsConfigMapper {
     @Update("<script>" +
             "UPDATE bi_charts set "  +
             "CHART_NAME = #{chartName}" +
-            "<if test=\"chartType != null\"> , CHART_TYPE = #{chartType} </if>" +
-            "<if test=\"createBy != null\"> , CREATE_BY = #{createBy} </if>" +
-            "<if test=\"groupBy != null\"> , GROUP_BY = #{groupBy} </if>" +
-            "<if test=\"chartConfig != null\"> , CHART_CONFIG = #{chartConfig} </if>" +
-            "<if test=\"describes != null\"> , CHART_DESCRIBES = #{describes} </if>" +
-            "<if test=\"filters != null\"> , BC_FILTERS = #{filters} </if>" +
-            "<if test=\"accessAuthority != null\"> , ACCESS_AUTHORITY = #{accessAuthority} </if>" +
-            "<if test=\"updateAuthority != null\"> , UPDATE_AUTHORITY = #{updateAuthority} </if>" +
-            "<if test=\"style != null\"> , BC_CHART_STYLE = #{style} </if>" +
-            "<if test=\"chartsGroup !=null\">, BC_CHARTS_GROUP = #{chartsGroup}</if>"+
-            "<if test=\"chartOption !=null\">, bc_charts_option = #{chartOption}</if>"+
-            "<if test=\"fetchConfig !=null\">, BC_FETCHCONFIG = #{fetchConfig}</if>"+
-            "<if test=\"updateDate != null\"> , UPDATE_DATE = to_date(#{updateDate},'YYYY-MM-DD hh24:mi:ss') </if>" +
+            "<if com.usoftchina.bi.starter.test=\"chartType != null\"> , CHART_TYPE = #{chartType} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"createBy != null\"> , CREATE_BY = #{createBy} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"groupBy != null\"> , GROUP_BY = #{groupBy} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"chartConfig != null\"> , CHART_CONFIG = #{chartConfig} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"describes != null\"> , CHART_DESCRIBES = #{describes} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"filters != null\"> , BC_FILTERS = #{filters} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"accessAuthority != null\"> , ACCESS_AUTHORITY = #{accessAuthority} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"updateAuthority != null\"> , UPDATE_AUTHORITY = #{updateAuthority} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"style != null\"> , BC_CHART_STYLE = #{style} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"chartsGroup !=null\">, BC_CHARTS_GROUP = #{chartsGroup}</if>"+
+            "<if com.usoftchina.bi.starter.test=\"chartOption !=null\">, bc_charts_option = #{chartOption}</if>"+
+            "<if com.usoftchina.bi.starter.test=\"fetchConfig !=null\">, BC_FETCHCONFIG = #{fetchConfig}</if>"+
+            "<if com.usoftchina.bi.starter.test=\"updateDate != null\"> , UPDATE_DATE = to_date(#{updateDate},'YYYY-MM-DD hh24:mi:ss') </if>" +
             "where id = #{chartId}" +
             "</script>")
     void updateChartConfig(ChartConfig chartConfig);
@@ -181,9 +181,9 @@ public interface ChartsConfigMapper {
     @Update("<script>"+
             "UPDATE bi_charts_group set "+
             "bc_group_name = #{groupName}" +
-            "<if test=\"groupIndex != null\"> , bc_index = #{groupIndex} </if>" +
-            "<if test=\"fatherId != null\"> , bc_father_id = #{fatherId} </if>" +
-            "<if test=\"createBy != null\"> , create_by = #{createBy} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"groupIndex != null\"> , bc_index = #{groupIndex} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"fatherId != null\"> , bc_father_id = #{fatherId} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"createBy != null\"> , create_by = #{createBy} </if>" +
             "，updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
             " where bc_id = #{id}" +
             "</script>")

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

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

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

@@ -1,8 +1,8 @@
-package com.dao.dashboard;
+package com.usoftchina.bi.dao.dashboard;
 
-import com.model.bo.DashOrder;
-import com.model.po.Dashboards;
-import com.model.pojo.TestPage;
+import com.usoftchina.bi.model.bo.DashOrder;
+import com.usoftchina.bi.model.po.Dashboards;
+import com.usoftchina.bi.core.base.TestPage;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -29,11 +29,11 @@ public interface DashboardsMapper {
     @Update("<script>" +
             "UPDATE BI_DASHBOARDS set "  +
             "BD_NAME = #{bdName}" +
-            "<if test=\"bdNote != null\"> , BD_NOTE = #{bdNote} </if>" +
-            "<if test=\"bdConfiguration != null\"> , CONFIGURATION = #{bdConfiguration} </if>" +
-            "<if test=\"thumbnail != null\"> , BD_THUMBNAIL = #{thumbnail} </if>" +
-            "<if test=\"relationColumns != null\">, relation_columns = #{relationColumns} </if>"+
-            "<if test=\"filters != null\">, filters = #{filters} </if>"+
+            "<if com.usoftchina.bi.starter.test=\"bdNote != null\"> , BD_NOTE = #{bdNote} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"bdConfiguration != null\"> , CONFIGURATION = #{bdConfiguration} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"thumbnail != null\"> , BD_THUMBNAIL = #{thumbnail} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"relationColumns != null\">, relation_columns = #{relationColumns} </if>"+
+            "<if com.usoftchina.bi.starter.test=\"filters != null\">, filters = #{filters} </if>"+
             " ,UPDATE_DATE = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') " +
             "where id = #{id}" +
             "</script>")

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

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

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

@@ -1,11 +1,11 @@
-package com.dao.dataSource;
-
-import com.model.po.DataConnector;
-import com.model.po.DataConnectorList;
-import com.model.po.Databases;
-import com.model.pojo.TestPage;
-import com.model.vo.configVo.DatabasesInfo;
-import com.model.vo.configVo.GroupInfo;
+package com.usoftchina.bi.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.core.base.TestPage;
+import com.usoftchina.bi.model.vo.configVo.DatabasesInfo;
+import com.usoftchina.bi.model.vo.configVo.GroupInfo;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -72,17 +72,17 @@ public interface DataConnectorMapper {
     @Update("<script>" +
             "UPDATE bi_data_connectors set "  +
             "data_name = #{dataName}" +
-            "<if test=\"dataTag != null\"> , data_tag = #{dataTag} </if>" +
-            "<if test=\"loadObject != null\"> , LOAD_OBJECT = #{loadObject} </if>" +
-            "<if test=\"columnConfig != null\"> , columns_config = #{columnConfig} </if>" +
-            "<if test=\"dbConfig != null\"> , DB_CONFIG = #{dbConfig} </if>" +
-            "<if test=\"usedNumber != null\"> , used_number = #{usedNumber} </if>" +
-            "<if test=\"createBy != null\"> , create_by = #{createBy} </if>" +
-            "<if test=\"type != null\"> , con_TYPE = #{type} </if>" +
-            "<if test=\"note != null\"> , DATA_NOTE = #{note} </if>" +
-            "<if test=\"tableName != null\"> , table_name = #{tableName} </if>" +
-            "<if test=\"connectorGroup != null\"> , BD_GROUP = #{connectorGroup} </if>"+
-            "<if test=\"updateDate != null\"> , UPDATE_DATE = to_date(#{updateDate},'YYYY-MM-DD hh24:mi:ss') </if>" +
+            "<if com.usoftchina.bi.starter.test=\"dataTag != null\"> , data_tag = #{dataTag} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"loadObject != null\"> , LOAD_OBJECT = #{loadObject} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"columnConfig != null\"> , columns_config = #{columnConfig} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"dbConfig != null\"> , DB_CONFIG = #{dbConfig} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"usedNumber != null\"> , used_number = #{usedNumber} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"createBy != null\"> , create_by = #{createBy} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"type != null\"> , con_TYPE = #{type} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"note != null\"> , DATA_NOTE = #{note} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"tableName != null\"> , table_name = #{tableName} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"connectorGroup != null\"> , BD_GROUP = #{connectorGroup} </if>"+
+            "<if com.usoftchina.bi.starter.test=\"updateDate != null\"> , UPDATE_DATE = to_date(#{updateDate},'YYYY-MM-DD hh24:mi:ss') </if>" +
             "where id = #{dataId}" +
             "</script>")
     void updateData(DataConnector dataConnector);
@@ -140,13 +140,13 @@ public interface DataConnectorMapper {
     @Update("<script>"+
             "UPDATE BI_DATABASES set "  +
             "BASES_NAME = #{name}" +
-            "<if test=\"addrass != null\"> , ADDRASS = #{addrass} </if>" +
-            "<if test=\"port != null\"> , PORT = #{port} </if>" +
-            "<if test=\"databaseType != null\"> , DATABASE_TYPE = #{databaseType} </if>" +
-            "<if test=\"dataName != null\"> , DATA_NAME = #{dataName} </if>" +
-            "<if test=\"userName != null\"> , USER_NAME = #{userName} </if>" +
-            "<if test=\"passWord != null\"> , PASS_WORD = #{passWord} </if>" +
-            "<if test=\"note != null\"> , NOTE = #{note} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"addrass != null\"> , ADDRASS = #{addrass} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"port != null\"> , PORT = #{port} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"databaseType != null\"> , DATABASE_TYPE = #{databaseType} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"dataName != null\"> , DATA_NAME = #{dataName} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"userName != null\"> , USER_NAME = #{userName} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"passWord != null\"> , PASS_WORD = #{passWord} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"note != null\"> , NOTE = #{note} </if>" +
             "where id = #{id}" +
             "</script>")
     void updatabases(Databases databases);
@@ -191,8 +191,8 @@ public interface DataConnectorMapper {
     @Update("<script>"+
             "UPDATE bi_base_group_by set "+
             "bb_group_name = #{groupName}" +
-            "<if test=\"groupIndex != null\"> , bb_index = #{groupIndex} </if>" +
-            "<if test=\"fatherId != null\"> , bb_father_id = #{fatherId} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"groupIndex != null\"> , bb_index = #{groupIndex} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"fatherId != null\"> , bb_father_id = #{fatherId} </if>" +
             ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
             " where bb_id = #{id}" +
             "</script>")

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

@@ -1,7 +1,7 @@
-package com.dao.strategy;
+package com.usoftchina.bi.dao.strategy;
 
-import com.model.bo.DashOrder;
-import com.model.po.Strategys;
+import com.usoftchina.bi.model.bo.DashOrder;
+import com.usoftchina.bi.model.po.Strategys;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -26,11 +26,11 @@ public interface StrategysBdMapper {
     @Update("<script>"+
             "UPDATE bi_db_strategys set "+
             "BS_DB_ID = #{tarId}" +
-            "<if test=\"rule != null\"> , BS_RULE = #{rule} </if>" +
-            "<if test=\"ruleStr != null\">, RULE_STR = #{ruleStr} </if> "+
-            "<if test=\"name != null\"> , BS_NAME = #{name} </if>" +
-            "<if test=\"createBy != null\"> , createBy = #{createBy} </if>" +
-            "<if test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"rule != null\"> , BS_RULE = #{rule} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"ruleStr != null\">, RULE_STR = #{ruleStr} </if> "+
+            "<if com.usoftchina.bi.starter.test=\"name != null\"> , BS_NAME = #{name} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"createBy != null\"> , createBy = #{createBy} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
             ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
             " where bs_id = #{id}" +
             "</script>")

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

@@ -1,7 +1,7 @@
-package com.dao.strategy;
+package com.usoftchina.bi.dao.strategy;
 
-import com.model.bo.DashOrder;
-import com.model.po.Strategys;
+import com.usoftchina.bi.model.bo.DashOrder;
+import com.usoftchina.bi.model.po.Strategys;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -26,11 +26,11 @@ public interface StrategysChartMapper {
     @Update("<script>"+
             "UPDATE bi_chart_strategys set "+
             "bc_chart_id = #{tarId}" +
-            "<if test=\"rule != null\"> , BC_RULE = #{rule} </if>" +
-            "<if test=\"ruleStr != null\"> , rule_str = #{ruleStr} </if>" +
-            "<if test=\"name != null\"> , BC_NAME = #{name} </if>" +
-            "<if test=\"createBy != null\"> , createBy = #{createBy} </if>" +
-            "<if test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"rule != null\"> , BC_RULE = #{rule} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"ruleStr != null\"> , rule_str = #{ruleStr} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"name != null\"> , BC_NAME = #{name} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"createBy != null\"> , createBy = #{createBy} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
             ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
             " where bc_id = #{id}" +
             "</script>")

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

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

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

@@ -1,7 +1,7 @@
-package com.dao.user;
+package com.usoftchina.bi.dao.user;
 
-import com.model.po.User;
-import com.model.po.UserGroup;
+import com.usoftchina.bi.model.po.User;
+import com.usoftchina.bi.model.po.UserGroup;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -25,11 +25,11 @@ public interface UserMapper {
     @Update("<script>" +
             "UPDATE bi_users set " +
             "USER_NAME = #{userName}" +
-            "<if test=\"passWord != null\"> , PASS_WORD = #{passWord} </if>" +
-            " <if test=\"name != null\"> , bu_name = #{name} </if>" +
-            " <if test=\"post != null\"> , BU_POST = #{post} </if>" +
-            " <if test=\"department != null\"> , BU_DEPARTMENT = #{department} </if>" +
-            " <if test=\"role != null\"> , BU_ROLE = #{role} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"passWord != null\"> , PASS_WORD = #{passWord} </if>" +
+            " <if com.usoftchina.bi.starter.test=\"name != null\"> , bu_name = #{name} </if>" +
+            " <if com.usoftchina.bi.starter.test=\"post != null\"> , BU_POST = #{post} </if>" +
+            " <if com.usoftchina.bi.starter.test=\"department != null\"> , BU_DEPARTMENT = #{department} </if>" +
+            " <if com.usoftchina.bi.starter.test=\"role != null\"> , BU_ROLE = #{role} </if>" +
             " ,updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss')" +
             "  where bu_id = #{id}" +
             " </script>")
@@ -109,7 +109,7 @@ public interface UserMapper {
     @Update("<script>" +
             "UPDATE bi_user_groups set "  +
             "bg_name = #{userGroupName}" +
-            "<if test=\"userGroupNote != null\"> , bg_note = #{userGroupNote} </if>" +
+            "<if com.usoftchina.bi.starter.test=\"userGroupNote != null\"> , bg_note = #{userGroupNote} </if>" +
             ",UPDATA_DATE = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') " +
             "where bg_id = #{id}" +
             "</script>")

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

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

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

@@ -1,6 +1,6 @@
-package com.model.bo;
+package com.usoftchina.bi.model.bo;
 
-import com.model.pojo.TestPage;
+import com.usoftchina.bi.core.base.TestPage;
 
 public class BaseToDataInfo {
     private int id;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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