增加saas配置

pom.xml

@@ -31,6 +31,7 @@
 		<xmlgraphics.version>2.1</xmlgraphics.version>
 		<mail.version>1.4.7</mail.version>
 		<commons.lang.version>2.6</commons.lang.version>
+		<mysql.jdbc.version>5.1.47</mysql.jdbc.version>
 	</properties>
 
 	<dependencies>
@@ -83,11 +84,6 @@
 			<artifactId>fastjson</artifactId>
 			<version>${fastjson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-			<version>${oracle.jdbc.version}</version>
-		</dependency>
 
 		<!-- 打印报表 -->
 		<dependency>
@@ -423,6 +419,88 @@
 		</pluginManagement>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>oracle</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.oracle</groupId>
+					<artifactId>ojdbc6</artifactId>
+					<version>${oracle.jdbc.version}</version>
+				</dependency>
+			</dependencies>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<id>mysql</id>
+			<dependencies>
+				<dependency>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+					<version>${mysql.jdbc.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<!-- mvn deploy -P docker -->
+			<id>saas-docker</id>
+			<properties>
+				<docker.repository>192.168.253.3:4000</docker.repository>
+				<docker.registry.name>saas</docker.registry.name>
+			</properties>
+			<dependencies>
+				<dependency>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+					<version>${mysql.jdbc.version}</version>
+				</dependency>
+			</dependencies>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<!-- Docker maven plugin -->
+						<plugin>
+							<groupId>com.spotify</groupId>
+							<artifactId>docker-maven-plugin</artifactId>
+							<version>1.0.0</version>
+							<configuration>
+								<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+								<registryUrl>${docker.repository}</registryUrl>
+								<pushImage>true</pushImage>
+								<forceTags>true</forceTags>
+								<imageName>
+									${docker.repository}/${docker.registry.name}/${project.artifactId}:${project.version}
+								</imageName>
+								<imageTags>
+									<imageTag>latest</imageTag>
+								</imageTags>
+								<resources>
+									<resource>
+										<targetPath>/</targetPath>
+										<directory>${project.build.directory}</directory>
+										<include>${project.build.finalName}.jar</include>
+									</resource>
+								</resources>
+							</configuration>
+							<executions>
+								<execution>
+									<id>build-image</id>
+									<phase>package</phase>
+									<goals>
+										<goal>build</goal>
+									</goals>
+								</execution>
+							</executions>
+						</plugin>
+						<!-- Docker maven plugin -->
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
+	</profiles>
+
 	<distributionManagement>
 		<!-- 发布release仓库 -->
 		<repository>

src/main/docker/Dockerfile

@@ -0,0 +1,4 @@
+FROM tomcat
+
+ADD report-0.0.1.jar /usr/local/tomcat/webapps/report.jar
+ENV JAVA_OPTS="$JAVA_OPTS -server -Xmx2g -Xms1g -Duser.timezone=GMT+08 -Dfile.encoding=utf-8"

src/main/java/com/uas/report/exception/ExceptionHandlerAdvice.java

@@ -34,6 +34,7 @@ public class ExceptionHandlerAdvice {
 	public ResponseEntity<ModelMap> handleError(Throwable e) {
 		logger.error("", e);
 		ModelMap map = new ModelMap();
+		map.put("code", 500);
 		map.put("success", false);
 		map.put("message", e.getMessage());
 		map.put("detailedMessage", ExceptionUtils.getDetailedMessage(e));

src/main/resources/application.yml

@@ -8,12 +8,6 @@ spring:
    enabled: true
    max-file-size: 128MB
    max-request-size: 128MB
- jpa:
-  database: ORACLE
-  show-sql: false
-  properties:
-   hibernate:
-    dialect: org.hibernate.dialect.Oracle10gDialect
     
 security:
  basic:

src/main/resources/config/application-saas-dev.properties

@@ -0,0 +1,9 @@
+localBaseDir=/opt/report/data
+localImagesDir=/Picture
+localJrxmlDir=/jrxml
+standardMaster=DEFAULT
+hasStandardJrxmls=true
+standardJrxmlsUrl=http://print.ubtob.com/report/file/standardJrxmls?userName=%s&onlyData=1
+shareJrxmlsWithSubMaster=false
+
+datasource={"SAAS_BIZ":{"driverClassName":"com.mysql.jdbc.Driver","url":"jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false","username":"root","password":"select111***","initialSize":3,"minIdle":0,"maxActive":20,"maxWait":60000,"timeBetweenEvictionRunsMillis":60000,"minEvictableIdleTimeMillis":300000,"validationQuery":"SELECT 1","testWhileIdle":true,"testOnBorrow":true,"testOnReturn":false,"removeAbandoned":true,"removeAbandonedTimeout":120,"logAbandoned":true,"timeBetweenLogStatsMillis":600000,"poolPreparedStatements":true,"maxPoolPreparedStatementPerConnectionSize":20,"filters":"stat,slf4j","connectionProperties":"druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000"}}