diff --git a/fit2cloud-commons/fit2cloud-common-auth/pom.xml b/dataease-commons/dataease-common-auth/pom.xml similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/pom.xml rename to dataease-commons/dataease-common-auth/pom.xml index de3d747919..aef5720caf 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/pom.xml +++ b/dataease-commons/dataease-common-auth/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - fit2cloud-commons - com.fit2cloud - 1.0-SNAPSHOT + io.dataease + dataease-commons + 1.0.0 4.0.0 - fit2cloud-common-auth + dataease-common-auth @@ -24,9 +24,9 @@ ${jwt.version} - com.fit2cloud - fit2cloud-common-db - 1.0-SNAPSHOT + io.dataease + dataease-common-db + 1.0.0 @@ -50,6 +50,11 @@ ehcache-core ${ehcache.version} + + commons-codec + commons-codec + 1.15 + @@ -58,4 +63,4 @@ - \ No newline at end of file + diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/api/UserApi.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/api/UserApi.java similarity index 83% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/api/UserApi.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/api/UserApi.java index ce80688de6..72c1671b3c 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/api/UserApi.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/api/UserApi.java @@ -1,14 +1,13 @@ -package com.fit2cloud.commons.auth.api; +package io.dataease.commons.auth.api; import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.asymmetric.RSA; -import com.fit2cloud.commons.auth.bean.LoginDto; -import com.fit2cloud.commons.auth.bean.UserBean; -import com.fit2cloud.commons.auth.bean.UserInfo; -import com.fit2cloud.commons.auth.config.RsaProperties; -import com.fit2cloud.commons.auth.service.UserService; -import com.fit2cloud.commons.auth.util.JWTUtil; -import com.fit2cloud.commons.auth.util.RsaUtil; +import io.dataease.commons.auth.bean.LoginDto; +import io.dataease.commons.auth.bean.UserBean; +import io.dataease.commons.auth.bean.UserInfo; +import io.dataease.commons.auth.config.RsaProperties; +import io.dataease.commons.auth.service.UserService; +import io.dataease.commons.auth.util.JWTUtil; +import io.dataease.commons.auth.util.RsaUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/ExtPermissionBean.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/ExtPermissionBean.java similarity index 86% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/ExtPermissionBean.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/ExtPermissionBean.java index ac08b5df0b..d959e23083 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/ExtPermissionBean.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/ExtPermissionBean.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.bean; +package io.dataease.commons.auth.bean; import lombok.AllArgsConstructor; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/LoginDto.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/LoginDto.java similarity index 88% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/LoginDto.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/LoginDto.java index 2102f71883..e3d0676a05 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/LoginDto.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/LoginDto.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.bean; +package io.dataease.commons.auth.bean; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/PermissionKey.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/PermissionKey.java similarity index 95% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/PermissionKey.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/PermissionKey.java index 75a4ae23af..677acda492 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/PermissionKey.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/PermissionKey.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.bean; +package io.dataease.commons.auth.bean; import lombok.AllArgsConstructor; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserBean.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/UserBean.java similarity index 88% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserBean.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/UserBean.java index 0917ac9d08..e69d832c1d 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserBean.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/UserBean.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.bean; +package io.dataease.commons.auth.bean; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserInfo.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/UserInfo.java similarity index 90% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserInfo.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/UserInfo.java index 11cb5e8189..521ab98a50 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserInfo.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.bean; +package io.dataease.commons.auth.bean; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/CorsConfig.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/CorsConfig.java similarity index 96% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/CorsConfig.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/CorsConfig.java index 5c406daec3..a7ecf3ed39 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/CorsConfig.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.config; +package io.dataease.commons.auth.config; import org.springframework.context.annotation.Bean; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/F2cRealm.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/F2cRealm.java similarity index 84% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/F2cRealm.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/F2cRealm.java index 892fd00ada..dca3044dd3 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/F2cRealm.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/F2cRealm.java @@ -1,9 +1,8 @@ -package com.fit2cloud.commons.auth.config; +package io.dataease.commons.auth.config; -import com.fit2cloud.commons.auth.bean.UserBean; -import com.fit2cloud.commons.auth.service.UserService; -import com.fit2cloud.commons.auth.util.JWTUtil; -import com.fit2cloud.commons.auth.util.RsaUtil; +import io.dataease.commons.auth.bean.UserBean; +import io.dataease.commons.auth.service.UserService; +import io.dataease.commons.auth.util.JWTUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.shiro.authc.AuthenticationException; @@ -68,13 +67,8 @@ public class F2cRealm extends AuthorizingRealm { if (userBean == null) { throw new AuthenticationException("User didn't existed!"); } - String pwd = null; - try { - pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, userBean.getPassword()); - } catch (Exception e) { - e.printStackTrace(); - } - if (! JWTUtil.verify(token, username, pwd)) { + + if (! JWTUtil.verify(token, username, userBean.getPassword())) { throw new AuthenticationException("Username or password error"); } diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/JWTToken.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/JWTToken.java similarity index 89% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/JWTToken.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/JWTToken.java index 2b6a704229..27e273ca61 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/JWTToken.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/JWTToken.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.config; +package io.dataease.commons.auth.config; import org.apache.shiro.authc.AuthenticationToken; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/RsaProperties.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/RsaProperties.java similarity index 89% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/RsaProperties.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/RsaProperties.java index 06028eb011..7ca59c3c7a 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/RsaProperties.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/RsaProperties.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.config; +package io.dataease.commons.auth.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/ShiroConfig.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/ShiroConfig.java similarity index 90% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/ShiroConfig.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/ShiroConfig.java index ff2d675a0a..6d03eb3780 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/config/ShiroConfig.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/ShiroConfig.java @@ -1,10 +1,9 @@ -package com.fit2cloud.commons.auth.config; +package io.dataease.commons.auth.config; -import com.fit2cloud.commons.auth.filter.F2CLogoutFilter; -import com.fit2cloud.commons.auth.filter.F2CPermissionsFilter; -import com.fit2cloud.commons.auth.filter.F2CRolesFilter; -import com.fit2cloud.commons.auth.filter.JWTFilter; -import com.fit2cloud.commons.auth.service.ShiroService; +import io.dataease.commons.auth.filter.F2CLogoutFilter; +import io.dataease.commons.auth.filter.F2CPermissionsFilter; +import io.dataease.commons.auth.filter.JWTFilter; +import io.dataease.commons.auth.service.ShiroService; import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; import org.apache.shiro.mgt.DefaultSubjectDAO; import org.apache.shiro.spring.LifecycleBeanPostProcessor; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/dao/ExtUserMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/dao/ExtUserMapper.java similarity index 88% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/dao/ExtUserMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/dao/ExtUserMapper.java index 28566486cd..dd3d52dee0 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/dao/ExtUserMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/dao/ExtUserMapper.java @@ -1,9 +1,9 @@ -package com.fit2cloud.commons.auth.dao; +package io.dataease.commons.auth.dao; -import com.fit2cloud.commons.auth.bean.ExtPermissionBean; -import com.fit2cloud.commons.auth.entity.SysUser; +import io.dataease.commons.auth.bean.ExtPermissionBean; +import io.dataease.commons.auth.entity.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDept.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDept.java similarity index 97% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDept.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDept.java index 70d3f546a3..b632c215da 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDept.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDict.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDict.java similarity index 96% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDict.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDict.java index 40a4da4071..6a618e2cad 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDict.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDict.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDictDetail.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDictDetail.java similarity index 97% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDictDetail.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDictDetail.java index cd37343fc7..d7f266b197 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysDictDetail.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysDictDetail.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysMenu.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysMenu.java similarity index 98% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysMenu.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysMenu.java index 31bb34dece..1560b691ad 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysMenu.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysRole.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysRole.java similarity index 96% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysRole.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysRole.java index 72fbaf5011..26d2ec0038 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysRole.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysUser.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysUser.java similarity index 98% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysUser.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysUser.java index 1c52f712a5..32ea76a6b0 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysUser.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysUsersRoles.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysUsersRoles.java similarity index 94% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysUsersRoles.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysUsersRoles.java index eea20d796e..7ab81eb2af 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/SysUsersRoles.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/entity/SysUsersRoles.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.entity; +package io.dataease.commons.auth.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CLogoutFilter.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CLogoutFilter.java similarity index 94% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CLogoutFilter.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CLogoutFilter.java index 433d8995ce..6a1942e3df 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CLogoutFilter.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CLogoutFilter.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.filter; +package io.dataease.commons.auth.filter; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authc.LogoutFilter; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CPermissionsFilter.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CPermissionsFilter.java similarity index 95% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CPermissionsFilter.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CPermissionsFilter.java index 3877d5d68c..3a4eced887 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CPermissionsFilter.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CPermissionsFilter.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.filter; +package io.dataease.commons.auth.filter; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CRolesFilter.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CRolesFilter.java similarity index 95% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CRolesFilter.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CRolesFilter.java index 6e8370d439..12fc221e2d 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/F2CRolesFilter.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/F2CRolesFilter.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.filter; +package io.dataease.commons.auth.filter; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authz.AuthorizationFilter; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/JWTFilter.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/JWTFilter.java similarity index 96% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/JWTFilter.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/JWTFilter.java index 66c52e7528..9fb0ac15f3 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/JWTFilter.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/JWTFilter.java @@ -1,7 +1,7 @@ -package com.fit2cloud.commons.auth.filter; +package io.dataease.commons.auth.filter; -import com.fit2cloud.commons.auth.config.JWTToken; -import com.fit2cloud.commons.auth.util.JWTUtil; +import io.dataease.commons.auth.config.JWTToken; +import io.dataease.commons.auth.util.JWTUtil; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; import org.slf4j.Logger; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/XssFilter.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/XssFilter.java similarity index 97% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/XssFilter.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/XssFilter.java index 88050c84e0..c31de50e5f 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/filter/XssFilter.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.filter; +package io.dataease.commons.auth.filter; import cn.hutool.core.util.StrUtil; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDeptMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDeptMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDeptMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDeptMapper.java index 49e26cd054..9c0ffcc6bc 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDeptMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDeptMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysDept; +import io.dataease.commons.auth.entity.SysDept; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDictDetailMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDictDetailMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDictDetailMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDictDetailMapper.java index f61d3c8baf..6d5215cf39 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDictDetailMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDictDetailMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysDictDetail; +import io.dataease.commons.auth.entity.SysDictDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDictMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDictMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDictMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDictMapper.java index cc76b90154..6900002de6 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysDictMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysDictMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysDict; +import io.dataease.commons.auth.entity.SysDict; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysMenuMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysMenuMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysMenuMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysMenuMapper.java index 9511c565b4..ab0b597d02 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysMenuMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysMenuMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysMenu; +import io.dataease.commons.auth.entity.SysMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysRoleMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysRoleMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysRoleMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysRoleMapper.java index 1485e2e59a..7b5e31df55 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysRoleMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysRoleMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysRole; +import io.dataease.commons.auth.entity.SysRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysUserMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysUserMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysUserMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysUserMapper.java index a077e0301b..c7fe629db8 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysUserMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysUserMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysUser; +import io.dataease.commons.auth.entity.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysUsersRolesMapper.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysUsersRolesMapper.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysUsersRolesMapper.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysUsersRolesMapper.java index 9d41d4da10..831732b199 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/SysUsersRolesMapper.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/mapper/SysUsersRolesMapper.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.auth.mapper; +package io.dataease.commons.auth.mapper; -import com.fit2cloud.commons.auth.entity.SysUsersRoles; +import io.dataease.commons.auth.entity.SysUsersRoles; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/ShiroService.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/ShiroService.java similarity index 95% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/ShiroService.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/ShiroService.java index bee83be7b0..a01e6d0d58 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/ShiroService.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/ShiroService.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.service; +package io.dataease.commons.auth.service; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/UserService.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/UserService.java similarity index 78% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/UserService.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/UserService.java index b60890e701..12c787a592 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/UserService.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/UserService.java @@ -1,13 +1,12 @@ -package com.fit2cloud.commons.auth.service; +package io.dataease.commons.auth.service; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.fit2cloud.commons.auth.bean.UserBean; -import com.fit2cloud.commons.auth.dao.ExtUserMapper; -import com.fit2cloud.commons.auth.entity.SysUser; -import com.fit2cloud.commons.auth.mapper.SysUserMapper; +import io.dataease.commons.auth.bean.UserBean; +import io.dataease.commons.auth.dao.ExtUserMapper; +import io.dataease.commons.auth.entity.SysUser; +import io.dataease.commons.auth.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/impl/ShiroServiceImpl.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/impl/ShiroServiceImpl.java similarity index 91% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/impl/ShiroServiceImpl.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/impl/ShiroServiceImpl.java index 152d16ef67..2c0412fe8d 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/impl/ShiroServiceImpl.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/service/impl/ShiroServiceImpl.java @@ -1,8 +1,8 @@ -package com.fit2cloud.commons.auth.service.impl; +package io.dataease.commons.auth.service.impl; -import com.fit2cloud.commons.auth.bean.ExtPermissionBean; -import com.fit2cloud.commons.auth.dao.ExtUserMapper; -import com.fit2cloud.commons.auth.service.ShiroService; +import io.dataease.commons.auth.bean.ExtPermissionBean; +import io.dataease.commons.auth.dao.ExtUserMapper; +import io.dataease.commons.auth.service.ShiroService; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/CacheUtil.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/CacheUtil.java similarity index 97% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/CacheUtil.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/CacheUtil.java index f6d34e076c..b262bfc226 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/CacheUtil.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/CacheUtil.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.util; +package io.dataease.commons.auth.util; import cn.hutool.core.util.ObjectUtil; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/JWTUtil.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/JWTUtil.java similarity index 92% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/JWTUtil.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/JWTUtil.java index 7080f406f3..5eeb0abac0 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/JWTUtil.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/JWTUtil.java @@ -1,14 +1,12 @@ -package com.fit2cloud.commons.auth.util; +package io.dataease.commons.auth.util; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.DecodedJWT; -import com.fit2cloud.commons.auth.dao.ExtUserMapper; -import com.fit2cloud.commons.auth.service.UserService; +import io.dataease.commons.auth.dao.ExtUserMapper; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; import java.util.Date; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/RsaUtil.java b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/RsaUtil.java similarity index 99% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/RsaUtil.java rename to dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/RsaUtil.java index 77864b4db4..8c898dbd01 100644 --- a/fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/util/RsaUtil.java +++ b/dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/util/RsaUtil.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.auth.util; +package io.dataease.commons.auth.util; diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/resources/application.properties b/dataease-commons/dataease-common-auth/src/main/resources/application.properties similarity index 100% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/resources/application.properties rename to dataease-commons/dataease-common-auth/src/main/resources/application.properties diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/resources/banner.txt b/dataease-commons/dataease-common-auth/src/main/resources/banner.txt similarity index 100% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/resources/banner.txt rename to dataease-commons/dataease-common-auth/src/main/resources/banner.txt diff --git a/fit2cloud-commons/fit2cloud-common-auth/src/main/resources/ehcache.xml b/dataease-commons/dataease-common-auth/src/main/resources/ehcache.xml similarity index 100% rename from fit2cloud-commons/fit2cloud-common-auth/src/main/resources/ehcache.xml rename to dataease-commons/dataease-common-auth/src/main/resources/ehcache.xml diff --git a/fit2cloud-commons/fit2cloud-common-base/pom.xml b/dataease-commons/dataease-common-base/pom.xml similarity index 63% rename from fit2cloud-commons/fit2cloud-common-base/pom.xml rename to dataease-commons/dataease-common-base/pom.xml index fa5c7e07ce..dc7056e581 100644 --- a/fit2cloud-commons/fit2cloud-common-base/pom.xml +++ b/dataease-commons/dataease-common-base/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - fit2cloud-commons - com.fit2cloud - 1.0-SNAPSHOT + dataease-commons + io.dataease + 1.0.0 4.0.0 - fit2cloud-common-base + dataease-common-base - \ No newline at end of file + diff --git a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/Fit2cloudException.java b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/Fit2cloudException.java similarity index 97% rename from fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/Fit2cloudException.java rename to dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/Fit2cloudException.java index 52ec220288..c98a164c22 100644 --- a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/Fit2cloudException.java +++ b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/Fit2cloudException.java @@ -1,7 +1,7 @@ -package com.fit2cloud.commons.base; +package io.dataease.commons.base; import cn.hutool.core.util.StrUtil; -import com.fit2cloud.commons.base.result.ResultEntity; +import io.dataease.commons.base.result.ResultEntity; import org.slf4j.LoggerFactory; import org.springframework.boot.web.error.ErrorAttributeOptions; import org.springframework.boot.web.servlet.error.ErrorAttributes; diff --git a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/Fit2cloudResult.java b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/Fit2cloudResult.java similarity index 94% rename from fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/Fit2cloudResult.java rename to dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/Fit2cloudResult.java index 09f23d45bf..99fbfae174 100644 --- a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/Fit2cloudResult.java +++ b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/Fit2cloudResult.java @@ -1,8 +1,8 @@ -package com.fit2cloud.commons.base; +package io.dataease.commons.base; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.fit2cloud.commons.base.result.ResultEntity; +import io.dataease.commons.base.result.ResultEntity; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; import org.springframework.http.converter.StringHttpMessageConverter; diff --git a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/api/PermissionErrorApi.java b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/api/PermissionErrorApi.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/api/PermissionErrorApi.java rename to dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/api/PermissionErrorApi.java index 33e39e5577..77fc31349e 100644 --- a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/api/PermissionErrorApi.java +++ b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/api/PermissionErrorApi.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.base.api; +package io.dataease.commons.base.api; -import com.fit2cloud.commons.base.result.ResultEntity; +import io.dataease.commons.base.result.ResultEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/api/TokenExpApi.java b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/api/TokenExpApi.java similarity index 75% rename from fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/api/TokenExpApi.java rename to dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/api/TokenExpApi.java index 2391764315..cde9c8d3c6 100644 --- a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/api/TokenExpApi.java +++ b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/api/TokenExpApi.java @@ -1,6 +1,6 @@ -package com.fit2cloud.commons.base.api; +package io.dataease.commons.base.api; -import com.fit2cloud.commons.base.result.ResultEntity; +import io.dataease.commons.base.result.ResultEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/result/ResultCode.java b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/result/ResultCode.java similarity index 94% rename from fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/result/ResultCode.java rename to dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/result/ResultCode.java index 435778b983..3a4de318c9 100644 --- a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/result/ResultCode.java +++ b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/result/ResultCode.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.base.result; +package io.dataease.commons.base.result; import lombok.Data; diff --git a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/result/ResultEntity.java b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/result/ResultEntity.java similarity index 96% rename from fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/result/ResultEntity.java rename to dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/result/ResultEntity.java index bc392cf4f1..eeb97341b4 100644 --- a/fit2cloud-commons/fit2cloud-common-base/src/main/java/com/fit2cloud/commons/base/result/ResultEntity.java +++ b/dataease-commons/dataease-common-base/src/main/java/io/dataease/commons/base/result/ResultEntity.java @@ -1,4 +1,4 @@ -package com.fit2cloud.commons.base.result; +package io.dataease.commons.base.result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/fit2cloud-commons/fit2cloud-common-db/pom.xml b/dataease-commons/dataease-common-db/pom.xml similarity index 91% rename from fit2cloud-commons/fit2cloud-common-db/pom.xml rename to dataease-commons/dataease-common-db/pom.xml index 994fb2e30d..3f26f06f36 100644 --- a/fit2cloud-commons/fit2cloud-common-db/pom.xml +++ b/dataease-commons/dataease-common-db/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - fit2cloud-commons - com.fit2cloud - 1.0-SNAPSHOT + dataease-commons + io.dataease + 1.0.0 4.0.0 - fit2cloud-common-db + dataease-common-db @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/CodeGenerator.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/CodeGenerator.java similarity index 99% rename from fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/CodeGenerator.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/CodeGenerator.java index 7baa1bd59d..6f3ea699fc 100644 --- a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/CodeGenerator.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.fit2cloud.common.db; +package io.dataease.common.db; import com.baomidou.mybatisplus.generator.AutoGenerator; diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/GeneratorApi.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/GeneratorApi.java similarity index 95% rename from fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/GeneratorApi.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/GeneratorApi.java index e712abf035..138854a827 100644 --- a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/GeneratorApi.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/GeneratorApi.java @@ -1,4 +1,4 @@ -package com.fit2cloud.common.db; +package io.dataease.common.db; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/MybatisPlusConfig.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/MybatisPlusConfig.java similarity index 96% rename from fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/MybatisPlusConfig.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/MybatisPlusConfig.java index f8e1594e38..c5ae10393f 100644 --- a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/MybatisPlusConfig.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.fit2cloud.common.db; +package io.dataease.common.db; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer; diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/PageUtils.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/PageUtils.java similarity index 94% rename from fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/PageUtils.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/PageUtils.java index e62b08fc43..e11f5566c4 100644 --- a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/PageUtils.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/PageUtils.java @@ -1,4 +1,4 @@ -package com.fit2cloud.common.db; +package io.dataease.common.db; import com.github.pagehelper.Page; diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/Pager.java b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/Pager.java similarity index 88% rename from fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/Pager.java rename to dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/Pager.java index 3daf57e250..38fe3f5226 100644 --- a/fit2cloud-commons/fit2cloud-common-db/src/main/java/com/fit2cloud/common/db/Pager.java +++ b/dataease-commons/dataease-common-db/src/main/java/io/dataease/common/db/Pager.java @@ -1,4 +1,4 @@ -package com.fit2cloud.common.db; +package io.dataease.common.db; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/resources/application.properties b/dataease-commons/dataease-common-db/src/main/resources/application.properties similarity index 100% rename from fit2cloud-commons/fit2cloud-common-db/src/main/resources/application.properties rename to dataease-commons/dataease-common-db/src/main/resources/application.properties diff --git a/fit2cloud-commons/fit2cloud-common-db/src/main/resources/f2cmapper.java.ftl b/dataease-commons/dataease-common-db/src/main/resources/f2cmapper.java.ftl similarity index 100% rename from fit2cloud-commons/fit2cloud-common-db/src/main/resources/f2cmapper.java.ftl rename to dataease-commons/dataease-common-db/src/main/resources/f2cmapper.java.ftl diff --git a/fit2cloud-commons/fit2cloud-common-logs/pom.xml b/dataease-commons/dataease-common-logs/pom.xml similarity index 63% rename from fit2cloud-commons/fit2cloud-common-logs/pom.xml rename to dataease-commons/dataease-common-logs/pom.xml index 213646cded..2481f3215b 100644 --- a/fit2cloud-commons/fit2cloud-common-logs/pom.xml +++ b/dataease-commons/dataease-common-logs/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - fit2cloud-commons - com.fit2cloud - 1.0-SNAPSHOT + dataease-commons + io.dataease + 1.0.0 4.0.0 - fit2cloud-common-logs + dataease-common-logs - \ No newline at end of file + diff --git a/fit2cloud-commons/pom.xml b/dataease-commons/pom.xml similarity index 57% rename from fit2cloud-commons/pom.xml rename to dataease-commons/pom.xml index 9a881fafac..52ac4974a8 100644 --- a/fit2cloud-commons/pom.xml +++ b/dataease-commons/pom.xml @@ -3,20 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + io.dataease dataease - com.fit2cloud - 1.0-SNAPSHOT + 1.0.0 4.0.0 - fit2cloud-commons + dataease-commons pom - fit2cloud-common-auth - fit2cloud-common-base - fit2cloud-common-logs - fit2cloud-common-db + dataease-common-logs + dataease-common-db + dataease-common-base + dataease-common-auth - \ No newline at end of file + diff --git a/fit2cloud-system/pom.xml b/dataease-server/pom.xml similarity index 55% rename from fit2cloud-system/pom.xml rename to dataease-server/pom.xml index af7a01a42a..bca365071b 100644 --- a/fit2cloud-system/pom.xml +++ b/dataease-server/pom.xml @@ -4,32 +4,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> dataease - com.fit2cloud - 1.0-SNAPSHOT + io.dataease + 1.0.0 4.0.0 - fit2cloud-system + dataease-server - com.fit2cloud - fit2cloud-common-base - 1.0-SNAPSHOT + io.dataease + dataease-common-base + 1.0.0 - com.fit2cloud - fit2cloud-common-auth - 1.0-SNAPSHOT + io.dataease + dataease-common-auth + 1.0.0 - com.fit2cloud - fit2cloud-common-db - 1.0-SNAPSHOT + io.dataease + dataease-common-db + 1.0.0 @@ -41,10 +41,15 @@ spring-boot-starter-test + + com.google.guava + guava + 18.0 + - \ No newline at end of file + diff --git a/fit2cloud-system/src/main/java/com/fit2cloud/SystemApp.java b/dataease-server/src/main/java/io/dataease/SystemApp.java similarity index 95% rename from fit2cloud-system/src/main/java/com/fit2cloud/SystemApp.java rename to dataease-server/src/main/java/io/dataease/SystemApp.java index e44cf87c8a..5a6a4669b4 100644 --- a/fit2cloud-system/src/main/java/com/fit2cloud/SystemApp.java +++ b/dataease-server/src/main/java/io/dataease/SystemApp.java @@ -1,4 +1,4 @@ -package com.fit2cloud; +package io.dataease; import org.springframework.boot.SpringApplication; diff --git a/fit2cloud-system/src/main/java/com/fit2cloud/system/api/BusiApi.java b/dataease-server/src/main/java/io/dataease/system/api/BusiApi.java similarity index 73% rename from fit2cloud-system/src/main/java/com/fit2cloud/system/api/BusiApi.java rename to dataease-server/src/main/java/io/dataease/system/api/BusiApi.java index 1de46daf25..ef70be84cb 100644 --- a/fit2cloud-system/src/main/java/com/fit2cloud/system/api/BusiApi.java +++ b/dataease-server/src/main/java/io/dataease/system/api/BusiApi.java @@ -1,18 +1,11 @@ -package com.fit2cloud.system.api; +package io.dataease.system.api; -import com.fit2cloud.common.db.PageUtils; -import com.fit2cloud.common.db.Pager; /*import com.fit2cloud.commons.auth.entity.User; import com.fit2cloud.commons.auth.mapper.UserMapper;*/ -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController public class BusiApi { diff --git a/fit2cloud-system/src/main/java/com/fit2cloud/system/api/SysApi.java b/dataease-server/src/main/java/io/dataease/system/api/SysApi.java similarity index 88% rename from fit2cloud-system/src/main/java/com/fit2cloud/system/api/SysApi.java rename to dataease-server/src/main/java/io/dataease/system/api/SysApi.java index d143c689bb..2eff5e6f23 100644 --- a/fit2cloud-system/src/main/java/com/fit2cloud/system/api/SysApi.java +++ b/dataease-server/src/main/java/io/dataease/system/api/SysApi.java @@ -1,4 +1,4 @@ -package com.fit2cloud.system.api; +package io.dataease.system.api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/fit2cloud-system/src/main/java/com/fit2cloud/system/api/TestApi.java b/dataease-server/src/main/java/io/dataease/system/api/TestApi.java similarity index 96% rename from fit2cloud-system/src/main/java/com/fit2cloud/system/api/TestApi.java rename to dataease-server/src/main/java/io/dataease/system/api/TestApi.java index dfc59b6df8..a009913d8b 100644 --- a/fit2cloud-system/src/main/java/com/fit2cloud/system/api/TestApi.java +++ b/dataease-server/src/main/java/io/dataease/system/api/TestApi.java @@ -1,4 +1,4 @@ -package com.fit2cloud.system.api; +package io.dataease.system.api; diff --git a/fit2cloud-system/src/main/resources/application.properties b/dataease-server/src/main/resources/application.properties similarity index 100% rename from fit2cloud-system/src/main/resources/application.properties rename to dataease-server/src/main/resources/application.properties diff --git a/fit2cloud-system/src/main/resources/db/migration/V1__init.sql b/dataease-server/src/main/resources/db/migration/V1__init.sql similarity index 90% rename from fit2cloud-system/src/main/resources/db/migration/V1__init.sql rename to dataease-server/src/main/resources/db/migration/V1__init.sql index 60c825ab5e..7cadb40cbc 100644 --- a/fit2cloud-system/src/main/resources/db/migration/V1__init.sql +++ b/dataease-server/src/main/resources/db/migration/V1__init.sql @@ -126,3 +126,17 @@ CREATE TABLE `sys_users_roles` ( PRIMARY KEY (`user_id`,`role_id`) USING BTREE, KEY `FKq4eq273l04bpu4efj0jd0jb98` (`role_id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='用户角色关联'; + + +DROP TABLE IF EXISTS `datasource`; +CREATE TABLE `datasource` ( + `id` varchar(50) NOT NULL COMMENT 'ID', + `name` varchar(255) NOT NULL COMMENT '名称', + `type` varchar(255) NOT NULL COMMENT '类型', + `configuration` longtext COMMENT '详细信息', + `description` varchar(255) DEFAULT NULL COMMENT '描述', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建者', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='数据源链接'; diff --git a/dataease-server/src/test/java/io/dataease/MyTest.java b/dataease-server/src/test/java/io/dataease/MyTest.java new file mode 100644 index 0000000000..f87a6bdfb5 --- /dev/null +++ b/dataease-server/src/test/java/io/dataease/MyTest.java @@ -0,0 +1,33 @@ +package io.dataease; + +import io.dataease.datasource.JdbcDataProvider; + +import java.util.HashMap; +import java.util.Map; + +public class MyTest { + + public static void main(String[] args) throws Exception { + Map dataSource = new HashMap<>(); + dataSource.put("driver", "com.mysql.cj.jdbc.Driver"); + dataSource.put("jdbc_url", "jdbc:mysql://localhost:3306/dataease?characterEncoding=utf8&useSSL=true"); + dataSource.put("database", "dataease"); + dataSource.put("user", "root"); + dataSource.put("passwd", "jinlong"); + dataSource.put("", ""); + Map query = new HashMap<>(); + query.put("sql", "select table_name from information_schema.tables where table_schema='DATABASE';".replace("DATABASE", dataSource.get("database"))); +// query.put("sql", "SELECT * FROM dataease.test_users;"); + JdbcDataProvider jdbcDataProvider = new JdbcDataProvider(); + jdbcDataProvider.setDataSource(dataSource); + jdbcDataProvider.setQuery(query); +// jdbcDataProvider.test(); +// jdbcDataProvider.getData(); + for (String showTable : jdbcDataProvider.showTables()) { + System.out.println(showTable); + } + + + } + +} diff --git a/fit2cloud-system/src/test/java/com/fit2cloud/MyTest.java b/fit2cloud-system/src/test/java/com/fit2cloud/MyTest.java deleted file mode 100644 index 0e27cf82c0..0000000000 --- a/fit2cloud-system/src/test/java/com/fit2cloud/MyTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.fit2cloud; - -import com.fit2cloud.common.db.CodeGenerator; -import lombok.SneakyThrows; -import org.junit.jupiter.api.Test; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -public class MyTest { - - /*public static void main(String[] args) throws IOException { - ClassLoader classLoader = SystemApp.class.getClassLoader(); - InputStream resourceAsStream = classLoader.getResourceAsStream("application.properties"); - Properties properties = new Properties(); - properties.load(resourceAsStream); - System.setProperties(properties); - - CodeGenerator.test(); - }*/ - -} diff --git a/fit2cloud-view/.editorconfig b/frontend/.editorconfig similarity index 100% rename from fit2cloud-view/.editorconfig rename to frontend/.editorconfig diff --git a/fit2cloud-view/.env.development b/frontend/.env.development similarity index 100% rename from fit2cloud-view/.env.development rename to frontend/.env.development diff --git a/fit2cloud-view/.env.production b/frontend/.env.production similarity index 100% rename from fit2cloud-view/.env.production rename to frontend/.env.production diff --git a/fit2cloud-view/PENDING.md b/frontend/PENDING.md similarity index 100% rename from fit2cloud-view/PENDING.md rename to frontend/PENDING.md diff --git a/fit2cloud-view/README.md b/frontend/README.md similarity index 100% rename from fit2cloud-view/README.md rename to frontend/README.md diff --git a/fit2cloud-view/babel.config.js b/frontend/babel.config.js similarity index 100% rename from fit2cloud-view/babel.config.js rename to frontend/babel.config.js diff --git a/fit2cloud-view/mock/index.js b/frontend/mock/index.js similarity index 100% rename from fit2cloud-view/mock/index.js rename to frontend/mock/index.js diff --git a/fit2cloud-view/mock/license.js b/frontend/mock/license.js similarity index 100% rename from fit2cloud-view/mock/license.js rename to frontend/mock/license.js diff --git a/fit2cloud-view/mock/mock-server.js b/frontend/mock/mock-server.js similarity index 100% rename from fit2cloud-view/mock/mock-server.js rename to frontend/mock/mock-server.js diff --git a/fit2cloud-view/mock/result-holder.js b/frontend/mock/result-holder.js similarity index 100% rename from fit2cloud-view/mock/result-holder.js rename to frontend/mock/result-holder.js diff --git a/fit2cloud-view/mock/user-token.js b/frontend/mock/user-token.js similarity index 100% rename from fit2cloud-view/mock/user-token.js rename to frontend/mock/user-token.js diff --git a/fit2cloud-view/mock/user.js b/frontend/mock/user.js similarity index 100% rename from fit2cloud-view/mock/user.js rename to frontend/mock/user.js diff --git a/fit2cloud-view/mock/utils.js b/frontend/mock/utils.js similarity index 100% rename from fit2cloud-view/mock/utils.js rename to frontend/mock/utils.js diff --git a/fit2cloud-view/package.json b/frontend/package.json similarity index 100% rename from fit2cloud-view/package.json rename to frontend/package.json diff --git a/fit2cloud-view/public/favicon.ico b/frontend/public/favicon.ico similarity index 100% rename from fit2cloud-view/public/favicon.ico rename to frontend/public/favicon.ico diff --git a/fit2cloud-view/public/index.html b/frontend/public/index.html similarity index 100% rename from fit2cloud-view/public/index.html rename to frontend/public/index.html diff --git a/fit2cloud-view/src/App.vue b/frontend/src/App.vue similarity index 100% rename from fit2cloud-view/src/App.vue rename to frontend/src/App.vue diff --git a/fit2cloud-view/src/api/license.js b/frontend/src/api/license.js similarity index 100% rename from fit2cloud-view/src/api/license.js rename to frontend/src/api/license.js diff --git a/fit2cloud-view/src/api/user.js b/frontend/src/api/user-token.js similarity index 100% rename from fit2cloud-view/src/api/user.js rename to frontend/src/api/user-token.js diff --git a/frontend/src/api/user.js b/frontend/src/api/user.js new file mode 100644 index 0000000000..5dc6435d97 --- /dev/null +++ b/frontend/src/api/user.js @@ -0,0 +1,21 @@ +/* 前后端分离的登录方式 */ +import {get, post, put} from "@/plugins/request" + +export function login(data) { + return post("/login", data) +} + +export function logout() { + return post("/logout") +} + +export function getCurrentUser() { + return get("/info") +} + +export function updateInfo(data) { + return put("/update", data) +} + + + diff --git a/fit2cloud-view/src/assets/RackShift-assist-white.png b/frontend/src/assets/RackShift-assist-white.png similarity index 100% rename from fit2cloud-view/src/assets/RackShift-assist-white.png rename to frontend/src/assets/RackShift-assist-white.png diff --git a/fit2cloud-view/src/assets/RackShift-black.png b/frontend/src/assets/RackShift-black.png similarity index 100% rename from fit2cloud-view/src/assets/RackShift-black.png rename to frontend/src/assets/RackShift-black.png diff --git a/fit2cloud-view/src/assets/RackShift-white.png b/frontend/src/assets/RackShift-white.png similarity index 100% rename from fit2cloud-view/src/assets/RackShift-white.png rename to frontend/src/assets/RackShift-white.png diff --git a/fit2cloud-view/src/assets/font/Roboto/Roboto-Regular.ttf b/frontend/src/assets/font/Roboto/Roboto-Regular.ttf similarity index 100% rename from fit2cloud-view/src/assets/font/Roboto/Roboto-Regular.ttf rename to frontend/src/assets/font/Roboto/Roboto-Regular.ttf diff --git a/fit2cloud-view/src/assets/font/Roboto/index.css b/frontend/src/assets/font/Roboto/index.css similarity index 100% rename from fit2cloud-view/src/assets/font/Roboto/index.css rename to frontend/src/assets/font/Roboto/index.css diff --git a/fit2cloud-view/src/assets/login-desc.png b/frontend/src/assets/login-desc.png similarity index 100% rename from fit2cloud-view/src/assets/login-desc.png rename to frontend/src/assets/login-desc.png diff --git a/fit2cloud-view/src/business/app-layout/header-components/LanguageSwitch.vue b/frontend/src/business/app-layout/header-components/LanguageSwitch.vue similarity index 100% rename from fit2cloud-view/src/business/app-layout/header-components/LanguageSwitch.vue rename to frontend/src/business/app-layout/header-components/LanguageSwitch.vue diff --git a/fit2cloud-view/src/business/app-layout/header-components/PersonalSetting.vue b/frontend/src/business/app-layout/header-components/PersonalSetting.vue similarity index 100% rename from fit2cloud-view/src/business/app-layout/header-components/PersonalSetting.vue rename to frontend/src/business/app-layout/header-components/PersonalSetting.vue diff --git a/fit2cloud-view/src/business/app-layout/horizontal-layout/HorizontalHeader.vue b/frontend/src/business/app-layout/horizontal-layout/HorizontalHeader.vue similarity index 100% rename from fit2cloud-view/src/business/app-layout/horizontal-layout/HorizontalHeader.vue rename to frontend/src/business/app-layout/horizontal-layout/HorizontalHeader.vue diff --git a/fit2cloud-view/src/business/app-layout/horizontal-layout/index.vue b/frontend/src/business/app-layout/horizontal-layout/index.vue similarity index 100% rename from fit2cloud-view/src/business/app-layout/horizontal-layout/index.vue rename to frontend/src/business/app-layout/horizontal-layout/index.vue diff --git a/fit2cloud-view/src/business/dashboard/index.vue b/frontend/src/business/dashboard/index.vue similarity index 100% rename from fit2cloud-view/src/business/dashboard/index.vue rename to frontend/src/business/dashboard/index.vue diff --git a/fit2cloud-view/src/business/directive/ClickOutsideDemo.vue b/frontend/src/business/directive/ClickOutsideDemo.vue similarity index 100% rename from fit2cloud-view/src/business/directive/ClickOutsideDemo.vue rename to frontend/src/business/directive/ClickOutsideDemo.vue diff --git a/fit2cloud-view/src/business/directive/PermissionDemo.vue b/frontend/src/business/directive/PermissionDemo.vue similarity index 100% rename from fit2cloud-view/src/business/directive/PermissionDemo.vue rename to frontend/src/business/directive/PermissionDemo.vue diff --git a/fit2cloud-view/src/business/login/index.vue b/frontend/src/business/login/index.vue similarity index 100% rename from fit2cloud-view/src/business/login/index.vue rename to frontend/src/business/login/index.vue diff --git a/fit2cloud-view/src/business/system-setting/ParamsSetting.vue b/frontend/src/business/system-setting/ParamsSetting.vue similarity index 100% rename from fit2cloud-view/src/business/system-setting/ParamsSetting.vue rename to frontend/src/business/system-setting/ParamsSetting.vue diff --git a/fit2cloud-view/src/business/system-setting/UserManagement.vue b/frontend/src/business/system-setting/UserManagement.vue similarity index 100% rename from fit2cloud-view/src/business/system-setting/UserManagement.vue rename to frontend/src/business/system-setting/UserManagement.vue diff --git a/fit2cloud-view/src/components/dynamic-table/TablePagination.vue b/frontend/src/components/dynamic-table/TablePagination.vue similarity index 100% rename from fit2cloud-view/src/components/dynamic-table/TablePagination.vue rename to frontend/src/components/dynamic-table/TablePagination.vue diff --git a/fit2cloud-view/src/components/dynamic-table/index.vue b/frontend/src/components/dynamic-table/index.vue similarity index 100% rename from fit2cloud-view/src/components/dynamic-table/index.vue rename to frontend/src/components/dynamic-table/index.vue diff --git a/fit2cloud-view/src/components/layout/LayoutContent.vue b/frontend/src/components/layout/LayoutContent.vue similarity index 100% rename from fit2cloud-view/src/components/layout/LayoutContent.vue rename to frontend/src/components/layout/LayoutContent.vue diff --git a/fit2cloud-view/src/components/layout/LayoutHeader.vue b/frontend/src/components/layout/LayoutHeader.vue similarity index 100% rename from fit2cloud-view/src/components/layout/LayoutHeader.vue rename to frontend/src/components/layout/LayoutHeader.vue diff --git a/fit2cloud-view/src/components/layout/LayoutMain.vue b/frontend/src/components/layout/LayoutMain.vue similarity index 100% rename from fit2cloud-view/src/components/layout/LayoutMain.vue rename to frontend/src/components/layout/LayoutMain.vue diff --git a/fit2cloud-view/src/components/layout/LayoutSidebar.vue b/frontend/src/components/layout/LayoutSidebar.vue similarity index 100% rename from fit2cloud-view/src/components/layout/LayoutSidebar.vue rename to frontend/src/components/layout/LayoutSidebar.vue diff --git a/fit2cloud-view/src/components/layout/LayoutView.vue b/frontend/src/components/layout/LayoutView.vue similarity index 100% rename from fit2cloud-view/src/components/layout/LayoutView.vue rename to frontend/src/components/layout/LayoutView.vue diff --git a/fit2cloud-view/src/components/layout/index.vue b/frontend/src/components/layout/index.vue similarity index 100% rename from fit2cloud-view/src/components/layout/index.vue rename to frontend/src/components/layout/index.vue diff --git a/fit2cloud-view/src/components/layout/sidebar/FixiOSBug.js b/frontend/src/components/layout/sidebar/FixiOSBug.js similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/FixiOSBug.js rename to frontend/src/components/layout/sidebar/FixiOSBug.js diff --git a/fit2cloud-view/src/components/layout/sidebar/Item.vue b/frontend/src/components/layout/sidebar/Item.vue similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/Item.vue rename to frontend/src/components/layout/sidebar/Item.vue diff --git a/fit2cloud-view/src/components/layout/sidebar/Link.vue b/frontend/src/components/layout/sidebar/Link.vue similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/Link.vue rename to frontend/src/components/layout/sidebar/Link.vue diff --git a/fit2cloud-view/src/components/layout/sidebar/Logo.vue b/frontend/src/components/layout/sidebar/Logo.vue similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/Logo.vue rename to frontend/src/components/layout/sidebar/Logo.vue diff --git a/fit2cloud-view/src/components/layout/sidebar/SidebarItem.vue b/frontend/src/components/layout/sidebar/SidebarItem.vue similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/SidebarItem.vue rename to frontend/src/components/layout/sidebar/SidebarItem.vue diff --git a/fit2cloud-view/src/components/layout/sidebar/SidebarToggleButton.vue b/frontend/src/components/layout/sidebar/SidebarToggleButton.vue similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/SidebarToggleButton.vue rename to frontend/src/components/layout/sidebar/SidebarToggleButton.vue diff --git a/fit2cloud-view/src/components/layout/sidebar/index.vue b/frontend/src/components/layout/sidebar/index.vue similarity index 100% rename from fit2cloud-view/src/components/layout/sidebar/index.vue rename to frontend/src/components/layout/sidebar/index.vue diff --git a/fit2cloud-view/src/components/redirect/index.vue b/frontend/src/components/redirect/index.vue similarity index 100% rename from fit2cloud-view/src/components/redirect/index.vue rename to frontend/src/components/redirect/index.vue diff --git a/fit2cloud-view/src/directive/click-outside/index.js b/frontend/src/directive/click-outside/index.js similarity index 100% rename from fit2cloud-view/src/directive/click-outside/index.js rename to frontend/src/directive/click-outside/index.js diff --git a/fit2cloud-view/src/directive/index.js b/frontend/src/directive/index.js similarity index 100% rename from fit2cloud-view/src/directive/index.js rename to frontend/src/directive/index.js diff --git a/fit2cloud-view/src/directive/permission/index.js b/frontend/src/directive/permission/index.js similarity index 100% rename from fit2cloud-view/src/directive/permission/index.js rename to frontend/src/directive/permission/index.js diff --git a/fit2cloud-view/src/i18n/index.js b/frontend/src/i18n/index.js similarity index 100% rename from fit2cloud-view/src/i18n/index.js rename to frontend/src/i18n/index.js diff --git a/fit2cloud-view/src/i18n/lang/en-US.js b/frontend/src/i18n/lang/en-US.js similarity index 100% rename from fit2cloud-view/src/i18n/lang/en-US.js rename to frontend/src/i18n/lang/en-US.js diff --git a/fit2cloud-view/src/i18n/lang/zh-CN.js b/frontend/src/i18n/lang/zh-CN.js similarity index 100% rename from fit2cloud-view/src/i18n/lang/zh-CN.js rename to frontend/src/i18n/lang/zh-CN.js diff --git a/fit2cloud-view/src/i18n/lang/zh-TW.js b/frontend/src/i18n/lang/zh-TW.js similarity index 100% rename from fit2cloud-view/src/i18n/lang/zh-TW.js rename to frontend/src/i18n/lang/zh-TW.js diff --git a/fit2cloud-view/src/icons/index.js b/frontend/src/icons/index.js similarity index 100% rename from fit2cloud-view/src/icons/index.js rename to frontend/src/icons/index.js diff --git a/fit2cloud-view/src/main.js b/frontend/src/main.js similarity index 100% rename from fit2cloud-view/src/main.js rename to frontend/src/main.js diff --git a/fit2cloud-view/src/permission.js b/frontend/src/permission.js similarity index 100% rename from fit2cloud-view/src/permission.js rename to frontend/src/permission.js diff --git a/fit2cloud-view/src/plugins/index.js b/frontend/src/plugins/index.js similarity index 100% rename from fit2cloud-view/src/plugins/index.js rename to frontend/src/plugins/index.js diff --git a/fit2cloud-view/src/plugins/message.js b/frontend/src/plugins/message.js similarity index 100% rename from fit2cloud-view/src/plugins/message.js rename to frontend/src/plugins/message.js diff --git a/fit2cloud-view/src/plugins/request.js b/frontend/src/plugins/request.js similarity index 100% rename from fit2cloud-view/src/plugins/request.js rename to frontend/src/plugins/request.js diff --git a/fit2cloud-view/src/router/index.js b/frontend/src/router/index.js similarity index 100% rename from fit2cloud-view/src/router/index.js rename to frontend/src/router/index.js diff --git a/fit2cloud-view/src/router/modules/directives.js b/frontend/src/router/modules/directives.js similarity index 100% rename from fit2cloud-view/src/router/modules/directives.js rename to frontend/src/router/modules/directives.js diff --git a/fit2cloud-view/src/router/modules/filters.js b/frontend/src/router/modules/filters.js similarity index 100% rename from fit2cloud-view/src/router/modules/filters.js rename to frontend/src/router/modules/filters.js diff --git a/fit2cloud-view/src/router/modules/system-setting.js b/frontend/src/router/modules/system-setting.js similarity index 100% rename from fit2cloud-view/src/router/modules/system-setting.js rename to frontend/src/router/modules/system-setting.js diff --git a/fit2cloud-view/src/store/getters.js b/frontend/src/store/getters.js similarity index 100% rename from fit2cloud-view/src/store/getters.js rename to frontend/src/store/getters.js diff --git a/fit2cloud-view/src/store/index.js b/frontend/src/store/index.js similarity index 100% rename from fit2cloud-view/src/store/index.js rename to frontend/src/store/index.js diff --git a/fit2cloud-view/src/store/modules/app.js b/frontend/src/store/modules/app.js similarity index 100% rename from fit2cloud-view/src/store/modules/app.js rename to frontend/src/store/modules/app.js diff --git a/fit2cloud-view/src/store/modules/license.js b/frontend/src/store/modules/license.js similarity index 100% rename from fit2cloud-view/src/store/modules/license.js rename to frontend/src/store/modules/license.js diff --git a/fit2cloud-view/src/store/modules/permission.js b/frontend/src/store/modules/permission.js similarity index 100% rename from fit2cloud-view/src/store/modules/permission.js rename to frontend/src/store/modules/permission.js diff --git a/frontend/src/store/modules/user-token.js b/frontend/src/store/modules/user-token.js new file mode 100644 index 0000000000..78735dded6 --- /dev/null +++ b/frontend/src/store/modules/user-token.js @@ -0,0 +1,97 @@ +import {login, getCurrentUser, updateInfo, logout} from '@/api/user-token' +import {resetRouter} from '@/router' +import {getToken, setToken, removeToken} from '@/utils/token' +import {getLanguage, setLanguage} from "@/i18n"; + +/* 前后端不分离的登录办法*/ +const state = { + token: getToken(), + name: "", + language: getLanguage(), + roles: [] +} + +const mutations = { + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_LANGUAGE: (state, language) => { + state.language = language + setLanguage(language) + }, + SET_ROLES: (state, roles) => { + state.roles = roles + } +} + +const actions = { + login({commit}, userInfo) { + const {username, password} = userInfo + return new Promise((resolve, reject) => { + login({username: username.trim(), password: password}).then(response => { + let token = response.data + commit('SET_TOKEN', token) + setToken(token) + resolve(response) + }).catch(error => { + reject(error) + }) + }) + }, + + isLogin({commit}) { + return new Promise((resolve, reject) => { + let token = getToken() + if (token) { + commit('SET_TOKEN', token); + resolve(true) + } else { + reject(false) + } + }); + }, + + getCurrentUser({commit}) { + return new Promise((resolve, reject) => { + getCurrentUser().then(response => { + const {name, roles, language} = response.data + commit('SET_NAME', name) + commit('SET_ROLES', roles) + commit('SET_LANGUAGE', language) + resolve(response.data) + }).catch(error => { + reject(error) + }) + }); + }, + + setLanguage({commit, state}, language) { + commit('SET_LANGUAGE', language) + return new Promise((resolve, reject) => { + updateInfo(state.id, {language: language}).then(response => { + resolve(response) + }).catch(error => { + reject(error) + }) + }) + }, + + logout({commit}) { + logout().then(() => { + commit('SET_TOKEN', ""); + commit('SET_ROLES', []) + removeToken() + resetRouter() + }) + }, +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/fit2cloud-view/src/store/modules/user.js b/frontend/src/store/modules/user.js similarity index 100% rename from fit2cloud-view/src/store/modules/user.js rename to frontend/src/store/modules/user.js diff --git a/fit2cloud-view/src/styles/business/app.scss b/frontend/src/styles/business/app.scss similarity index 100% rename from fit2cloud-view/src/styles/business/app.scss rename to frontend/src/styles/business/app.scss diff --git a/fit2cloud-view/src/styles/business/header-menu.scss b/frontend/src/styles/business/header-menu.scss similarity index 100% rename from fit2cloud-view/src/styles/business/header-menu.scss rename to frontend/src/styles/business/header-menu.scss diff --git a/fit2cloud-view/src/styles/common/mixins.scss b/frontend/src/styles/common/mixins.scss similarity index 100% rename from fit2cloud-view/src/styles/common/mixins.scss rename to frontend/src/styles/common/mixins.scss diff --git a/fit2cloud-view/src/styles/common/variables.scss b/frontend/src/styles/common/variables.scss similarity index 100% rename from fit2cloud-view/src/styles/common/variables.scss rename to frontend/src/styles/common/variables.scss diff --git a/fit2cloud-view/src/styles/index.scss b/frontend/src/styles/index.scss similarity index 100% rename from fit2cloud-view/src/styles/index.scss rename to frontend/src/styles/index.scss diff --git a/fit2cloud-view/src/utils/token.js b/frontend/src/utils/token.js similarity index 100% rename from fit2cloud-view/src/utils/token.js rename to frontend/src/utils/token.js diff --git a/fit2cloud-view/src/utils/validate.js b/frontend/src/utils/validate.js similarity index 100% rename from fit2cloud-view/src/utils/validate.js rename to frontend/src/utils/validate.js diff --git a/fit2cloud-view/vue.config.js b/frontend/vue.config.js similarity index 100% rename from fit2cloud-view/vue.config.js rename to frontend/vue.config.js diff --git a/fit2cloud-view/代码规范.MD b/frontend/代码规范.MD similarity index 100% rename from fit2cloud-view/代码规范.MD rename to frontend/代码规范.MD diff --git a/fit2cloud-view/国际化规范.md b/frontend/国际化规范.md similarity index 100% rename from fit2cloud-view/国际化规范.md rename to frontend/国际化规范.md diff --git a/fit2cloud-view/目录结构.md b/frontend/目录结构.md similarity index 100% rename from fit2cloud-view/目录结构.md rename to frontend/目录结构.md diff --git a/pom.xml b/pom.xml index f70f0cc5fc..5e9483ccb7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.fit2cloud + io.dataease dataease - 1.0-SNAPSHOT + 1.0.0 - fit2cloud-commons - fit2cloud-system + dataease-commons + dataease-server pom @@ -145,4 +145,4 @@ - \ No newline at end of file +