feat: 更新依赖

hcframe-parent/hcframe-activiti/pom.xml

@@ -22,15 +22,21 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-spring-boot-starter</artifactId>
             <version>7.1.0.M1</version>
         </dependency>
+        <dependency>
+            <groupId>com.taixingyiji</groupId>
+            <artifactId>hcframe-base</artifactId>
+            <version>1.2.2-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.activiti;
 
-import com.hcframe.base.module.datasource.config.DataSourceConfiguration;
+import com.taixingyiji.base.module.datasource.config.DataSourceConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/ActivitiUtils.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.activiti.activiti;
 
-import com.hcframe.base.common.ResultPageInfo;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.EmptyCheckUtils;
+import com.taixingyiji.base.common.ResultPageInfo;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.EmptyCheckUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.impl.ProcessInstanceQueryProperty;
 import org.activiti.engine.impl.TaskQueryProperty;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/common/ShiroRealmConfig.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.activiti.common;
 
-import com.hcframe.base.module.auth.dao.FtUserDao;
-import com.hcframe.base.module.shiro.service.ShiroType;
-import com.hcframe.base.module.shiro.service.SystemRealm;
+import com.taixingyiji.base.module.auth.dao.FtUserDao;
+import com.taixingyiji.base.module.shiro.service.ShiroType;
+import com.taixingyiji.base.module.shiro.service.SystemRealm;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.springframework.stereotype.Component;
 

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/ProcessController.java

@@ -2,8 +2,8 @@ package com.taixingyiji.activiti.controller;
 
 import com.taixingyiji.activiti.activiti.CommonProcessDefinition;
 import com.taixingyiji.activiti.service.ProcessService;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import io.lettuce.core.dynamic.annotation.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/TaskController.java

@@ -3,8 +3,8 @@ package com.taixingyiji.activiti.controller;
 import com.alibaba.fastjson.JSON;
 import com.taixingyiji.activiti.activiti.CommonTask;
 import com.taixingyiji.activiti.service.TaskSysService;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/BackReasonDao.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.activiti.dao;
 
 import com.taixingyiji.activiti.entity.BackReason;
-import com.hcframe.base.common.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (BackReason)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/CandidateUserDao.java

@@ -2,7 +2,7 @@ package com.taixingyiji.activiti.dao;
 
 
 import com.taixingyiji.activiti.entity.CandidateUser;
-import com.hcframe.base.common.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (CandidateUser)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskDao.java

@@ -2,7 +2,7 @@ package com.taixingyiji.activiti.dao;
 
 
 import com.taixingyiji.activiti.entity.DataTask;
-import com.hcframe.base.common.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (DataTask)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskHisDao.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.activiti.dao;
 
 import com.taixingyiji.activiti.entity.DataTaskHis;
-import com.hcframe.base.common.Mapper;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (DataTaskHis)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/ProcessService.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.activiti.service;
 
 import com.taixingyiji.activiti.activiti.CommonProcessDefinition;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/TaskSysService.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.activiti.service;
 
 import com.taixingyiji.activiti.activiti.CommonTask;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.Map;
 

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/ProcessServiceImpl.java

@@ -4,9 +4,9 @@ import com.taixingyiji.activiti.activiti.ActivitiUtils;
 import com.taixingyiji.activiti.activiti.CommonProcessDefinition;
 import com.taixingyiji.activiti.service.ProcessService;
 import com.taixingyiji.activiti.utils.FileUtil;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.Deployment;
 import org.slf4j.Logger;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/TaskSysServiceImpl.java

@@ -12,10 +12,10 @@ import com.taixingyiji.activiti.entity.CandidateUser;
 import com.taixingyiji.activiti.entity.DataTask;
 import com.taixingyiji.activiti.entity.DataTaskHis;
 import com.taixingyiji.activiti.service.TaskSysService;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.EmptyCheckUtils;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.EmptyCheckUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.BeanUtils;

hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TaskControllerTest.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.taixingyiji.activiti.activiti.ActivitiUtils;
 import com.taixingyiji.activiti.activiti.CommonTask;
 import com.taixingyiji.activiti.controller.TaskController;
-import com.hcframe.base.common.ResultPageInfo;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultPageInfo;
+import com.taixingyiji.base.common.WebPageInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

hcframe-parent/hcframe-config/pom.xml

@@ -43,7 +43,7 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
             <version>1.2.1-SNAPSHOT</version>
         </dependency>

hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/common/config/CommandLineRunnerImpl.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.config.common.config;
 
-import com.hcframe.base.module.cache.CacheService;
-import com.hcframe.base.module.datasource.utils.DataSourceUtil;
+import com.taixingyiji.base.module.cache.CacheService;
+import com.taixingyiji.base.module.datasource.utils.DataSourceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/common/config/ShiroRealmConfig.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.config.common.config;
 
