Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-solr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
xzxt-solr
Commits
0b14b75c
Commit
0b14b75c
authored
May 24, 2019
by
wangxing
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/master' into dev_neimeng
parents
dae02ebb
698816a0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
src/main/java/com/cc/service/impl/IDicItemServiceImpl.java
+0
-0
src/main/resources/config.properties
+8
-9
src/main/resources/spring-context.xml
+1
-1
No files found.
src/main/java/com/cc/service/impl/IDicItemServiceImpl.java
View file @
0b14b75c
This diff is collapsed.
Click to expand it.
src/main/resources/config.properties
View file @
0b14b75c
...
...
@@ -46,7 +46,7 @@ connectTimeout=30000
#\u8bfb\u53d6\u6570\u636e\u8d85\u65f6\u65f6\u95f4
readTimeout
=
30000
#所属单位
ssdw
=
1
50000000000
ssdw
=
6
50000000000
#默认首页进三员或者工作桌面 1、三员 2、工作桌面
indexFlag
=
2
#关系挖掘服务url
...
...
@@ -56,14 +56,13 @@ JlJmkey=8b67946e
#山西刑事技术平台比中详情页面
xsjsAddress
=
http://10.94.65.15:8081/xjpt/pages/business/sys/viewEntity.action?functionType=20&tableName
#redis config
#redis.host=127.0.0.1
#redis.port=6379
#redis.pass=
#redis.maxIdle=300
#redis.maxActive=600
#redis.maxWait=1000
#redis.testOnBorrow=true
redis.url
=
http://127.0.0.1:9043/xzxt-rest
redis.host
=
127.0.0.1
redis.port
=
6379
redis.pass
=
redis.maxIdle
=
300
redis.maxActive
=
600
redis.maxWait
=
1000
redis.testOnBorrow
=
true
zhyyPath
=
http://zhyy.xzxt.nm:7001
main.url
=
http://www.xzxt.nm
caiji.url
=
http://anjian.xzxt.nm:9022
...
...
src/main/resources/spring-context.xml
View file @
0b14b75c
...
...
@@ -41,7 +41,7 @@
<!--控制住数据源 -->
<property
name=
"dataSource"
ref=
"dataSource"
></property>
</bean>
<
!--<import resource="redis-context.xml"/>--
>
<
import
resource=
"redis-context.xml"
/
>
<aop:config>
<!-- 切入点表达式 -->
<aop:pointcut
expression=
"execution(* com.cc.service..*(..))"
id=
"txPoint"
/>
...
...
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