Skip to content

Commit 9b354b2

Browse files
author
zhuoda
committed
【v3.3.0】 1、uniapp 首页菜单功能区多平台适配;2、菜单组件路径说明;3、长时间不在线自动返回登录页;4、标签页 tab 为圆角;5、升级 sa token 到 1.37.0;6、代码生成表单弹窗 关闭事件;7、接口操作日志@OperateLogAspect 对文件的处理;
1 parent fd27cd6 commit 9b354b2

File tree

49 files changed

+321
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+321
-312
lines changed

‎smart-admin-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<jjwt.version>0.9.1</jjwt.version>
4848
<jwks-rsa.version>0.9.0</jwks-rsa.version>
4949
<velocity-tools.version>3.1</velocity-tools.version>
50-
<sa-token.version>1.35.0.RC</sa-token.version>
50+
<sa-token.version>1.37.0</sa-token.version>
5151
<ip2region.version>2.7.0</ip2region.version>
5252
<bcprov.version>1.59</bcprov.version>
5353
<jackson-datatype-jsr310.version>2.13.4</jackson-datatype-jsr310.version>

‎smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ public ResponseDTO<LoginResultVO> login(LoginForm loginForm, String ip, String u
159159

160160
// 对于万能密码：受限制sa token 要求loginId唯一，万能密码只能插入一段uuid
161161
String saTokenLoginId = SUPER_PASSWORD_LOGIN_ID_PREFIX + StringConst.COLON + UUID.randomUUID().toString().replace("-", "") + StringConst.COLON + employeeEntity.getEmployeeId();
162-
// 万能密码登录只能登录15分钟
163-
StpUtil.login(saTokenLoginId, 900);
162+
// 万能密码登录只能登录30分钟
163+
StpUtil.login(saTokenLoginId, 1800);
164164

165165
} else {
166166

‎smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
2828
import org.springframework.web.context.request.RequestContextHolder;
2929
import org.springframework.web.context.request.ServletRequestAttributes;
30+
import org.springframework.web.multipart.MultipartFile;
3031
import org.springframework.web.servlet.ModelAndView;
3132

3233
import javax.annotation.Resource;
@@ -238,6 +239,7 @@ private String buildParamString(Object[] args) {
238239
if (arg instanceof HttpServletRequest
239240
|| arg instanceof HttpServletResponse
240241
|| arg instanceof ModelAndView
242+
|| arg instanceof MultipartFile
241243
|| arg instanceof BindResult) {
242244
continue;
243245
}

‎smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm

+182-178
Large diffs are not rendered by default.

‎smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ spring:
33
datasource:
44
url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
55
username: root
6-
password: Zhuoda#1024lab
6+
password: Zhuoda1024lab
77
initial-size: 10
88
min-idle: 10
99
max-active: 100

‎smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ spring:
33
datasource:
44
url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
55
username: root
6-
password: Java@1024
6+
password: Zhuoda1024lab
77
initial-size: 2
88
min-idle: 2
99
max-active: 10

‎smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!---
22
* 字段 下拉选择框
3-
*
3+
*
44
* @Author: 1024创新实验室：罗伊
5-
* @Date: 2022-09-12 22:06:45
6-
* @Wechat: zhuda1024
7-
* @Email: lab1024@163.com
8-
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
5+
* @Date: 2022-09-12 22:06:45
6+
* @Wechat: zhuda1024
7+
* @Email: lab1024@163.com
8+
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
99
*
1010
-->
1111
<template>
@@ -108,7 +108,7 @@
108108
emit('update:value', valueList);
109109
emit('change', valueList);
110110
} else {
111-
let findValue = dictValueList.value.find((e) => e.valueCode == value);
111+
let findValue = dictValueList.value.find((e) => e.valueCode === value);
112112
emit('update:value', findValue.valueCode);
113113
emit('change', findValue.valueCode);
114114
}

‎smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
22
* 标签页
3-
*
4-
* @Author: 1024创新实验室-主任：卓大
5-
* @Date: 2022-09-06 20:29:12
6-
* @Wechat: zhuda1024
7-
* @Email: lab1024@163.com
8-
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
3+
*
4+
* @Author: 1024创新实验室-主任：卓大
5+
* @Date: 2022-09-06 20:29:12
6+
* @Wechat: zhuda1024
7+
* @Email: lab1024@163.com
8+
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
99
-->
1010
<template>
1111
<!-- 标签页，共两部分：1、标签 ；2、标签操作区 -->
@@ -130,6 +130,7 @@
130130

131131
const { useToken } = theme;
132132
const { token } = useToken();
133+
const borderRadius = token.value.borderRadius + 'px';
133134
</script>
134135

135136
<style scoped lang="less">
@@ -199,6 +200,7 @@
199200

200201
:deep(.ant-tabs-small > .ant-tabs-nav .ant-tabs-tab) {
201202
padding: 5px 8px 3px 10px;
203+
border-radius: v-bind(borderRadius);
202204
}
203205

204206
:deep(.ant-tabs-tab-active) {

‎smart-admin-web/javascript-ant-design-vue3/src/views/system/menu/components/menu-operate-modal.vue

+2-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<a-form-item v-if="form.frameFlag" label="外链地址" name="frameUrl">
4848
<a-input v-model:value="form.frameUrl" placeholder="请输入外链地址" />
4949
</a-form-item>
50-
<a-form-item v-else label="组件地址" name="component">
50+
<a-form-item v-else label="组件地址" name="component" help="比如 商品列表：/business/erp/goods/goods-list.vue">
5151
<a-input v-model:value="form.component" placeholder="请输入组件地址 默认带有开头/@/views" />
5252
</a-form-item>
5353
</template>
@@ -91,9 +91,8 @@
9191
</a-form-item>
9292
</template>
9393
<!-- 按钮 end -->
94-
<a-form-item label="排序" name="sort">
94+
<a-form-item label="排序" name="sort" help="值越小越靠前">
9595
<a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
96-
<h6 style="color: #ababab">值越小越靠前</h6>
9796
</a-form-item>
9897
</a-form>
9998
<div class="footer">

‎smart-admin-web/typescript-ant-design-vue3/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
### **敬请期待，2024年5月开干**
2+

‎smart-app/.env.development

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
NODE_ENV=development
22
VITE_APP_TITLE='SmartAdmin 开发环境(Dev)'
3-
VITE_APP_API_URL='http://127.0.0.1:1024'
3+
VITE_APP_API_URL='https://app.smartadmin.vip/smart-app-api'

‎smart-app/src/App.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { useUserStore } from '/@/store/modules/system/user';
2+
import { useUserStore } from '@/store/modules/system/user';
33
export default {
44
onLaunch: function () {
55
useUserStore().getLoginInfo();

‎smart-app/src/api/business/goods/goods-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @LastEditTime: 2022-06-23
66
* @LastEditors: zhuoda
77
*/
8-
import { postRequest, getRequest } from '/@/lib/smart-request';
8+
import { postRequest, getRequest } from '@/lib/smart-request';
99

1010
export const goodsApi = {
1111
// 添加商品 @author zhuoda

‎smart-app/src/api/business/oa/enterprise-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @Email: [email protected]
88
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
99
*/
10-
import { postRequest, getRequest } from '/@/lib/smart-request';
10+
import { postRequest, getRequest } from '@/lib/smart-request';
1111

1212
export const enterpriseApi = {
1313
// 新建企业 @author 开云

‎smart-app/src/api/business/oa/notice-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @Author: zhuoda
55
* @Date: 2022-08-16 20:34:36
66
*/
7-
import { postRequest, getRequest } from '/@/lib/smart-request';
7+
import { postRequest, getRequest } from '@/lib/smart-request';
88

99
export const noticeApi = {
1010
// ---------------- 通知公告类型 -----------------------

‎smart-app/src/api/support/change-log-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @Date: 2022-09-26 14:53:50
66
* @Copyright 1024创新实验室
77
*/
8-
import { postRequest, getRequest } from '/@/lib/smart-request';
8+
import { postRequest, getRequest } from '@/lib/smart-request';
99

1010
export const changeLogApi = {
1111
/**

‎smart-app/src/api/support/dict-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @Email: [email protected]
88
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
99
*/
10-
import { postRequest, getRequest } from '/@/lib/smart-request';
10+
import { postRequest, getRequest } from '@/lib/smart-request';
1111

1212
export const dictApi = {
1313
// 分页查询数据字典KEY - @author 卓大

‎smart-app/src/api/support/file-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @Date: 2022-09-26 14:53:50
66
* @Copyright 1024创新实验室
77
*/
8-
import { uploadRequest } from '/@/lib/smart-request';
8+
import { uploadRequest } from '@/lib/smart-request';
99

1010
export const fileApi = {
1111
upload: (file, folder) => {

‎smart-app/src/api/system/login-api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @Email: [email protected]
88
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
99
*/
10-
import { getRequest, postRequest } from '/@/lib/smart-request';
10+
import { getRequest, postRequest } from '@/lib/smart-request';
1111

1212
export const loginApi = {
1313
/**

‎smart-app/src/components/dict-select/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<script setup>
1818
import { onMounted, ref, watch } from 'vue';
19-
import { dictApi } from '/@/api/support/dict-api';
19+
import { dictApi } from '@/api/support/dict-api';
2020

2121
const props = defineProps({
2222
keyCode: String,

‎smart-app/src/lib/smart-request.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* @Email: [email protected]
88
* @Copyright 1024创新实验室 （ https://1024lab.net ），Since 2012
99
*/
10-
import { USER_TOKEN } from '/@/constants/local-storage-key-const';
11-
import { DATA_TYPE_ENUM } from '/@/constants/common-const';
10+
import { USER_TOKEN } from '@/constants/local-storage-key-const';
11+
import { DATA_TYPE_ENUM } from '@/constants/common-const';
1212
import { decryptData, encryptData } from './encrypt';
13-
import { useUserStore } from '/@/store/modules/system/user';
13+
import { useUserStore } from '@/store/modules/system/user';
1414

1515
const baseUrl = import.meta.env.VITE_APP_API_URL;
1616

‎smart-app/src/main.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { store } from './store/index';
66
import './theme/index.scss';
77

88
// 枚举管理
9-
import smartEnumPlugin from '/@/plugins/smart-enums-plugin';
10-
import constantsInfo from '/@/constants/index';
9+
import smartEnumPlugin from '@/plugins/smart-enums-plugin';
10+
import constantsInfo from '@/constants/index';
1111
import lodash from 'lodash';
1212

1313
export function createApp() {

‎smart-app/src/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name" : "",
2+
"name" : "smart-app",
33
"appid" : "",
44
"description" : "",
55
"versionName" : "1.0.0",
@@ -50,7 +50,7 @@
5050
"quickapp" : {},
5151
/* 小程序特有相关 */
5252
"mp-weixin" : {
53-
"appid" : "",
53+
"appid" : "wx2f5032ef5c4adae4",
5454
"setting" : {
5555
"urlCheck" : false
5656
},

‎smart-app/src/pages/enterprise/enterprise-detail.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@
8383
</template>
8484

8585
<script setup>
86-
import SmartDetailTabs from '/@/components/smart-detail-tabs/index.vue';
86+
import SmartDetailTabs from '@/components/smart-detail-tabs/index.vue';
8787
import { ref, reactive } from 'vue';
88-
import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
88+
import { enterpriseApi } from '@/api/business/oa/enterprise-api';
8989
import { onShow, onLoad } from '@dcloudio/uni-app';
90-
import { smartSentry } from '/@/lib/smart-sentry';
91-
import { SmartLoading, SmartToast } from '/@/lib/smart-support';
90+
import { smartSentry } from '@/lib/smart-sentry';
91+
import { SmartLoading, SmartToast } from '@/lib/smart-support';
9292
9393
// ----------------------- tab -----------------------
9494

‎smart-app/src/pages/enterprise/enterprise-form.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848

4949
<script setup>
5050
import { reactive, ref } from 'vue';
51-
import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
52-
import { regular } from '/@/constants/regular-const';
53-
import SmartEnumRadio from '/@/components/smart-enum-radio/index.vue';
54-
import { smartSentry } from '/@/lib/smart-sentry';
55-
import { SmartLoading, SmartToast } from '/@/lib/smart-support';
51+
import { enterpriseApi } from '@/api/business/oa/enterprise-api';
52+
import { regular } from '@/constants/regular-const';
53+
import SmartEnumRadio from '@/components/smart-enum-radio/index.vue';
54+
import { smartSentry } from '@/lib/smart-sentry';
55+
import { SmartLoading, SmartToast } from '@/lib/smart-support';
5656
import { onLoad, onReady, onShow } from '@dcloudio/uni-app';
5757
5858
// --------------------- 表单 ---------------------

‎smart-app/src/pages/enterprise/enterprise-list.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555

5656
<script setup>
5757
import { reactive, ref } from 'vue';
58-
import { enterpriseApi } from '/@/api/business/oa/enterprise-api';
58+
import { enterpriseApi } from '@/api/business/oa/enterprise-api';
5959
import { onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
6060
import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
61-
import { smartSentry } from '/@/lib/smart-sentry';
61+
import { smartSentry } from '@/lib/smart-sentry';
6262
import _ from 'lodash';
6363
6464
// --------------------------- 查询 ---------------------------------

‎smart-app/src/pages/goods/components/goods-query-form-popup.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
<script setup>
3232
import { reactive, ref, toRaw } from 'vue';
33-
import DictSelect from '/@/components/dict-select/index.vue';
34-
import SmartEnumSelect from '/@/components/smart-enum-select/index.vue';
33+
import DictSelect from '@/components/dict-select/index.vue';
34+
import SmartEnumSelect from '@/components/smart-enum-select/index.vue';
3535
3636
const emits = defineEmits(['close']);
3737
defineExpose({ show });

‎smart-app/src/pages/goods/goods-index.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
<script setup>
4747
import { reactive, ref } from 'vue';
4848
import QueryFormPopUp from './components/goods-query-form-popup.vue';
49-
import { goodsApi } from '/@/api/business/goods/goods-api';
49+
import { goodsApi } from '@/api/business/goods/goods-api';
5050
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
5151
import useMescroll from '@/uni_modules/uni-mescroll/hooks/useMescroll';
52-
import { smartSentry } from '/@/lib/smart-sentry';
52+
import { smartSentry } from '@/lib/smart-sentry';
5353
import NoticeList from './components/goods-list.vue';
5454
import _ from 'lodash';
5555

‎smart-app/src/pages/home/components/goods.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
<script setup>
2828
import { ref } from 'vue';
29-
import { smartSentry } from '/@/lib/smart-sentry';
29+
import { smartSentry } from '@/lib/smart-sentry';
3030
import { onShow } from '@dcloudio/uni-app';
31-
import { goodsApi } from '/@/api/business/goods/goods-api';
31+
import { goodsApi } from '@/api/business/goods/goods-api';
3232
3333
const queryForm = {
3434
pageNum: 1,

0 commit comments

Comments
 (0)