xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-04 10:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.10.0

Browse Source
This commit is contained in:
zhuoda
2020-12-14 15:56:25 +08:00
parent 653f4c2d6c
commit 7e580440f0
13 changed files with 310 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
smart-admin-service/smart-admin-api/doc/readme.txt
View File

@@ -1,19 +1,13 @@
1 更新密码
EmployeeController.updatePwd
2 更新功能点
PrivilegeController functionSaveOrUpdate和menuBatchSave、batchSaveFunctionList
3 超管默认账号
1 超管默认账号
sa/123456
4 执行脚本：
2 执行脚本：
先执行：src/main/resources/sql/smart-admin.sql
再执行：src/main/resources/sql/quartz_mysql_2.3.0.sql
5 除dev之外文件
3 除dev之外文件
6 刷新页面，获取权限是否走缓存
4 刷新页面，获取权限是否走缓存
LoginService.getSession
7 test类中去掉代码生成run
5 test类中去掉代码生成run

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/support/quartz/service/QuartzTask.java
View File

@@ -47,7 +47,11 @@ public class QuartzTask extends QuartzJobBean {
QuartzTaskLogEntity taskLogEntity = new QuartzTaskLogEntity();
taskLogEntity.setTaskId(taskId);
taskLogEntity.setIpAddress(SmartIPUtil.getLocalHostIP());
taskLogEntity.setTaskName(quartzTaskEntity.getTaskName());
try {
taskLogEntity.setTaskName(quartzTaskEntity.getTaskName());
} catch (Exception e) {
e.printStackTrace();
}
String paramsStr = null;
if (params != null) {
paramsStr = params.toString();

1
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/employee/EmployeeController.java
View File

@@ -86,7 +86,6 @@ public class EmployeeController {
public ResponseDTO<String> updatePwd(@Valid @RequestBody EmployeeUpdatePwdDTO updatePwdDTO) {
RequestTokenBO requestToken = SmartRequestTokenUtil.getRequestUser();
return employeeService.updatePwd(updatePwdDTO, requestToken);
// return ResponseDTO.succ();
}
@ApiOperation(value = "通过部门id获取当前部门的人员&没有部门的人", notes = "@author yandanyang")

3
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/privilege/controller/PrivilegeController.java
View File

@@ -42,7 +42,6 @@ public class PrivilegeController {
@PostMapping("/privilege/menu/batchSaveMenu")
public ResponseDTO<String> menuBatchSave(@Valid @RequestBody ValidateList<PrivilegeMenuDTO> menuList) {
return privilegeService.menuBatchSave(menuList);
// return ResponseDTO.succ();
}
@@ -57,14 +56,12 @@ public class PrivilegeController {
@PostMapping("/privilege/function/saveOrUpdate")
public ResponseDTO<String> functionSaveOrUpdate(@Valid @RequestBody PrivilegeFunctionDTO privilegeFunctionDTO) {
return privilegeService.functionSaveOrUpdate(privilegeFunctionDTO);
// return ResponseDTO.succ();
}
@ApiOperation(value = "批量保存功能点")
@PostMapping("/privilege/function/batchSave")
public ResponseDTO<String> batchSaveFunctionList(@Valid @RequestBody ValidateList<PrivilegeFunctionDTO> functionList) {
return privilegeService.batchSaveFunctionList(functionList);
// return ResponseDTO.succ();
}

2
smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
View File

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms

2
smart-admin-service/smart-admin-api/src/main/resources/pre/application.properties
View File

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms

2
smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
View File

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=Gq123456@
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms

2
smart-admin-service/smart-admin-api/src/main/resources/sit/application.properties
View File

@@ -44,7 +44,7 @@ spring.redis.host=127.0.0.1
spring.redis.port=6379
spring.redis.timeout=10000ms
spring.redis.password=
spring.redis.lettuce..pool.max-active=10
spring.redis.lettuce.pool.max-active=10
spring.redis.lettuce.pool.min-idle=5
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.max-wait=30000ms

442
smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
View File

File diff suppressed because one or more lines are too long

1
smart-admin-web/package.json
View File

@@ -23,6 +23,7 @@
"cropperjs": "^1.2.2",
"dayjs": "^1.7.7",
"decimal.js": "^10.1.1",
"e-guide-layer": "^0.1.1",
"echarts": "^4.0.4",
"gq-plus": "^2.1.5",
"html2canvas": "^1.0.0-alpha.12",

5
smart-admin-web/src/components/main/components/header-bar/header-bar.less
View File

@@ -12,3 +12,8 @@
}
}
}
.step-bottom-btn{
width: 380px !important;
}

30
smart-admin-web/src/components/main/components/header-bar/header-bar.vue
View File

@@ -6,7 +6,7 @@
icon="icon iconfont icondaohangzhedie"
/>
<div class="custom-bread-crumb" style="margin-left: 30px;">
<div class="custom-bread-crumb" style="margin-left: 30px;" id="topMenuSelectDiv">
<div class="ivu-breadcrumb" >
<Dropdown @on-click="changeTopMenu">
<a href="javascript:void(0)" style="font-size:15px;font-weight:600">
@@ -35,6 +35,11 @@
<div class="custom-content-con">
<slot></slot>
</div>
<e-guide-layer
:current-index.sync="guideActiveIndex"
:guide-list="guideList"
/>
</div>
</template>
<script>
@@ -64,6 +69,27 @@ export default {
required:true
}
},
data(){
return {
guideActiveIndex: 0,
guideList: [
{
confirmBtnText: '第一步：选择顶级菜单（SmartAdmin是支持四级菜单的哦）',
targetDom: '#topMenuSelectDiv',
clickHandle: () => {
this.guideActiveIndex = 1
},
},
{
confirmBtnText: '第二步：选择顶级下单下的三级菜单',
targetDom: '.side-menu-wrapper',
clickHandle: () => {
this.guideActiveIndex = 2
}
}
],
}
},
computed: {
// 面包屑集合
breadCrumbList() {
@@ -80,3 +106,5 @@ export default {
}
};
</script>

6
smart-admin-web/src/main.js
View File

@@ -23,9 +23,13 @@ import enumInfo from '@/constants';
// 处理table操作按钮
import tableAction from './lib/table-action';
//时间
// 时间
import moment from 'moment';
import 'e-guide-layer/dist/e-guide-layer.css'
import eGuideLayer from 'e-guide-layer'
Vue.use(eGuideLayer);
Vue.prototype.$tableAction = tableAction;
Vue.use(Enum, { enumInfo });