配置文件修改

atms-api/pom.xml

@@ -297,8 +297,59 @@
 			<systemPath>${basedir}/lib/java-axp-1.0-SNAPSHOT.jar</systemPath>
 		</dependency>
 	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<filters>
+					<filter>src/main/resources/conf/conf_profile_dev.properties</filter>
+				</filters>
+			</build>
+			<properties>
+				<env>dev</env>
+			</properties>
+		</profile>
+		<profile>
+			<id>staging</id>
+			<build>
+				<filters>
+					<filter>src/main/resources/conf/conf_profile_staging.properties</filter>
+				</filters>
+			</build>
+			<properties>
+				<env>staging</env>
+			</properties>
+		</profile>
+		<profile>
+			<id>pub</id>
+			<build>
+				<filters>
+					<filter>src/main/resources/conf/conf_profile_pub.properties</filter>
+				</filters>
+			</build>
+			<properties>
+				<env>pub</env>
+			</properties>
+		</profile>
+	</profiles>
+
 	<build>
 		<finalName>atms-api</finalName>
+		<!-- idea不会编译src的java目录的xml文件,将IDEA maven项目中src源代码下的xml等资源文件编译进classes文件夹 -->
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.properties</include>
+					<include>**/*.xml</include>
+				</includes>
+				<filtering>true</filtering><!-- replace variable attribute or not -->
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -364,6 +415,37 @@
 				<artifactId>sonar-maven-plugin</artifactId>
 				<version>3.4.0.905</version>
 			</plugin>
+
+			<plugin>
+				<groupId>org.mybatis.generator</groupId>
+				<artifactId>mybatis-generator-maven-plugin</artifactId>
+				<version>1.3.2</version>
+				<configuration>
+					<verbose>true</verbose>
+					<overwrite>true</overwrite>
+				</configuration>
+			</plugin>
+			<!-- 资源文件拷贝插件 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<!-- java编译插件 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.2</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 </project>

atms-api/src/main/resources/applicationContext.xml

@@ -17,9 +17,9 @@
     <property name="locations">
       <list>
         <!-- Base settings for all environments -->
-        <value>classpath:conf_base.properties</value>
+        <value>classpath:conf/conf_base.properties</value>
         <!-- Settings for selected environment -->
-        <value>classpath:conf_profile_${atms_env_id:local}.properties</value>
+        <value>classpath:conf/conf.properties</value>
       </list>
     </property>
   </bean>

atms-api/src/main/resources/conf/conf.properties

+jdbc_url=${jdbc_url}
+jdbc_user=${jdbc_user}
+jdbc_password=${jdbc_password}
+
+mail_jdbc_url=${mail_jdbc_url}
+mail_jdbc_user=${mail_jdbc_user}
+mail_jdbc_password=${mail_jdbc_password}
+
+web.url=${web.url}
+
+jwt.base64Secret=${jwt.base64Secret}
+jwt.powerToken=${jwt.powerToken}
\ No newline at end of file

atms-api/src/main/resources/conf_profile_dev.properties → atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -6,7 +6,7 @@ mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
 mail_jdbc_user=sa
 mail_jdbc_password=atmsunittestSQL
 
-web.url=http://192.168.1.102:8090
+web.url=http://localhost:8080
 
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
\ No newline at end of file

atms-api/src/main/resources/conf_profile_local.properties → atms-api/src/main/resources/conf/conf_profile_staging.properties

-jdbc_url=jdbc:sqlserver://10.157.107.11:1801;DatabaseName=TaxAdmin8
-jdbc_user=sa8
-jdbc_password=sa8@pwc
-
-mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
-mail_jdbc_user=sa
-mail_jdbc_password=atmsunittestSQL
-
-#web.url=http://localhost:8080
-web.url=http://cnshaappulv004:8080
-
-jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
+jdbc_url=jdbc:sqlserver://10.157.107.11:1801;DatabaseName=TaxAdmin8
+jdbc_user=sa8
+jdbc_password=sa8@pwc
+
+mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
+mail_jdbc_user=sa
+mail_jdbc_password=atmsunittestSQL
+
+web.url=http://cnshaappulv004:8080
+
+jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
\ No newline at end of file