Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CDEK Development
tariff-calculator
Commits
9a4fc10b
Commit
9a4fc10b
authored
8 years ago
by
Vladimir Kolmakov
Browse files
Options
Download
Email Patches
Plain Diff
новые рабочие CatalogCommon и queue.client, конфиг пропертиз, бины (с подключением к dev среде)
parent
e78857c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
backend/calculator-backend/webapp/WEB-INF/config.properties
+2
-0
backend/calculator-backend/webapp/WEB-INF/config.properties
backend/calculator-backend/webapp/WEB-INF/web-context.xml
+5
-8
backend/calculator-backend/webapp/WEB-INF/web-context.xml
pom.xml
+2
-2
pom.xml
with
9 additions
and
10 deletions
+9
-10
backend/calculator-backend/webapp/WEB-INF/config.properties
View file @
9a4fc10b
...
...
@@ -22,6 +22,8 @@ services.administrator.role=\u0414\u0438\u0440\u0435\u043A\u0442\u043E\u0440 \u0
application.roles
=
\u
041B
\u
043E
\u0433\u0438\u0441\u0442
,
\u0414\u0438\u0440\u0435\u
043A
\u0442\u
043E
\u0440
\u
043F
\u
043E
\u
043B
\u
043E
\u0433\u0438\u0441\u0442\u0438\u
043A
\u0435
esb.url
=
http://172.16.83.22:8887
esb.direct.route.catalogs.instance
=
CatalogServer_dev
esb.direct.route.catalogs.parameter
=
catalogType
event.type.catalogs
=
catalogs
server.port
=
8080
host.name
=
"tariff-calculator-1"
...
...
This diff is collapsed.
Click to expand it.
backend/calculator-backend/webapp/WEB-INF/web-context.xml
View file @
9a4fc10b
...
...
@@ -476,19 +476,16 @@
<task:scheduler
id=
"myScheduler"
pool-size=
"10"
/>
<task:annotation-driven
scheduler=
"myScheduler"
/>
<import
resource=
"classpath:rabbit-config.xml"
/>
<bean
id=
"catalogRefresher"
class=
"com.cdek.catalog.common.service.integrate.CatalogRefresher"
/>
<bean
id=
"esbConnector"
class=
"com.cdek.queue.connector.impl.EsbConnector"
/>
<bean
id=
"registrationScheduler"
class=
"com.cdek.queue.scheduler.RegistrationScheduler"
/>
<bean
id=
"subscriberConstructor"
class=
"com.cdek.queue.utils.SubscriberConstructor"
/>
<import
resource=
"classpath:subscriber-registration-config.xml"
/>
<context:component-scan
base-package=
"com.cdek.queue.utils"
/>
<bean
id=
"catalogRefresher"
class=
"com.cdek.catalog.common.service.integrate.CatalogRefresher"
/>
<bean
id=
"eventHandlerMap"
class=
"com.cdek.catalog.common.handler.CatalogEventHandlerMap"
/>
<bean
id=
"simpleJdbcInsert"
class=
"org.springframework.jdbc.core.simple.SimpleJdbcInsert"
>
<constructor-arg
ref=
"dataSource"
/>
</bean>
<bean
id=
"eventQueueDao"
class=
"com.cdek.queue.dao.EsbEventDao"
/>
<bean
id=
"catalogsService"
class=
"com.cdek.catalog.common.service.CatalogService"
/>
<bean
id=
"catalogServerConnector"
class=
"com.cdek.catalog.common.service.integrate.CatalogServerConnector"
/>
<!--<bean id="catalogsService" class="com.cdek.catalog.common.service.CatalogService"/>-->
<bean
id=
"esbIntegrator"
class=
"com.cdek.catalog.common.service.integrate.EsbIntegrator"
/>
<beans
profile=
"prod"
>
...
...
This diff is collapsed.
Click to expand it.
pom.xml
View file @
9a4fc10b
...
...
@@ -46,9 +46,9 @@
<JettyPlatform.version>
1.0-37
</JettyPlatform.version>
<commons.jdbc.version>
1.0-7
</commons.jdbc.version>
<Catalog.Postgres.version>
1.0-9
</Catalog.Postgres.version>
<CatalogCommon.version>
1.0-
8
</CatalogCommon.version>
<CatalogCommon.version>
1.0-
15
</CatalogCommon.version>
<authinclude.version>
1.0-1
</authinclude.version>
<cdek.queue.client.version>
1.0-
2
</cdek.queue.client.version>
<cdek.queue.client.version>
1.0-
10
</cdek.queue.client.version>
<cdek.queue.postgre.version>
1.0-5
</cdek.queue.postgre.version>
<javax.servlet.api.version>
3.1.0
</javax.servlet.api.version>
</properties>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help