[add]提交新功能

system-manage/pom.xml

@@ -18,25 +18,15 @@
     </properties>
     </properties>
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>
-            <groupId>com.github.davidfantasy</groupId>
-            <artifactId>mybatis-plus-generator-ui</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.arch</groupId>
             <groupId>org.arch</groupId>
-            <artifactId>nacos</artifactId>
+            <artifactId>log</artifactId>
             <version>1.0-SNAPSHOT</version>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>org.arch</groupId>
             <groupId>org.arch</groupId>
-            <artifactId>storage</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.arch</groupId>
-            <artifactId>filters</artifactId>
+            <artifactId>nacos</artifactId>
             <version>1.0-SNAPSHOT</version>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         </dependency>
-
-
     </dependencies>
     </dependencies>
-</project>
+
\ No newline at end of file
+</project>

system-manage/src/main/java/org/arch/manage/service/impl/UserServiceImpl.java

@@ -48,8 +48,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     @Value("${refreshTokenExpireTime}")
     @Value("${refreshTokenExpireTime}")
     private Long refreshTokenExpireTime;
     private Long refreshTokenExpireTime;
 
 
-    @Value("${isc.start}")
-    private boolean iscStart;
+  /*  @Value("${isc.start}")
+    private boolean iscStart;*/
     @Autowired
     @Autowired
     private UserMapper userMapper;
     private UserMapper userMapper;
 
 
@@ -478,7 +478,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
      */
      */
     private void setToken(UserDto userDto) {
     private void setToken(UserDto userDto) {
 
 
-    	String token=null;
+    	/*String token=null;
         if(userDto != null&&iscStart){
         if(userDto != null&&iscStart){
         	String tkval=redisService.get("isc_token:");
         	String tkval=redisService.get("isc_token:");
 			if(tkval!=null){
 			if(tkval!=null){
@@ -496,7 +496,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 
 
 
          userDto.setToken(token);
          userDto.setToken(token);
-        }
+        }*/
     }
     }
 
 
     /**
     /**
@@ -547,7 +547,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
      */
      */
     public void setMenu(UserDto userDto,Long userId) throws Exception {
     public void setMenu(UserDto userDto,Long userId) throws Exception {
         Set<Menu> menus = null;
         Set<Menu> menus = null;
-        if(iscStart){
+       // if(iscStart){
 
 
         	 String token=null;
         	 String token=null;
              String tkval=redisService.get("isc_token:");
              String tkval=redisService.get("isc_token:");
@@ -565,7 +565,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 //            	  iscids.add(i);
 //            	  iscids.add(i);
 //              }
 //              }
 //              userDto.setMenuIds(iscids);
 //              userDto.setMenuIds(iscids);
-        }
+      //  }
         	if(isAdmin(userDto)){
         	if(isAdmin(userDto)){
                 menus = menuService.findAllForSet();
                 menus = menuService.findAllForSet();
             }else if(userId != null) {
             }else if(userId != null) {

system-manage/src/main/java/org/arch/manage/util/UserUtil.java

@@ -24,8 +24,8 @@ public class UserUtil {
     @Autowired
     @Autowired
     private UserService userService;
     private UserService userService;
 
 
-    @Value("${isc.start}")
-    private Boolean isc_start;
+  /*  @Value("${isc.start}")
+    private Boolean isc_start;*/
     @Autowired
     @Autowired
     private RedisService redisService;
     private RedisService redisService;
 
 

system-manage/src/main/resources/mapper/UserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xcasz.modules.system.service.mapper.UserMapper">
-    <select id="getUserList3" resultType="com.xcasz.modules.system.domain.User">
+<mapper namespace="org.arch.manage.mapper.UserMapper">
+    <select id="getUserList3" resultType="org.arch.common.modules.sysmange.dto.UserDto">
     SELECT DISTINCT
     SELECT DISTINCT
         ( sur.user_id ) AS xx,
         ( sur.user_id ) AS xx,
         su.*,
         su.*,
@@ -22,7 +22,7 @@
         </foreach>
         </foreach>
         AND su.id IS NOT NULL AND is_delete = '0' )
         AND su.id IS NOT NULL AND is_delete = '0' )
     </select>
     </select>
-    <select id="getUserList" resultType="com.xcasz.modules.system.service.dto.UserDto">
+    <select id="getUserList" resultType="org.arch.common.modules.sysmange.dto.UserDto">
         SELECT
         SELECT
             su.*,
             su.*,
             s.org_simple_name
             s.org_simple_name