-import com.hcframe.base.module.auth.dao.FtUserDao;
-import com.hcframe.base.module.auth.entity.FtUser;
-import com.hcframe.base.module.shiro.service.ShiroType;
-import com.hcframe.base.module.shiro.service.SystemRealm;
+import com.taixingyiji.base.module.auth.dao.FtUserDao;
+import com.taixingyiji.base.module.auth.entity.FtUser;
+import com.taixingyiji.base.module.shiro.service.ShiroType;
+import com.taixingyiji.base.module.shiro.service.SystemRealm;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.springframework.stereotype.Component;
 

hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/module/cloud/ManageService.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.config.module.cloud;
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/module/cms/CasConrtroller.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.config.module.cms;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/module/controller/CasController.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.config.module.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.redis.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CookieValue;

hcframe-parent/hcframe-config/src/main/java/com/taixingyiji/config/module/controller/TestController.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.config.module.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.data.module.BaseMapper;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.jasig.cas.client.authentication.AttributePrincipal;

hcframe-parent/hcframe-es/pom.xml

@@ -18,7 +18,7 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
             <version>1.2.1-SNAPSHOT</version>
         </dependency>

hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/CommandLineRunnerImpl.java

@@ -1,7 +1,7 @@
 package com.hcframe.es.config;
 
-import com.hcframe.base.module.cache.CacheService;
-import com.hcframe.base.module.datasource.utils.DataSourceUtil;
+import com.taixingyiji.base.module.cache.CacheService;
+import com.taixingyiji.base.module.datasource.utils.DataSourceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/config/ShiroRealmConfig.java

@@ -1,9 +1,9 @@
 package com.hcframe.es.config;
 
-import com.hcframe.base.module.auth.dao.FtUserDao;
-import com.hcframe.base.module.auth.entity.FtUser;
-import com.hcframe.base.module.shiro.service.ShiroType;
-import com.hcframe.base.module.shiro.service.SystemRealm;
+import com.taixingyiji.base.module.auth.dao.FtUserDao;
+import com.taixingyiji.base.module.auth.entity.FtUser;
+import com.taixingyiji.base.module.shiro.service.ShiroType;
+import com.taixingyiji.base.module.shiro.service.SystemRealm;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.springframework.stereotype.Component;
 

hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/controller/SearchController.java

@@ -1,6 +1,6 @@
 package com.hcframe.es.controller;
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 import com.hcframe.es.service.SearchService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/esmapper/impl/EsMapperImpl.java

@@ -1,6 +1,6 @@
 package com.hcframe.es.esmapper.impl;
 
-import com.hcframe.base.common.ServiceException;
+import com.taixingyiji.base.common.ServiceException;
 import com.hcframe.es.esmapper.EsMapper;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;

hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/SearchService.java

@@ -1,7 +1,7 @@
 package com.hcframe.es.service;
 
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 
 import javax.servlet.http.HttpServletRequest;
 

hcframe-parent/hcframe-es/src/main/java/com/hcframe/es/service/impl/SearchServiceImpl.java

@@ -1,7 +1,7 @@
 package com.hcframe.es.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 import com.hcframe.es.esmapper.EsMapper;
 import com.hcframe.es.service.SearchService;
 import org.elasticsearch.action.search.SearchResponse;

hcframe-parent/hcframe-gateway/pom.xml

@@ -26,7 +26,7 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
             <version>1.2.1-SNAPSHOT</version>
             <exclusions>

hcframe-parent/hcframe-gateway/src/main/java/com/taixingyiji/gateway/GatewayApplication.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.gateway;
 
 import com.taixingyiji.gateway_cas_stater.annotate.EnableGatewayCas;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.redis.RedisUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

hcframe-parent/hcframe-test/pom.xml

@@ -22,7 +22,7 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
             <version>1.2.1-SNAPSHOT</version>
         </dependency>

hcframe-parent/hcframe-test/src/main/java/com/taixingyiji/test/config/ShiroRealmConfig.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.test.config;
 
-import com.hcframe.base.module.auth.dao.FtUserDao;
-import com.hcframe.base.module.shiro.service.ShiroType;
-import com.hcframe.base.module.shiro.service.SystemRealm;
+import com.taixingyiji.base.module.auth.dao.FtUserDao;
+import com.taixingyiji.base.module.shiro.service.ShiroType;
+import com.taixingyiji.base.module.shiro.service.SystemRealm;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.springframework.stereotype.Component;
 

hcframe-parent/hcframe-test/src/main/java/com/taixingyiji/test/controller/DataTestController.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.test.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.auth.entity.FtUser;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.auth.entity.FtUser;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

hcframe-parent/hcframe-user/pom.xml

@@ -23,9 +23,9 @@
             <version>2.2.0-GA</version>
         </dependency>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.taixingyiji</groupId>

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/UserApplication.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.user;
 
-import com.hcframe.base.module.datasource.config.DataSourceConfiguration;
+import com.taixingyiji.base.module.datasource.config.DataSourceConfiguration;
 import net.unicon.cas.client.configuration.CasClientConfigurationProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/config/CommandLineRunnerImpl.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.user.common.config;
 
