Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

         String token = JWTUtils.newToken(sysUser.getUserName());
     
         //保存token
-        saveToken(token);
+        sysTokenService.saveToken(token);
         
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
         sysTokenService.remove(sysTokenQueryWrapper);
         return ResponseBean.success("成功退出");
     }
-    
-    private void saveToken(String token) {
-        SysToken sysToken = new SysToken();
-        sysToken.setToken(token);
-        sysToken.setExpDate(LocalDateTime.now());
-        sysTokenService.save(sysToken);
-    }
 }

src/main/java/com/huiju/estateagents/center/sysUser/service/ISysTokenService.java

  * @since 2019-09-11
  */
 public interface ISysTokenService extends IService<SysToken> {
-
+	
+	SysToken saveToken(String token);
 }

src/main/java/com/huiju/estateagents/center/sysUser/service/impl/SysTokenServiceImpl.java

 import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.mapper.SysTokenMapper;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 令牌表  服务实现类
  */
 @Service
 public class SysTokenServiceImpl extends ServiceImpl<SysTokenMapper, SysToken> implements ISysTokenService {
-
+	
+	@Autowired
+	private SysTokenMapper sysTokenMapper;
+	
+	@Override
+	public SysToken saveToken(String token) {
+		SysToken sysToken = new SysToken();
+		sysToken.setToken(token);
+		sysToken.setExpDate(LocalDateTime.now().plusDays(7));
+		sysTokenMapper.insert(sysToken);
+		return sysToken;
+	}
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

         String token = JWTUtils.newTokenByMap(map);
     
         //保存token
-        saveToken(token);
+        sysTokenService.saveToken(token);
     
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
         }
         return responseBean;
     }
-    
-    private void saveToken(String token) {
-        SysToken sysToken = new SysToken();
-        sysToken.setToken(token);
-        sysToken.setExpDate(LocalDateTime.now());
-        sysTokenService.save(sysToken);
-    }
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

             TaRole taRole = new TaRole();
             taRole.setRoleName(name);
             taRole.setOrgId(orgId);
+            taRole.setStatus(1);
             taRole.setCreateDate(LocalDateTime.now());
             taRoleMapper.insert(taRole);
 

src/main/java/com/huiju/estateagents/entity/SysButtonInMenu.java

     private String code;
     
     private String remark;
-    
+
     @TableField(exist = false)
     private List<Integer> roles;
 }