Commit 8666ab19ca29c0f02da938bf12e0abf10e0dda10

Authored by weiliwhereareyou@163.com
2 parents 5c367063 6eaf7be3

Merge remote-tracking branch 'origin/dev' into dev

Showing 1 changed file with 0 additions and 79 deletions
mobsite-man-web/pom.xml
@@ -211,85 +211,6 @@ @@ -211,85 +211,6 @@
211 </properties> 211 </properties>
212 </profile> 212 </profile>
213 213
214 - <profile>  
215 - <id>pnr_clone</id>  
216 - <activation>  
217 - <activeByDefault>true</activeByDefault>  
218 - </activation>  
219 - <properties>  
220 - <!-- 显示模板 -->  
221 - <project.view.VMDefault>layout/default_content</project.view.VMDefault>  
222 -  
223 - <!-- redis 配置 -->  
224 - <project.redis.host1>10.28.5.200</project.redis.host1>  
225 - <project.redis.port1>6379</project.redis.port1>  
226 -  
227 - <!-- 商品详情链接地址 -->  
228 - <project.product.detail.path>http://www.1n4j.com/product/</project.product.detail.path>  
229 -  
230 - <!-- 后台默认静态资源地址 -->  
231 - <project.default.assets.path>http://static.1n4j.com/static/ace1.3/assets</project.default.assets.path>  
232 -  
233 - <!-- 公共样式引用 -->  
234 - <project.default.assets.common.path>http://static.1n4j.com/static/</project.default.assets.common.path>  
235 -  
236 - <!-- 本地资源地址 -->  
237 - <project.default.local.path>http://mobman.1n4j.com/</project.default.local.path>  
238 -  
239 - <!-- 图片服务器前缀 -->  
240 - <project.imageserver.prefix>http://10.28.6.53</project.imageserver.prefix>  
241 -  
242 - <!-- 店铺域名 -->  
243 - <project.shop.domain>http://shop.1n4j.com</project.shop.domain>  
244 -  
245 - <!-- sms.webchina.cn 短信发送接口的配置 -->  
246 - <project.sms.webchina.SMSKey>2cf3264488ee3beef224</project.sms.webchina.SMSKey>  
247 - <project.sms.webchina.userName>itly</project.sms.webchina.userName>  
248 - <project.sms.webchina.postURL>http://gbk.sms.webchinese.cn</project.sms.webchina.postURL>  
249 -  
250 - <!-- interface user -->  
251 - <website.user.baseUrl>http://user.1n4j.com</website.user.baseUrl>  
252 - <website.user.token>token</website.user.token>  
253 - <!-- interface websiteClient -->  
254 - <website.websiteClient.baseUrl>http://manweb.1n4j.com/</website.websiteClient.baseUrl>  
255 - <website.websiteClient.token>token</website.websiteClient.token>  
256 - <!-- interface titan -->  
257 - <website.titan.accesskey>accesskey</website.titan.accesskey>  
258 - <website.titan.secretkey>secretkey</website.titan.secretkey>  
259 -  
260 - <!-- interface search -->  
261 - <website.search.host>interface.dd.1n4j.com</website.search.host>  
262 - <website.search.port>9831</website.search.port>  
263 -  
264 - <!-- messagecenter -->  
265 - <website.messagecenter.namesrvAddr>10.28.6.54:9876</website.messagecenter.namesrvAddr>  
266 - <website.messagecenter.producerGroup>mobsite_man</website.messagecenter.producerGroup>  
267 -  
268 - <!-- 登录拦截器开关 -->  
269 - <project.manger.enabled>true</project.manger.enabled>  
270 -  
271 - <!-- 数据库连接池配置文件 -->  
272 - <project.dbpool.driverClass>org.mariadb.jdbc.Driver</project.dbpool.driverClass>  
273 - <project.dbpool.jdbcUrl>jdbc:mysql://10.28.5.201:3306/mobsite_man?useUnicode=true&amp;characterEncoding=utf8</project.dbpool.jdbcUrl>  
274 - <project.dbpool.username>root</project.dbpool.username>  
275 - <project.dbpool.password>123456</project.dbpool.password>  
276 - <project.dbpool.idleConnectionTestPeriodInMinutes>1</project.dbpool.idleConnectionTestPeriodInMinutes>  
277 - <project.dbpool.idleMaxAgeInMinutes>4</project.dbpool.idleMaxAgeInMinutes>  
278 - <project.dbpool.partitionCount>1</project.dbpool.partitionCount>  
279 - <project.dbpool.maxConnectionsPerPartition>3</project.dbpool.maxConnectionsPerPartition>  
280 - <project.dbpool.minConnectionsPerPartition>2</project.dbpool.minConnectionsPerPartition>  
281 - <project.dbpool.acquireIncrement>2</project.dbpool.acquireIncrement>  
282 - <project.dbpool.statementsCacheSize>50</project.dbpool.statementsCacheSize>  
283 - <project.dbpool.releaseHelperThreads>3</project.dbpool.releaseHelperThreads>  
284 - <!--权限相关配置-->  
285 - <conf.manage.enable>true</conf.manage.enable>  
286 - <conf.manage.spider>true</conf.manage.spider>  
287 - <conf.manage.system>mobman</conf.manage.system>  
288 - <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>  
289 - <conf.manage.includes>^/.*\.do</conf.manage.includes>  
290 - <conf.manage.excludes>^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/appVersion/.*</conf.manage.excludes>  
291 - </properties>  
292 - </profile>  
293 214
294 <profile> 215 <profile>
295 <id>product</id> 216 <id>product</id>