Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
63e8ea13
Commit
63e8ea13
authored
9 months ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新事项,异步更新关联
parent
7bd47354
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
472 deletions
+37
-472
base-manager/pom.xml
base-manager/pom.xml
+12
-0
base-manager/pom.xml.bak
base-manager/pom.xml.bak
+0
-449
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java
.../xhx/module/matter/service/impl/MatterExtServiceImpl.java
+1
-1
portal-manager/pom.xml
portal-manager/pom.xml
+24
-22
No files found.
base-manager/pom.xml
View file @
63e8ea13
...
@@ -89,6 +89,18 @@
...
@@ -89,6 +89,18 @@
</properties>
</properties>
</profile>
</profile>
<profile>
<id>
qiling
</id>
<properties>
<profiles.active>
qiling
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</profile>
<profile>
<profile>
<id>
reg
</id>
<id>
reg
</id>
<properties>
<properties>
...
...
This diff is collapsed.
Click to expand it.
base-manager/pom.xml.bak
deleted
100644 → 0
View file @
7bd47354
This diff is collapsed.
Click to expand it.
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java
View file @
63e8ea13
...
@@ -234,8 +234,8 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
...
@@ -234,8 +234,8 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
@Override
@Override
public
Rest
<
String
>
syncDelMatterBySiteId
(
SiteEntity
siteEntity
,
Context
context
)
{
public
Rest
<
String
>
syncDelMatterBySiteId
(
SiteEntity
siteEntity
,
Context
context
)
{
List
<
MatterEntity
>
govMatterList
=
getMatterEntities
(
siteEntity
,
context
);
List
<
MatterEntity
>
govMatterList
=
getMatterEntities
(
siteEntity
,
context
);
if
(
ObjectUtils
.
isEmpty
(
govMatterList
))
return
Rest
.
ok
(
"爬取事项列表为空!"
);
if
(!
deleted
)
return
Rest
.
ok
(
"配置不允许删除!"
);
if
(!
deleted
)
return
Rest
.
ok
(
"配置不允许删除!"
);
if
(
ObjectUtils
.
isEmpty
(
govMatterList
))
return
Rest
.
ok
(
"爬取事项列表为空!"
);
log
.
info
(
"计算差集"
);
log
.
info
(
"计算差集"
);
MatterQuery
matterQuery
=
new
MatterQuery
();
MatterQuery
matterQuery
=
new
MatterQuery
();
...
...
This diff is collapsed.
Click to expand it.
portal-manager/pom.xml
View file @
63e8ea13
...
@@ -14,13 +14,22 @@
...
@@ -14,13 +14,22 @@
<packaging>
jar
</packaging>
<packaging>
jar
</packaging>
<description>
一体化政务门户管理平台
</description>
<description>
一体化政务门户管理平台
</description>
<properties>
<!-- 默认值 -->
<profiles.server.debug></profiles.server.debug>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.log.level>
info
</profiles.log.level>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
</properties>
<profiles>
<profiles>
<profile>
<profile>
<id>
develop
</id>
<id>
develop
</id>
<properties>
<properties>
<profiles.active>
develop
</profiles.active>
<profiles.active>
develop
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -35,8 +44,6 @@
...
@@ -35,8 +44,6 @@
</activation>
</activation>
<properties>
<properties>
<profiles.active>
test
</profiles.active>
<profiles.active>
test
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -49,8 +56,6 @@
...
@@ -49,8 +56,6 @@
<id>
product
</id>
<id>
product
</id>
<properties>
<properties>
<profiles.active>
product
</profiles.active>
<profiles.active>
product
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
192.168.0.250:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
192.168.0.250:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -62,8 +67,6 @@
...
@@ -62,8 +67,6 @@
<id>
yibin
</id>
<id>
yibin
</id>
<properties>
<properties>
<profiles.active>
yibin
</profiles.active>
<profiles.active>
yibin
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
172.15.28.120:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
172.15.28.120:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -76,8 +79,6 @@
...
@@ -76,8 +79,6 @@
<id>
sngx
</id>
<id>
sngx
</id>
<properties>
<properties>
<profiles.active>
sngx
</profiles.active>
<profiles.active>
sngx
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -90,8 +91,6 @@
...
@@ -90,8 +91,6 @@
<id>
regtest
</id>
<id>
regtest
</id>
<properties>
<properties>
<profiles.active>
regtest
</profiles.active>
<profiles.active>
regtest
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -104,8 +103,18 @@
...
@@ -104,8 +103,18 @@
<id>
reg
</id>
<id>
reg
</id>
<properties>
<properties>
<profiles.active>
reg
</profiles.active>
<profiles.active>
reg
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</profile>
<profile>
<id>
qiling
</id>
<properties>
<profiles.active>
qiling
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -118,8 +127,6 @@
...
@@ -118,8 +127,6 @@
<id>
yanyuan
</id>
<id>
yanyuan
</id>
<properties>
<properties>
<profiles.active>
yanyuan
</profiles.active>
<profiles.active>
yanyuan
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
172.16.30.245:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
172.16.30.245:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -132,8 +139,6 @@
...
@@ -132,8 +139,6 @@
<id>
pengxi
</id>
<id>
pengxi
</id>
<properties>
<properties>
<profiles.active>
pengxi
</profiles.active>
<profiles.active>
pengxi
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
192.168.106.6:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
192.168.106.6:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -146,8 +151,6 @@
...
@@ -146,8 +151,6 @@
<id>
bzjkq
</id>
<id>
bzjkq
</id>
<properties>
<properties>
<profiles.active>
bzjkq
</profiles.active>
<profiles.active>
bzjkq
</profiles.active>
<profiles.server.port>
17212
</profiles.server.port>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
...
@@ -157,8 +160,7 @@
...
@@ -157,8 +160,7 @@
</profile>
</profile>
</profiles>
</profiles>
<properties>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
...
...
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