去除接口鉴权,简化登录

master
zengchenxi 10 months ago
parent f2fecd495a
commit b1d373d3c4

@ -1,15 +1,8 @@
package com.chanko.yunxi.mes.heli.framework.security.core.service; package com.chanko.yunxi.mes.heli.framework.security.core.service;
import cn.hutool.core.collection.CollUtil;
import com.chanko.yunxi.mes.heli.framework.security.core.LoginUser;
import com.chanko.yunxi.mes.heli.framework.security.core.util.SecurityFrameworkUtils;
import com.chanko.yunxi.mes.heli.module.system.api.permission.PermissionApi; import com.chanko.yunxi.mes.heli.module.system.api.permission.PermissionApi;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import java.util.Arrays;
import static com.chanko.yunxi.mes.heli.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/** /**
* {@link SecurityFrameworkService} * {@link SecurityFrameworkService}
* *
@ -22,36 +15,42 @@ public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
@Override @Override
public boolean hasPermission(String permission) { public boolean hasPermission(String permission) {
return hasAnyPermissions(permission); return true;
// return hasAnyPermissions(permission);
} }
@Override @Override
public boolean hasAnyPermissions(String... permissions) { public boolean hasAnyPermissions(String... permissions) {
return permissionApi.hasAnyPermissions(getLoginUserId(), permissions); return true;
// return permissionApi.hasAnyPermissions(getLoginUserId(), permissions);
} }
@Override @Override
public boolean hasRole(String role) { public boolean hasRole(String role) {
return hasAnyRoles(role); return true;
// return hasAnyRoles(role);
} }
@Override @Override
public boolean hasAnyRoles(String... roles) { public boolean hasAnyRoles(String... roles) {
return permissionApi.hasAnyRoles(getLoginUserId(), roles); return true;
// return permissionApi.hasAnyRoles(getLoginUserId(), roles);
} }
@Override @Override
public boolean hasScope(String scope) { public boolean hasScope(String scope) {
return hasAnyScopes(scope); return true;
// return hasAnyScopes(scope);
} }
@Override @Override
public boolean hasAnyScopes(String... scope) { public boolean hasAnyScopes(String... scope) {
LoginUser user = SecurityFrameworkUtils.getLoginUser(); return true;
/*LoginUser user = SecurityFrameworkUtils.getLoginUser();
if (user == null) { if (user == null) {
return false; return false;
} }
return CollUtil.containsAny(user.getScopes(), Arrays.asList(scope)); return CollUtil.containsAny(user.getScopes(), Arrays.asList(scope));*/
} }
} }

@ -4,15 +4,15 @@
class="relative h-[100%] lt-xl:bg-[var(--login-bg-color)] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px" class="relative h-[100%] lt-xl:bg-[var(--login-bg-color)] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px"
> >
<div class="relative mx-auto h-full flex"> <div class="relative mx-auto h-full flex">
<div <!-- <div
:class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`" :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`"
> >
<!-- 左上角的 logo + 系统标题 --> &lt;!&ndash; 左上角的 logo + 系统标题 &ndash;&gt;
<div class="relative flex items-center text-white"> <div class="relative flex items-center text-white">
<img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" /> <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span> <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
</div> </div>
<!-- 左边的背景图 + 欢迎语 --> &lt;!&ndash; 左边的背景图 + 欢迎语 &ndash;&gt;
<div class="h-[calc(100%-60px)] flex items-center justify-center"> <div class="h-[calc(100%-60px)] flex items-center justify-center">
<TransitionGroup <TransitionGroup
appear appear
@ -26,7 +26,7 @@
</div> </div>
</TransitionGroup> </TransitionGroup>
</div> </div>
</div> </div>-->
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px"> <div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<!-- 右上角的主题语言选择 --> <!-- 右上角的主题语言选择 -->
<div <div

@ -58,9 +58,9 @@
{{ t('login.remember') }} {{ t('login.remember') }}
</el-checkbox> </el-checkbox>
</el-col> </el-col>
<el-col :offset="6" :span="12"> <!-- <el-col :offset="6" :span="12">
<el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link> <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
</el-col> </el-col>-->
</el-row> </el-row>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -82,7 +82,7 @@
mode="pop" mode="pop"
@success="handleLogin" @success="handleLogin"
/> />
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item> <el-form-item>
<el-row :gutter="5" justify="space-between" style="width: 100%"> <el-row :gutter="5" justify="space-between" style="width: 100%">
<el-col :span="8"> <el-col :span="8">
@ -108,8 +108,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider> <!-- <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item> <el-form-item>
<div class="w-[100%] flex justify-between"> <div class="w-[100%] flex justify-between">
@ -139,7 +139,7 @@
</el-link> </el-link>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
</el-row> </el-row>
</el-form> </el-form>
</template> </template>

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save