修改站点与子站点

base-manager/pom.xml

@@ -28,11 +28,14 @@
 				<profiles.server.port>17211</profiles.server.port>
 				<profiles.queue.type>rabbitmq</profiles.queue.type>
 				<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
-				<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
+				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
+				<profiles.rabbitmq.username>guest</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>guest</profiles.rabbitmq.password>
+				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
+				<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-dev</profiles.nacos.namespace>
+				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 				<profiles.log.level>DEBUG</profiles.log.level>
 			</properties>

base-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/service/impl/IdgeneratorServiceImpl.java

 package com.mortals.xhx.base.system.idgenerator.service.impl;
 
+import cn.hutool.Hutool;
 import com.alibaba.fastjson.JSON;
 import com.mortals.xhx.base.system.idgenerator.dao.IdgeneratorDao;
 import com.mortals.xhx.base.system.idgenerator.model.IdgeneratorEntity;
@@ -68,6 +69,8 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
         private final Class[] factorsClazz;
 
         private IdGeneratorKey(Long step, String methodName, Class[] factorsClazz) {
+
+
             this.step = step;
             this.methodName = methodName;
             this.factorsClazz = factorsClazz;

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -42,11 +42,6 @@ public class DemoStartedService implements IApplicationStartedService {
     @Autowired
     private SiteService siteService;
     @Autowired
-    private ICacheService cacheService;
-
-    @Autowired
-    private UserService userService;
-    @Autowired
     private IUserFeign userFeign;
 
     @Override
@@ -63,104 +58,6 @@ public class DemoStartedService implements IApplicationStartedService {
         userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
             Context context = new Context();
 
-
-
-         /*   IUser user = new IUser() {
-                @Override
-                public Long getId() {
-                    return userPdu.getId();
-                }
-
-                @Override
-                public Long getDeptId() {
-                    return null;
-                }
-
-                @Override
-                public String getDeptName() {
-                    return null;
-                }
-
-                @Override
-                public Long getCustomerId() {
-                    return null;
-                }
-
-                @Override
-                public Long getSiteId() {
-                    return null;
-                }
-
-                @Override
-                public String getSiteIds() {
-                    return userPdu.getSiteIds();
-                }
-
-                @Override
-                public Long getCustomerJoinId() {
-                    return null;
-                }
-
-                @Override
-                public String getCustomerNum() {
-                    return null;
-                }
-
-                @Override
-                public String getLoginName() {
-                    return userPdu.getLoginName();
-                }
-
-                @Override
-                public String getRealName() {
-                    return userPdu.getRealName();
-                }
-
-                @Override
-                public boolean isAdmin() {
-                    return userPdu.getId()==1L;
-                }
-
-                @Override
-                public boolean isSystemUser() {
-                    return false;
-                }
-
-                @Override
-                public boolean isManager() {
-                    return false;
-                }
-
-                @Override
-                public Integer getUserType() {
-                    return null;
-                }
-
-                @Override
-                public String getToken() {
-                    return null;
-                }
-
-                @Override
-                public Long getLoginTime() {
-                    return null;
-                }
-
-                @Override
-                public Long getExpireTime() {
-                    return null;
-                }
-
-                @Override
-                public void setExpireTime(Long expireTime) {
-
-                }
-
-                @Override
-                public String getMenuUrl() {
-                    return null;
-                }
-            };*/
             UserEntity entity = new UserEntity();
             entity.initAttrValue();
             BeanUtils.copyProperties(userPdu, entity, BeanUtil.getNullPropertyNames(userPdu));

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -250,6 +250,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         if (ObjectUtils.isEmpty(siteCache)) {
             throw new AppException("站点不存在，siteId:" + siteId);
         }
+        siteList.add(siteCache);
         AreaEntity areaEntity = areaService.getExtCache(siteCache.getAreaCode());
         if (ObjectUtils.isEmpty(areaEntity)) {
             throw new AppException(String.format("区域不存在！区域编码：%s", siteCache.getAreaCode()));
@@ -259,6 +260,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         SiteQuery siteQuery = new SiteQuery();
         siteQuery.setAreaCode(matchCode+"%");
         List<SiteEntity> siteEntities = this.find(siteQuery);
+
+        if(!ObjectUtils.isEmpty(siteEntities)){
+            siteList.addAll(siteEntities);
+        }
+
+        //添加当前站点
+
+
 //
 //        List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
 //        ;
@@ -267,7 +276,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 //            if (bool) continue;
 //
 //        }
-        return siteEntities;
+        return siteList;
     }
 
     private boolean getSite(String rootAreaCode, String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {

common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java

@@ -22,7 +22,6 @@ public class MessageProducer implements IMessageProduceService {
     private RabbitTemplate rabbitTemplate;
 
     public void syncAccessSend(AccessLogPdu accessLogPdu) {
-       // log.info("accessinfo==>{}",JSON.toJSONString(accessLogPdu));
         rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
     }
 

portal-manager/pom.xml

@@ -24,13 +24,12 @@
 				<profiles.active>develop</profiles.active>
 				<profiles.server.port>17212</profiles.server.port>
 				<profiles.queue.type>rabbitmq</profiles.queue.type>
-				<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
-				<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
+				<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
 				<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-				<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-				<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
+				<profiles.rabbitmq.username>guest</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>guest</profiles.rabbitmq.password>
 				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-				<profiles.nacos.server-addr>192.168.0.252: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.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
@@ -74,7 +73,6 @@
 	</properties>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>com.mortals.xhx</groupId>
 			<artifactId>common-lib</artifactId>

portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -3,7 +3,7 @@
     "baseUrl": "http://127.0.0.1:17212/zwfw"
   },
   "portal-dev": {
-    "baseUrl": "http://192.168.0.217:17212/zwfw"
+    "baseUrl": "http://192.168.0.98:11072/zwfw"
   },
   "portal-test": {
     "baseUrl": "http://192.168.0.98:11078/zwfw"

smart-gateway/pom.xml

@@ -25,12 +25,12 @@
                 <profiles.server.port>17214</profiles.server.port>
                 <profiles.queue.type>rabbitmq</profiles.queue.type>
                 <profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
-                <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
+                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
+                <profiles.rabbitmq.username>guest</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>guest</profiles.rabbitmq.password>
                 <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-                <profiles.nacos.server-addr>192.168.0.252: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.namespace>smart-gov</profiles.nacos.namespace>
                 <profiles.log.path>/mortals/app/logs</profiles.log.path>