pay 修改
This commit is contained in:
hupeng
172
README.md
172
README.md
@ -1,83 +1,143 @@
|
||||
<h1 style="text-align: center">el-admin 后台管理系统</h1>
|
||||
<div style="text-align: center">
|
||||
<h1 style="text-align: center">yshop意象商城系统</h1>
|
||||
|
||||
[](https://github.com/elunez/eladmin/blob/master/LICENSE)
|
||||
[](https://gitee.com/elunez/eladmin)
|
||||
[](https://github.com/elunez/eladmin)
|
||||
[](https://github.com/elunez/eladmin)
|
||||
|
||||
</div>
|
||||
|
||||
#### 项目简介
|
||||
eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前后端分离的后台管理系统， 权限控制的方式为RBAC，项目支持数据字典与数据权限管理，支持一键生成前后端代码，支持前端菜单动态路由
|
||||
yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurity+jwt+redis+Vue的前后端分离的商城系统， 包含商城、拼团、砍价、
|
||||
秒杀、优惠券、积分、分销等功能，更适合企业或个人二次开发；
|
||||
|
||||
**开发文档** [https://docs.auauz.net/](https://docs.auauz.net)
|
||||
**开发文档** 【[查看文档](https://gitee.com/guchengwuyue/yshopmall/wikis/%E5%BC%80%E5%8F%91%E7%8E%AF%E5%A2%83?sort_id=1718722)】
|
||||
|
||||
**体验地址** [https://auauz.net/](https://auauz.net/)
|
||||
#### 体验地址(手机体验最好用公众号，因为H5模式不支持微信支付，只有余额支付)
|
||||
|
||||
| | 后台系统 | 前端(公众号)及H5 |
|
||||
|--- |--- | --- |
|
||||
| | https://yshop.dayouqiantu.cn | https://h5.dayouqiantu.cn |
|
||||
| | 后台体验账号/密码：admin/123456 | 公众号: |
|
||||
|
||||
**账号密码** ```admin/123456```(默认密码都是123456)
|
||||
|
||||
#### 项目源码
|
||||
|
||||
| | 后端源码 | 前端源码 |
|
||||
| | 后台系统源码 | 后台系统前端源码 |
|
||||
|--- |--- | --- |
|
||||
| github | https://github.com/elunez/eladmin | https://github.com/elunez/eladmin-qd |
|
||||
| 码云 | https://gitee.com/elunez/eladmin | https://gitee.com/elunez/eladmin-qt |
|
||||
| 码云 | https://gitee.com/guchengwuyue/yshopmall | https://gitee.com/guchengwuyue/yshopmall_qd |
|
||||
| github | https://github.com/guchengwuyue/yshopmall |https://github.com/guchengwuyue/yshopmall_qd |
|
||||
|
||||
#### 开源版本与VIP版本说明
|
||||
|
||||
|
||||
### 开源版
|
||||
1.包括整个商城系统后台、数据库、api(只是简单的配置好模块);
|
||||
|
||||
2.本版本本身属于独立后台商城管理系统、可独立作为cms、商城等等后台使用;
|
||||
|
||||
3.可以个人、企业直接使用。
|
||||
|
||||
### VIP版
|
||||
1.包括整个商城系统后台、数据库、API、H5;
|
||||
|
||||
2.本版本是演示的所有功能代码;
|
||||
|
||||
3.加入VIP、享有后续所有功能免费升级及其技术支持等。
|
||||
|
||||
4、VIP为终身，【[详情请查看](https://gitee.com/guchengwuyue/yshopmall/wikis/pages?sort_id=1715823&doc_id=441578)】
|
||||
|
||||
|
||||
## 商城功能
|
||||
|
||||
* 一：商品模块：商品添加、规格设置，商品上下架等
|
||||
* 二：订单模块：下单、购物车、支付，发货、收货、评价、退款等
|
||||
* 三：营销模块：积分、优惠券、分销、砍价、拼团、秒杀(、到店核销等
|
||||
* 四：微信模块：自定义菜单、自动回复、微信授权、图文管理、模板消息推送
|
||||
* 五：配置模块：各种配置
|
||||
* 六：用户模块：登陆、注册、会员卡等
|
||||
* 七：其他等
|
||||
|
||||
|
||||
#### 已经完成功能
|
||||
- 可以具体查看演示地址查看当前版本已经完成的功能，不再絮叨啦
|
||||
|
||||
|
||||
#### 系统功能
|
||||
- 用户管理：提供用户的相关配置，新增用户后，默认密码为123456
|
||||
- 角色管理：对权限与菜单进行分配，可根据部门设置角色的数据权限
|
||||
- 权限管理：权限细化到接口，可以理解成按钮权限
|
||||
- 菜单管理：已实现菜单动态路由，后端可配置化，支持多级菜单
|
||||
- 部门管理：可配置系统组织架构，树形表格展示
|
||||
- 岗位管理：配置各个部门的职位
|
||||
- 字典管理：应广大码友的要求加入字典管理，可维护常用一些固定的数据，如：状态，性别等
|
||||
- 操作日志：记录用户操作的日志
|
||||
- 异常日志：记录异常日志，方便开发人员定位错误
|
||||
- 系统缓存：使用jedis将缓存操作可视化，并提供对redis的基本操作，可根据需求自行扩展
|
||||
- SQL监控：采用druid 监控数据库访问性能，默认用户名admin，密码123456
|
||||
- 定时任务：整合Quartz做定时任务，加入任务日志，任务运行情况一目了然
|
||||
- 代码生成：高灵活度一键生成前后端代码，减少百分之80左右的工作任务
|
||||
- 邮件工具：配合富文本，发送html格式的邮件
|
||||
- 免费图床：使用sm.ms图床，用作公共图片上传使用
|
||||
- 七牛云存储：可同步七牛云存储的数据到系统，无需登录七牛云直接操作云数据
|
||||
- 支付宝支付：整合了支付宝支付并且提供了测试账号，可自行测试
|
||||
|
||||
#### 项目结构
|
||||
项目采用分模块开发方式，将通用的配置放在公共模块，```system```模块为系统核心模块也是项目入口模块，```logging``` 模块为系统的日志模块，```tools``` 为第三方工具模块，包含了图床、邮件、七牛云、支付宝，```generator``` 为系统的代码生成模块
|
||||
- eladmin-common 公共模块
|
||||
- exception 项目统一异常的处理
|
||||
- mapper mapstruct的通用mapper
|
||||
- redis redis缓存相关配置
|
||||
- swagger2 接口文档配置
|
||||
- utils 系统通用工具类
|
||||
- eladmin-system 系统核心模块（系统启动入口）
|
||||
- config 配置跨域与静态资源，与数据权限
|
||||
- modules 系统相关模块(登录授权、定时任务等)
|
||||
- eladmin-logging 系统日志模块
|
||||
- eladmin-tools 系统第三方工具模块
|
||||
- eladmin-generator 系统代码生成模块
|
||||
项目采用分模块开发方式
|
||||
- yshop-api 公众号(H5)API模块
|
||||
- yshop-mp 微信相关模块
|
||||
- yshop-common 公共模块
|
||||
- yshop-system 商城系统模块
|
||||
- yshop-logging 日志模块
|
||||
- yshop-tools 第三方工具模块
|
||||
- yshop-generator 代码生成模块
|
||||
|
||||
#### 系统预览
|
||||
<table>
|
||||
<tr>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf77fa8144d68788.png"/></td>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf7763993e361778.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194017_9207632f_477893.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194030_70f5ce92_477893.png"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf7763971d453615.png"/></td>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf77632e85a60423.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194114_cd0b06ce_477893.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194130_abb4f788_477893.png"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf77632b4b090165.png"/></td>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf77639929277783.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194147_63de73f4_477893.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194207_7b3b1f53_477893.png"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="https://i.loli.net/2019/05/18/5cdf78969adc389599.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/194217_3f47214f_477893.png"/></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
#### 项目捐赠
|
||||
项目的发展离不开你的支持，请作者喝杯咖啡吧 ☕！ [Donate](https://docs.auauz.net/#/jz)
|
||||
<table>
|
||||
<tr>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201443_df1cc3a6_477893.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201540_ef6123a9_477893.png"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201601_acd0ccd3_477893.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201622_f913b59c_477893.png"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201646_5bc6df48_477893.png"/></td>
|
||||
<td><img src="https://images.gitee.com/uploads/images/2019/1107/201706_32ee305c_477893.png"/></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
## 技术选型
|
||||
* 1 后端使用技术
|
||||
* 1.1 SpringBoot
|
||||
* 1.2 mybatis、MyBatis-Plus
|
||||
* 1.3 SpringSecurity
|
||||
* 1.4 JAP
|
||||
* 1.5 Druid1
|
||||
* 1.6 Slf4j
|
||||
* 1.7 Fastjson
|
||||
* 1.8 JWT
|
||||
* 1.9 Redis
|
||||
* 1.10 Quartz
|
||||
* 1.11 Mysql
|
||||
* 1.12 swagger
|
||||
* 1.13 WxJava
|
||||
* 1.14 Lombok
|
||||
* 1.15 Hutool
|
||||
* 1.16 Mapstruct
|
||||
|
||||
* 前端使用技术
|
||||
* 2.1 Vue 全家桶
|
||||
* 2.2 Element
|
||||
|
||||
|
||||
#### 项目下步工作计划
|
||||
第一阶段：积分功能、优惠券功能、公众号功能
|
||||
第二阶段：分销、砍价、拼团
|
||||
#### 反馈交流
|
||||
- QQ交流群：891137268
|
||||
- QQ交流群：907721261
|
||||
- 喜欢这个商城后台的小伙伴留下你的小星星啦,star,star哦！
|
||||
|
||||
#### 特别鸣谢
|
||||
- eladmin:https://github.com/elunez/eladmin
|
||||
- mybaitsplus:https://github.com/baomidou/mybatis-plus
|
||||
- hutool:https://github.com/looly/hutool
|
||||
- wxjava:https://github.com/Wechat-Group/WxJava
|
||||
- vue:https://github.com/vuejs/vue
|
||||
- element:https://github.com/ElemeFE/element
|
||||
|
||||
683
sql/eladmin.sql
683
sql/eladmin.sql
@ -1,683 +0,0 @@
|
||||
/*
|
||||
Navicat Premium Data Transfer
|
||||
|
||||
Source Server : 本地
|
||||
Source Server Type : MySQL
|
||||
Source Server Version : 50562
|
||||
Source Host : localhost:3306
|
||||
Source Schema : eladmin
|
||||
|
||||
Target Server Type : MySQL
|
||||
Target Server Version : 50562
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 26/09/2019 17:41:39
|
||||
*/
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
SET FOREIGN_KEY_CHECKS = 0;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for alipay_config
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `alipay_config`;
|
||||
CREATE TABLE `alipay_config` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
|
||||
`app_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '应用ID',
|
||||
`charset` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编码',
|
||||
`format` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型 固定格式json',
|
||||
`gateway_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '网关地址',
|
||||
`notify_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '异步回调',
|
||||
`private_key` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '私钥',
|
||||
`public_key` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '公钥',
|
||||
`return_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '回调地址',
|
||||
`sign_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签名方式',
|
||||
`sys_service_provider_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '商户号',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of alipay_config
|
||||
-- ----------------------------
|
||||
INSERT INTO `alipay_config` VALUES (1, '2016091700532697', 'utf-8', 'JSON', 'https://openapi.alipaydev.com/gateway.do', 'http://api.auauz.net/api/aliPay/notify', 'MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5js8sInU10AJ0cAQ8UMMyXrQ+oHZEkVt5lBwsStmTJ7YikVYgbskx1YYEXTojRsWCb+SH/kDmDU4pK/u91SJ4KFCRMF2411piYuXU/jF96zKrADznYh/zAraqT6hvAIVtQAlMHN53nx16rLzZ/8jDEkaSwT7+HvHiS+7sxSojnu/3oV7BtgISoUNstmSe8WpWHOaWv19xyS+Mce9MY4BfseFhzTICUymUQdd/8hXA28/H6osUfAgsnxAKv7Wil3aJSgaJczWuflYOve0dJ3InZkhw5Cvr0atwpk8YKBQjy5CdkoHqvkOcIB+cYHXJKzOE5tqU7inSwVbHzOLQ3XbnAgMBAAECggEAVJp5eT0Ixg1eYSqFs9568WdetUNCSUchNxDBu6wxAbhUgfRUGZuJnnAll63OCTGGck+EGkFh48JjRcBpGoeoHLL88QXlZZbC/iLrea6gcDIhuvfzzOffe1RcZtDFEj9hlotg8dQj1tS0gy9pN9g4+EBH7zeu+fyv+qb2e/v1l6FkISXUjpkD7RLQr3ykjiiEw9BpeKb7j5s7Kdx1NNIzhkcQKNqlk8JrTGDNInbDM6inZfwwIO2R1DHinwdfKWkvOTODTYa2MoAvVMFT9Bec9FbLpoWp7ogv1JMV9svgrcF9XLzANZ/OQvkbe9TV9GWYvIbxN6qwQioKCWO4GPnCAQKBgQDgW5MgfhX8yjXqoaUy/d1VjI8dHeIyw8d+OBAYwaxRSlCfyQ+tieWcR2HdTzPca0T0GkWcKZm0ei5xRURgxt4DUDLXNh26HG0qObbtLJdu/AuBUuCqgOiLqJ2f1uIbrz6OZUHns+bT/jGW2Ws8+C13zTCZkZt9CaQsrp3QOGDx5wKBgQDTul39hp3ZPwGNFeZdkGoUoViOSd5Lhowd5wYMGAEXWRLlU8z+smT5v0POz9JnIbCRchIY2FAPKRdVTICzmPk2EPJFxYTcwaNbVqL6lN7J2IlXXMiit5QbiLauo55w7plwV6LQmKm9KV7JsZs5XwqF7CEovI7GevFzyD3w+uizAQKBgC3LY1eRhOlpWOIAhpjG6qOoohmeXOphvdmMlfSHq6WYFqbWwmV4rS5d/6LNpNdL6fItXqIGd8I34jzql49taCmi+A2nlR/E559j0mvM20gjGDIYeZUz5MOE8k+K6/IcrhcgofgqZ2ZED1ksHdB/E8DNWCswZl16V1FrfvjeWSNnAoGAMrBplCrIW5xz+J0Hm9rZKrs+AkK5D4fUv8vxbK/KgxZ2KaUYbNm0xv39c+PZUYuFRCz1HDGdaSPDTE6WeWjkMQd5mS6ikl9hhpqFRkyh0d0fdGToO9yLftQKOGE/q3XUEktI1XvXF0xyPwNgUCnq0QkpHyGVZPtGFxwXiDvpvgECgYA5PoB+nY8iDiRaJNko9w0hL4AeKogwf+4TbCw+KWVEn6jhuJa4LFTdSqp89PktQaoVpwv92el/AhYjWOl/jVCm122f9b7GyoelbjMNolToDwe5pF5RnSpEuDdLy9MfE8LnE3PlbE7E5BipQ3UjSebkgNboLHH/lNZA5qvEtvbfvQ==', 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut9evKRuHJ/2QNfDlLwvN/S8l9hRAgPbb0u61bm4AtzaTGsLeMtScetxTWJnVvAVpMS9luhEJjt+Sbk5TNLArsgzzwARgaTKOLMT1TvWAK5EbHyI+eSrc3s7Awe1VYGwcubRFWDm16eQLv0k7iqiw+4mweHSz/wWyvBJVgwLoQ02btVtAQErCfSJCOmt0Q/oJQjj08YNRV4EKzB19+f5A+HQVAKy72dSybTzAK+3FPtTtNen/+b5wGeat7c32dhYHnGorPkPeXLtsqqUTp1su5fMfd4lElNdZaoCI7osZxWWUo17vBCZnyeXc9fk0qwD9mK6yRAxNbrY72Xx5VqIqwIDAQAB', 'http://api.auauz.net/api/aliPay/return', 'RSA2', '2088102176044281');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for dept
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `dept`;
|
||||
CREATE TABLE `dept` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
|
||||
`pid` bigint(20) NOT NULL COMMENT '上级部门',
|
||||
`create_time` datetime NULL DEFAULT NULL,
|
||||
`enabled` bit(1) NOT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of dept
|
||||
-- ----------------------------
|
||||
INSERT INTO `dept` VALUES (1, 'eladmin', 0, '2019-03-25 09:14:05', b'1');
|
||||
INSERT INTO `dept` VALUES (2, '研发部', 7, '2019-03-25 09:15:32', b'1');
|
||||
INSERT INTO `dept` VALUES (5, '运维部', 7, '2019-03-25 09:20:44', b'1');
|
||||
INSERT INTO `dept` VALUES (6, '测试部', 8, '2019-03-25 09:52:18', b'1');
|
||||
INSERT INTO `dept` VALUES (7, '华南分部', 1, '2019-03-25 11:04:50', b'1');
|
||||
INSERT INTO `dept` VALUES (8, '华北分部', 1, '2019-03-25 11:04:53', b'1');
|
||||
INSERT INTO `dept` VALUES (9, '财务部', 7, '2019-03-25 11:05:34', b'1');
|
||||
INSERT INTO `dept` VALUES (10, '行政部', 8, '2019-03-25 11:05:58', b'1');
|
||||
INSERT INTO `dept` VALUES (11, '人事部', 8, '2019-03-25 11:07:58', b'1');
|
||||
INSERT INTO `dept` VALUES (12, '市场部', 7, '2019-03-25 11:10:24', b'0');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for dict
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `dict`;
|
||||
CREATE TABLE `dict` (
|
||||
`id` bigint(11) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典名称',
|
||||
`remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of dict
|
||||
-- ----------------------------
|
||||
INSERT INTO `dict` VALUES (1, 'user_status', '用户状态');
|
||||
INSERT INTO `dict` VALUES (4, 'dept_status', '部门状态');
|
||||
INSERT INTO `dict` VALUES (5, 'job_status', '岗位状态');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for dict_detail
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `dict_detail`;
|
||||
CREATE TABLE `dict_detail` (
|
||||
`id` bigint(11) NOT NULL AUTO_INCREMENT,
|
||||
`label` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典标签',
|
||||
`value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典值',
|
||||
`sort` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '排序',
|
||||
`dict_id` bigint(11) NULL DEFAULT NULL COMMENT '字典id',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `FK5tpkputc6d9nboxojdbgnpmyb`(`dict_id`) USING BTREE,
|
||||
CONSTRAINT `FK5tpkputc6d9nboxojdbgnpmyb` FOREIGN KEY (`dict_id`) REFERENCES `dict` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of dict_detail
|
||||
-- ----------------------------
|
||||
INSERT INTO `dict_detail` VALUES (1, '激活', 'true', '1', 1);
|
||||
INSERT INTO `dict_detail` VALUES (2, '锁定', 'false', '2', 1);
|
||||
INSERT INTO `dict_detail` VALUES (11, '正常', 'true', '1', 4);
|
||||
INSERT INTO `dict_detail` VALUES (12, '停用', 'false', '2', 4);
|
||||
INSERT INTO `dict_detail` VALUES (13, '正常', 'true', '1', 5);
|
||||
INSERT INTO `dict_detail` VALUES (14, '停用', 'false', '2', 5);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for email_config
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `email_config`;
|
||||
CREATE TABLE `email_config` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`from_user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '收件人',
|
||||
`host` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮件服务器SMTP地址',
|
||||
`pass` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
|
||||
`port` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '端口',
|
||||
`user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发件者用户名',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for gen_config
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `gen_config`;
|
||||
CREATE TABLE `gen_config` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`author` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作者',
|
||||
`cover` bit(1) NULL DEFAULT NULL COMMENT '是否覆盖',
|
||||
`module_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模块名称',
|
||||
`pack` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '至于哪个包下',
|
||||
`path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '前端代码生成的路径',
|
||||
`api_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`prefix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of gen_config
|
||||
-- ----------------------------
|
||||
INSERT INTO `gen_config` VALUES (1, 'Zheng Jie', b'0', 'eladmin-system', 'co.yixiang.test', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\views\\test1111', 'E:\\workspace\\me\\front\\eladmin-qt\\src\\api', NULL);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for job
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `job`;
|
||||
CREATE TABLE `job` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
|
||||
`enabled` bit(1) NOT NULL,
|
||||
`create_time` datetime NULL DEFAULT NULL,
|
||||
`sort` bigint(20) NOT NULL,
|
||||
`dept_id` bigint(20) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `FKmvhj0rogastlctflsxf1d6k3i`(`dept_id`) USING BTREE,
|
||||
CONSTRAINT `FKmvhj0rogastlctflsxf1d6k3i` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of job
|
||||
-- ----------------------------
|
||||
INSERT INTO `job` VALUES (2, '董事长秘书', b'1', '2019-03-29 14:01:30', 2, 1);
|
||||
INSERT INTO `job` VALUES (8, '人事专员', b'1', '2019-03-29 14:52:28', 3, 11);
|
||||
INSERT INTO `job` VALUES (10, '产品经理', b'0', '2019-03-29 14:55:51', 4, 2);
|
||||
INSERT INTO `job` VALUES (11, '全栈开发', b'1', '2019-03-31 13:39:30', 6, 2);
|
||||
INSERT INTO `job` VALUES (12, '软件测试', b'1', '2019-03-31 13:39:43', 5, 2);
|
||||
INSERT INTO `job` VALUES (19, '董事长', b'1', '2019-03-31 14:58:15', 1, 1);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for local_storage
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `local_storage`;
|
||||
CREATE TABLE `local_storage` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
||||
`real_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名',
|
||||
`suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '后缀',
|
||||
`path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '路径',
|
||||
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
|
||||
`size` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '大小',
|
||||
`operate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '操作人',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '修改日期',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for log
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `log`;
|
||||
CREATE TABLE `log` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
||||
`create_time` datetime NULL DEFAULT NULL,
|
||||
`description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`exception_detail` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
|
||||
`log_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`method` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`params` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
|
||||
`request_ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`time` bigint(20) NULL DEFAULT NULL,
|
||||
`username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 14269 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for menu
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `menu`;
|
||||
CREATE TABLE `menu` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`i_frame` bit(1) NULL DEFAULT NULL COMMENT '是否外链',
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '菜单名称',
|
||||
`component` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '组件',
|
||||
`pid` bigint(20) NOT NULL COMMENT '上级菜单ID',
|
||||
`sort` bigint(20) NOT NULL COMMENT '排序',
|
||||
`icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标',
|
||||
`path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '链接地址',
|
||||
`cache` bit(1) NULL DEFAULT b'0',
|
||||
`hidden` bit(1) NULL DEFAULT b'0',
|
||||
`component_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '-',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
INDEX `FKqcf9gem97gqa5qjm4d3elcqt5`(`pid`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 40 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of menu
|
||||
-- ----------------------------
|
||||
INSERT INTO `menu` VALUES (1, '2018-12-18 15:11:29', b'0', '系统管理', NULL, 0, 1, 'system', 'system', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (2, '2018-12-18 15:14:44', b'0', '用户管理', 'system/user/index', 1, 2, 'peoples', 'user', b'0', b'0', 'User');
|
||||
INSERT INTO `menu` VALUES (3, '2018-12-18 15:16:07', b'0', '角色管理', 'system/role/index', 1, 3, 'role', 'role', b'0', b'0', 'Role');
|
||||
INSERT INTO `menu` VALUES (4, '2018-12-18 15:16:45', b'0', '权限管理', 'system/permission/index', 1, 4, 'permission', 'permission', b'0', b'0', 'Permission');
|
||||
INSERT INTO `menu` VALUES (5, '2018-12-18 15:17:28', b'0', '菜单管理', 'system/menu/index', 1, 5, 'menu', 'menu', b'0', b'0', 'Menu');
|
||||
INSERT INTO `menu` VALUES (6, '2018-12-18 15:17:48', b'0', '系统监控', NULL, 0, 10, 'monitor', 'monitor', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (7, '2018-12-18 15:18:26', b'0', '操作日志', 'monitor/log/index', 6, 11, 'log', 'logs', b'1', b'0', 'Log');
|
||||
INSERT INTO `menu` VALUES (8, '2018-12-18 15:19:01', b'0', '系统缓存', 'monitor/redis/index', 6, 13, 'redis', 'redis', b'0', b'0', 'Redis');
|
||||
INSERT INTO `menu` VALUES (9, '2018-12-18 15:19:34', b'0', 'SQL监控', 'monitor/sql/index', 6, 14, 'sqlMonitor', 'druid', b'0', b'0', 'Sql');
|
||||
INSERT INTO `menu` VALUES (10, '2018-12-19 13:38:16', b'0', '组件管理', NULL, 0, 50, 'zujian', 'components', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (11, '2018-12-19 13:38:49', b'0', '图标库', 'components/IconSelect', 10, 51, 'icon', 'icon', b'0', b'0', 'Icons');
|
||||
INSERT INTO `menu` VALUES (14, '2018-12-27 10:13:09', b'0', '邮件工具', 'tools/email/index', 36, 24, 'email', 'email', b'0', b'0', 'Email');
|
||||
INSERT INTO `menu` VALUES (15, '2018-12-27 11:58:25', b'0', '富文本', 'components/Editor', 10, 52, 'fwb', 'tinymce', b'0', b'0', 'Editor');
|
||||
INSERT INTO `menu` VALUES (16, '2018-12-28 09:36:53', b'0', '图床管理', 'tools/picture/index', 36, 25, 'image', 'pictures', b'0', b'0', 'Pictures');
|
||||
INSERT INTO `menu` VALUES (17, '2018-12-28 15:09:49', b'1', '项目地址', '', 0, 0, 'github', 'https://github.com/elunez/eladmin', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (18, '2018-12-31 11:12:15', b'0', '存储管理', 'tools/storage/index', 36, 23, 'qiniu', 'storage', b'0', b'0', 'Storage');
|
||||
INSERT INTO `menu` VALUES (19, '2018-12-31 14:52:38', b'0', '支付宝工具', 'tools/aliPay/index', 36, 27, 'alipay', 'aliPay', b'0', b'0', 'AliPay');
|
||||
INSERT INTO `menu` VALUES (21, '2019-01-04 16:22:03', b'0', '多级菜单', '', 0, 900, 'menu', 'nested', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (22, '2019-01-04 16:23:29', b'0', '二级菜单1', 'nested/menu1/index', 21, 999, 'menu', 'menu1', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (23, '2019-01-04 16:23:57', b'0', '二级菜单2', 'nested/menu2/index', 21, 999, 'menu', 'menu2', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (24, '2019-01-04 16:24:48', b'0', '三级菜单1', 'nested/menu1/menu1-1', 22, 999, 'menu', 'menu1-1', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (27, '2019-01-07 17:27:32', b'0', '三级菜单2', 'nested/menu1/menu1-2', 22, 999, 'menu', 'menu1-2', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (28, '2019-01-07 20:34:40', b'0', '定时任务', 'system/timing/index', 36, 21, 'timing', 'timing', b'0', b'0', 'Timing');
|
||||
INSERT INTO `menu` VALUES (30, '2019-01-11 15:45:55', b'0', '代码生成', 'generator/index', 36, 22, 'dev', 'generator', b'0', b'0', 'GeneratorIndex');
|
||||
INSERT INTO `menu` VALUES (32, '2019-01-13 13:49:03', b'0', '异常日志', 'monitor/log/errorLog', 6, 12, 'error', 'errorLog', b'0', b'0', 'ErrorLog');
|
||||
INSERT INTO `menu` VALUES (33, '2019-03-08 13:46:44', b'0', 'Markdown', 'components/MarkDown', 10, 53, 'markdown', 'markdown', b'0', b'0', 'Markdown');
|
||||
INSERT INTO `menu` VALUES (34, '2019-03-08 15:49:40', b'0', 'Yaml编辑器', 'components/YamlEdit', 10, 54, 'dev', 'yaml', b'0', b'0', 'YamlEdit');
|
||||
INSERT INTO `menu` VALUES (35, '2019-03-25 09:46:00', b'0', '部门管理', 'system/dept/index', 1, 6, 'dept', 'dept', b'0', b'0', 'Dept');
|
||||
INSERT INTO `menu` VALUES (36, '2019-03-29 10:57:35', b'0', '系统工具', '', 0, 20, 'sys-tools', 'sys-tools', b'0', b'0', NULL);
|
||||
INSERT INTO `menu` VALUES (37, '2019-03-29 13:51:18', b'0', '岗位管理', 'system/job/index', 1, 7, 'Steve-Jobs', 'job', b'0', b'0', 'Job');
|
||||
INSERT INTO `menu` VALUES (38, '2019-03-29 19:57:53', b'0', '接口文档', 'tools/swagger/index', 36, 26, 'swagger', 'swagger2', b'0', b'0', 'Swagger');
|
||||
INSERT INTO `menu` VALUES (39, '2019-04-10 11:49:04', b'0', '字典管理', 'system/dict/index', 1, 8, 'dictionary', 'dict', b'0', b'0', 'Dict');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for permission
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `permission`;
|
||||
CREATE TABLE `permission` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
|
||||
`pid` int(11) NOT NULL COMMENT '上级权限',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of permission
|
||||
-- ----------------------------
|
||||
INSERT INTO `permission` VALUES (1, '超级管理员', '2018-12-03 12:27:48', 'ADMIN', 0);
|
||||
INSERT INTO `permission` VALUES (2, '用户管理', '2018-12-03 12:28:19', 'USER_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (3, '用户查询', '2018-12-03 12:31:35', 'USER_SELECT', 2);
|
||||
INSERT INTO `permission` VALUES (4, '用户创建', '2018-12-03 12:31:35', 'USER_CREATE', 2);
|
||||
INSERT INTO `permission` VALUES (5, '用户编辑', '2018-12-03 12:31:35', 'USER_EDIT', 2);
|
||||
INSERT INTO `permission` VALUES (6, '用户删除', '2018-12-03 12:31:35', 'USER_DELETE', 2);
|
||||
INSERT INTO `permission` VALUES (7, '角色管理', '2018-12-03 12:28:19', 'ROLES_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (8, '角色查询', '2018-12-03 12:31:35', 'ROLES_SELECT', 7);
|
||||
INSERT INTO `permission` VALUES (10, '角色创建', '2018-12-09 20:10:16', 'ROLES_CREATE', 7);
|
||||
INSERT INTO `permission` VALUES (11, '角色编辑', '2018-12-09 20:10:42', 'ROLES_EDIT', 7);
|
||||
INSERT INTO `permission` VALUES (12, '角色删除', '2018-12-09 20:11:07', 'ROLES_DELETE', 7);
|
||||
INSERT INTO `permission` VALUES (13, '权限管理', '2018-12-09 20:11:37', 'PERMISSION_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (14, '权限查询', '2018-12-09 20:11:55', 'PERMISSION_SELECT', 13);
|
||||
INSERT INTO `permission` VALUES (15, '权限创建', '2018-12-09 20:14:10', 'PERMISSION_CREATE', 13);
|
||||
INSERT INTO `permission` VALUES (16, '权限编辑', '2018-12-09 20:15:44', 'PERMISSION_EDIT', 13);
|
||||
INSERT INTO `permission` VALUES (17, '权限删除', '2018-12-09 20:15:59', 'PERMISSION_DELETE', 13);
|
||||
INSERT INTO `permission` VALUES (18, '缓存管理', '2018-12-17 13:53:25', 'REDIS_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (20, '缓存查询', '2018-12-17 13:54:07', 'REDIS_SELECT', 18);
|
||||
INSERT INTO `permission` VALUES (22, '缓存删除', '2018-12-17 13:55:04', 'REDIS_DELETE', 18);
|
||||
INSERT INTO `permission` VALUES (23, '图床管理', '2018-12-27 20:31:49', 'PICTURE_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (24, '查询图片', '2018-12-27 20:32:04', 'PICTURE_SELECT', 23);
|
||||
INSERT INTO `permission` VALUES (25, '上传图片', '2018-12-27 20:32:24', 'PICTURE_UPLOAD', 23);
|
||||
INSERT INTO `permission` VALUES (26, '删除图片', '2018-12-27 20:32:45', 'PICTURE_DELETE', 23);
|
||||
INSERT INTO `permission` VALUES (29, '菜单管理', '2018-12-28 17:34:31', 'MENU_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (30, '菜单查询', '2018-12-28 17:34:41', 'MENU_SELECT', 29);
|
||||
INSERT INTO `permission` VALUES (31, '菜单创建', '2018-12-28 17:34:52', 'MENU_CREATE', 29);
|
||||
INSERT INTO `permission` VALUES (32, '菜单编辑', '2018-12-28 17:35:20', 'MENU_EDIT', 29);
|
||||
INSERT INTO `permission` VALUES (33, '菜单删除', '2018-12-28 17:35:29', 'MENU_DELETE', 29);
|
||||
INSERT INTO `permission` VALUES (35, '定时任务管理', '2019-01-08 14:59:57', 'JOB_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (36, '任务查询', '2019-01-08 15:00:09', 'JOB_SELECT', 35);
|
||||
INSERT INTO `permission` VALUES (37, '任务创建', '2019-01-08 15:00:20', 'JOB_CREATE', 35);
|
||||
INSERT INTO `permission` VALUES (38, '任务编辑', '2019-01-08 15:00:33', 'JOB_EDIT', 35);
|
||||
INSERT INTO `permission` VALUES (39, '任务删除', '2019-01-08 15:01:13', 'JOB_DELETE', 35);
|
||||
INSERT INTO `permission` VALUES (40, '部门管理', '2019-03-29 17:06:55', 'DEPT_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (41, '部门查询', '2019-03-29 17:07:09', 'DEPT_SELECT', 40);
|
||||
INSERT INTO `permission` VALUES (42, '部门创建', '2019-03-29 17:07:29', 'DEPT_CREATE', 40);
|
||||
INSERT INTO `permission` VALUES (43, '部门编辑', '2019-03-29 17:07:52', 'DEPT_EDIT', 40);
|
||||
INSERT INTO `permission` VALUES (44, '部门删除', '2019-03-29 17:08:14', 'DEPT_DELETE', 40);
|
||||
INSERT INTO `permission` VALUES (45, '岗位管理', '2019-03-29 17:08:52', 'USERJOB_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (46, '岗位查询', '2019-03-29 17:10:27', 'USERJOB_SELECT', 45);
|
||||
INSERT INTO `permission` VALUES (47, '岗位创建', '2019-03-29 17:10:55', 'USERJOB_CREATE', 45);
|
||||
INSERT INTO `permission` VALUES (48, '岗位编辑', '2019-03-29 17:11:08', 'USERJOB_EDIT', 45);
|
||||
INSERT INTO `permission` VALUES (49, '岗位删除', '2019-03-29 17:11:19', 'USERJOB_DELETE', 45);
|
||||
INSERT INTO `permission` VALUES (50, '字典管理', '2019-04-10 16:24:51', 'DICT_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (51, '字典查询', '2019-04-10 16:25:16', 'DICT_SELECT', 50);
|
||||
INSERT INTO `permission` VALUES (52, '字典创建', '2019-04-10 16:25:29', 'DICT_CREATE', 50);
|
||||
INSERT INTO `permission` VALUES (53, '字典编辑', '2019-04-10 16:27:19', 'DICT_EDIT', 50);
|
||||
INSERT INTO `permission` VALUES (54, '字典删除', '2019-04-10 16:27:30', 'DICT_DELETE', 50);
|
||||
INSERT INTO `permission` VALUES (55, '文件管理', '2019-09-08 12:31:54', 'LOCALSTORAGE_ALL', 0);
|
||||
INSERT INTO `permission` VALUES (56, '文件搜索', '2019-09-08 12:40:53', 'LOCALSTORAGE_SELECT', 55);
|
||||
INSERT INTO `permission` VALUES (57, '文件上传', '2019-09-08 12:41:05', 'LOCALSTORAGE_CREATE', 55);
|
||||
INSERT INTO `permission` VALUES (58, '文件编辑', '2019-09-08 12:41:19', 'LOCALSTORAGE_EDIT', 55);
|
||||
INSERT INTO `permission` VALUES (59, '文件删除', '2019-09-08 12:41:29', 'LOCALSTORAGE_DELETE', 55);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for picture
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `picture`;
|
||||
CREATE TABLE `picture` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '上传日期',
|
||||
`delete_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '删除的URL',
|
||||
`filename` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片名称',
|
||||
`height` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片高度',
|
||||
`size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片大小',
|
||||
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片地址',
|
||||
`username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名称',
|
||||
`width` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片宽度',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for qiniu_config
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `qiniu_config`;
|
||||
CREATE TABLE `qiniu_config` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`access_key` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'accessKey',
|
||||
`bucket` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Bucket 识别符',
|
||||
`host` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '外链域名',
|
||||
`secret_key` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'secretKey',
|
||||
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '空间类型',
|
||||
`zone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '机房',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for qiniu_content
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `qiniu_content`;
|
||||
CREATE TABLE `qiniu_content` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`bucket` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Bucket 识别符',
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件名称',
|
||||
`size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件大小',
|
||||
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型：私有或公开',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '上传或同步的时间',
|
||||
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件url',
|
||||
`suffix` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for quartz_job
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `quartz_job`;
|
||||
CREATE TABLE `quartz_job` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`bean_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'Spring Bean名称',
|
||||
`cron_expression` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'cron 表达式',
|
||||
`is_pause` bit(1) NULL DEFAULT NULL COMMENT '状态：1暂停、0启用',
|
||||
`job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务名称',
|
||||
`method_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '方法名称',
|
||||
`params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数',
|
||||
`remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
|
||||
`update_time` datetime NULL DEFAULT NULL COMMENT '创建或更新日期',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of quartz_job
|
||||
-- ----------------------------
|
||||
INSERT INTO `quartz_job` VALUES (1, 'visitsTask', '0 0 0 * * ?', b'0', '更新访客记录', 'run', NULL, '每日0点创建新的访客记录', '2019-01-08 14:53:31');
|
||||
INSERT INTO `quartz_job` VALUES (2, 'testTask', '0/5 * * * * ?', b'1', '测试1', 'run1', 'test', '带参测试，多参使用json', '2019-08-22 14:08:29');
|
||||
INSERT INTO `quartz_job` VALUES (3, 'testTask', '0/5 * * * * ?', b'1', '测试', 'run', '', '不带参测试', '2019-09-26 16:44:39');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for quartz_log
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `quartz_log`;
|
||||
CREATE TABLE `quartz_log` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
||||
`baen_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`create_time` datetime NULL DEFAULT NULL,
|
||||
`cron_expression` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`exception_detail` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
|
||||
`is_success` bit(1) NULL DEFAULT NULL,
|
||||
`job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`method_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`params` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`time` bigint(20) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 51 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for role
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `role`;
|
||||
CREATE TABLE `role` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '名称',
|
||||
`remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
|
||||
`data_scope` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`level` int(255) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of role
|
||||
-- ----------------------------
|
||||
INSERT INTO `role` VALUES (1, '2018-11-23 11:04:37', '超级管理员', '·', '全部', 1);
|
||||
INSERT INTO `role` VALUES (2, '2018-11-23 13:09:06', '普通用户', '用于测试菜单与权限', '自定义', 3);
|
||||
INSERT INTO `role` VALUES (4, '2019-05-13 14:16:15', '普通管理员', '普通管理员级别为2，使用该角色新增用户时只能赋予比普通管理员级别低的角色', '自定义', 2);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for roles_depts
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `roles_depts`;
|
||||
CREATE TABLE `roles_depts` (
|
||||
`role_id` bigint(20) NOT NULL,
|
||||
`dept_id` bigint(20) NOT NULL,
|
||||
PRIMARY KEY (`role_id`, `dept_id`) USING BTREE,
|
||||
INDEX `FK7qg6itn5ajdoa9h9o78v9ksur`(`dept_id`) USING BTREE,
|
||||
CONSTRAINT `FK7qg6itn5ajdoa9h9o78v9ksur` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
|
||||
CONSTRAINT `FKrg1ci4cxxfbja0sb0pddju7k` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of roles_depts
|
||||
-- ----------------------------
|
||||
INSERT INTO `roles_depts` VALUES (2, 5);
|
||||
INSERT INTO `roles_depts` VALUES (4, 6);
|
||||
INSERT INTO `roles_depts` VALUES (4, 7);
|
||||
INSERT INTO `roles_depts` VALUES (2, 8);
|
||||
INSERT INTO `roles_depts` VALUES (2, 9);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for roles_menus
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `roles_menus`;
|
||||
CREATE TABLE `roles_menus` (
|
||||
`menu_id` bigint(20) NOT NULL COMMENT '菜单ID',
|
||||
`role_id` bigint(20) NOT NULL COMMENT '角色ID',
|
||||
PRIMARY KEY (`menu_id`, `role_id`) USING BTREE,
|
||||
INDEX `FKcngg2qadojhi3a651a5adkvbq`(`role_id`) USING BTREE,
|
||||
CONSTRAINT `FKo7wsmlrrxb2osfaoavp46rv2r` FOREIGN KEY (`menu_id`) REFERENCES `menu` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
|
||||
CONSTRAINT `FKtag324maketmxffly3pdyh193` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of roles_menus
|
||||
-- ----------------------------
|
||||
INSERT INTO `roles_menus` VALUES (1, 1);
|
||||
INSERT INTO `roles_menus` VALUES (2, 1);
|
||||
INSERT INTO `roles_menus` VALUES (3, 1);
|
||||
INSERT INTO `roles_menus` VALUES (4, 1);
|
||||
INSERT INTO `roles_menus` VALUES (5, 1);
|
||||
INSERT INTO `roles_menus` VALUES (6, 1);
|
||||
INSERT INTO `roles_menus` VALUES (7, 1);
|
||||
INSERT INTO `roles_menus` VALUES (8, 1);
|
||||
INSERT INTO `roles_menus` VALUES (9, 1);
|
||||
INSERT INTO `roles_menus` VALUES (10, 1);
|
||||
INSERT INTO `roles_menus` VALUES (11, 1);
|
||||
INSERT INTO `roles_menus` VALUES (14, 1);
|
||||
INSERT INTO `roles_menus` VALUES (15, 1);
|
||||
INSERT INTO `roles_menus` VALUES (16, 1);
|
||||
INSERT INTO `roles_menus` VALUES (17, 1);
|
||||
INSERT INTO `roles_menus` VALUES (18, 1);
|
||||
INSERT INTO `roles_menus` VALUES (19, 1);
|
||||
INSERT INTO `roles_menus` VALUES (21, 1);
|
||||
INSERT INTO `roles_menus` VALUES (22, 1);
|
||||
INSERT INTO `roles_menus` VALUES (23, 1);
|
||||
INSERT INTO `roles_menus` VALUES (24, 1);
|
||||
INSERT INTO `roles_menus` VALUES (27, 1);
|
||||
INSERT INTO `roles_menus` VALUES (28, 1);
|
||||
INSERT INTO `roles_menus` VALUES (30, 1);
|
||||
INSERT INTO `roles_menus` VALUES (32, 1);
|
||||
INSERT INTO `roles_menus` VALUES (33, 1);
|
||||
INSERT INTO `roles_menus` VALUES (34, 1);
|
||||
INSERT INTO `roles_menus` VALUES (35, 1);
|
||||
INSERT INTO `roles_menus` VALUES (36, 1);
|
||||
INSERT INTO `roles_menus` VALUES (37, 1);
|
||||
INSERT INTO `roles_menus` VALUES (38, 1);
|
||||
INSERT INTO `roles_menus` VALUES (39, 1);
|
||||
INSERT INTO `roles_menus` VALUES (1, 2);
|
||||
INSERT INTO `roles_menus` VALUES (2, 2);
|
||||
INSERT INTO `roles_menus` VALUES (3, 2);
|
||||
INSERT INTO `roles_menus` VALUES (4, 2);
|
||||
INSERT INTO `roles_menus` VALUES (5, 2);
|
||||
INSERT INTO `roles_menus` VALUES (6, 2);
|
||||
INSERT INTO `roles_menus` VALUES (8, 2);
|
||||
INSERT INTO `roles_menus` VALUES (9, 2);
|
||||
INSERT INTO `roles_menus` VALUES (10, 2);
|
||||
INSERT INTO `roles_menus` VALUES (11, 2);
|
||||
INSERT INTO `roles_menus` VALUES (14, 2);
|
||||
INSERT INTO `roles_menus` VALUES (15, 2);
|
||||
INSERT INTO `roles_menus` VALUES (16, 2);
|
||||
INSERT INTO `roles_menus` VALUES (17, 2);
|
||||
INSERT INTO `roles_menus` VALUES (18, 2);
|
||||
INSERT INTO `roles_menus` VALUES (19, 2);
|
||||
INSERT INTO `roles_menus` VALUES (21, 2);
|
||||
INSERT INTO `roles_menus` VALUES (22, 2);
|
||||
INSERT INTO `roles_menus` VALUES (23, 2);
|
||||
INSERT INTO `roles_menus` VALUES (24, 2);
|
||||
INSERT INTO `roles_menus` VALUES (27, 2);
|
||||
INSERT INTO `roles_menus` VALUES (28, 2);
|
||||
INSERT INTO `roles_menus` VALUES (30, 2);
|
||||
INSERT INTO `roles_menus` VALUES (33, 2);
|
||||
INSERT INTO `roles_menus` VALUES (34, 2);
|
||||
INSERT INTO `roles_menus` VALUES (35, 2);
|
||||
INSERT INTO `roles_menus` VALUES (36, 2);
|
||||
INSERT INTO `roles_menus` VALUES (37, 2);
|
||||
INSERT INTO `roles_menus` VALUES (38, 2);
|
||||
INSERT INTO `roles_menus` VALUES (39, 2);
|
||||
INSERT INTO `roles_menus` VALUES (1, 4);
|
||||
INSERT INTO `roles_menus` VALUES (2, 4);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for roles_permissions
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `roles_permissions`;
|
||||
CREATE TABLE `roles_permissions` (
|
||||
`role_id` bigint(20) NOT NULL COMMENT '角色ID',
|
||||
`permission_id` bigint(20) NOT NULL COMMENT '权限ID',
|
||||
PRIMARY KEY (`role_id`, `permission_id`) USING BTREE,
|
||||
INDEX `FKboeuhl31go7wer3bpy6so7exi`(`permission_id`) USING BTREE,
|
||||
CONSTRAINT `FK4hrolwj4ned5i7qe8kyiaak6m` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
|
||||
CONSTRAINT `FKboeuhl31go7wer3bpy6so7exi` FOREIGN KEY (`permission_id`) REFERENCES `permission` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of roles_permissions
|
||||
-- ----------------------------
|
||||
INSERT INTO `roles_permissions` VALUES (1, 1);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 3);
|
||||
INSERT INTO `roles_permissions` VALUES (4, 3);
|
||||
INSERT INTO `roles_permissions` VALUES (4, 4);
|
||||
INSERT INTO `roles_permissions` VALUES (4, 5);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 8);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 14);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 20);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 23);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 24);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 25);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 26);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 30);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 36);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 41);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 46);
|
||||
INSERT INTO `roles_permissions` VALUES (2, 51);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for user
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `user`;
|
||||
CREATE TABLE `user` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`avatar_id` bigint(20) NULL DEFAULT NULL COMMENT '头像',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`email` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '邮箱',
|
||||
`enabled` bigint(20) NULL DEFAULT NULL COMMENT '状态：1启用、0禁用',
|
||||
`password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '密码',
|
||||
`username` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户名',
|
||||
`last_password_reset_time` datetime NULL DEFAULT NULL COMMENT '最后修改密码的日期',
|
||||
`dept_id` bigint(20) NULL DEFAULT NULL,
|
||||
`phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`job_id` bigint(20) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
UNIQUE INDEX `UK_kpubos9gc2cvtkb0thktkbkes`(`email`) USING BTREE,
|
||||
UNIQUE INDEX `username`(`username`) USING BTREE,
|
||||
INDEX `FK5rwmryny6jthaaxkogownknqp`(`dept_id`) USING BTREE,
|
||||
INDEX `FKfftoc2abhot8f2wu6cl9a5iky`(`job_id`) USING BTREE,
|
||||
INDEX `FKpq2dhypk2qgt68nauh2by22jb`(`avatar_id`) USING BTREE,
|
||||
CONSTRAINT `FK5rwmryny6jthaaxkogownknqp` FOREIGN KEY (`dept_id`) REFERENCES `dept` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
|
||||
CONSTRAINT `FKfftoc2abhot8f2wu6cl9a5iky` FOREIGN KEY (`job_id`) REFERENCES `job` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
|
||||
CONSTRAINT `FKpq2dhypk2qgt68nauh2by22jb` FOREIGN KEY (`avatar_id`) REFERENCES `user_avatar` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of user
|
||||
-- ----------------------------
|
||||
INSERT INTO `user` VALUES (1, NULL, '2018-08-23 09:11:56', 'admin@eladmin.net', 1, 'e10adc3949ba59abbe56e057f20f883e', 'admin', '2019-05-18 17:34:21', 2, '18888888888', 11);
|
||||
INSERT INTO `user` VALUES (3, NULL, '2018-12-27 20:05:26', 'test@eladmin.net', 1, 'e10adc3949ba59abbe56e057f20f883e', 'test', '2019-04-01 09:15:24', 2, '17777777777', 12);
|
||||
INSERT INTO `user` VALUES (5, NULL, '2019-04-02 10:07:12', 'hr@eladmin.net', 1, 'e10adc3949ba59abbe56e057f20f883e', 'hr', NULL, 11, '15555555555', 8);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for user_avatar
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `user_avatar`;
|
||||
CREATE TABLE `user_avatar` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
||||
`real_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`size` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for users_roles
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `users_roles`;
|
||||
CREATE TABLE `users_roles` (
|
||||
`user_id` bigint(20) NOT NULL COMMENT '用户ID',
|
||||
`role_id` bigint(20) NOT NULL COMMENT '角色ID',
|
||||
PRIMARY KEY (`user_id`, `role_id`) USING BTREE,
|
||||
INDEX `FKq4eq273l04bpu4efj0jd0jb98`(`role_id`) USING BTREE,
|
||||
CONSTRAINT `FKgd3iendaoyh04b95ykqise6qh` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
|
||||
CONSTRAINT `FKt4v0rrweyk393bdgt107vdx0x` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
|
||||
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of users_roles
|
||||
-- ----------------------------
|
||||
INSERT INTO `users_roles` VALUES (1, 1);
|
||||
INSERT INTO `users_roles` VALUES (3, 2);
|
||||
INSERT INTO `users_roles` VALUES (5, 4);
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for verification_code
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `verification_code`;
|
||||
CREATE TABLE `verification_code` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
|
||||
`code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '验证码',
|
||||
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
|
||||
`status` bit(1) NULL DEFAULT NULL COMMENT '状态：1有效、0过期',
|
||||
`type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '验证码类型：email或者短信',
|
||||
`value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '接收邮箱或者手机号码',
|
||||
`scenes` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '业务名称：如重置邮箱、重置密码等',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for visits
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS `visits`;
|
||||
CREATE TABLE `visits` (
|
||||
`id` bigint(20) NOT NULL AUTO_INCREMENT,
|
||||
`create_time` datetime NULL DEFAULT NULL,
|
||||
`date` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
`ip_counts` bigint(20) NULL DEFAULT NULL,
|
||||
`pv_counts` bigint(20) NULL DEFAULT NULL,
|
||||
`week_day` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
UNIQUE INDEX `UK_11aksgq87euk9bcyeesfs4vtp`(`date`) USING BTREE
|
||||
) ENGINE = InnoDB AUTO_INCREMENT = 96 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact;
|
||||
|
||||
SET FOREIGN_KEY_CHECKS = 1;
|
||||
3905
sql/yixiang3.sql
3905
sql/yixiang3.sql
File diff suppressed because it is too large
Load Diff
@ -14,6 +14,7 @@ import co.yixiang.modules.order.service.YxStoreOrderService;
|
||||
import co.yixiang.modules.order.service.YxStoreOrderStatusService;
|
||||
import co.yixiang.modules.order.web.dto.*;
|
||||
import co.yixiang.modules.order.web.param.OrderParam;
|
||||
import co.yixiang.modules.order.web.param.PayParam;
|
||||
import co.yixiang.modules.order.web.param.RefundParam;
|
||||
import co.yixiang.modules.order.web.param.YxStoreOrderQueryParam;
|
||||
import co.yixiang.modules.order.web.vo.YxStoreOrderQueryVo;
|
||||
@ -150,6 +151,9 @@ public class StoreOrderController extends BaseController {
|
||||
if(StrUtil.isNotEmpty(orderId)){
|
||||
switch (param.getPayType()){
|
||||
case "weixin":
|
||||
if(param.getFrom().equals("weixinh5")){
|
||||
throw new ErrorRequestException("H5模式不支持微信支付，请用公众号演示");
|
||||
}
|
||||
try {
|
||||
map.put("status","WECHAT_PAY");
|
||||
WxPayMpOrderResult wxPayMpOrderResult = storeOrderService
|
||||
@ -178,6 +182,69 @@ public class StoreOrderController extends BaseController {
|
||||
return ApiResult.fail("订单生成失败");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 订单支付
|
||||
*/
|
||||
@PostMapping("/order/pay")
|
||||
@ApiOperation(value = "订单支付",notes = "订单支付")
|
||||
public ApiResult<ConfirmOrderDTO> pay(@Valid @RequestBody PayParam param){
|
||||
|
||||
Map<String,Object> map = new LinkedHashMap<>();
|
||||
int uid = SecurityUtils.getUserId().intValue();
|
||||
if(StrUtil.isEmpty(param.getUni())) return ApiResult.fail("参数错误");
|
||||
|
||||
YxStoreOrderQueryVo storeOrder = storeOrderService
|
||||
.getOrderInfo(param.getUni(),uid);
|
||||
if(ObjectUtil.isNull(storeOrder)) return ApiResult.fail("订单不存在");
|
||||
|
||||
if(storeOrder.getPaid() == 1) return ApiResult.fail("该订单已支付");
|
||||
|
||||
//todo 砍价
|
||||
//todo 拼团
|
||||
|
||||
String orderId = storeOrder.getOrderId();
|
||||
|
||||
OrderExtendDTO orderDTO = new OrderExtendDTO();
|
||||
orderDTO.setOrderId(orderId);
|
||||
map.put("status","SUCCESS");
|
||||
map.put("result",orderDTO);
|
||||
//开始处理支付
|
||||
if(StrUtil.isNotEmpty(orderId)){
|
||||
switch (param.getPaytype()){
|
||||
case "weixin":
|
||||
if(param.getFrom().equals("weixinh5")){
|
||||
throw new ErrorRequestException("H5模式不支持微信支付，请用公众号演示");
|
||||
}
|
||||
try {
|
||||
map.put("status","WECHAT_PAY");
|
||||
WxPayMpOrderResult wxPayMpOrderResult = storeOrderService
|
||||
.wxPay(orderId);
|
||||
//重新组装
|
||||
Map<String,String> jsConfig = new HashMap<>();
|
||||
jsConfig.put("appId",wxPayMpOrderResult.getAppId());
|
||||
jsConfig.put("timestamp",wxPayMpOrderResult.getTimeStamp());
|
||||
jsConfig.put("nonceStr",wxPayMpOrderResult.getNonceStr());
|
||||
jsConfig.put("package",wxPayMpOrderResult.getPackageValue());
|
||||
jsConfig.put("signType",wxPayMpOrderResult.getSignType());
|
||||
jsConfig.put("paySign",wxPayMpOrderResult.getPaySign());
|
||||
orderDTO.setJsConfig(jsConfig);
|
||||
map.put("result",orderDTO);
|
||||
return ApiResult.ok(map);
|
||||
} catch (WxPayException e) {
|
||||
return ApiResult.fail(e.getMessage());
|
||||
}
|
||||
case "yue":
|
||||
storeOrderService.yuePay(orderId,uid);
|
||||
return ApiResult.ok(map,"余额支付成功");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return ApiResult.fail("订单生成失败");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 订单详情
|
||||
*/
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
package co.yixiang.modules.order.web.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @ClassName PayDTO
|
||||
* @Author hupeng <610796224@qq.com>
|
||||
* @Date 2019/11/7
|
||||
**/
|
||||
@Data
|
||||
public class PayDTO implements Serializable {
|
||||
private String from;
|
||||
private String paytype;
|
||||
private String uni;
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package co.yixiang.modules.order.web.param;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @ClassName PayDTO
|
||||
* @Author hupeng <610796224@qq.com>
|
||||
* @Date 2019/11/7
|
||||
**/
|
||||
@Data
|
||||
public class PayParam implements Serializable {
|
||||
private String from;
|
||||
private String paytype;
|
||||
private String uni;
|
||||
}
|
||||
@ -1,6 +1,7 @@
|
||||
package co.yixiang.modules.user.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import co.yixiang.common.entity.BaseEntity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
@ -21,112 +22,112 @@ import java.util.Date;
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@ApiModel(value="YxUser对象", description="用户表")
|
||||
@ApiModel(value = "YxUser对象", description = "用户表")
|
||||
public class YxUser extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "用户id")
|
||||
@TableId(value = "uid", type = IdType.AUTO)
|
||||
private Integer uid;
|
||||
@ApiModelProperty(value = "用户id")
|
||||
@TableId(value = "uid", type = IdType.AUTO)
|
||||
private Integer uid;
|
||||
|
||||
@ApiModelProperty(value = "用户账户(跟accout一样)")
|
||||
private String username;
|
||||
@ApiModelProperty(value = "用户账户(跟accout一样)")
|
||||
private String username;
|
||||
|
||||
@ApiModelProperty(value = "用户账号")
|
||||
private String account;
|
||||
@ApiModelProperty(value = "用户账号")
|
||||
private String account;
|
||||
|
||||
@ApiModelProperty(value = "用户密码（跟pwd）")
|
||||
private String password;
|
||||
@ApiModelProperty(value = "用户密码（跟pwd）")
|
||||
private String password;
|
||||
|
||||
@ApiModelProperty(value = "用户密码")
|
||||
private String pwd;
|
||||
@ApiModelProperty(value = "用户密码")
|
||||
private String pwd;
|
||||
|
||||
@ApiModelProperty(value = "真实姓名")
|
||||
private String realName;
|
||||
@ApiModelProperty(value = "真实姓名")
|
||||
private String realName;
|
||||
|
||||
@ApiModelProperty(value = "生日")
|
||||
private Integer birthday;
|
||||
@ApiModelProperty(value = "生日")
|
||||
private Integer birthday;
|
||||
|
||||
@ApiModelProperty(value = "身份证号码")
|
||||
private String cardId;
|
||||
@ApiModelProperty(value = "身份证号码")
|
||||
private String cardId;
|
||||
|
||||
@ApiModelProperty(value = "用户备注")
|
||||
private String mark;
|
||||
@ApiModelProperty(value = "用户备注")
|
||||
private String mark;
|
||||
|
||||
@ApiModelProperty(value = "合伙人id")
|
||||
private Integer partnerId;
|
||||
@ApiModelProperty(value = "合伙人id")
|
||||
private Integer partnerId;
|
||||
|
||||
@ApiModelProperty(value = "用户分组id")
|
||||
private Integer groupId;
|
||||
@ApiModelProperty(value = "用户分组id")
|
||||
private Integer groupId;
|
||||
|
||||
@ApiModelProperty(value = "用户昵称")
|
||||
private String nickname;
|
||||
@ApiModelProperty(value = "用户昵称")
|
||||
private String nickname;
|
||||
|
||||
@ApiModelProperty(value = "用户头像")
|
||||
private String avatar;
|
||||
@ApiModelProperty(value = "用户头像")
|
||||
private String avatar;
|
||||
|
||||
@ApiModelProperty(value = "手机号码")
|
||||
private String phone;
|
||||
@ApiModelProperty(value = "手机号码")
|
||||
private String phone;
|
||||
|
||||
@ApiModelProperty(value = "添加时间")
|
||||
private Integer addTime;
|
||||
@ApiModelProperty(value = "添加时间")
|
||||
private Integer addTime;
|
||||
|
||||
@ApiModelProperty(value = "添加ip")
|
||||
private String addIp;
|
||||
@ApiModelProperty(value = "添加ip")
|
||||
private String addIp;
|
||||
|
||||
@ApiModelProperty(value = "最后一次登录时间")
|
||||
private Integer lastTime;
|
||||
@ApiModelProperty(value = "最后一次登录时间")
|
||||
private Integer lastTime;
|
||||
|
||||
@ApiModelProperty(value = "最后一次登录ip")
|
||||
private String lastIp;
|
||||
@ApiModelProperty(value = "最后一次登录ip")
|
||||
private String lastIp;
|
||||
|
||||
@ApiModelProperty(value = "用户余额")
|
||||
private BigDecimal nowMoney;
|
||||
@ApiModelProperty(value = "用户余额")
|
||||
private BigDecimal nowMoney;
|
||||
|
||||
@ApiModelProperty(value = "佣金金额")
|
||||
private BigDecimal brokeragePrice;
|
||||
@ApiModelProperty(value = "佣金金额")
|
||||
private BigDecimal brokeragePrice;
|
||||
|
||||
@ApiModelProperty(value = "用户剩余积分")
|
||||
private BigDecimal integral;
|
||||
@ApiModelProperty(value = "用户剩余积分")
|
||||
private BigDecimal integral;
|
||||
|
||||
@ApiModelProperty(value = "连续签到天数")
|
||||
private Integer signNum;
|
||||
@ApiModelProperty(value = "连续签到天数")
|
||||
private Integer signNum;
|
||||
|
||||
@ApiModelProperty(value = "1为正常，0为禁止")
|
||||
private Boolean status;
|
||||
@ApiModelProperty(value = "1为正常，0为禁止")
|
||||
private Boolean status;
|
||||
|
||||
@ApiModelProperty(value = "等级")
|
||||
private Integer level;
|
||||
@ApiModelProperty(value = "等级")
|
||||
private Integer level;
|
||||
|
||||
@ApiModelProperty(value = "推广元id")
|
||||
private Integer spreadUid;
|
||||
@ApiModelProperty(value = "推广元id")
|
||||
private Integer spreadUid;
|
||||
|
||||
@ApiModelProperty(value = "推广员关联时间")
|
||||
private Integer spreadTime;
|
||||
@ApiModelProperty(value = "推广员关联时间")
|
||||
private Integer spreadTime;
|
||||
|
||||
@ApiModelProperty(value = "用户类型")
|
||||
private String userType;
|
||||
@ApiModelProperty(value = "用户类型")
|
||||
private String userType;
|
||||
|
||||
@ApiModelProperty(value = "是否为推广员")
|
||||
private Boolean isPromoter;
|
||||
@ApiModelProperty(value = "是否为推广员")
|
||||
private Boolean isPromoter;
|
||||
|
||||
@ApiModelProperty(value = "用户购买次数")
|
||||
private Integer payCount;
|
||||
@ApiModelProperty(value = "用户购买次数")
|
||||
private Integer payCount;
|
||||
|
||||
@ApiModelProperty(value = "下级人数")
|
||||
private Integer spreadCount;
|
||||
@ApiModelProperty(value = "下级人数")
|
||||
private Integer spreadCount;
|
||||
|
||||
@ApiModelProperty(value = "清理会员时间")
|
||||
private Integer cleanTime;
|
||||
@ApiModelProperty(value = "清理会员时间")
|
||||
private Integer cleanTime;
|
||||
|
||||
@ApiModelProperty(value = "详细地址")
|
||||
private String addres;
|
||||
@ApiModelProperty(value = "详细地址")
|
||||
private String addres;
|
||||
|
||||
@ApiModelProperty(value = "管理员编号 ")
|
||||
private Integer adminid;
|
||||
@ApiModelProperty(value = "管理员编号 ")
|
||||
private Integer adminid;
|
||||
|
||||
@ApiModelProperty(value = "用户登陆类型，h5,wechat,routine")
|
||||
private String loginType;
|
||||
@ApiModelProperty(value = "用户登陆类型，h5,wechat,routine")
|
||||
private String loginType;
|
||||
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ public class YxWechatUser extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "微信用户id")
|
||||
@TableId(value = "uid", type = IdType.AUTO)
|
||||
@TableId(value = "uid", type = IdType.INPUT)
|
||||
private Integer uid;
|
||||
|
||||
@ApiModelProperty(value = "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段")
|
||||
|
||||
@ -11,6 +11,7 @@ import co.yixiang.modules.security.security.JwtUser;
|
||||
import co.yixiang.modules.security.utils.JwtTokenUtil;
|
||||
import co.yixiang.modules.user.entity.YxUser;
|
||||
import co.yixiang.modules.user.entity.YxWechatUser;
|
||||
import co.yixiang.modules.user.mapper.YxUserMapper;
|
||||
import co.yixiang.modules.user.service.YxUserService;
|
||||
import co.yixiang.modules.user.service.YxWechatUserService;
|
||||
import co.yixiang.utils.EncryptUtils;
|
||||
@ -92,9 +93,30 @@ public class WechatController extends BaseController {
|
||||
if(ObjectUtil.isNotNull(wechatUser)){
|
||||
jwtUser = (JwtUser) userDetailsService.loadUserByUsername(wechatUser.getNickname());
|
||||
}else{
|
||||
|
||||
|
||||
//用户保存
|
||||
YxUser user = new YxUser();
|
||||
user.setAccount(wxMpUser.getNickname());
|
||||
user.setUsername(wxMpUser.getNickname());
|
||||
user.setPassword(EncryptUtils.encryptPassword("123456"));
|
||||
user.setPwd(EncryptUtils.encryptPassword("123456"));
|
||||
user.setPhone("");
|
||||
user.setUserType("wechat");
|
||||
user.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setLastTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setNickname(wxMpUser.getNickname());
|
||||
user.setAvatar(wxMpUser.getHeadImgUrl());
|
||||
user.setNowMoney(BigDecimal.ZERO);
|
||||
user.setBrokeragePrice(BigDecimal.ZERO);
|
||||
user.setIntegral(BigDecimal.ZERO);
|
||||
|
||||
userService.save(user);
|
||||
|
||||
|
||||
//保存微信用户
|
||||
YxWechatUser yxWechatUser = new YxWechatUser();
|
||||
// System.out.println("wxMpUser:"+wxMpUser);
|
||||
// System.out.println("wxMpUser:"+wxMpUser);
|
||||
yxWechatUser.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
yxWechatUser.setNickname(wxMpUser.getNickname());
|
||||
yxWechatUser.setOpenid(wxMpUser.getOpenId());
|
||||
@ -119,27 +141,11 @@ public class WechatController extends BaseController {
|
||||
if(ObjectUtil.isNotEmpty(wxMpUser.getGroupId())){
|
||||
yxWechatUser.setGroupid(wxMpUser.getGroupId());
|
||||
}
|
||||
yxWechatUser.setUid(user.getUid());
|
||||
|
||||
wechatUserService.save(yxWechatUser);
|
||||
|
||||
|
||||
//用户保存
|
||||
YxUser user = new YxUser();
|
||||
user.setAccount(wxMpUser.getNickname());
|
||||
user.setUsername(wxMpUser.getNickname());
|
||||
user.setPassword(EncryptUtils.encryptPassword("123456"));
|
||||
user.setPwd(EncryptUtils.encryptPassword("123456"));
|
||||
user.setPhone("");
|
||||
user.setUserType("wechat");
|
||||
user.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setLastTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setNickname(wxMpUser.getNickname());
|
||||
user.setAvatar(wxMpUser.getHeadImgUrl());
|
||||
user.setNowMoney(BigDecimal.ZERO);
|
||||
user.setBrokeragePrice(BigDecimal.ZERO);
|
||||
user.setIntegral(BigDecimal.ZERO);
|
||||
user.setUid(yxWechatUser.getUid());
|
||||
userService.save(user);
|
||||
|
||||
jwtUser = (JwtUser) userDetailsService.loadUserByUsername(wxMpUser.getNickname());
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ spring:
|
||||
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
||||
url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
|
||||
username: yshop
|
||||
password: yshoP@2019#yx
|
||||
password:
|
||||
|
||||
# 初始化配置
|
||||
initial-size: 3
|
||||
@ -48,7 +48,7 @@ spring:
|
||||
database: 0
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password: yshop2019@yxtw
|
||||
password:
|
||||
#连接超时时间
|
||||
timeout: 5000
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>yshop-system</artifactId>
|
||||
<name>核心模块</name>
|
||||
<name>后台模块</name>
|
||||
|
||||
<properties>
|
||||
<jjwt.version>0.9.1</jjwt.version>
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package co.yixiang.modules.quartz.rest;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import co.yixiang.modules.quartz.domain.QuartzJob;
|
||||
import co.yixiang.modules.quartz.service.QuartzJobService;
|
||||
@ -45,6 +46,7 @@ public class QuartzJobController {
|
||||
@PostMapping(value = "/jobs")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_CREATE')")
|
||||
public ResponseEntity create(@Validated @RequestBody QuartzJob resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
if (resources.getId() != null) {
|
||||
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
|
||||
}
|
||||
@ -55,6 +57,7 @@ public class QuartzJobController {
|
||||
@PutMapping(value = "/jobs")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_EDIT')")
|
||||
public ResponseEntity update(@Validated(QuartzJob.Update.class) @RequestBody QuartzJob resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
quartzJobService.update(resources);
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -63,6 +66,7 @@ public class QuartzJobController {
|
||||
@PutMapping(value = "/jobs/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_EDIT')")
|
||||
public ResponseEntity updateIsPause(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
quartzJobService.updateIsPause(quartzJobService.findById(id));
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -71,6 +75,7 @@ public class QuartzJobController {
|
||||
@PutMapping(value = "/jobs/exec/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_EDIT')")
|
||||
public ResponseEntity execution(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
quartzJobService.execution(quartzJobService.findById(id));
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -79,6 +84,7 @@ public class QuartzJobController {
|
||||
@DeleteMapping(value = "/jobs/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','JOB_ALL','JOB_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
quartzJobService.delete(quartzJobService.findById(id));
|
||||
return new ResponseEntity(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@ -71,6 +71,10 @@ public class AuthenticationController {
|
||||
}
|
||||
final JwtUser jwtUser = (JwtUser) userDetailsService.loadUserByUsername(authorizationUser.getUsername());
|
||||
|
||||
// System.out.println(jwtUser.getUsername());
|
||||
// System.out.println(jwtUser.getPassword());
|
||||
//System.out.println(EncryptUtils.encryptPassword(authorizationUser.getPassword()));
|
||||
//System.out.println(authorizationUser.getPassword());
|
||||
if(!jwtUser.getPassword().equals(EncryptUtils.encryptPassword(authorizationUser.getPassword()))){
|
||||
throw new AccountExpiredException("密码错误");
|
||||
}
|
||||
|
||||
@ -36,6 +36,9 @@ public class JwtAuthorizationTokenFilter extends OncePerRequestFilter {
|
||||
|
||||
final String requestHeader = request.getHeader(this.tokenHeader);
|
||||
|
||||
String m = request.getMethod();
|
||||
|
||||
|
||||
String username = null;
|
||||
String authToken = null;
|
||||
if (requestHeader != null && requestHeader.startsWith("Bearer ")) {
|
||||
|
||||
@ -4,6 +4,7 @@ import lombok.Data;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
@ -27,6 +28,7 @@ public class YxStoreCategory implements Serializable {
|
||||
|
||||
// 分类名称
|
||||
@Column(name = "cate_name",nullable = false)
|
||||
@NotBlank(message = "分类名称不能为空")
|
||||
private String cateName;
|
||||
|
||||
// 排序
|
||||
@ -35,6 +37,7 @@ public class YxStoreCategory implements Serializable {
|
||||
|
||||
// 图标
|
||||
@Column(name = "pic",nullable = false)
|
||||
@NotBlank(message = "请上传分类图片")
|
||||
private String pic;
|
||||
|
||||
// 是否推荐
|
||||
|
||||
@ -4,6 +4,8 @@ import lombok.Data;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
import javax.persistence.*;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.math.BigDecimal;
|
||||
import java.io.Serializable;
|
||||
|
||||
@ -28,22 +30,27 @@ public class YxStoreProduct implements Serializable {
|
||||
|
||||
// 商品图片
|
||||
@Column(name = "image",nullable = false)
|
||||
@NotBlank(message = "请上传商品图片")
|
||||
private String image;
|
||||
|
||||
// 轮播图
|
||||
@Column(name = "slider_image",nullable = false)
|
||||
@NotBlank(message = "请上传轮播图")
|
||||
private String sliderImage;
|
||||
|
||||
// 商品名称
|
||||
@Column(name = "store_name",nullable = false)
|
||||
@NotBlank(message = "请填写商品名称")
|
||||
private String storeName;
|
||||
|
||||
// 商品简介
|
||||
@Column(name = "store_info",nullable = false)
|
||||
@NotBlank(message = "请填写商品简介")
|
||||
private String storeInfo;
|
||||
|
||||
// 关键字
|
||||
@Column(name = "keyword",nullable = false)
|
||||
@NotBlank(message = "请填写关键字")
|
||||
private String keyword;
|
||||
|
||||
// 产品条码（一维码）
|
||||
@ -52,62 +59,72 @@ public class YxStoreProduct implements Serializable {
|
||||
|
||||
// 分类id
|
||||
@Column(name = "cate_id",nullable = false)
|
||||
@NotBlank(message = "请选择分类")
|
||||
private String cateId;
|
||||
|
||||
// 商品价格
|
||||
@Column(name = "price",nullable = false)
|
||||
@Min(value = 0)
|
||||
private BigDecimal price;
|
||||
|
||||
// 会员价格
|
||||
@Column(name = "vip_price",nullable = false)
|
||||
@Min(value = 0)
|
||||
private BigDecimal vipPrice;
|
||||
|
||||
// 市场价
|
||||
@Column(name = "ot_price",nullable = false)
|
||||
@Min(value = 0)
|
||||
private BigDecimal otPrice;
|
||||
|
||||
// 邮费
|
||||
@Column(name = "postage",nullable = false)
|
||||
@Min(value = 0)
|
||||
private BigDecimal postage;
|
||||
|
||||
// 单位名
|
||||
@Column(name = "unit_name",nullable = false)
|
||||
@NotBlank(message = "请填写单位")
|
||||
private String unitName;
|
||||
|
||||
// 排序
|
||||
@Column(name = "sort",nullable = false)
|
||||
@Min(value = 0)
|
||||
private Integer sort;
|
||||
|
||||
// 销量
|
||||
@Column(name = "sales",nullable = false)
|
||||
@Min(value = 0)
|
||||
private Integer sales;
|
||||
|
||||
// 库存
|
||||
@Column(name = "stock",nullable = false)
|
||||
@Min(value = 0)
|
||||
private Integer stock;
|
||||
|
||||
// 状态（0：未上架，1：上架）
|
||||
@Column(name = "is_show",nullable = false)
|
||||
@Column(name = "is_show",columnDefinition="int default 1")
|
||||
private Integer isShow;
|
||||
|
||||
// 是否热卖
|
||||
@Column(name = "is_hot",nullable = false)
|
||||
@Column(name = "is_hot",columnDefinition="int default 0")
|
||||
private Integer isHot;
|
||||
|
||||
// 是否优惠
|
||||
@Column(name = "is_benefit",nullable = false)
|
||||
@Column(name = "is_benefit",columnDefinition="int default 0")
|
||||
private Integer isBenefit;
|
||||
|
||||
// 是否精品
|
||||
@Column(name = "is_best",nullable = false)
|
||||
@Column(name = "is_best",columnDefinition="int default 0")
|
||||
private Integer isBest;
|
||||
|
||||
// 是否新品
|
||||
@Column(name = "is_new",nullable = false)
|
||||
@Column(name = "is_new",columnDefinition="int default 0")
|
||||
private Integer isNew;
|
||||
|
||||
// 产品描述
|
||||
@Column(name = "description",nullable = false)
|
||||
@NotBlank(message = "产品描述")
|
||||
private String description;
|
||||
|
||||
// 添加时间
|
||||
@ -115,11 +132,11 @@ public class YxStoreProduct implements Serializable {
|
||||
private Integer addTime;
|
||||
|
||||
// 是否包邮
|
||||
@Column(name = "is_postage",nullable = false)
|
||||
@Column(name = "is_postage",columnDefinition="int default 0")
|
||||
private Integer isPostage;
|
||||
|
||||
// 是否删除
|
||||
@Column(name = "is_del",nullable = false)
|
||||
@Column(name = "is_del",columnDefinition="int default 0")
|
||||
private Integer isDel;
|
||||
|
||||
// 商户是否代理 0不可代理1可代理
|
||||
@ -127,31 +144,33 @@ public class YxStoreProduct implements Serializable {
|
||||
private Integer merUse;
|
||||
|
||||
// 获得积分
|
||||
@Column(name = "give_integral",nullable = false)
|
||||
@Column(name = "give_integral",columnDefinition="int default 0")
|
||||
@Min(value = 0)
|
||||
private BigDecimal giveIntegral;
|
||||
|
||||
// 成本价
|
||||
@Column(name = "cost",nullable = false)
|
||||
@Column(name = "cost",columnDefinition="int default 0")
|
||||
@Min(value = 0)
|
||||
private BigDecimal cost;
|
||||
|
||||
// 秒杀状态 0 未开启 1已开启
|
||||
@Column(name = "is_seckill",nullable = false)
|
||||
@Column(name = "is_seckill",columnDefinition="int default 0")
|
||||
private Integer isSeckill;
|
||||
|
||||
// 砍价状态 0未开启 1开启
|
||||
@Column(name = "is_bargain")
|
||||
@Column(name = "is_bargain",columnDefinition="int default 0")
|
||||
private Integer isBargain;
|
||||
|
||||
// 是否优品推荐
|
||||
@Column(name = "is_good",nullable = false)
|
||||
@Column(name = "is_good",columnDefinition="int default 0")
|
||||
private Integer isGood;
|
||||
|
||||
// 虚拟销量
|
||||
@Column(name = "ficti")
|
||||
@Column(name = "ficti",columnDefinition="int default 0")
|
||||
private Integer ficti;
|
||||
|
||||
// 浏览量
|
||||
@Column(name = "browse")
|
||||
@Column(name = "browse",columnDefinition="int default 0")
|
||||
private Integer browse;
|
||||
|
||||
// 产品二维码地址(用户小程序海报)
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
package co.yixiang.modules.shop.rest;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import co.yixiang.modules.shop.domain.YxStoreCategory;
|
||||
import co.yixiang.modules.shop.service.YxStoreCategoryService;
|
||||
import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO;
|
||||
import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria;
|
||||
import co.yixiang.utils.OrderUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.http.HttpStatus;
|
||||
@ -42,6 +45,8 @@ public class YxStoreCategoryController {
|
||||
@PostMapping(value = "/yxStoreCategory")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','YXSTORECATEGORY_ALL','YXSTORECATEGORY_CREATE')")
|
||||
public ResponseEntity create(@Validated @RequestBody YxStoreCategory resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
resources.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
return new ResponseEntity(yxStoreCategoryService.create(resources),HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@ -50,6 +55,7 @@ public class YxStoreCategoryController {
|
||||
@PutMapping(value = "/yxStoreCategory")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','YXSTORECATEGORY_ALL','YXSTORECATEGORY_EDIT')")
|
||||
public ResponseEntity update(@Validated @RequestBody YxStoreCategory resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
yxStoreCategoryService.update(resources);
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -59,6 +65,7 @@ public class YxStoreCategoryController {
|
||||
@DeleteMapping(value = "/yxStoreCategory/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','YXSTORECATEGORY_ALL','YXSTORECATEGORY_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Integer id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
yxStoreCategoryService.delete(id);
|
||||
return new ResponseEntity(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
package co.yixiang.modules.shop.rest;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import co.yixiang.utils.OrderUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import co.yixiang.aop.log.Log;
|
||||
@ -16,6 +19,8 @@ import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* @author hupeng
|
||||
* @date 2019-10-04
|
||||
@ -41,6 +46,14 @@ public class YxStoreProductController {
|
||||
@PostMapping(value = "/yxStoreProduct")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_CREATE')")
|
||||
public ResponseEntity create(@Validated @RequestBody YxStoreProduct resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
resources.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
if(ObjectUtil.isEmpty(resources.getGiveIntegral())) resources.setGiveIntegral(BigDecimal.ZERO);
|
||||
if(ObjectUtil.isEmpty(resources.getCost())) resources.setCost(BigDecimal.ZERO);
|
||||
//resources.setIsBargain(0);
|
||||
//resources.setIsSeckill(0);
|
||||
//resources.setIsDel(0);
|
||||
//resources.setIsShow(1);
|
||||
return new ResponseEntity(yxStoreProductService.create(resources),HttpStatus.CREATED);
|
||||
}
|
||||
|
||||
@ -58,6 +71,7 @@ public class YxStoreProductController {
|
||||
@DeleteMapping(value = "/yxStoreProduct/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Integer id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
yxStoreProductService.delete(id);
|
||||
return new ResponseEntity(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package co.yixiang.modules.shop.service.impl;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.modules.shop.domain.YxStoreCategory;
|
||||
import co.yixiang.modules.shop.service.YxStoreCategoryService;
|
||||
import co.yixiang.utils.ValidationUtil;
|
||||
@ -56,6 +57,8 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public YxStoreCategoryDTO create(YxStoreCategory resources) {
|
||||
if(ObjectUtil.isNull(resources.getPid())) resources.setPid(0);
|
||||
if(ObjectUtil.isNull(resources.getSort())) resources.setSort(1);
|
||||
return yxStoreCategoryMapper.toDto(yxStoreCategoryRepository.save(resources));
|
||||
}
|
||||
|
||||
@ -82,6 +85,8 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
|
||||
Set<YxStoreCategoryDTO> cates= new LinkedHashSet<>();
|
||||
List<String> deptNames = categoryDTOS.stream().map(YxStoreCategoryDTO::getCateName)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
YxStoreCategoryDTO categoryDTO = new YxStoreCategoryDTO();
|
||||
Boolean isChild;
|
||||
for (YxStoreCategoryDTO deptDTO : categoryDTOS) {
|
||||
isChild = false;
|
||||
@ -103,10 +108,14 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
|
||||
cates.add(deptDTO);
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (CollectionUtils.isEmpty(trees)) {
|
||||
trees = cates;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Integer totalElements = categoryDTOS!=null?categoryDTOS.size():0;
|
||||
|
||||
Map map = new HashMap();
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package co.yixiang.modules.system.rest;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import co.yixiang.utils.SecurityUtils;
|
||||
import co.yixiang.aop.log.Log;
|
||||
@ -73,6 +74,7 @@ public class MenuController {
|
||||
@PostMapping(value = "/menus")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_CREATE')")
|
||||
public ResponseEntity create(@Validated @RequestBody Menu resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
if (resources.getId() != null) {
|
||||
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
|
||||
}
|
||||
@ -83,6 +85,7 @@ public class MenuController {
|
||||
@PutMapping(value = "/menus")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_EDIT')")
|
||||
public ResponseEntity update(@Validated(Menu.Update.class) @RequestBody Menu resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
menuService.update(resources);
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -91,6 +94,7 @@ public class MenuController {
|
||||
@DeleteMapping(value = "/menus/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','MENU_ALL','MENU_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Long id){
|
||||
//if(id>0) throw new BadRequestException("演示环境禁止操作");
|
||||
List<Menu> menuList = menuService.findByPid(id);
|
||||
Set<Menu> menuSet = new HashSet<>();
|
||||
menuSet.add(menuService.findOne(id));
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package co.yixiang.modules.system.rest;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.modules.system.domain.Permission;
|
||||
@ -66,6 +67,7 @@ public class PermissionController {
|
||||
@PutMapping(value = "/permissions")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','PERMISSION_ALL','PERMISSION_EDIT')")
|
||||
public ResponseEntity update(@Validated(Permission.Update.class) @RequestBody Permission resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
permissionService.update(resources);
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -74,6 +76,7 @@ public class PermissionController {
|
||||
@DeleteMapping(value = "/permissions/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','PERMISSION_ALL','PERMISSION_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
List<Permission> permissions = permissionService.findByPid(id);
|
||||
Set<Permission> permissionSet = new HashSet<>();
|
||||
permissionSet.add(permissionMapper.toEntity(permissionService.findById(id)));
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package co.yixiang.modules.system.rest;
|
||||
|
||||
import cn.hutool.core.lang.Dict;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import co.yixiang.utils.SecurityUtils;
|
||||
import co.yixiang.utils.ThrowableUtil;
|
||||
@ -83,6 +84,7 @@ public class RoleController {
|
||||
@PutMapping(value = "/roles")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')")
|
||||
public ResponseEntity update(@Validated(Role.Update.class) @RequestBody Role resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
roleService.update(resources);
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -91,6 +93,7 @@ public class RoleController {
|
||||
@PutMapping(value = "/roles/permission")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')")
|
||||
public ResponseEntity updatePermission(@RequestBody Role resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
roleService.updatePermission(resources,roleService.findById(resources.getId()));
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -99,6 +102,7 @@ public class RoleController {
|
||||
@PutMapping(value = "/roles/menu")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_EDIT')")
|
||||
public ResponseEntity updateMenu(@RequestBody Role resources){
|
||||
//if(ObjectUtil.isNotNull(resources)) throw new BadRequestException("演示环境禁止操作");
|
||||
roleService.updateMenu(resources,roleService.findById(resources.getId()));
|
||||
return new ResponseEntity(HttpStatus.NO_CONTENT);
|
||||
}
|
||||
@ -107,6 +111,7 @@ public class RoleController {
|
||||
@DeleteMapping(value = "/roles/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','ROLES_ALL','ROLES_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
try {
|
||||
roleService.delete(id);
|
||||
}catch (Throwable e){
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package co.yixiang.modules.system.rest;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.config.DataScope;
|
||||
import co.yixiang.domain.VerificationCode;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
@ -124,6 +125,7 @@ public class UserController {
|
||||
@DeleteMapping(value = "/users/{id}")
|
||||
@PreAuthorize("hasAnyRole('ADMIN','USER_ALL','USER_DELETE')")
|
||||
public ResponseEntity delete(@PathVariable Long id){
|
||||
// if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
Integer currentLevel = Collections.min(roleService.findByUsers_Id(SecurityUtils.getUserId()).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList()));
|
||||
Integer optLevel = Collections.min(roleService.findByUsers_Id(id).stream().map(RoleSmallDTO::getLevel).collect(Collectors.toList()));
|
||||
|
||||
@ -141,6 +143,7 @@ public class UserController {
|
||||
*/
|
||||
@PostMapping(value = "/users/updatePass")
|
||||
public ResponseEntity updatePass(@RequestBody UserPassVo user){
|
||||
//if(ObjectUtil.isNotNull(user)) throw new BadRequestException("演示环境禁止操作");
|
||||
UserDetails userDetails = SecurityUtils.getUserDetails();
|
||||
if(!userDetails.getPassword().equals(EncryptUtils.encryptPassword(user.getOldPass()))){
|
||||
throw new BadRequestException("修改失败，旧密码错误");
|
||||
|
||||
@ -41,6 +41,15 @@ spring:
|
||||
# 生产环境设置成 none，避免程序运行时自动更新数据库结构
|
||||
ddl-auto: update
|
||||
|
||||
redis:
|
||||
#数据库索引
|
||||
database: 0
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password:
|
||||
#连接超时时间
|
||||
timeout: 5000
|
||||
|
||||
#jwt
|
||||
jwt:
|
||||
header: Authorization
|
||||
|
||||
@ -4,9 +4,9 @@ spring:
|
||||
druid:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
||||
url: jdbc:log4jdbc:mysql://localhost:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
|
||||
username: root
|
||||
password: 123456
|
||||
url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
|
||||
username: yshop
|
||||
password:
|
||||
|
||||
# 初始化配置
|
||||
initial-size: 3
|
||||
@ -42,6 +42,14 @@ spring:
|
||||
hibernate:
|
||||
# 生产环境设置成 none，避免程序运行时自动更新数据库结构
|
||||
ddl-auto: none
|
||||
redis:
|
||||
#数据库索引
|
||||
database: 0
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password:
|
||||
#连接超时时间
|
||||
timeout: 5000
|
||||
|
||||
#jwt
|
||||
jwt:
|
||||
@ -72,8 +80,8 @@ swagger:
|
||||
|
||||
# 文件存储路径
|
||||
file:
|
||||
path: /home/eladmin/file/
|
||||
avatar: /home/eladmin/avatar/
|
||||
path: /home/yshop/file/
|
||||
avatar: /home/yshop/avatar/
|
||||
# 文件大小 /M
|
||||
maxSize: 100
|
||||
avatarMaxSize: 5
|
||||
@ -20,14 +20,6 @@ spring:
|
||||
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
|
||||
open-in-view: true
|
||||
|
||||
redis:
|
||||
#数据库索引
|
||||
database: 0
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password:
|
||||
#连接超时时间
|
||||
timeout: 5000
|
||||
|
||||
#七牛云
|
||||
qiniu:
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
package co.yixiang.rest;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import co.yixiang.exception.BadRequestException;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.domain.QiniuConfig;
|
||||
@ -37,6 +40,7 @@ public class QiniuController {
|
||||
@Log("配置七牛云存储")
|
||||
@PutMapping(value = "/qiNiuConfig")
|
||||
public ResponseEntity emailConfig(@Validated @RequestBody QiniuConfig qiniuConfig){
|
||||
//if(ObjectUtil.isNotNull(qiniuConfig)) throw new BadRequestException("演示环境禁止操作");
|
||||
qiNiuService.update(qiniuConfig);
|
||||
qiNiuService.update(qiniuConfig.getType());
|
||||
return new ResponseEntity(HttpStatus.OK);
|
||||
@ -85,6 +89,7 @@ public class QiniuController {
|
||||
@Log("下载文件")
|
||||
@GetMapping(value = "/qiNiuContent/download/{id}")
|
||||
public ResponseEntity download(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
Map map = new HashMap(1);
|
||||
map.put("url", qiNiuService.download(qiNiuService.findByContentId(id),qiNiuService.find()));
|
||||
return new ResponseEntity(map,HttpStatus.OK);
|
||||
@ -99,6 +104,7 @@ public class QiniuController {
|
||||
@Log("删除文件")
|
||||
@DeleteMapping(value = "/qiNiuContent/{id}")
|
||||
public ResponseEntity delete(@PathVariable Long id){
|
||||
//if(id > 0) throw new BadRequestException("演示环境禁止操作");
|
||||
qiNiuService.delete(qiNiuService.findByContentId(id),qiNiuService.find());
|
||||
return new ResponseEntity(HttpStatus.OK);
|
||||
}
|
||||
@ -111,6 +117,7 @@ public class QiniuController {
|
||||
@Log("删除图片")
|
||||
@DeleteMapping(value = "/qiNiuContent")
|
||||
public ResponseEntity deleteAll(@RequestBody Long[] ids) {
|
||||
//if(ArrayUtil.isNotEmpty(ids)) throw new BadRequestException("演示环境禁止操作");
|
||||
qiNiuService.deleteAll(ids, qiNiuService.find());
|
||||
return new ResponseEntity(HttpStatus.OK);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user