Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

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

@@ -47,7 +47,7 @@ public class DemoStartedService implements IApplicationStartedService {
 
     @Override
     public void start() {
-        ThreadPool.getInstance().init(10);
+        ThreadPool.getInstance().init(6);
         logger.info("开始服务..[初始化用户站点树]");
         //删除redis 中的 站点树
         cacheService.del(USER_SITE_TREE);

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

@@ -210,10 +210,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         //新加的站点 只需要更新全树
 
         //更新同步部门相关
-        deptService.syncDeptBySiteId(entity, context);
+        //deptService.syncDeptBySiteId(entity, context);
 
         //通知php系统更新
-        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
+        String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://127.0.0.1:11078/zwfw_api");
         HashMap<String, String> paramsMap = new HashMap<>();
         paramsMap.put("siteid", entity.getId().toString());
 
@@ -390,20 +390,13 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     public List<SiteTreeSelect> getSiteTree(Context context) {
         // List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
         List<SiteTreeSelect> collect = getSiteTreeSelects(context.getUser().getId().toString());
-        log.info("siteTree:{}", JSON.toJSONString(collect));
+       // log.info("siteTree:{}", JSON.toJSONString(collect));
         if (!ObjectUtils.isEmpty(collect)) {
             return collect;
         } else {
             //反全站点树  如果没有全站点树，则临时构建 admin 为全站点树
             return getSiteTreeSelects("1");
         }
-
-        //如果所属站点为空返回全节点树
-//        if (!ObjectUtils.isEmpty(siteTreeSelects)) {
-//            return siteTreeSelects;
-//        } else {
-//            return siteTreeMap.get(1);
-//        }
     }
 
     private List<SiteTreeSelect> getSiteTreeSelects(String userId) {

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -11,6 +11,7 @@ import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.utils.ZipUtils;
+import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.workman.dao.WorkmanDao;
 import com.mortals.xhx.module.workman.model.WorkmanEntity;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
@@ -49,6 +50,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
     @Autowired
     private WorkmanService workmanService;
 
+    @Override
+    protected String getExtKey(WorkmanEntity data) {
+        return data.getLoginName();
+    }
+
 
     @Override
     protected void saveBefore(WorkmanEntity entity, Context context) throws AppException {
@@ -97,7 +103,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
 
     @Override
     public WorkmanEntity doLogin(String loginName, String password, String loginIp) throws AppException {
-        WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName));
+
+        WorkmanEntity workmanEntity = this.getExtCache(loginName);
+        if(ObjectUtils.isEmpty(workmanEntity)){
+            workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName));
+        }
         if (workmanEntity == null || !workmanEntity.getLoginName().equals(loginName)) {
             throw new AppException("用户名不存在！");
         }

base-manager/src/main/resources/bootstrap.yml

@@ -37,6 +37,7 @@ spring:
         group: ${spring.cloud.nacos.discovery.group}
         namespace: ${spring.cloud.nacos.discovery.namespace} # Nacos 命名空间 dev 的编号
         file-extension: yaml
+
 druid:
   mysql:
     usePingMethod: false

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -20,7 +20,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###自助终端应用列表
-POST {{baseUrl}}/app/list
+POST http://112.19.80.237:11078/base/app/list
 Content-Type: application/json
 
 {

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

 
 ###站点部门窗口列表
-POST {{baseUrl}}/window/list
+POST http://112.19.80.237:11078/base/window/list
 Content-Type: application/json
 
 {

portal-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartService.java

@@ -27,7 +27,7 @@ public class DemoStartService implements IApplicationService {
 
     @Override
     public void start() {
-        ThreadPool.getInstance().init(10);
+        ThreadPool.getInstance().init(6);
         logger.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]");
     }
 

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -454,7 +454,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                             this.dao.update(userEntity);
                             updateRedisUserSession(userEntity);
                         });
-                        //this.dao.updateBatch(userEntityList);
                     }
                 } else {
                     log.info("获取用户站点列表树数据失败：" + apiResp.getString("msg"));

smart-gateway/pom.xml

@@ -150,7 +150,6 @@
                 <profiles.log.level>info</profiles.log.level>
                 <package.environment>build</package.environment>
                 <skipUi>false</skipUi>
-                <profiles.holidayUrl>https://timor.tech/api/holiday/year/</profiles.holidayUrl>
             </properties>
         </profile>
 

smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java

@@ -53,7 +53,7 @@ import java.util.Map;
  * @description:
  **/
 @Slf4j
-@Component
+//@Component
 public class AccessLogFilter implements GlobalFilter, Ordered {
     @Value("${spring.application.name:gateway}")
     private String appName;