shiyang / regional-platform

Download as
Browse Code »

Commit ce6cb2e1353e2b7f2c8e1d407af64b589cfd1a41

Authored by rui.zhang
2 parents c1c3ca4950 daf2630852
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-data-api/pom.xml View file @ ce6cb2e
... ... @@ -14,22 +14,18 @@
14 14 <dependency>
15 15 <groupId>org.apache.cxf</groupId>
16 16 <artifactId>cxf-rt-frontend-jaxws</artifactId>
17   - <version>3.1.5</version>
18 17 </dependency>
19 18 <dependency>
20 19 <groupId>org.apache.cxf</groupId>
21 20 <artifactId>cxf-rt-transports-http</artifactId>
22   - <version>3.1.5</version>
23 21 </dependency>
24 22 <dependency>
25 23 <groupId>org.apache.cxf</groupId>
26 24 <artifactId>cxf-rt-transports-http-jetty</artifactId>
27   - <version>3.1.5</version>
28 25 </dependency>
29 26 <dependency>
30 27 <groupId>org.apache.cxf</groupId>
31 28 <artifactId>cxf-rt-ws-security</artifactId>
32   - <version>3.1.5</version>
33 29 </dependency>
34 30 <dependency>
35 31 <groupId>com.lyms.core</groupId>
platform-job-index/pom.xml View file @ ce6cb2e
... ... @@ -157,5 +157,36 @@
157 157 </plugins>
158 158 <finalName>platform-job-index</finalName>
159 159 </build>
  160 + <profiles>
  161 + <profile>
  162 + <id>dev</id>
  163 +
  164 + <!-- 默认激活开发配制，使用config-dev.properties来替换设置过虑的资源文件中的${key} -->
  165 + <activation>
  166 + <activeByDefault>true</activeByDefault>
  167 + </activation>
  168 + <build>
  169 + <filters>
  170 + <filter>../platform-resource/resources/config-dev.properties</filter>
  171 + </filters>
  172 + </build>
  173 + </profile>
  174 + <profile>
  175 + <id>test</id>
  176 + <build>
  177 + <filters>
  178 + <filter>../platform-resource/resources/config-test.properties</filter>
  179 + </filters>
  180 + </build>
  181 + </profile>
  182 + <profile>
  183 + <id>prod</id>
  184 + <build>
  185 + <filters>
  186 + <filter>../platform-resource/resources/config-product.properties</filter>
  187 + </filters>
  188 + </build>
  189 + </profile>
  190 + </profiles>
160 191 </project>
platform-job-index/src/main/webapp/WEB-INF/web.xml View file @ ce6cb2e
... ... @@ -18,7 +18,10 @@
18 18 classpath*:/spring/applicationContext.xml
19 19 </param-value>
20 20 </context-param>
21   -
  21 + <context-param>
  22 + <param-name>webAppRootKey</param-name>
  23 + <param-value>webapp.job.index</param-value>
  24 + </context-param>
22 25 <session-config>
23 26 <session-timeout>60</session-timeout>
24 27 </session-config>
platform-operate-api/pom.xml View file @ ce6cb2e
... ... @@ -60,13 +60,36 @@
60 60 </plugins>
61 61 <finalName>platform-operate-api</finalName>
62 62 </build>
63   - <!-- <profiles> <profile> <id>mysql</id> <properties> <deploy.type>mysql</deploy.type>
64   - </properties> <activation> <activeByDefault>true</activeByDefault> </activation>
65   - <dependencies> <dependency> <groupId>com.lyms.core</groupId> <artifactId>permission-dal-mysql</artifactId>
66   - <version>${project.version}</version> </dependency> </dependencies> </profile>
67   - <profile> <id>mongo</id> <properties> <deploy.type>mongo</deploy.type> </properties>
68   - <dependencies> <dependency> <groupId>com.lyms.core</groupId> <artifactId>permission-dal-mongo</artifactId>
69   - <version>${project.version}</version> </dependency> </dependencies> </profile>
70   - </profiles> -->
  63 + <profiles>
  64 + <profile>
  65 + <id>dev</id>
  66 +
  67 + <!-- 默认激活开发配制，使用config-dev.properties来替换设置过虑的资源文件中的${key} -->
  68 + <activation>
  69 + <activeByDefault>true</activeByDefault>
  70 + </activation>
  71 + <build>
  72 + <filters>
  73 + <filter>../platform-resource/resources/config-dev.properties</filter>
  74 + </filters>
  75 + </build>
  76 + </profile>
  77 + <profile>
  78 + <id>test</id>
  79 + <build>
  80 + <filters>
  81 + <filter>../platform-resource/resources/config-test.properties</filter>
  82 + </filters>
  83 + </build>
  84 + </profile>
  85 + <profile>
  86 + <id>prod</id>
  87 + <build>
  88 + <filters>
  89 + <filter>../platform-resource/resources/config-product.properties</filter>
  90 + </filters>
  91 + </build>
  92 + </profile>
  93 + </profiles>
71 94 </project>
platform-operate-api/src/main/resources/database.properties View file @ ce6cb2e
... ... @@ -2,9 +2,9 @@
2 2 #mongo.db.port=27017
3 3 #mongo.db.dbname=platform
4 4  
5   -mongo.db.host=192.168.5.223
6   -mongo.db.port=27017
7   -mongo.db.dbname=platform
  5 +mongo.db.host=${mongo.db.host}
  6 +mongo.db.port=${mongo.db.port}
  7 +mongo.db.dbname=${mongo.db.dbname}
8 8 mongo.db.username=root
9 9 mongo.db.password=root
10 10  
11 11  
... ... @@ -27,15 +27,15 @@
27 27  
28 28  
29 29 maindata.driver=com.mysql.jdbc.Driver
30   -maindata.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
31   -maindata.username=platform
32   -maindata.password=platform123
  30 +maindata.jdbcurl=${mysql.jdbcurl}
  31 +maindata.username=${mysql.db.name}
  32 +maindata.password=${mysql.db.password}
33 33  
34 34 maindata.maxpoolsize=5
35 35 maindata.initialpoolsize=2
36 36 maindata.minpoolsize=2
37 37  
38   -redis.servers=192.168.5.250:6379:mommybaby123
  38 +redis.servers=${redis.servers}
39 39  
40 40 token.prefix=member
41 41  
platform-operate-api/src/main/webapp/WEB-INF/web.xml View file @ ce6cb2e
... ... @@ -27,6 +27,10 @@
27 27 <param-value>classpath:log4j_config.xml</param-value>
28 28 </context-param>
29 29 <context-param>
  30 + <param-name>webAppRootKey</param-name>
  31 + <param-value>webapp.operate</param-value>
  32 + </context-param>
  33 + <context-param>
30 34 <param-name>log4jRefreshInterval</param-name>
31 35 <param-value>60000</param-value>
32 36 </context-param>
platform-resource/resources/config-test.properties View file @ ce6cb2e
1 1 mongo.db.host=localhost
2   -mongo.db.port=27017
3   -mongo.db.dbname=dev_mongo
  2 +mongo.db.port=10001
  3 +mongo.db.dbname=platform
4 4  
5 5  
6 6 mysql.db.name=test
7 7 mysql.db.password=test
8 8 mysql.driver=com.mysql.jdbc.Driver
9   -mysql.jdbcurl=jdbc:mysql://192.168.5.250:3306/mommybaby?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
  9 +mysql.jdbcurl=jdbc:mysql://localhost:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
10 10  
11 11 mysql.maxpoolsize=5
12 12 mysql.initialpoolsize=2
13 13 mysql.minpoolsize=2
  14 +redis.servers=localhost:6379