-import com.hcframe.base.module.cache.CacheService;
+import com.taixingyiji.base.module.cache.CacheService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/config/ShiroRealmConfig.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.user.common.config;
 
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.shiro.service.ShiroType;
-import com.hcframe.base.module.shiro.service.SystemRealm;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.shiro.service.ShiroType;
+import com.taixingyiji.base.module.shiro.service.SystemRealm;
 import com.taixingyiji.user.module.auth.service.AuthService;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.springframework.beans.factory.annotation.Qualifier;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/common/log/OprateLog.java

@@ -16,13 +16,13 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.auth.entity.FtUser;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.auth.entity.FtUser;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/controller/AuthController.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.user.module.auth.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
 import com.taixingyiji.user.module.auth.service.AuthService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.Logical;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/controller/MenuController.java

@@ -1,10 +1,10 @@
 package com.taixingyiji.user.module.auth.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.MenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,7 +56,7 @@ public class MenuController {
     @RequiresPermissions(value = {"system:auth:function:edit"})
 	@LogAnno(operateType="更新功能权限",moduleName="系统管理-权限管理-功能权限管理")
     @ApiOperation(value = "更新功能级权限")
-    public ResultVO<Integer> updateMenu(@RequestParam Map<String, Object> data, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateMenu(@RequestParam Map<String, Object> data, @PathVariable Integer version) {
         redisUtil.del("auth");
         data.remove("children");
         return menuService.updateMenu(data, version);

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/controller/RoleController.java

@@ -1,10 +1,10 @@
 package com.taixingyiji.user.module.auth.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.RoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -49,7 +49,7 @@ public class RoleController {
     @LogAnno(operateType="更新角色信息",moduleName="系统管理-权限管理-角色管理")
     @ApiOperation(value = "更新role")
     @RequiresPermissions(value = {"system:auth:role:edit"})
-    public ResultVO<Integer> updateRole(@RequestParam Map<String, Object> role, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateRole(@RequestParam Map<String, Object> role, @PathVariable Integer version) {
         redisUtil.del("auth");
         return roleService.updateRole(role, version);
     }

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/controller/RoleDeptController.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.auth.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.RoleDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/controller/RoleGroupController.java

@@ -1,10 +1,10 @@
 package com.taixingyiji.user.module.auth.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.RoleGroupServie;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -49,7 +49,7 @@ public class RoleGroupController {
     @LogAnno(operateType="更新角色组信息",moduleName="系统管理-权限管理-角色组管理")
     @ApiOperation(value = "更新角色组")
     @RequiresPermissions(value = {"system:auth:roleGroup:edit"})
-    public ResultVO<Integer> updateRole(@RequestParam Map<String, Object> roleGroup, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateRole(@RequestParam Map<String, Object> roleGroup, @PathVariable Integer version) {
         redisUtil.del("auth");
         return roleGroupServie.update(roleGroup, version);
     }

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/controller/RoleUserController.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.auth.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.RoleUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/mapper/AuthDao.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.user.module.auth.mapper;
 
-import com.hcframe.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
 
 import java.util.List;
 import java.util.Map;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/mapper/impl/AuthDaoImpl.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.user.module.auth.mapper.impl;
 
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.data.module.*;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.data.module.*;
 import com.taixingyiji.user.module.auth.mapper.AuthDao;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/mapper/impl/RoleDaoImpl.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.user.module.auth.mapper.impl;
 
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
 import com.taixingyiji.user.module.auth.mapper.RoleDao;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/AuthService.java

@@ -1,7 +1,8 @@
 package com.taixingyiji.user.module.auth.service;
 
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.auth.vo.RouterVo;
+
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.auth.vo.RouterVo;
 
 import java.util.List;
 import java.util.Map;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/MenuService.java

@@ -4,8 +4,8 @@ import java.util.List;
 import java.util.Map;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 /**
  * @author wewe
@@ -18,7 +18,7 @@ public interface MenuService {
 
 	ResultVO<Object> deleteMenu(List<Long> ids);
 
-	ResultVO<Integer> updateMenu(Map<String, Object> data, Integer version);
+	ResultVO<Map<String,Object>> updateMenu(Map<String, Object> data, Integer version);
 
 	ResultVO<PageInfo<Map<String, Object>>> getMenuList(String data, WebPageInfo webPageInfo);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/RoleDeptService.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.user.module.auth.service;
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 
 /**
  * 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/RoleGroupServie.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.auth.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.Map;
 
@@ -18,7 +18,7 @@ public interface RoleGroupServie {
 
     ResultVO<Map<String,Object>>  add(Map<String, Object> roleGroup);
 
-    ResultVO<Integer> update(Map<String, Object> roleGroup, Integer version);
+    ResultVO<Map<String, Object>> update(Map<String, Object> roleGroup, Integer version);
 
     ResultVO<Integer> delete(String ids);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/RoleService.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.auth.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +17,7 @@ import java.util.Map;
 public interface RoleService {
     ResultVO<Object> addRole(Map<String, Object> role);
 
-    ResultVO<Integer> updateRole(Map<String, Object> role, Integer version);
+    ResultVO<Map<String,Object>> updateRole(Map<String, Object> role, Integer version);
 
     ResultVO<Object> deleteRole(String ids);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/RoleUserService.java

@@ -1,6 +1,7 @@
 package com.taixingyiji.user.module.auth.service;
 
-import com.hcframe.base.common.ResultVO;
+
+import com.taixingyiji.base.common.ResultVO;
 
 /**
  * @author lhc

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/impl/AuthServiceImpl.java

@@ -1,13 +1,13 @@
 package com.taixingyiji.user.module.auth.service.impl;
 
-import com.hcframe.base.common.utils.StringUtils;
-import com.hcframe.base.module.auth.constants.AuthConstants;
-import com.hcframe.base.module.auth.dao.OsSysMenuDao;
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.auth.vo.MetaVo;
-import com.hcframe.base.module.auth.vo.RouterVo;
-import com.hcframe.base.module.data.module.*;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.utils.StringUtils;
+import com.taixingyiji.base.module.auth.constants.AuthConstants;
+import com.taixingyiji.base.module.auth.dao.OsSysMenuDao;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.auth.vo.MetaVo;
+import com.taixingyiji.base.module.auth.vo.RouterVo;
+import com.taixingyiji.base.module.data.module.*;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.mapper.AuthDao;
 import com.taixingyiji.user.module.auth.service.AuthService;
 import org.springframework.beans.factory.annotation.Qualifier;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/impl/MenuServiceImpl.java

@@ -1,15 +1,15 @@
 package com.taixingyiji.user.module.auth.service.impl;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.cache.CacheService;
-import com.hcframe.base.module.cache.impl.TableCache;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.cache.CacheService;
+import com.taixingyiji.base.module.cache.impl.TableCache;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.MenuService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ import java.util.*;
  */
 
 @Service("userMenuService")
-public class MenuServiceImpl2 implements MenuService {
+public class MenuServiceImpl implements MenuService {
 
 	private static final OsSysTable OS_SYS_MENU = OsSysTable.builder().tableName("OS_SYS_MENU").tablePk("MENU_ID").build();
 	private static final OsSysTable OS_REL_ROLE_MENU = OsSysTable.builder().tableName("OS_REL_ROLE_MENU").tablePk("ROLE_MENU_ID").build();
@@ -102,7 +102,7 @@ public class MenuServiceImpl2 implements MenuService {
 	}
 
 	@Override
-	public ResultVO<Integer> updateMenu(Map<String, Object> data, Integer version) {
+	public ResultVO<Map<String,Object>> updateMenu(Map<String, Object> data, Integer version) {
 		tableCache.delete("menu");
 		return tableService.updateWithDate(OS_SYS_MENU, data, version);
 	}

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/impl/RoleDeptServiceImpl.java

@@ -1,12 +1,12 @@
 package com.taixingyiji.user.module.auth.service.impl;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.utils.JudgeException;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.utils.JudgeException;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.auth.service.RoleDeptService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/impl/RoleGroupServiceImpl.java

@@ -1,15 +1,15 @@
 package com.taixingyiji.user.module.auth.service.impl;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.JudgeException;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.module.DataMap;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.JudgeException;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.module.DataMap;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.auth.service.RoleGroupServie;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ public class RoleGroupServiceImpl implements RoleGroupServie {
     }
 
     @Override
-    public ResultVO<Integer> update(Map<String, Object> roleGroup, Integer version) {
+    public ResultVO<Map<String,Object>> update(Map<String, Object> roleGroup, Integer version) {
         return tableService.updateWithDate(TABLE_INFO, roleGroup, version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/impl/RoleServiceImpl.java

@@ -1,13 +1,13 @@
 package com.taixingyiji.user.module.auth.service.impl;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.auth.mapper.RoleDao;
 import com.taixingyiji.user.module.auth.service.RoleService;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -52,7 +52,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public ResultVO<Integer> updateRole(Map<String, Object> role, Integer version) {
+    public ResultVO<Map<String,Object>> updateRole(Map<String, Object> role, Integer version) {
         return tableService.updateWithDate(TABLE_INFO, role, version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/auth/service/impl/RoleUserServiceImpl.java

@@ -1,12 +1,12 @@
 package com.taixingyiji.user.module.auth.service.impl;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.utils.JudgeException;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.utils.JudgeException;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.auth.service.RoleUserService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/config/controller/UserConfigController.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.user.module.config.controller;
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 import com.taixingyiji.user.module.config.entity.UserConfig;
 import com.taixingyiji.user.module.config.service.UserConfigService;
 import org.springframework.web.bind.annotation.GetMapping;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/config/service/UserConfigService.java

@@ -1,6 +1,6 @@
 package com.taixingyiji.user.module.config.service;
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 import com.taixingyiji.user.module.config.entity.UserConfig;
 
 /**

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/config/service/impl/UserConfigServiceImpl.java

@@ -1,11 +1,11 @@
 package com.taixingyiji.user.module.config.service.impl;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.utils.JudgeException;
-import com.hcframe.base.common.utils.ObjectUtil;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.utils.JudgeException;
+import com.taixingyiji.base.common.utils.ObjectUtil;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.common.config.UserConstant;
 import com.taixingyiji.user.module.config.entity.UserConfig;
 import com.taixingyiji.user.module.config.service.UserConfigService;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/controller/CasController.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.user.module.manage.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.module.auth.service.AuthService;
 import net.unicon.cas.client.configuration.CasClientConfigurationProperties;
 import org.apache.shiro.SecurityUtils;
@@ -43,7 +43,7 @@ public class CasController {
 
 
     @GetMapping("valid")
-    public ResultVO<String> casValid(HttpServletResponse response, HttpServletRequest request,String webUrl) {
+    public ResultVO<String> casValid(HttpServletResponse response, HttpServletRequest request, String webUrl) {
         String token = "";
         try {
             Cookie[] cookies = request.getCookies();

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/controller/ManageController.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.user.module.manage.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
 import com.taixingyiji.user.module.manage.service.ManageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,7 +46,7 @@ public class ManageController {
     @LogAnno(operateType = "更新用户信息", moduleName = "系统管理-用户管理-馆内用户管理")
     @ApiOperation(value = "更新用户信息")
     @RequiresPermissions(value = {"system:userManage:innerUser:edit"})
-    public ResultVO<Integer> updateUser(@RequestParam Map<String, Object> user, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateUser(@RequestParam Map<String, Object> user, @PathVariable Integer version) {
         return manageService.updateUser(user, version);
     }
 
@@ -69,7 +69,7 @@ public class ManageController {
     @LogAnno(operateType = "用户启用禁用", moduleName = "系统管理-用户管理-馆内用户管理")
     @ApiOperation(value = "启用/禁用", notes = "用户启用禁用")
     @RequiresPermissions(value = {"system:userManage:innerUser:enabled"})
-    public ResultVO<Integer> disable(Boolean enabled, String userId, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> disable(Boolean enabled, String userId, @PathVariable Integer version) {
         return manageService.disable(enabled, userId, version);
     }
 
@@ -77,14 +77,14 @@ public class ManageController {
     @LogAnno(operateType = "重置密码", moduleName = "系统管理-用户管理-馆内用户管理")
     @ApiOperation(value = "重置密码")
     @RequiresPermissions(value = {"system:userManage:innerUser:resetPassword"})
-    public ResultVO<Integer> resetPassword(String userId, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> resetPassword(String userId, @PathVariable Integer version) {
         return manageService.resetPassword(userId, version);
     }
 
     @PutMapping("changePassword")
     @LogAnno(operateType = "修改密码", moduleName = "系统管理-用户管理-馆内用户管理")
     @ApiOperation(value = "修改密码", notes = "用户输入原密码和新密码")
-    public ResultVO<Integer> changePassword(String pwd, String npwd, String npwd2) {
+    public ResultVO<Map<String,Object>> changePassword(String pwd, String npwd, String npwd2) {
         return manageService.changePassword(pwd, npwd, npwd2);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/controller/ManageGwController.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.user.module.manage.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
 import com.taixingyiji.user.module.manage.service.ManageGwService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,7 +39,7 @@ public class ManageGwController {
 	@LogAnno(operateType="编辑馆外用户信息",moduleName="系统管理-用户管理-馆外用户信息管理")
     @ApiOperation(value = "更新用户信息")
     @RequiresPermissions(value = {"system:userManage:outerUser:edit"})
-    public ResultVO<Integer> updateUser(@RequestParam Map<String,Object> user,@PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateUser(@RequestParam Map<String,Object> user,@PathVariable Integer version) {
         return service.updateUser(user,version);
     }
 
@@ -62,7 +62,7 @@ public class ManageGwController {
     @LogAnno(operateType="启用/禁用馆外用户",moduleName="系统管理-用户管理-馆外用户信息管理")
     @ApiOperation(value = "启用/禁用馆外用户",notes = "用户启用禁用")
     @RequiresPermissions(value = {"system:userManage:outerUser:enable"})
-    public ResultVO<Integer> disable(Boolean enabled,String userId,@PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> disable(Boolean enabled,String userId,@PathVariable Integer version) {
         return service.disable(enabled,userId,version);
     }
 
@@ -70,7 +70,7 @@ public class ManageGwController {
     @LogAnno(operateType="馆外用户重置密码",moduleName="系统管理-用户管理-馆外用户信息管理")
     @ApiOperation(value = "馆外用户重置密码",notes = "用户启用禁用")
     @RequiresPermissions(value = {"system:userManage:outerUser:resetPassword"})
-    public ResultVO<Integer> resetPassword(String userId,@PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> resetPassword(String userId,@PathVariable Integer version) {
         return service.resetPassword(userId,version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/mapper/impl/ManageMapperImpl.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.user.module.manage.mapper.impl;
 
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
 import com.taixingyiji.user.module.manage.mapper.ManageMapper;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/service/ManageGwService.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.manage.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.Map;
 
@@ -15,15 +15,15 @@ public interface ManageGwService {
 
 	ResultVO<Map<String,Object>> addUser(Map<String, Object> user);
 
-    ResultVO<Integer> updateUser(Map<String, Object> user, Integer version);
+    ResultVO<Map<String,Object>> updateUser(Map<String, Object> user, Integer version);
 
     ResultVO<Integer> deleteUser(String ids);
 
     ResultVO<PageInfo<Map<String, Object>>> getUserList(String data, WebPageInfo webPageInfo,String orgId);
 
-    ResultVO<Integer> resetPassword(String userId, Integer version);
+    ResultVO<Map<String,Object>> resetPassword(String userId, Integer version);
 
-    ResultVO<Integer> disable(Boolean enabled, String userId, Integer version);
+    ResultVO<Map<String,Object>> disable(Boolean enabled, String userId, Integer version);
 
     ResultVO<Object> valid(String loginName);
 }

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/service/ManageService.java

@@ -1,27 +1,27 @@
 package com.taixingyiji.user.module.manage.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.Map;
 
 public interface ManageService {
     ResultVO<Map<String,Object>> addUser(Map<String, Object> user);
 
-    ResultVO<Integer> updateUser(Map<String, Object> user, Integer version);
+    ResultVO<Map<String,Object>> updateUser(Map<String, Object> user, Integer version);
 
     ResultVO<Integer> deleteUser(String ids);
 
     ResultVO<PageInfo<Map<String, Object>>> getUserList(String data, WebPageInfo webPageInfo, String orgId);
 
-    ResultVO<Integer> resetPassword(String userId, Integer version);
+    ResultVO<Map<String,Object>> resetPassword(String userId, Integer version);
 
-    ResultVO<Integer> disable(Boolean enabled, String userId, Integer version);
+    ResultVO<Map<String,Object>> disable(Boolean enabled, String userId, Integer version);
 
     ResultVO<Object> sync();
 
-	ResultVO<Integer> changePassword(String pwd, String npwd, String npwd2);
+	ResultVO<Map<String,Object>> changePassword(String pwd, String npwd, String npwd2);
 
     ResultVO<Object> getUserPost(String userId);
 }

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/service/impl/ManageGwServiceImpl.java

@@ -3,15 +3,15 @@ package com.taixingyiji.user.module.manage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.JudgeException;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.module.DataMap;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.JudgeException;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.module.DataMap;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.common.utils.MD5Utils;
 import com.taixingyiji.user.module.manage.service.ManageGwService;
 import org.apache.shiro.SecurityUtils;
@@ -74,7 +74,7 @@ public class ManageGwServiceImpl implements ManageGwService {
     }
 
     @Override
-    public ResultVO<Integer> updateUser(Map<String, Object> user, Integer version) {
+    public ResultVO<Map<String,Object>> updateUser(Map<String, Object> user, Integer version) {
         user.put("USER_TYPE", "GW");
         user.remove("PASSWORD");
         if (!StringUtils.isEmpty(user.get("ORG_ACCOUNT_ID"))) {
@@ -129,7 +129,7 @@ public class ManageGwServiceImpl implements ManageGwService {
     }
 
     @Override
-    public ResultVO<Integer> resetPassword(String userId, Integer version) {
+    public ResultVO<Map<String,Object>> resetPassword(String userId, Integer version) {
         Map<String, Object> map = new HashMap<>(2);
         map.put(ID, userId.replaceAll("\"", ""));
         try {
@@ -142,7 +142,7 @@ public class ManageGwServiceImpl implements ManageGwService {
     }
 
     @Override
-    public ResultVO<Integer> disable(Boolean enabled, String userId, Integer version) {
+    public ResultVO<Map<String,Object>> disable(Boolean enabled, String userId, Integer version) {
         Map<String, Object> map = new HashMap<>(2);
         map.put(ID, userId);
         map.put("DISABLED", enabled);

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/service/impl/ManageServiceDataImpl.java

@@ -3,18 +3,18 @@ package com.taixingyiji.user.module.manage.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.DateUtil;
-import com.hcframe.base.common.utils.JudgeException;
-import com.hcframe.base.module.data.constants.FieldConstants;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.module.DataMap;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.DateUtil;
+import com.taixingyiji.base.common.utils.JudgeException;
+import com.taixingyiji.base.module.data.constants.FieldConstants;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.module.DataMap;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.common.utils.MD5Utils;
 import com.taixingyiji.user.common.utils.POIUtil;
 import com.taixingyiji.user.module.config.entity.UserConfig;
@@ -103,7 +103,7 @@ public class ManageServiceDataImpl implements ManageService {
     }
 
     @Override
-    public ResultVO<Integer> updateUser(Map<String, Object> user, Integer version) {
+    public ResultVO<Map<String,Object>> updateUser(Map<String, Object> user, Integer version) {
         user.remove("PASSWORD");
         if (!StringUtils.isEmpty(user.get("ORG_ACCOUNT_ID"))) {
             String orgAcId = String.valueOf(user.get("ORG_ACCOUNT_ID"));
@@ -157,7 +157,7 @@ public class ManageServiceDataImpl implements ManageService {
     }
 
     @Override
-    public ResultVO<Integer> resetPassword(String userId, Integer version) {
+    public ResultVO<Map<String,Object>> resetPassword(String userId, Integer version) {
         Map<String, Object> map = new HashMap<>(2);
         map.put(PK_ID, userId.replaceAll("\"", ""));
         try {
@@ -172,7 +172,7 @@ public class ManageServiceDataImpl implements ManageService {
     }
 
     @Override
-    public ResultVO<Integer> disable(Boolean enabled, String userId, Integer version) {
+    public ResultVO<Map<String,Object>> disable(Boolean enabled, String userId, Integer version) {
         Map<String, Object> map = new HashMap<>(2);
         map.put(PK_ID, userId);
         map.put("DISABLED", enabled);
@@ -217,7 +217,7 @@ public class ManageServiceDataImpl implements ManageService {
     }
 
     @Override
-    public ResultVO<Integer> changePassword(String pwd, String npwd, String npwd2) {
+    public ResultVO<Map<String,Object>> changePassword(String pwd, String npwd, String npwd2) {
         JudgeException.isNull(pwd, "密码不能为空");
         JudgeException.isNull(npwd, "新密码不能为空");
         if (!npwd.equals(npwd2)) {

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/manage/service/impl/ManageServiceImpl.java

@@ -1,7 +1,7 @@
 package com.taixingyiji.user.module.manage.service.impl;
 
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
 import com.taixingyiji.user.module.manage.service.ManageDataService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/controller/DeptController.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.userinfo.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import com.taixingyiji.user.module.userinfo.service.DeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,7 +37,7 @@ public class DeptController {
     @PutMapping("/{version}")
     @ApiOperation(value = "更新dept")
     @RequiresPermissions(value = {"system:userManage:orgManage:edit"})
-    public ResultVO<Integer> updateDept(@RequestParam Map<String, Object> org, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateDept(@RequestParam Map<String, Object> org, @PathVariable Integer version) {
         return deptService.updateDept(org, version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/controller/LogController.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.userinfo.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import com.taixingyiji.user.module.userinfo.service.LogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/controller/OrgController.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.userinfo.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import com.taixingyiji.user.module.userinfo.service.OrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class OrgController {
 
     @PutMapping("/{version}")
     @ApiOperation(value = "更新org")
-    public ResultVO<Integer> updateOrg(@RequestParam Map<String,Object> org,@PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateOrg(@RequestParam Map<String,Object> org,@PathVariable Integer version) {
         return orgService.updateOrg(org,version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/controller/OsController.java

@@ -2,6 +2,9 @@ package com.taixingyiji.user.module.userinfo.controller;
 
 import java.util.Map;
 
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -12,9 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
 import com.taixingyiji.user.module.userinfo.service.OsService;
 
 import io.swagger.annotations.Api;
@@ -53,7 +53,7 @@ public class OsController {
     @PutMapping("/{version}")
     @LogAnno(operateType = "更新系统信息", moduleName = "系统管理-权限管理-系统信息管理")
     @ApiOperation(value = "更新系统信息")
-    public ResultVO<Integer> updateOs(@RequestParam Map<String, Object> os, @PathVariable Integer version) {
+    public ResultVO<Map<String,Object>> updateOs(@RequestParam Map<String, Object> os, @PathVariable Integer version) {
         return osService.updateOs(os, version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/controller/TitleController.java

@@ -1,9 +1,9 @@
 package com.taixingyiji.user.module.userinfo.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.log.annotation.LogAnno;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
 import com.taixingyiji.user.module.userinfo.service.TitleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,7 +42,7 @@ public class TitleController {
 	    @LogAnno(operateType="更新职称信息",moduleName="系统管理-用户管理-职称管理")
 	    @ApiOperation(value = "更新title")
 		@RequiresPermissions(value = {"system:userManage:title:edit"})
-	    public ResultVO<Integer> updateTitle(@RequestParam Map<String,Object> title,@PathVariable Integer version) {
+	    public ResultVO<Map<String,Object>> updateTitle(@RequestParam Map<String,Object> title,@PathVariable Integer version) {
 	        return titleService.updateTitle(title,version);
 	    }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/DeptService.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.userinfo.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
 public interface DeptService {
     ResultVO<Object> addDept(Map<String, Object> org);
 
-    ResultVO<Integer> updateDept(Map<String, Object> org, Integer version);
+    ResultVO<Map<String ,Object>> updateDept(Map<String, Object> org, Integer version);
 
     ResultVO<Object> deleteDept(String ids);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/LogService.java

@@ -3,8 +3,8 @@ package com.taixingyiji.user.module.userinfo.service;
 import java.util.Map;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 public interface LogService {
 	ResultVO<PageInfo<Map<String, Object>>> getLogList(String data, WebPageInfo webPageInfo);

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/OrgService.java

@@ -1,8 +1,8 @@
 package com.taixingyiji.user.module.userinfo.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
 public interface OrgService {
     ResultVO<Object> addOrg(Map<String, Object> org);
 
-    ResultVO<Integer> updateOrg(Map<String, Object> org, Integer version);
+    ResultVO<Map<String,Object>> updateOrg(Map<String, Object> org, Integer version);
 
     ResultVO<Object> deleteOrg(String ids);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/OsService.java

@@ -3,8 +3,8 @@ package com.taixingyiji.user.module.userinfo.service;
 import java.util.Map;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 public interface OsService {
 
@@ -12,7 +12,7 @@ public interface OsService {
 
     ResultVO<Object> addOs(Map<String, Object> os);
 
-    ResultVO<Integer> updateOs(Map<String, Object> os, Integer version);
+    ResultVO<Map<String,Object>> updateOs(Map<String, Object> os, Integer version);
 
     ResultVO<Object> deleteOs(String ids);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/TitleService.java

@@ -3,8 +3,8 @@ package com.taixingyiji.user.module.userinfo.service;
 import java.util.Map;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 public interface TitleService {
 	
@@ -12,7 +12,7 @@ public interface TitleService {
 
 	    ResultVO<Object> addTitle(Map<String, Object> title);
 
-	    ResultVO<Integer> updateTitle(Map<String, Object> title, Integer version);
+	    ResultVO<Map<String,Object>> updateTitle(Map<String, Object> title, Integer version);
 
 	    ResultVO<Object> deleteTitle(String ids);
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/impl/DeptServiceImpl.java

@@ -3,16 +3,16 @@ package com.taixingyiji.user.module.userinfo.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.MyPageHelper;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.module.DataMap;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.MyPageHelper;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.module.DataMap;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.userinfo.service.DeptService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -139,7 +139,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    public ResultVO<Integer> updateDept(Map<String, Object> org, Integer version) {
+    public ResultVO<Map<String,Object>> updateDept(Map<String, Object> org, Integer version) {
         return tableService.updateWithDate(TABLE_INFO, org, version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/impl/LogServiceImpl.java

@@ -6,12 +6,12 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.userinfo.service.LogService;
 
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/impl/OrgServiceImpl.java

@@ -3,17 +3,17 @@ package com.taixingyiji.user.module.userinfo.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.MyPageHelper;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.module.DataMap;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
-import com.hcframe.redis.RedisUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.MyPageHelper;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.module.DataMap;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.redis.RedisUtil;
 import com.taixingyiji.user.common.config.UserConstant;
 import com.taixingyiji.user.module.config.entity.UserConfig;
 import com.taixingyiji.user.module.config.service.UserConfigService;
@@ -61,7 +61,7 @@ public class OrgServiceImpl implements OrgService {
     }
 
     @Override
-    public ResultVO<Integer> updateOrg(Map<String, Object> org, Integer version) {
+    public ResultVO<Map<String,Object>> updateOrg(Map<String, Object> org, Integer version) {
         UserConfig userConfig = userConfigService.getUserConfig();
         OsSysTable osSysTable = OsSysTable.builder().tableName(userConfig.getOrgTableName()).tablePk(userConfig.getOrgKey()).build();
         return tableService.updateWithDate(osSysTable, org, version);

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/impl/OsServiceImpl.java

@@ -7,13 +7,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.userinfo.service.OsService;
 
 @Service
@@ -49,7 +49,7 @@ public class OsServiceImpl implements OsService {
     }
 
     @Override
-    public ResultVO<Integer> updateOs(Map<String, Object> os, Integer version) {
+    public ResultVO<Map<String,Object>> updateOs(Map<String, Object> os, Integer version) {
         return tableService.updateWithDate(TABLE_INFO, os, version);
     }
 

hcframe-parent/hcframe-user/src/main/java/com/taixingyiji/user/module/userinfo/service/impl/TitleServiceImpl.java

@@ -1,15 +1,15 @@
 package com.taixingyiji.user.module.userinfo.service.impl;
 
 import com.github.pagehelper.PageInfo;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.cache.CacheService;
-import com.hcframe.base.module.cache.impl.TableCache;
-import com.hcframe.base.module.data.module.BaseMapper;
-import com.hcframe.base.module.data.module.BaseMapperImpl;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.data.service.TableService;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.module.cache.CacheService;
+import com.taixingyiji.base.module.cache.impl.TableCache;
+import com.taixingyiji.base.module.data.module.BaseMapper;
+import com.taixingyiji.base.module.data.module.BaseMapperImpl;
+import com.taixingyiji.base.module.data.module.Condition;
+import com.taixingyiji.base.module.data.service.TableService;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import com.taixingyiji.user.module.userinfo.service.TitleService;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ public class TitleServiceImpl implements TitleService {
     }
 
     @Override
-    public ResultVO<Integer> updateTitle(Map<String, Object> title, Integer version) {
+    public ResultVO<Map<String,Object>> updateTitle(Map<String, Object> title, Integer version) {
         tableCache.delete("title");
         return tableService.updateWithDate(TABLE_INFO, title, version);
     }