master
Gitea 2 weeks ago
parent 0f75e1b735
commit 32863d452e
  1. 2
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  2. 4
      jeecgboot-vue3/.env
  3. 2
      jeecgboot-vue3/index.html
  4. BIN
      jeecgboot-vue3/src/assets/loginmini/icon/cxql.png
  5. BIN
      jeecgboot-vue3/src/assets/loginmini/icon/cxqt.png
  6. 4
      jeecgboot-vue3/src/components/Application/src/AppLogo.vue
  7. 2
      jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue
  8. 8
      jeecgboot-vue3/src/layouts/default/header/index.vue
  9. 6
      jeecgboot-vue3/src/layouts/default/tabs/index.vue
  10. 14
      jeecgboot-vue3/src/views/sys/login/TokenLoginPage.vue
  11. 14
      jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
  12. 8
      jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts

@ -1759,7 +1759,7 @@ public class SysUserController {
* @return * @return
*/ */
@PostMapping("/login/setting/userEdit") @PostMapping("/login/setting/userEdit")
@RequiresPermissions("system:user:setting:edit") //@RequiresPermissions("system:user:setting:edit")
public Result<String> userEdit(@RequestBody SysUser sysUser, HttpServletRequest request) { public Result<String> userEdit(@RequestBody SysUser sysUser, HttpServletRequest request) {
String username = JwtUtil.getUserNameByToken(request); String username = JwtUtil.getUserNameByToken(request);
SysUser user = sysUserService.getById(sysUser.getId()); SysUser user = sysUserService.getById(sysUser.getId());

@ -2,10 +2,10 @@
VITE_PORT = 3500 VITE_PORT = 3500
# 网站标题 # 网站标题
VITE_GLOB_APP_TITLE =创新券 VITE_GLOB_APP_TITLE =驻马店市科技创新券管理平台
# 简称,此变量只能是字符/下划线 # 简称,此变量只能是字符/下划线
VITE_GLOB_APP_SHORT_NAME = JeecgBoot_Pro VITE_GLOB_APP_SHORT_NAME = 驻马店市科技创新券管理平台
# 单点登录服务端地址 # 单点登录服务端地址
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas

@ -157,7 +157,7 @@
</style> </style>
<div class="app-loading"> <div class="app-loading">
<div class="app-loading-wrap"> <div class="app-loading-wrap">
<img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" /> <div class="app-loading-title">登录中</div>
<div class="app-loading-dots"> <div class="app-loading-dots">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span> <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div> </div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

@ -4,7 +4,7 @@
--> -->
<template> <template>
<div class="anticon" :class="getAppLogoClass" @click="goHome"> <div class="anticon" :class="getAppLogoClass" @click="goHome">
<img src="../../../assets/images/logo.png" /> <!-- <img src="../../../assets/images/logo.png" />-->
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle"> <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
{{ shortTitle }} {{ shortTitle }}
</div> </div>
@ -38,7 +38,7 @@
const { getCollapsedShowTitle } = useMenuSetting(); const { getCollapsedShowTitle } = useMenuSetting();
const userStore = useUserStore(); const userStore = useUserStore();
const { title, shortTitle } = useGlobSetting(); const { title, shortTitle } = useGlobSetting();
const go = useGo(); const go = useGo();
const getAppLogoClass = computed(() => [prefixCls, props.theme, { 'collapsed-show-title': unref(getCollapsedShowTitle) }]); const getAppLogoClass = computed(() => [prefixCls, props.theme, { 'collapsed-show-title': unref(getCollapsedShowTitle) }]);

@ -15,7 +15,7 @@
<MenuDivider v-if="getShowDoc" /> <MenuDivider v-if="getShowDoc" />
<MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" /> <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" />
<MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" /> <MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" />
<MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" /> <!--<MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />-->
<MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" /> <MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
<!-- <MenuItem <!-- <MenuItem
v-if="getUseLockPage" v-if="getUseLockPage"

@ -33,7 +33,7 @@
<LockScreen v-if="getUseLockPage" /> <LockScreen v-if="getUseLockPage" />
<AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" /> <!--<AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />-->
<UserDropDown :theme="getHeaderTheme" /> <UserDropDown :theme="getHeaderTheme" />
@ -225,7 +225,7 @@
//update-begin---author:scott ---date:2022-09-30 for----------- //update-begin---author:scott ---date:2022-09-30 for-----------
// //
@prefix-cls: ~'@{namespace}-layout-header'; @prefix-cls: ~'@{namespace}-layout-header';
.ant-layout .@{prefix-cls} { .ant-layout .@{prefix-cls} {
display: flex; display: flex;
padding: 0 8px; padding: 0 8px;
@ -233,14 +233,14 @@
height: @header-height; height: @header-height;
// update-end--author:liaozhiyang---date:20240407---forQQYUN-8762 // update-end--author:liaozhiyang---date:20240407---forQQYUN-8762
align-items: center; align-items: center;
.headerIntroductionClass { .headerIntroductionClass {
margin-right: 4px; margin-right: 4px;
margin-bottom: 2px; margin-bottom: 2px;
border-bottom: 0px; border-bottom: 0px;
border-left: 0px; border-left: 0px;
} }
&--light { &--light {
.headerIntroductionClass { .headerIntroductionClass {
color: #000; color: #000;

@ -21,16 +21,16 @@
<template #rightExtra v-if="getShowRedo || getShowQuick"> <template #rightExtra v-if="getShowRedo || getShowQuick">
<TabRedo v-if="getShowRedo" /> <TabRedo v-if="getShowRedo" />
<!-- <TabContent isExtra :tabItem="$route" v-if="getShowQuick" /> --> <!-- <TabContent isExtra :tabItem="$route" v-if="getShowQuick" /> -->
<!-- 列表页全屏 <!-- 列表页全屏
<FoldButton v-if="getShowFold" />--> <FoldButton v-if="getShowFold" />-->
<!-- <FullscreenOutlined /> --> <!-- <FullscreenOutlined /> -->
<router-link to="/ai" class="ai-icon"> <!--<router-link to="/ai" class="ai-icon">
<a-tooltip title="AI助手" placement="left"> <a-tooltip title="AI助手" placement="left">
<svg t="1706259688149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2056" width="17" height="17"> <svg t="1706259688149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2056" width="17" height="17">
<path d="M826.368 325.632c0-7.168 2.048-10.24 10.24-10.24h123.904c7.168 0 10.24 2.048 10.24 10.24v621.568c0 7.168-2.048 10.24-10.24 10.24h-122.88c-8.192 0-10.24-4.096-10.24-10.24l-1.024-621.568z m-8.192-178.176c0-50.176 35.84-79.872 79.872-79.872 48.128 0 79.872 32.768 79.872 79.872 0 52.224-33.792 79.872-81.92 79.872-46.08 1.024-77.824-27.648-77.824-79.872zM462.848 584.704C441.344 497.664 389.12 307.2 368.64 215.04h-2.048c-16.384 92.16-58.368 247.808-92.16 369.664h188.416zM243.712 712.704l-62.464 236.544c-2.048 7.168-4.096 8.192-12.288 8.192H54.272c-8.192 0-10.24-2.048-8.192-12.288l224.256-783.36c4.096-13.312 7.168-26.624 8.192-65.536 0-6.144 2.048-8.192 7.168-8.192H450.56c6.144 0 8.192 2.048 10.24 8.192l250.88 849.92c2.048 7.168 0 10.24-7.168 10.24H573.44c-7.168 0-10.24-2.048-12.288-7.168l-65.536-236.544c1.024 1.024-251.904 0-251.904 0z" fill="#333333" p-id="19816"></path> <path d="M826.368 325.632c0-7.168 2.048-10.24 10.24-10.24h123.904c7.168 0 10.24 2.048 10.24 10.24v621.568c0 7.168-2.048 10.24-10.24 10.24h-122.88c-8.192 0-10.24-4.096-10.24-10.24l-1.024-621.568z m-8.192-178.176c0-50.176 35.84-79.872 79.872-79.872 48.128 0 79.872 32.768 79.872 79.872 0 52.224-33.792 79.872-81.92 79.872-46.08 1.024-77.824-27.648-77.824-79.872zM462.848 584.704C441.344 497.664 389.12 307.2 368.64 215.04h-2.048c-16.384 92.16-58.368 247.808-92.16 369.664h188.416zM243.712 712.704l-62.464 236.544c-2.048 7.168-4.096 8.192-12.288 8.192H54.272c-8.192 0-10.24-2.048-8.192-12.288l224.256-783.36c4.096-13.312 7.168-26.624 8.192-65.536 0-6.144 2.048-8.192 7.168-8.192H450.56c6.144 0 8.192 2.048 10.24 8.192l250.88 849.92c2.048 7.168 0 10.24-7.168 10.24H573.44c-7.168 0-10.24-2.048-12.288-7.168l-65.536-236.544c1.024 1.024-251.904 0-251.904 0z" fill="#333333" p-id="19816"></path>
</svg> </svg>
</a-tooltip> </a-tooltip>
</router-link> </router-link>-->
</template> </template>
</Tabs> </Tabs>
</div> </div>

@ -1,11 +1,11 @@
<template> <template>
<div class="app-loading"> <div class="app-loading">
<div class="app-loading-wrap"> <div class="app-loading-wrap">
<img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo"> <div class="app-loading-title">登录中</div>
<div class="app-loading-dots"> <div class="app-loading-dots">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span> <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div> </div>
<div class="app-loading-title">创新券</div> <div class="app-loading-title">驻马店市科技创新券管理平台</div>
</div> </div>
</div> </div>
</template> </template>
@ -19,7 +19,7 @@
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
export default { export default {
name: "TokenLogin", name: "TokenLogin",
setup(){ setup(){
@ -31,7 +31,7 @@
if(!routeQuery){ if(!routeQuery){
createMessage.warning('参数无效') createMessage.warning('参数无效')
} }
const token = routeQuery['loginToken']; const token = routeQuery['loginToken'];
if(!token){ if(!token){
createMessage.warning('token无效') createMessage.warning('token无效')
@ -53,12 +53,12 @@
duration: 4, duration: 4,
}); });
} }
function requestSuccess(res){ function requestSuccess(res){
let info = routeQuery.info; let info = routeQuery.info;
if(info){ if(info){
let query = JSON.parse(info); let query = JSON.parse(info);
//update-begin-author:taoyan date:2023-4-27 for: QQYUN-4882 //update-begin-author:taoyan date:2023-4-27 for: QQYUN-4882
let path = ''; let path = '';
if(query.isLowApp === 1){ if(query.isLowApp === 1){
@ -68,7 +68,7 @@
path = '/task/handle/' + taskId path = '/task/handle/' + taskId
} }
//update-end-author:taoyan date:2023-4-27 for: QQYUN-4882 //update-end-author:taoyan date:2023-4-27 for: QQYUN-4882
router.replace({ path, query }); router.replace({ path, query });
notification.success({ notification.success({
message: t('sys.login.loginSuccessTitle'), message: t('sys.login.loginSuccessTitle'),

@ -1,7 +1,7 @@
<template> <template>
<div :class="prefixCls" class="login-background-img"> <div :class="prefixCls" class="login-background-img">
<AppLocalePicker class="absolute top-4 right-4 enter-x xl:text-gray-600" :showText="false"/> <!-- <AppLocalePicker class="absolute top-4 right-4 enter-x xl:text-gray-600" :showText="false"/>
<AppDarkModeToggle class="absolute top-3 right-7 enter-x" /> <AppDarkModeToggle class="absolute top-3 right-7 enter-x" />-->
<div class="aui-logo" v-if="!getIsMobile"> <div class="aui-logo" v-if="!getIsMobile">
<div> <div>
<h3> <h3>
@ -10,7 +10,7 @@
</div> </div>
</div> </div>
<div v-else class="aui-phone-logo"> <div v-else class="aui-phone-logo">
<img :src="logoImg" alt="jeecg" /> <!--<img :src="logoImg" alt="jeecg" />-->
</div> </div>
<div v-show="type === 'login'"> <div v-show="type === 'login'">
<div class="aui-content"> <div class="aui-content">
@ -103,7 +103,7 @@
</div> </div>
</div> </div>
</div> </div>
<a-form @keyup.enter.native="loginHandleClick"> <!-- <a-form @keyup.enter.native="loginHandleClick">
<div class="aui-flex aui-third-text"> <div class="aui-flex aui-third-text">
<div class="aui-flex-box aui-third-border"> <div class="aui-flex-box aui-third-border">
<span>{{ t('sys.login.otherSignIn') }}</span> <span>{{ t('sys.login.otherSignIn') }}</span>
@ -131,7 +131,7 @@
</div> </div>
</div> </div>
</div> </div>
</a-form> </a-form>-->
</div> </div>
</div> </div>
</div> </div>
@ -172,8 +172,8 @@
import MiniForgotpad from './MiniForgotpad.vue'; import MiniForgotpad from './MiniForgotpad.vue';
import MiniRegister from './MiniRegister.vue'; import MiniRegister from './MiniRegister.vue';
import MiniCodelogin from './MiniCodelogin.vue'; import MiniCodelogin from './MiniCodelogin.vue';
import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png'; import logoImg from '/@/assets/loginmini/icon/cxql.png';
import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png'; import adTextImg from '/@/assets/loginmini/icon/cxql.png';
import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application'; import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
import { useLocaleStore } from '/@/store/modules/locale'; import { useLocaleStore } from '/@/store/modules/locale';
import { useDesign } from "/@/hooks/web/useDesign"; import { useDesign } from "/@/hooks/web/useDesign";

@ -30,7 +30,7 @@ export const settingList = [
img1: geren1, img1: geren1,
img2: geren2, img2: geren2,
}, },
{ /* {
key: '2', key: '2',
name: '我的组织', name: '我的组织',
component: 'TenantSetting', component: 'TenantSetting',
@ -38,7 +38,7 @@ export const settingList = [
icon:'ant-design:team-outlined', icon:'ant-design:team-outlined',
img1: zuhu1, img1: zuhu1,
img2: zuhu2, img2: zuhu2,
}, },*/
{ {
key: '3', key: '3',
name: '账号安全', name: '账号安全',
@ -47,14 +47,14 @@ export const settingList = [
img1: anquan1, img1: anquan1,
img2: anquan2, img2: anquan2,
}, },
{ /* {
key: '4', key: '4',
name: '第三方APP', name: '第三方APP',
component: 'WeChatDingSetting', component: 'WeChatDingSetting',
icon: 'ant-design:contacts-outlined', icon: 'ant-design:contacts-outlined',
img1: app1, img1: app1,
img2: app2, img2: app2,
}, },*/
]; ];

Loading…
Cancel
Save